Changeset 27491 in osm for applications/viewer/jmapviewer

Timestamp:

2012-01-19T18:48:10+01:00 (13 years ago)

Author:

simon04

Message:

jmapviewer: fix encoding bug (under Windows) introduced in r27483.

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

@@ -4 +4 @@
 
 import java.awt.Image;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.StringReader;
 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;
@@ -63 +62 @@
             URL u = new URL("http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&output=xml&key="
                     + API_KEY);
-            BufferedReader in = new BufferedReader(new InputStreamReader(u.openStream()));
-            StringBuilder content = new StringBuilder(1<<15 /* represents 32k */);
-            String line;
-            while ((line = in.readLine()) != null) {
-                content.append(line);
-            }
-            in.close();
+            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 content.toString().getBytes();
+            return r.getBytes("utf-8");
         }
     }
@@ -99 +93 @@
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             DocumentBuilder builder = factory.newDocumentBuilder();
-            Document document = builder.parse(new InputSource(
-                    UTFInputStreamReader.create(new ByteArrayInputStream(xml.getBytes()), "UTF-8")));
+            Document document = builder.parse(new InputSource(new StringReader(xml)));
 
             XPathFactory xPathFactory = XPathFactory.newInstance();
@@ -228 +221 @@
                             Thread.sleep(waitTimeSec * 1000L);
                             waitTimeSec *= 2;
+                            ex.printStackTrace();
                         }
                     }
@@ -236 +230 @@
             final List<Attribution> data;
             try {
-                data = attributions.get(100, TimeUnit.MILLISECONDS);
+                data = attributions.get(1000, TimeUnit.MILLISECONDS);
             } catch (TimeoutException ex) {
                 return "Loading Bing attribution data...";