Changeset 9134 in josm for trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

Timestamp:

2015-12-15T20:55:53+01:00 (8 years ago)

Author:

wiktorn

Message:

Introduce imagery-source warnings about alignment and reprojections.

Introduce new setting to maps.xsd:

• valid-georeference - which marks imagery sources that are properly georeferenced (i.e. do not need imagery offset adjustments)
• epsg4326to3857Supported - which marks imagery sources that might be safely queried using EPSG:3857 square BBOX, using EPSG:4326 projection

Make the AlignImageryPanel to show only, when valid-georeference is not set to true and provide the ability to hide this message ("do not show again"), which will be now remembered on per-source basis. Due to this changes, good imagery sources will not show warning to novice users and - experienced users will be presented with a warning, when they open an new imagery source which might be unaligned.

Introduce the ability to check "do not show again" the warning about EPSG:3857 to EPSG:4326 reprojections - as above - on per imagery basis.

All imagery sources should be now reviewed and set valid-georeference=true when appropriate.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (modified) (6 diffs)

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

@@ -14 +14 @@
 import javax.swing.AbstractAction;
 import javax.swing.Action;
+import javax.swing.JOptionPane;
 
 import org.apache.commons.jcs.access.CacheAccess;
@@ -29 +30 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 
 /**
@@ -113 +115 @@
     @Override
     public boolean isProjectionSupported(Projection proj) {
-        return supportedProjections == null || supportedProjections.isEmpty() || supportedProjections.contains(proj.toCode());
+        return supportedProjections == null || supportedProjections.isEmpty() || supportedProjections.contains(proj.toCode()) ||
+                (info.isEpsg4326To3857Supported() && supportedProjections.contains("EPSG:4326") &&  "EPSG:3857".equals(Main.getProjection().toCode()));
     }
 
@@ -124 +127 @@
         String appendix = "";
 
-        if (supportedProjections.contains("EPSG:4326") &&  "EPSG:3857".equals(Main.getProjection().toCode())) {
+        if (isReprojectionPossible()) {
             appendix = ". " + tr("JOSM will use EPSG:4326 to query the server, but results may vary "
                     + "depending on the WMS server");
@@ -133 +136 @@
     @Override
     public void projectionChanged(Projection oldValue, Projection newValue) {
-        super.projectionChanged(oldValue, newValue);
+        // do not call super - we need custom warning dialog
+
+        if (!isProjectionSupported(newValue)) {
+            String message = tr("The layer {0} does not support the new projection {1}.\n"
+                    + " Supported projections are: {2}\n"
+                    + "Change the projection again or remove the layer.",
+                    getName(), newValue.toCode(), nameSupportedProjections());
+
+            ExtendedDialog warningDialog = new ExtendedDialog(Main.parent, tr("Warning"), new String[]{tr("OK")}).
+                    setContent(message).
+                    setIcon(JOptionPane.WARNING_MESSAGE);
+
+            if (isReprojectionPossible()) {
+                warningDialog.toggleEnable("imagery.wms.projectionSupportWarnings." + tileSource.getBaseUrl());
+            }
+            warningDialog.showDialog();
+        }
 
         if (!newValue.equals(oldValue) && tileSource instanceof TemplatedWMSTileSource) {
@@ -156 +175 @@
         return AbstractCachedTileSourceLayer.getCache(CACHE_REGION_NAME);
     }
+
+    private boolean isReprojectionPossible() {
+        return supportedProjections.contains("EPSG:4326") &&  "EPSG:3857".equals(Main.getProjection().toCode());
+    }
 }