Changeset 31988 in osm for applications/editors

Timestamp:

2016-01-16T15:52:12+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Add Codacy badge to README and fix some issues in the TrafficoSign class

Location:

applications/editors/josm/plugins/mapillary

Files:

• README.md (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoSign.java (modified) (3 diffs)

applications/editors/josm/plugins/mapillary/README.md

@@ -4 +4 @@
 [![code coverage](https://img.shields.io/codecov/c/github/floscher/josm-mapillary-plugin/master.svg?style=flat-square)](https://codecov.io/github/floscher/josm-mapillary-plugin?branch=master)
 [![technical debt](https://img.shields.io/sonar/https/josm.openstreetmap.de/sonar/josm-plugins:mapillary/sqale_debt_ratio.svg?style=flat-square)](https://josm.openstreetmap.de/sonar/drilldown/measures/3325?metric=sqale_index)
+[![code quality](https://img.shields.io/codacy/49bb5717d8a64575b0b4ce771c62f1d7.svg?style=flat-square)](https://www.codacy.com/app/floscher/josm-mapillary-plugin)
 [![latest release](https://img.shields.io/github/release/floscher/josm-mapillary-plugin.svg?style=flat-square)](https://github.com/floscher/josm-mapillary-plugin/releases/latest)
 ![license: GPLv2 or later](https://img.shields.io/badge/license-GPLv2 or later-blue.svg?style=flat-square)

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

@@ -3 +3 @@
 
 import java.awt.Color;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -14 +15 @@
 import javax.json.JsonObject;
 
+import org.openstreetmap.josm.Main;
+
 public final class TrafficoSign {
   private static Map<String, Map<String, TrafficoSignElement[]>> signs = new HashMap<>();
@@ -23 +26 @@
   public static TrafficoSignElement[] getSign(String country, String signName) {
     if (signs.get(country) == null) {
-      System.out.println("Read signs for " + country);
-      InputStream countryStream = TrafficoSign.class
-          .getResourceAsStream("/data/fonts/traffico/signs/" + country + ".json");
-      if (countryStream == null) {
-        return null;
+      Main.info("Reading signs for country ''{0}''.", country);
+      try (
+        InputStream countryStream = TrafficoSign.class
+            .getResourceAsStream("/data/fonts/traffico/signs/" + country + ".json")) {
+        if (countryStream == null) {
+          return null;
+        }
+        JsonObject countrySigns = Json.createReader(countryStream).readObject();
+        Set<String> countrySignNames = countrySigns.keySet();
+        Main.info(
+            countrySignNames.size() + " different signs are supported for ''{0}'' by the Mapillary-plugin .",
+            country
+        );
+        Map<String, TrafficoSignElement[]> countryMap = new HashMap<>();
+        for (String name : countrySignNames) {
+          JsonArray elements = countrySigns.getJsonObject(name).getJsonArray("elements");
+
+          // TODO: Replace by an array when all types of sign elements (text!) are
+          // supported
+          List<TrafficoSignElement> layers = new ArrayList<>();
+
+          for (int i = 0; i < elements.size(); i++) {
+            Character glyph = TrafficoGlyph.getGlyph(elements.getJsonObject(i)
+                .getString("type"));
+            if (glyph != null) {
+              Color c;
+              switch (elements.getJsonObject(i).getString("color").toLowerCase()) {
+                case "black":
+                  c = Color.BLACK;
+                  break;
+                case "red":
+                  c = Color.RED;
+                  break;
+                case "blue":
+                  c = Color.BLUE;
+                  break;
+                case "white":
+                  c = Color.WHITE;
+                  break;
+                case "green":
+                  c = Color.GREEN;
+                  break;
+                case "yellow":
+                  c = Color.YELLOW;
+                  break;
+                default:
+                  c = Color.MAGENTA;
+              }
+              layers.add(new TrafficoSignElement(glyph, c));
+            }
+          }
+          countryMap.put(name, layers.toArray(new TrafficoSignElement[layers.size()]));
+        }
+        signs.put(country, countryMap);
+      } catch (IOException e) {
+        Main.error(e);
       }
-      JsonObject countrySigns = Json.createReader(countryStream).readObject();
-      Set<String> countrySignNames = countrySigns.keySet();
-      System.out.println(countrySignNames.size() + " signs found");
-      Map<String, TrafficoSignElement[]> countryMap = new HashMap<>();
-      for (String name : countrySignNames) {
-        System.out.println(" * sign " + name);
-        JsonArray elements = countrySigns.getJsonObject(name).getJsonArray(
-            "elements");
-
-        // TODO: Replace by an array when all types of sign elements (text!) are
-        // supported
-        List<TrafficoSignElement> layers = new ArrayList<>();
-
-        for (int i = 0; i < elements.size(); i++) {
-          System.out.println("   - "
-              + elements.getJsonObject(i).getString("color") + " layer "
-              + elements.getJsonObject(i).getString("type"));
-          Character glyph = TrafficoGlyph.getGlyph(elements.getJsonObject(i)
-              .getString("type"));
-          if (glyph != null) {
-            Color c;
-            switch (elements.getJsonObject(i).getString("color").toLowerCase()) {
-              case "black":
-                c = Color.BLACK;
-                break;
-              case "red":
-                c = Color.RED;
-                break;
-              case "blue":
-                c = Color.BLUE;
-                break;
-              case "white":
-                c = Color.WHITE;
-                break;
-              case "green":
-                c = Color.GREEN;
-                break;
-              case "yellow":
-                c = Color.YELLOW;
-                break;
-              default:
-                c = Color.MAGENTA;
-            }
-            layers.add(new TrafficoSignElement(glyph, c));
-          }
-        }
-        countryMap.put(name, layers.toArray(new TrafficoSignElement[0]));
-      }
-      signs.put(country, countryMap);
     }
     if (signs.get(country).get(signName) != null) {