Changeset 32973 in osm

Timestamp:

2016-09-11T13:47:28+02:00 (8 years ago)

Author:

nokutu

Message:

Added sign info to files and fixed some signs bugs

Location:

applications/editors/josm/plugins/mapillary

Files:

• data/signs/eu.cson (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillarySign.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryImageInfoDownloadThread.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/data/signs/eu.cson

@@ -92 +92 @@
 'prohibitory_vehicle_height_limit':                  'prohibitory--maximum-height--de'
 'prohibitory_vehicle_width_limit':                   'prohibitory--maximum-width--de'
+'warning--junction-with-a-side-road-perpendicular-right--de':   'danger--junction-with-a-side-road-perpendicular-right--de'

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillarySign.java

@@ -30 +30 @@
       HashMap<String, MapillarySign> countryMap = new HashMap<>();
       try (
-              BufferedReader br = new BufferedReader(new InputStreamReader(
-                      MapillarySign.class.getResourceAsStream("/data/signs/" + country + ".cson")
-              ));
+        BufferedReader br = new BufferedReader(new InputStreamReader(
+          MapillarySign.class.getResourceAsStream("/data/signs/" + country + ".cson")
+        ));
       ) {
         String line = "";
@@ -58 +58 @@
       return countryMap.get(name);
     } else {
-      if (name.split("--").length >= 3 && countryMap.containsValue(new MapillarySign(name))) {
-        Optional<MapillarySign> p = countryMap.values().stream().filter(sign -> sign.toString().equals(name)).findFirst();
-        assert p.isPresent();
-        return p.get();
+      if (name.split("--").length >= 3) {
+        if (countryMap.containsValue(new MapillarySign(name))) {
+          Optional<MapillarySign> p = countryMap.values().stream().filter(sign -> sign.toString().equals(name)).findFirst();
+          assert p.isPresent();
+          return p.get();
+        } else {
+          return new MapillarySign(name);
+        }
       } else {
-        Main.warn("Sign '" + name + "' does not exist in the plugin database. Please contanct the developer to add it.");
+        Main.warn("Sign '" + name + "' does not exist in the plugin database. Please contact the developer to add it.");
         return null;
       }
@@ -70 +74 @@
 
   public MapillarySign(String fullName) {
-    Main.info(fullName);
     this.fullName = fullName;
     String[] parts = fullName.split("--");

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryImageInfoDownloadThread.java

@@ -47 +47 @@
     try (
       BufferedReader br = new BufferedReader(new InputStreamReader(
-          MapillaryURL.searchImageInfoURL(bounds, page, null).openStream(), "UTF-8"
+        MapillaryURL.searchImageInfoURL(bounds, page, null).openStream(), "UTF-8"
       ));
     ) {
@@ -64 +64 @@
                 && ((MapillaryImage) image).getKey().equals(key)
                 && ((MapillaryImage) image).getUser() == null
-            ) {
+              ) {
               ((MapillaryImage) image).setUser(data.getString("user"));
               ((MapillaryImage) image).setCapturedAt(data.getJsonNumber("captured_at").longValue());
-              ((MapillaryImage) image).setLocation(data.getString("location"));
+              if (!data.isNull("location")) {
+                ((MapillaryImage) image).setLocation(data.getString("location"));
+              }
             }
           }