Changeset 30758 in osm for applications/viewer

Timestamp:

2014-10-21T02:54:10+02:00 (10 years ago)

Author:

donvip

Message:

[jmapviewer] update Bing logo + read it from Bing attribution if removed from source (like in Debian, see bug 765421. Modified patch from Marcus Lundblad, Martin Krüger and Sebastiaan Couwenberg)

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• images/bing_maps.png (modified) ( previous)
• tilesources/BingAerialTileSource.java (modified) (4 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -4 +4 @@
 import java.awt.Image;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -46 +47 @@
     private static final Pattern quadkeyPattern = Pattern.compile("\\{quadkey\\}");
     private static final Pattern culturePattern = Pattern.compile("\\{culture\\}");
-
+    private String brandLogoUri = null;
+
+    /**
+     * Constructs a new {@code BingAerialTileSource}.
+     */
     public BingAerialTileSource() {
         super("Bing Aerial Maps", "http://example.com/");
@@ -97 +102 @@
                 subdomains[i] = subdomainTxt.item(i).getNodeValue();
             }
+
+            brandLogoUri = xpath.compile("/Response/BrandLogoUri/text()").evaluate(document);
 
             XPathExpression attributionXpath = xpath.compile("Attribution/text()");
@@ -175 +182 @@
     public Image getAttributionImage() {
         try {
-            return ImageIO.read(JMapViewer.class.getResourceAsStream("images/bing_maps.png"));
+            final InputStream imageResource = JMapViewer.class.getResourceAsStream("images/bing_maps.png");
+            if (imageResource != null) {
+                return ImageIO.read(imageResource);
+            } else {
+                // Some Linux distributions (like Debian) will remove Bing logo from sources, so get it at runtime
+                for (int i = 0; i < 5 && getAttribution() == null; i++) {
+                    // Makes sure attribution is loaded
+                }
+                if (brandLogoUri != null && !brandLogoUri.isEmpty()) {
+                    System.out.println("Reading Bing logo from "+brandLogoUri);
+                    return ImageIO.read(new URL(brandLogoUri));
+                }
+            }
         } catch (IOException e) {
-            return null;
-        }
+            System.err.println("Error while retrieving Bing logo: "+e.getMessage());
+        }
+        return null;
     }