Changeset 11858 in josm for trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java

Timestamp:

2017-04-09T11:08:10+02:00 (7 years ago)

Author:

bastiK

Message:

fixed #7427 - Support reprojection (warping) of imagery layer

File:

• trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java (modified) (4 diffs)

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

@@ -3 +3 @@
 
 import java.io.IOException;
-import java.util.Set;
+import java.util.Collection;
 
 import org.apache.commons.jcs.access.CacheAccess;
@@ -15 +15 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -75 +76 @@
             return getMaxZoomLvl();
         }
-        double displayScale = Main.map.mapView.getScale() * Main.getProjection().getMetersPerUnit(); // meter per pixel
+        double displayScale = Main.map.mapView.getScale();
+        if (coordinateConverter.requiresReprojection()) {
+            displayScale *= Main.getProjection().getMetersPerUnit();
+        }
         Scale snap = scaleList.getSnapScale(displayScale, false);
-        return Math.max(
-                getMinZoomLvl(),
-                Math.min(
-                        snap != null ? snap.getIndex() : getMaxZoomLvl(),
-                        getMaxZoomLvl()
-                        )
-                );
+        return Utils.clamp(snap != null ? snap.getIndex() : getMaxZoomLvl(),
+                getMinZoomLvl(), getMaxZoomLvl());
     }
 
@@ -92 +91 @@
 
     @Override
-    public boolean isProjectionSupported(Projection proj) {
-        Set<String> supportedProjections = tileSource.getSupportedProjections();
-        return supportedProjections.contains(proj.toCode());
-    }
-
-    @Override
-    public String nameSupportedProjections() {
-        StringBuilder ret = new StringBuilder();
-        for (String e: tileSource.getSupportedProjections()) {
-            ret.append(e).append(", ");
-        }
-        return ret.length() > 2 ? ret.substring(0, ret.length()-2) : ret.toString();
+    public Collection<String> getNativeProjections() {
+        return tileSource.getSupportedProjections();
     }