Changeset 18207 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java

Timestamp:

2009-10-18T18:11:09+02:00 (17 years ago)

Author:

pieren

Message:

Use the new cadastre projection LambertCC9Zones

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java (modified) (4 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java

@@ -14 +14 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.projection.Lambert;
+import org.openstreetmap.josm.data.projection.LambertCC9Zones;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -22 +23 @@
     public static String name = "Change Lambert zone";
 
+    public static String[] lambert4zones = { "", "1 (51.30 to 48.15 degrees)", "2 (48.15 to 45.45 degrees)", "3 (45.45 to 42.76 degrees)", "4 (Corsica)" };
+    public static String[] lambert9zones = { "", "1 (41 to 43 degrees)", "2 (42 to 44 degrees)",
+            "3 (43 to 45 degrees)", "4 (44 to 46 degrees)", "5 (45 to 47 degrees)",
+            "6 (46 to 48 degrees)", "7 (47 to 49 degrees)", "8 (48 to 50 degrees)",
+            "9 (49 to 51 degrees)" };
+
     public MenuActionLambertZone() {
-        super(tr(name), "cadastre_small", tr("Set manually the Lambert zone (e.g. for locations between two zones)"),
+        super(tr(name), "cadastre_small", tr("Set manually the Lambert zone"),
                 null, false);
     }
@@ -29 +36 @@
     public void actionPerformed(ActionEvent e) {
         JPanel p = new JPanel(new GridBagLayout());
-        String[] zones = { "", "1 (51.30 to 48.15 degrees)", "2 (48.15 to 45.45 degrees)", "3 (45.45 to 42.76 degrees)", "4 (Corsica)" };
-        final JComboBox inputLambertZone = new JComboBox(zones);
+        final JComboBox inputLambertZone;
+        if (Main.proj instanceof LambertCC9Zones)
+            inputLambertZone = new JComboBox(lambert9zones);
+        else
+            inputLambertZone = new JComboBox(lambert4zones);
         JLabel newLambertZone = new JLabel(tr("Zone"));
         p.add(newLambertZone, GBC.std());
@@ -47 +57 @@
         if (inputLambertZone.getSelectedIndex() > 0) {
             Lambert.layoutZone = inputLambertZone.getSelectedIndex() - 1;
+            LambertCC9Zones.layoutZone = Lambert.layoutZone; 
         }
     }