Changeset 14523 in josm for trunk

Timestamp:

2018-12-08T21:22:54+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16073 - make sure correct projection is used

File:

• trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -34 +34 @@
 import org.openstreetmap.josm.data.imagery.WMTSTileSource;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource.WMTSGetCapabilitiesException;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.HttpClient;
@@ -190 +192 @@
     }
 
+    private static Projection getProjection(ImageryInfo info) {
+        return info.getServerProjections().isEmpty() ? ProjectionRegistry.getProjection() :
+            Projections.getProjectionByCode(info.getServerProjections().get(0));
+    }
+
     private static AbstractTileSource getTileSource(ImageryInfo info) throws IOException, WMTSGetCapabilitiesException {
         switch (info.getImageryType()) {
@@ -199 +206 @@
                 return new TemplatedTMSTileSource(info);
             case WMS:
-                return new TemplatedWMSTileSource(info, ProjectionRegistry.getProjection());
+                return new TemplatedWMSTileSource(info, getProjection(info));
             case WMS_ENDPOINT:
-                return new WMSEndpointTileSource(info, ProjectionRegistry.getProjection());
+                return new WMSEndpointTileSource(info, getProjection(info));
             case WMTS:
-                return new WMTSTileSource(info, ProjectionRegistry.getProjection());
+                return new WMTSTileSource(info, getProjection(info));
             default:
                 throw new UnsupportedOperationException(info.toString());