Changeset 32067 in osm

Timestamp:

2016-02-13T19:35:29+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Fix usage of traffico.ttf

Location:

applications/editors/josm/plugins/mapillary

Files:

• src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryImage.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryTrafficSignLayer.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java (modified) (4 diffs)

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

@@ -11 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.mapillary.cache.CacheUtils;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryMainDialog;
-import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
 
 /**

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

@@ -6 +6 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
 import org.openstreetmap.josm.plugins.mapillary.utils.ValidationUtil;
 

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

@@ -9 +9 @@
 import java.awt.Point;
 import java.awt.RenderingHints;
-import java.io.File;
 import java.io.IOException;
 
@@ -26 +25 @@
 
 public final class MapillaryTrafficSignLayer extends AbstractModifiableLayer {
-  private static final String TRAFFICO_PATH = "data/fonts/traffico/traffico.ttf";
+  private static final String TRAFFICO_PATH = "/data/fonts/traffico/traffico.ttf";
   private static MapillaryTrafficSignLayer instance;
   private final Font traffico;
@@ -33 +32 @@
     super("Mapillary traffic signs");
     try {
-      traffico = Font.createFont(Font.TRUETYPE_FONT, new File("data/fonts/traffico/traffico.ttf")).deriveFont(50.0f);
+      traffico = Font.createFont(
+          Font.TRUETYPE_FONT,
+          MapillaryTrafficSignLayer.class.getResourceAsStream(TRAFFICO_PATH)
+      ).deriveFont(50.0f);
     } catch (FontFormatException e) {
-      throw new IOException(I18n.tr("Traffic sign font at ''{0}'' has wrong format.", TRAFFICO_PATH), e);
+      throw new IOException(I18n.tr("Traffic sign font at ''{0}'' has wrong format", TRAFFICO_PATH), e);
     } catch (IOException e) {
-      throw new IOException(I18n.tr("Could not read font-file from ''{0}''.", TRAFFICO_PATH), e);
+      throw new IOException(I18n.tr("Could not read font-file from ''{0}''", TRAFFICO_PATH), e);
     }
   }
@@ -49 +51 @@
    */
   public static synchronized MapillaryTrafficSignLayer getInstance() throws IOException {
-    if (instance == null)
+    if (instance == null) {
       instance = new MapillaryTrafficSignLayer();
+    }
     return instance;
   }
@@ -81 +84 @@
 
     TrafficoSign[] signs = {
-        TrafficoSign.getSign("europe", "mandatory_cycle_track"),
-        TrafficoSign.getSign("de", "information_bus_stop"),
-        TrafficoSign.getSign("europe", "information_pedestrian_crossing") };
+        TrafficoSign.getSign("de", "bicycles-only"),
+        TrafficoSign.getSign("de", "bus-stop"),
+        TrafficoSign.getSign("de", "pedestrian-crossing") };
 
     for (int i = 0; i < signs.length && i < points.length; i++) {

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java

@@ -3 +3 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -20 +22 @@
  * @author floscher
  */
-public class TestUtil {
+public final class TestUtil {
   private static boolean isInitialized;
 
@@ -33 +35 @@
    * That is needed e.g. to use {@link MapillaryLayer#getInstance()}
    */
-  public static final void initPlugin() {
+  public static final synchronized void initPlugin() {
     if (!isInitialized) {
       System.setProperty("josm.home", "test/data/preferences");
@@ -73 +75 @@
         assertTrue(m.getDeclaringClass() != c || Modifier.isStatic(m.getModifiers()));
       }
-    } catch (Exception e) {
-      assertTrue(e.getMessage(), false);
+    } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+      fail(e.getLocalizedMessage());
     }
   }