Changeset 5017 in josm for trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

Timestamp:

2012-02-22T19:17:45+01:00 (12 years ago)

Author:

stoecker

Message:

use EPSG codes instead of instanceof to verify projection (allows to use proj4j projections instead of internally supported projections)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -57 +57 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
-import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MapView;
@@ -1030 +1029 @@
         List<String> serverProjections = info.getServerProjections();
         return serverProjections.contains(proj.toCode().toUpperCase())
-                || (proj instanceof Mercator && serverProjections.contains("EPSG:4326"));
+                || ("EPSG:3857".equals(proj.toCode()) && (serverProjections.contains("EPSG:4326") || serverProjections.contains("CRS:84")))
+                || ("EPSG:4326".equals(proj.toCode()) && serverProjections.contains("CRS:84"));
     }