Changeset 13674 in josm

Timestamp:

2018-04-24T21:32:50+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16219 - smarter selection of WMS projection

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (1 diff)
• WMSLayer.java (modified) (3 diffs)

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

@@ -1208 +1208 @@
 
         protected void sanitize() {
-            if (minX < tileSource.getTileXMin(zoom)) {
-                minX = tileSource.getTileXMin(zoom);
-            }
-            if (minY < tileSource.getTileYMin(zoom)) {
-                minY = tileSource.getTileYMin(zoom);
-            }
-            if (maxX > tileSource.getTileXMax(zoom)) {
-                maxX = tileSource.getTileXMax(zoom);
-            }
-            if (maxY > tileSource.getTileYMax(zoom)) {
-                maxY = tileSource.getTileYMax(zoom);
-            }
+            minX = Utils.clamp(minX, tileSource.getTileXMin(zoom), tileSource.getTileXMax(zoom));
+            maxX = Utils.clamp(maxX, tileSource.getTileXMin(zoom), tileSource.getTileXMax(zoom));
+            minY = Utils.clamp(minY, tileSource.getTileYMin(zoom), tileSource.getTileYMax(zoom));
+            maxY = Utils.clamp(maxY, tileSource.getTileYMin(zoom), tileSource.getTileYMax(zoom));
         }
 

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

@@ -18 +18 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.AbstractWMSTileSource;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -28 +29 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -130 +132 @@
             return requested;
         } else {
+            LatLon center = MainApplication.isDisplayingMapView() ?
+                    requested.eastNorth2latlon(MainApplication.getMap().mapView.getCenter()) : null;
+            Projection firstNonNullproj = null;
+            Projection firstProjInBounds = null;
             for (String code : serverProjections) {
                 Projection proj = Projections.getProjectionByCode(code);
                 if (proj != null) {
-                    Logging.info(tr("Reprojecting layer {0} from {1} to {2}. For best image quality and performance,"
-                            + " switch to one of the supported projections: {3}",
-                            getName(), proj.toCode(), Main.getProjection().toCode(), Utils.join(", ", getNativeProjections())));
-                    return proj;
+                    if (firstNonNullproj == null) {
+                        firstNonNullproj = proj;
+                    }
+                    if (center != null && proj.getWorldBoundsLatLon().contains(center)) {
+                        firstProjInBounds = proj;
+                        break;
+                    }
                 }
+            }
+            if (firstProjInBounds != null) {
+                return selectProjection(firstProjInBounds);
+            } else if (firstNonNullproj != null) {
+                return selectProjection(firstNonNullproj);
             }
             Logging.warn(tr("Unable to find supported projection for layer {0}. Using {1}.", getName(), requested.toCode()));
             return requested;
         }
+    }
+
+    private Projection selectProjection(Projection proj) {
+        Logging.info(tr("Reprojecting layer {0} from {1} to {2}. For best image quality and performance,"
+                + " switch to one of the supported projections: {3}",
+                getName(), proj.toCode(), Main.getProjection().toCode(), Utils.join(", ", getNativeProjections())));
+        return proj;
     }