Changeset 27507 in osm for applications/viewer

Timestamp:

2012-01-20T12:45:07+01:00 (13 years ago)

Author:

simon04

Message:

jmapviewer: remove JOSM specific stuff

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (modified) (5 diffs)

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

@@ -5 +5 @@
 import java.awt.Image;
 import java.io.IOException;
-import java.io.StringReader;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Scanner;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
@@ -29 +28 @@
 
 import org.openstreetmap.gui.jmapviewer.Coordinate;
-import org.openstreetmap.josm.io.CacheCustomContent;
-import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -52 +49 @@
     }
 
-    private static class BingAttributionData extends CacheCustomContent<IOException> {
-
-        public BingAttributionData() {
-            super("bing.attribution.xml", CacheCustomContent.INTERVAL_WEEKLY);
-        }
-
-        @Override
-        protected byte[] updateData() throws IOException {
-            URL u = new URL("http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&output=xml&key="
-                    + API_KEY);
-            UTFInputStreamReader in = UTFInputStreamReader.create(u.openStream(), "utf-8");
-            String r = new Scanner(in).useDelimiter("\\A").next();
-            System.out.println("Successfully loaded Bing attribution data.");
-            return r.getBytes("utf-8");
-        }
-    }
-
-    class Attribution {
+    protected class Attribution {
         String attribution;
         int minZoom;
@@ -89 +69 @@
     }
 
-    private List<Attribution> parseAttributionText(String xml) throws IOException {
+    protected URL getAttributionUrl() throws MalformedURLException {
+        return new URL("http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&output=xml&key="
+                + API_KEY);
+    }
+
+    protected List<Attribution> parseAttributionText(InputSource xml) throws IOException {
         try {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             DocumentBuilder builder = factory.newDocumentBuilder();
-            Document document = builder.parse(new InputSource(new StringReader(xml)));
+            Document document = builder.parse(xml);
 
             XPathFactory xPathFactory = XPathFactory.newInstance();
@@ -205 +190 @@
     }
 
+    protected Callable<List<Attribution>> getAttributionLoaderCallable() {
+        return new Callable<List<Attribution>>() {
+
+            @Override
+            public List<Attribution> call() throws Exception {
+                int waitTimeSec = 1;
+                while (true) {
+                    try {
+                        InputSource xml = new InputSource(getAttributionUrl().openStream());
+                        List<Attribution> r = parseAttributionText(xml);
+                        System.out.println("Successfully loaded Bing attribution data.");
+                        return r;
+                    } catch (IOException ex) {
+                        System.err.println("Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds.");
+                        Thread.sleep(waitTimeSec * 1000L);
+                        waitTimeSec *= 2;
+                    }
+                }
+            }
+        };
+    }
+
     @Override
     public String getAttributionText(int zoom, Coordinate topLeft, Coordinate botRight) {
         if (attributions == null) {
-            attributions = Executors.newSingleThreadExecutor().submit(new Callable<List<Attribution>>() {
-
-                @Override
-                public List<Attribution> call() throws Exception {
-                    BingAttributionData attributionLoader = new BingAttributionData();
-                    int waitTimeSec = 1;
-                    while (true) {
-                        try {
-                            return parseAttributionText(attributionLoader.updateIfRequiredString());
-                        } catch (IOException ex) {
-                            System.err.println("Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds.");
-                            Thread.sleep(waitTimeSec * 1000L);
-                            waitTimeSec *= 2;
-                            ex.printStackTrace();
-                        }
-                    }
-                }
-            });
+            attributions = Executors.newSingleThreadExecutor().submit(getAttributionLoaderCallable());
         }
         try {