Changeset 16595 in josm for trunk/src/org

Timestamp:

2020-06-11T08:40:11+02:00 (4 years ago)

Author:

simon04

Message:

Add unit test for Territories.getRegionalTaginfoUrls

File:

• trunk/src/org/openstreetmap/josm/tools/Territories.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Territories.java

@@ -188 +188 @@
 
     private static void initializeExternalData() {
+        initializeExternalData("Geofabrik",
+                Config.getUrls().getJOSMWebsite() + "/remote/geofabrik-index-v1-nogeom.json");
+    }
+
+    static void initializeExternalData(String source, String path) {
         taginfoGeofabrikCache = new TreeMap<>();
-        initializeExternalData(taginfoGeofabrikCache, "Geofabrik",
-                Config.getUrls().getJOSMWebsite() + "/remote/geofabrik-index-v1-nogeom.json");
-    }
-
-    static void initializeExternalData(Map<String, TaginfoRegionalInstance> cache, String source, String path) {
         try (CachedFile cf = new CachedFile(path); InputStream is = cf.getInputStream(); JsonParser json = Json.createParser(is)) {
             while (json.hasNext()) {
@@ -205 +205 @@
                             JsonArray iso2 = props.getJsonArray(ISO3166_2_LC);
                             if (iso1 != null) {
-                                readExternalTaginfo(cache, taginfo, iso1, source);
+                                readExternalTaginfo(taginfoGeofabrikCache, taginfo, iso1, source);
                             } else if (iso2 != null) {
-                                readExternalTaginfo(cache, taginfo, iso2, source);
+                                readExternalTaginfo(taginfoGeofabrikCache, taginfo, iso2, source);
                             }
                         })));