Changeset 17502 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2021-02-21T09:07:46+01:00 (3 years ago)

Author:

wiktorn

Message:

Check current tile projection when querying WMS server.

Add same logic as in WMSEndpointTileSource to check, whether coordinates needs
to be switched or not. Before this change, switch was calculated only when
adding the layer, so changing map projection was ignored.

Also it was using JOSM map projection settings instead of the projection that
was chosen to query the server and this could result in replaced X and Y
coordinates.

Closes: #20509

File:

• trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -57 +56 @@
     private final Map<String, String> headers = new ConcurrentHashMap<>();
     private final String date;
-    private final boolean switchLatLon;
+    private final boolean belowWMS130;
 
     /**
@@ -88 +87 @@
         // [1] https://www.epsg-registry.org/report.htm?type=selection&entity=urn:ogc:def:crs:EPSG::4326&reportDetail=short&style=urn:uuid:report-style:default-with-code&style_name=OGP%20Default%20With%20Code&title=EPSG:4326
         // CHECKSTYLE.ON: LineLength
-        if (baseUrl.toLowerCase(Locale.US).contains("crs=epsg:4326")) {
-            switchLatLon = true;
-        } else if (baseUrl.toLowerCase(Locale.US).contains("crs=")) {
-            // assume WMS 1.3.0
-            switchLatLon = ProjectionRegistry.getProjection().switchXY();
-        } else {
-            switchLatLon = false;
-        }
+        belowWMS130 = !baseUrl.toLowerCase(Locale.US).contains("crs=");
     }
 
@@ -133 +125 @@
                 break;
             case "bbox":
-                replacement = getBbox(zoom, tilex, tiley, switchLatLon);
+                replacement = getBbox(zoom, tilex, tiley, !belowWMS130 && getTileProjection().switchXY());
                 break;
             case "w":