Changeset 5458 in josm for trunk/src

Timestamp:

2012-08-19T02:54:58+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #2519 - do not allow multiple identical imagery layers

File:

• trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -56 +56 @@
         }
     }
+    
+    protected boolean isLayerAlreadyPresent() {
+        if (Main.map != null && Main.map.mapView != null) {
+            for (ImageryLayer layer : Main.map.mapView.getLayersOfType(ImageryLayer.class)) {
+                if (info.equals(layer.getInfo())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
     @Override
     protected void updateEnabledState() {
-        // never enable blacklisted entries.
-        if (info.isBlacklisted()) {
+        // never enable blacklisted entries. Do not add same imagery layer twice (fix #2519)
+        if (info.isBlacklisted() || isLayerAlreadyPresent()) {
             setEnabled(false);
         } else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING || info.getImageryType() == ImageryType.SCANEX) {