Changeset 28384 in osm for applications/editors/josm/plugins/opendata/src/org/openstreetmap

Timestamp:

2012-05-13T13:17:04+02:00 (13 years ago)

Author:

donvip

Message:

[josm_opendata] Update to JOSM 5236

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• datasets/fr/FrenchDataSetHandler.java (modified) (2 diffs)
• io/ProjectionChooser.java (modified) (3 diffs)
• io/geographic/DefaultShpHandler.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java

@@ -20 +20 @@
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -42 +41 @@
 
         protected static final Projection lambert93 = PRJ_LAMBERT_93.getProjection(); // France metropolitaine
-        protected static final UTM utm20 = new UTM(20, Hemisphere.North, false); // Guadeloupe, Martinique
-        protected static final UTM utm22 = new UTM(22, Hemisphere.North, false); // Guyane
-        protected static final UTM utm38 = new UTM(38, Hemisphere.South, false); // Mayotte
-        protected static final UTM utm40 = new UTM(40, Hemisphere.South, false); // Reunion
+        protected static final UTM utm20 = new UTM(20, Hemisphere.North); // Guadeloupe, Martinique
+        protected static final UTM utm22 = new UTM(22, Hemisphere.North); // Guyane
+        protected static final UTM utm38 = new UTM(38, Hemisphere.South); // Mayotte
+        protected static final UTM utm40 = new UTM(40, Hemisphere.South); // Reunion
         
         protected static final Lambert[] lambert4Zones = new Lambert[4];
         static {
                 for (int i=0; i<lambert4Zones.length; i++) {
-                        lambert4Zones[i] = new Lambert();
-                        lambert4Zones[i].setPreferences(Arrays.asList(Integer.toString(i+1)));
+                        lambert4Zones[i] = new Lambert(i);
                 }
         }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/ProjectionChooser.java

@@ -27 +27 @@
 
 import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -42 +43 @@
      * Combobox with all projections available
      */
-    private final JComboBox projectionCombo = new JComboBox(Projections.getProjections().toArray());
+    private final JComboBox projectionCombo = new JComboBox(ProjectionPreference.getProjectionChoices().toArray());
 
         public ProjectionChooser(Component parent) {
@@ -64 +65 @@
         
         public Projection getProjection() {
-                return (Projection) projectionCombo.getSelectedItem();
+                ProjectionChoice choice = (ProjectionChoice) projectionCombo.getSelectedItem();
+                return choice != null ? choice.getProjection() : null;
         }
 }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultShpHandler.java

@@ -40 +40 @@
 import org.openstreetmap.josm.data.projection.Ellipsoid;
 import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.data.projection.proj.LambertConformalConic;
 import org.openstreetmap.josm.data.projection.proj.LambertConformalConic.Parameters;
 import org.openstreetmap.josm.data.projection.proj.LambertConformalConic.Parameters1SP;
 import org.openstreetmap.josm.data.projection.proj.LambertConformalConic.Parameters2SP;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.tools.Pair;
@@ -83 +84 @@
                                 LambertConformal lambert = (LambertConformal) transform;
                                 GeodeticDatum geo = (GeodeticDatum) crs.getDatum();
-                                for (Projection p : Projections.getProjections()) {
+                                for (ProjectionChoice choice : ProjectionPreference.getProjectionChoices()) {
+                                        Projection p = choice.getProjection();
                                         if (p instanceof AbstractProjection) {
                                                 AbstractProjection ap = (AbstractProjection) p;