Changeset 7760 in josm for trunk/src

Timestamp:

2014-12-01T21:14:03+01:00 (9 years ago)

Author:

Don-vip

Message:

see #10798 - remote control: special handling of Bing (default title and layer icon) for imagery handler

File:

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

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

@@ -9 +9 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -46 +48 @@
     }
 
+    protected static ImageryInfo findBingEntry() {
+        for (ImageryInfo i : ImageryLayerInfo.instance.getDefaultLayers()) {
+            if (ImageryType.BING.equals(i.getImageryType())) {
+                return i;
+            }
+        }
+        return null;
+    }
+
     @Override
     protected void handleRequest() throws RequestHandlerErrorException {
@@ -51 +62 @@
         String title = args.get("title");
         String type = args.get("type");
-        if ((title == null) || (title.isEmpty())) {
+        final ImageryInfo bing = ImageryType.BING.getTypeString().equals(type) ? findBingEntry() : null;
+        if ((title == null || title.isEmpty()) && bing != null) {
+            title = bing.getName();
+        }
+        if (title == null || title.isEmpty()) {
             title = tr("Remote imagery");
         }
         String cookies = args.get("cookies");
         final ImageryInfo imgInfo = new ImageryInfo(title, url, type, null, cookies);
+        if (bing != null) {
+            imgInfo.setIcon(bing.getIcon());
+        }
         String min_zoom = args.get("min_zoom");
         if (min_zoom != null && !min_zoom.isEmpty()) {