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

Timestamp:

2014-12-22T01:01:08+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #10878 - do not add new imagery layer through remote control if it already exists

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java

@@ -57 +57 @@
     }
 
-    @Override
-    protected void handleRequest() throws RequestHandlerErrorException {
+    protected ImageryInfo buildImageryInfo() {
         String url = args.get("url");
         String title = args.get("title");
@@ -74 +73 @@
             imgInfo.setIcon(bing.getIcon());
         }
-        String min_zoom = args.get("min_zoom");
-        if (min_zoom != null && !min_zoom.isEmpty()) {
+        String minZoom = args.get("min_zoom");
+        if (minZoom != null && !minZoom.isEmpty()) {
             try {
-                imgInfo.setDefaultMinZoom(Integer.parseInt(min_zoom));
+                imgInfo.setDefaultMinZoom(Integer.parseInt(minZoom));
             } catch (NumberFormatException e) {
                 Main.error(e);
             }
         }
-        String max_zoom = args.get("max_zoom");
-        if (max_zoom != null && !max_zoom.isEmpty()) {
+        String maxZoom = args.get("max_zoom");
+        if (maxZoom != null && !maxZoom.isEmpty()) {
             try {
-                imgInfo.setDefaultMaxZoom(Integer.parseInt(max_zoom));
+                imgInfo.setDefaultMaxZoom(Integer.parseInt(maxZoom));
             } catch (NumberFormatException e) {
                 Main.error(e);
+            }
+        }
+        return imgInfo;
+    }
+
+    @Override
+    protected void handleRequest() throws RequestHandlerErrorException {
+        final ImageryInfo imgInfo = buildImageryInfo();
+        if (Main.isDisplayingMapView()) {
+            for (ImageryLayer layer : Main.map.mapView.getLayersOfType(ImageryLayer.class)) {
+                if (layer.getInfo().equals(imgInfo)) {
+                    Main.info("Imagery layer already exists: "+imgInfo);
+                    return;
+                }
             }
         }
@@ -114 +127 @@
                     args.put("url", decodeParam(query.substring(urlIdx + 5)));
                     query = query.substring(0, urlIdx);
-                } else {
-                    if (query.indexOf('#') != -1) {
-                        query = query.substring(0, query.indexOf('#'));
-                    }
+                } else if (query.indexOf('#') != -1) {
+                    query = query.substring(0, query.indexOf('#'));
                 }
                 String[] params = query.split("&", -1);