Changeset 31315 in osm for applications

Timestamp:

2015-06-29T18:10:52+02:00 (10 years ago)

Author:

nokutu

Message:

Added more signs

Location:

applications/editors/josm/plugins/mapillary

Files:

• images/signs/crossing.png (added)
• images/signs/no_overtaking.png (added)
• images/signs/no_parking.png (added)
• images/signs/no_turn.png (added)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterChooseSigns.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java (modified) (2 diffs)

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

@@ -173 +173 @@
                                         tempImage = tempImage.next();
                                         if (tempImage.isVisible()) {
-                                                setSelectedImage(tempImage, Main.pref.getBoolean("mapillary.move-to-picture", true));
+                                                setSelectedImage(tempImage, Main.pref.getBoolean(
+                                                                "mapillary.move-to-picture", true));
                                                 break;
                                         }
@@ -198 +199 @@
                                         tempImage = tempImage.previous();
                                         if (tempImage.isVisible()) {
-                        setSelectedImage(tempImage, Main.pref.getBoolean("mapillary.move-to-picture", true));
+                                                setSelectedImage(tempImage, Main.pref.getBoolean(
+                                                                "mapillary.move-to-picture", true));
                                                 break;
                                         }
@@ -221 +223 @@
          * Selects a new image and then starts a new MapillaryImageDownloadThread
          * thread in order to download its surrounding thumbnails. If the user does
-         * ctrl+click, this isn't triggered. You can choose wheter to center the
+         * ctrl+click, this isn't triggered. You can choose whether to center the
          * view on the new image or not.
          * 

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

@@ -24 +24 @@
         public final JCheckBox direction = new JCheckBox();
         public final JCheckBox uneven = new JCheckBox();
+        public final JCheckBox noParking = new JCheckBox();
+        public final JCheckBox noOvertaking = new JCheckBox();
+        public final JCheckBox crossing = new JCheckBox();
+        public final JCheckBox noTurn = new JCheckBox();
 
         private static MapillaryFilterChooseSigns INSTANCE;
@@ -36 +40 @@
                 direction.setSelected(true);
                 uneven.setSelected(true);
+                noParking.setSelected(true);
+                noOvertaking.setSelected(true);
+                crossing.setSelected(true);
+                noTurn.setSelected(true);
 
                 // Max speed sign
@@ -96 +104 @@
                 this.add(directionPanel);
 
+                // No turn
+                JPanel noTurnPanel = new JPanel();
+                JLabel noTurnLabel = new JLabel(tr("No turn"));
+                noTurnLabel.setIcon(new ImageProvider("signs/no_turn.png").get());
+                noTurnPanel.add(noTurnLabel);
+                noTurnPanel.add(noTurn);
+                this.add(noTurnPanel);
+
                 // Uneven road
                 JPanel unevenPanel = new JPanel();
@@ -103 +119 @@
                 unevenPanel.add(uneven);
                 this.add(unevenPanel);
+
+                // No parking
+                JPanel noParkingPanel = new JPanel();
+                JLabel noParkingLabel = new JLabel(tr("No parking"));
+                noParkingLabel.setIcon(new ImageProvider("signs/no_parking.png").get());
+                noParkingPanel.add(noParkingLabel);
+                noParkingPanel.add(noParking);
+                this.add(noParkingPanel);
+
+                // No overtaking
+                JPanel noOvertakingPanel = new JPanel();
+                JLabel noOvertakingLabel = new JLabel(tr("No overtaking"));
+                noOvertakingLabel.setIcon(new ImageProvider("signs/no_overtaking.png")
+                                .get());
+                noOvertakingPanel.add(noOvertakingLabel);
+                noOvertakingPanel.add(noOvertaking);
+                this.add(noOvertakingPanel);
+
+                // Pedestrian crossing
+                JPanel crossingPanel = new JPanel();
+                JLabel crossingLabel = new JLabel(tr("Pedestrian crossing"));
+                crossingLabel.setIcon(new ImageProvider("signs/crossing.png").get());
+                crossingPanel.add(crossingLabel);
+                crossingPanel.add(crossing);
+                this.add(crossingPanel);
 
                 this.setPreferredSize(new Dimension(600, 150));

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.GridLayout;
@@ -66 +65 @@
         private final String[] SIGN_TAGS = { "prohibitory_speed_limit",
                         "priority_stop", "other_give_way", "mandatory_roundabout",
-                        "other_no_entry", "danger_intersection", "mandatory_go",
-                        "mandatory_keep", "danger_priority_next_intersection",
-                        "danger_uneven_road" };
+                        "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 final JCheckBox[] SIGN_CHECKBOXES = { signFilter.maxspeed,
                         signFilter.stop, signFilter.giveWay, signFilter.roundabout,
-                        signFilter.access, signFilter.intersection, signFilter.direction,
-                        signFilter.direction, signFilter.intersection, signFilter.uneven };
+                        signFilter.access, signFilter.access, signFilter.intersection,
+                        signFilter.direction, signFilter.direction,
+                        signFilter.intersection, signFilter.uneven, signFilter.noParking,
+                        signFilter.noOvertaking, signFilter.crossing, signFilter.noTurn,
+                        signFilter.noTurn };
 
         public MapillaryFilterDialog() {