Changeset 5548 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2012-11-01T16:52:19+01:00 (11 years ago)

Author:

bastiK

Message:

remove Projection classes (replaced by data/epsg file)

concludes the projection rework from ealier this year

File:

• trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -12 +12 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -23 +24 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ValidateAction;
-import org.openstreetmap.josm.data.projection.Epsg4326;
-import org.openstreetmap.josm.data.projection.Lambert;
-import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.validation.tests.BuildingInBuilding;
 import org.openstreetmap.josm.data.validation.tests.Coastlines;
@@ -57 +55 @@
 import org.openstreetmap.josm.gui.layer.ValidatorLayer;
 import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 
 /**
@@ -253 +252 @@
      */
     public void initializeGridDetail() {
-        if (Main.getProjection().toString().equals(new Epsg4326().toString())) {
+        String code = Main.getProjection().toCode();
+        if (Arrays.asList(ProjectionPreference.wgs84.allCodes()).contains(code)) {
             OsmValidator.griddetail = 10000;
-        } else if (Main.getProjection().toString().equals(new Mercator().toString())) {
+        } else if (Arrays.asList(ProjectionPreference.mercator.allCodes()).contains(code)) {
             OsmValidator.griddetail = 0.01;
-        } else if (Main.getProjection().toString().equals(new Lambert().toString())) {
+        } else if (Arrays.asList(ProjectionPreference.lambert.allCodes()).contains(code)) {
             OsmValidator.griddetail = 0.1;
         } else {