Changeset 5017 in josm for trunk/src/org/openstreetmap/josm/io

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/io/imagery/WMSGrabber.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.imagery.GeorefImage.State;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
-import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
@@ -86 +85 @@
             int wi, int ht) throws MalformedURLException {
         String myProj = Main.getProjection().toCode();
-        if (!info.getServerProjections().contains(myProj) && (Main.getProjection() instanceof Mercator)) {
+        if (!info.getServerProjections().contains(myProj) && "EPSG:3857".equals(Main.getProjection().toCode())) {
             LatLon sw = Main.getProjection().eastNorth2latlon(new EastNorth(w, s));
             LatLon ne = Main.getProjection().eastNorth2latlon(new EastNorth(e, n));
@@ -99 +98 @@
         }
 
-        // Bounding box coordinats have to be switched for WMS 1.3.0 EPSG:4326.
+        // Bounding box coordinates have to be switched for WMS 1.3.0 EPSG:4326.
         //
         // Background: