Changeset 32972 in osm for applications/editors/josm

Timestamp:

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

Author:

nokutu

Message:

Improved sign system. Works in all countries and different sign packages.

Location:

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

Files:

• MapillaryImage.java (modified) (5 diffs)
• MapillarySign.java (added)
• gui/MapillaryFilterDialog.java (modified) (5 diffs)
• io/download/MapillaryImageInfoDownloadThread.java (modified) (1 diff)
• io/download/MapillaryTrafficSignDownloadThread.java (modified) (8 diffs)

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

@@ -16 +16 @@
  */
 public class MapillaryImage extends MapillaryAbstractImage {
-  /** Unique identifier of the object. */
+  /**
+   * Unique identifier of the object.
+   */
   private final String key;
-  /** The user that made the image. */
+  /**
+   * The user that made the image.
+   */
   private String user;
-  /** Set of traffic signs in the image. */
-  private final List<String> signs = new ArrayList<>();
-  /** Where the picture was taken. */
+  /**
+   * Set of traffic signs in the image.
+   */
+  private final List<MapillarySign> signs = new ArrayList<>();
+  /**
+   * Where the picture was taken.
+   */
   private String location;
 
@@ -28 +36 @@
    * Main constructor of the class MapillaryImage
    *
-   * @param key The unique identifier of the image.
+   * @param key    The unique identifier of the image.
    * @param latLon The latitude and longitude where it is positioned.
-   * @param ca The direction of the images in degrees, meaning 0 north.
+   * @param ca     The direction of the images in degrees, meaning 0 north.
    */
   public MapillaryImage(final String key, final LatLon latLon, final double ca) {
@@ -70 +78 @@
    * @param sign A {@code String} that identifies the type of sign.
    */
-  public void addSign(String sign) {
-    this.signs.add(sign);
+  public void addSign(MapillarySign sign) {
+    if (sign != null) {
+      this.signs.add(sign);
+    }
   }
 
@@ -79 +89 @@
    * @return A {@link List} object containing the signs assigned to this image.
    */
-  public List<String> getSigns() {
+  public List<MapillarySign> getSigns() {
     return this.signs;
   }
@@ -104 +114 @@
   public String toString() {
     return String.format(
-      "Image[key=%s,lat=%f,lon=%f,ca=%f,location=%s,user=%s,capturedAt=%d]",
-      key, latLon.lat(), latLon.lon(), ca, location, user, capturedAt
+            "Image[key=%s,lat=%f,lon=%f,ca=%f,location=%s,user=%s,capturedAt=%d]",
+            key, latLon.lat(), latLon.lon(), ca, location, user, capturedAt
     );
   }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java

@@ -11 +11 @@
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.regex.Pattern;
 
 import javax.swing.AbstractAction;
@@ -32 +33 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryImportedImage;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
+import org.openstreetmap.josm.plugins.mapillary.MapillarySign;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -69 +71 @@
    * The list of sign names
    */
-  private static final String[] SIGN_TAGS = {"prohibitory_speed_limit",
-          "priority_stop", "other_give_way", "mandatory_roundabout",
-          "other_no_entry", "prohibitory_no_traffic_both_ways",
-          "danger_intersection", "mandatory_go", "mandatory_keep",
-          "danger_priority_next_intersection", "danger_uneven_road",
-          "prohibitory_no_parking", "prohibitory_on_overtaking",
-          "danger_pedestrian_crossing", "prohibitory_no_u_turn",
-          "prohibitory_noturn"};
+  private static final String[] SIGN_TAGS = {"prohibitory--maximum-speed-limit",
+          "regulatory|priority--stop", "regulatory|priority--give_way|yield", "warning|mandatory--roundabout",
+          "prohibitory|regulatory--no-entry|no-traffic-both-ways",
+          "crossroads|junction", "mandatory--turn|straight", "uneven|slippery",
+          "no-parking", "no_overtaking",
+          "danger_pedestrian_crossing", "no_*_turn"};
   /**
    * The {@link JCheckBox} where the respective tag should be searched
@@ -82 +82 @@
   private final JCheckBox[] SIGN_CHECKBOXES = {this.signFilter.maxSpeed,
           this.signFilter.stop, this.signFilter.giveWay,
-          this.signFilter.roundabout, this.signFilter.access,
-          this.signFilter.access, this.signFilter.intersection,
-          this.signFilter.direction, this.signFilter.direction,
-          this.signFilter.intersection, this.signFilter.uneven,
+          this.signFilter.roundabout, this.signFilter.access, this.signFilter.intersection,
+          this.signFilter.direction, this.signFilter.uneven,
           this.signFilter.noParking, this.signFilter.noOvertaking,
-          this.signFilter.crossing, this.signFilter.noTurn, this.signFilter.noTurn};
+          this.signFilter.crossing, this.signFilter.noTurn};
 
   private MapillaryFilterDialog() {
@@ -242 +240 @@
   }
 
-  private static boolean checkSign(MapillaryImage img, JCheckBox signCheckBox, String singString) {
+  private static boolean checkSign(MapillaryImage img, JCheckBox signCheckBox, String signTag) {
     boolean contains = false;
-    for (String sign : img.getSigns()) {
-      if (sign.contains(singString))
+    for (MapillarySign sign : img.getSigns()) {
+      String[] parts = signTag.split("--");
+      if (Pattern.compile(parts[0]).matcher(sign.getCategory()).find() &&
+              Pattern.compile(parts[1]).matcher(sign.getType()).find()) {
         contains = true;
+      }
     }
     return contains == signCheckBox.isSelected() && contains;

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

@@ -67 +67 @@
               ((MapillaryImage) image).setUser(data.getString("user"));
               ((MapillaryImage) image).setCapturedAt(data.getJsonNumber("captured_at").longValue());
+              ((MapillaryImage) image).setLocation(data.getString("location"));
             }
           }

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

@@ -17 +17 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryImage;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
+import org.openstreetmap.josm.plugins.mapillary.MapillarySign;
 import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryURL;
 import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryURL.IMAGE_SELECTOR;
@@ -24 +25 @@
  *
  * @author nokutu
- *
  */
 public class MapillaryTrafficSignDownloadThread extends Thread {
@@ -34 +34 @@
    * Main constructor.
    *
-   * @param ex {@link ExecutorService} object that is executing this thread.
+   * @param ex     {@link ExecutorService} object that is executing this thread.
    * @param bounds the bounds in which the traffic signs should be downloaded
-   * @param page the pagenumber of the results page that should be retrieved
+   * @param page   the pagenumber of the results page that should be retrieved
    */
   public MapillaryTrafficSignDownloadThread(ExecutorService ex, Bounds bounds, int page) {
@@ -46 +46 @@
   @Override
   public void run() {
-
     try (
-      BufferedReader br = new BufferedReader(new InputStreamReader(
-        MapillaryURL.searchImageInfoURL(bounds, page, IMAGE_SELECTOR.OBJ_REC_ONLY).openStream(), "UTF-8"
-      ));
+            BufferedReader br = new BufferedReader(new InputStreamReader(
+                    MapillaryURL.searchImageInfoURL(bounds, page, IMAGE_SELECTOR.OBJ_REC_ONLY).openStream(), "UTF-8"
+            ));
     ) {
       JsonObject jsonobj = Json.createReader(br).readObject();
@@ -60 +59 @@
         JsonArray rects = jsonarr.getJsonObject(i).getJsonArray("rects");
         JsonArray rectversions = jsonarr.getJsonObject(i).getJsonArray(
-            "rectversions");
+                "rectversions");
         String key = jsonarr.getJsonObject(i).getString("key");
         if (rectversions != null) {
@@ -68 +67 @@
               JsonObject data = rects.getJsonObject(k);
               for (MapillaryAbstractImage image : MapillaryLayer.getInstance().getData().getImages()) {
-                if (image instanceof MapillaryImage && ((MapillaryImage) image).getKey().equals(key))
-                  ((MapillaryImage) image).addSign(data.getString("type"));
+                if (image instanceof MapillaryImage && ((MapillaryImage) image).getKey().equals(key)) {
+                  ((MapillaryImage) image).addSign(MapillarySign.getSign(data.getString("type"), rectversions.getJsonObject(j).getString("package").split("_")[1]));
+                }
               }
             }
@@ -81 +81 @@
             for (MapillaryAbstractImage image : MapillaryLayer.getInstance().getData().getImages()) {
               if (image instanceof MapillaryImage && ((MapillaryImage) image).getKey().equals(key)) {
-                ((MapillaryImage) image).addSign(data.getString("type"));
+                ((MapillaryImage) image).addSign(MapillarySign.getSign(data.getString("type"), data.getString("package").split("_")[1]));
               }
             }
@@ -87 +87 @@
         }
       }
-    } catch (MalformedURLException e) {
-      Main.error(e);
     } catch (IOException e) {
       Main.error(e);