Changeset 31795 in osm for applications/editors/josm/plugins/mapillary/src/org/openstreetmap

Timestamp:

2015-12-03T22:27:47+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Add tests for TrafficoSign

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• oauth/OAuthUtils.java (modified) (1 diff)
• traffico/TrafficoGlyph.java (modified) (1 diff)
• traffico/TrafficoSign.java (modified) (4 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthUtils.java

@@ -37 +37 @@
         "Bearer " + Main.pref.get("mapillary.access-token"));
 
-    BufferedReader in = new BufferedReader(new InputStreamReader(
-        con.getInputStream()));
-    return Json.createReader(in).readObject();
+    try (
+      BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))
+    ) {
+      return Json.createReader(in).readObject();
+    }
   }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoGlyph.java

@@ -10 +10 @@
 import javax.json.JsonReader;
 
-public class TrafficoGlyph {
+public final class TrafficoGlyph {
   private TrafficoGlyph() {
     // private constructor to avoid instantiation

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoSign.java

@@ -9 +9 @@
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 
 import javax.json.Json;
@@ -15 +14 @@
 import javax.json.JsonObject;
 
-public class TrafficoSign {
-  private static final Map<String, String> isIn = new TreeMap<>();
-
-  static {
-    isIn.put("be", "europe");
-    isIn.put("de", "europe");
-    isIn.put("dk", "europe");
-    isIn.put("es", "europe");
+public final class TrafficoSign {
+  private TrafficoSign() {
+    // private constructor to avoid instantiation
   }
 
@@ -31 +25 @@
       System.out.println("Read signs for " + country);
       InputStream countryStream = TrafficoSign.class
-          .getResourceAsStream("/data/fonts/traffico/signs/" + country
-              + ".json");
+          .getResourceAsStream("/data/fonts/traffico/signs/" + country + ".json");
       if (countryStream == null) {
         return null;
@@ -89 +82 @@
       return signs.get(country).get(signName);
     }
-    if (isIn.containsKey(country)) {
-      return TrafficoSign.getSign(isIn.get(country), signName);
-    }
     return null;
   }