Changeset 31314 in osm for applications

Timestamp:

2015-06-29T11:43:14+02:00 (9 years ago)

Author:

nokutu

Message:

Added more signs and fixed sign chooser dialog size

Location:

applications/editors/josm/plugins/mapillary

Files:

• images/signs/only_straight_on.png (modified) ( previous)
• images/signs/uneaven.png (added)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterChooseSigns.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java (modified) (1 diff)

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -22 +23 @@
         public final JCheckBox intersection = new JCheckBox();
         public final JCheckBox direction = new JCheckBox();
+        public final JCheckBox uneven = new JCheckBox();
 
         private static MapillaryFilterChooseSigns INSTANCE;
@@ -33 +35 @@
                 intersection.setSelected(true);
                 direction.setSelected(true);
+                uneven.setSelected(true);
 
                 // Max speed sign
@@ -92 +95 @@
                 directionPanel.add(direction);
                 this.add(directionPanel);
+
+                // Uneven road
+                JPanel unevenPanel = new JPanel();
+                JLabel unevenLabel = new JLabel(tr("Uneven road"));
+                unevenLabel.setIcon(new ImageProvider("signs/uneaven.png").get());
+                unevenPanel.add(unevenLabel);
+                unevenPanel.add(uneven);
+                this.add(unevenPanel);
+
+                this.setPreferredSize(new Dimension(600, 150));
         }
 

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

@@ -67 +67 @@
                         "priority_stop", "other_give_way", "mandatory_roundabout",
                         "other_no_entry", "danger_intersection", "mandatory_go",
-                        "mandatory_keep" };
+                        "mandatory_keep", "danger_priority_next_intersection",
+                        "danger_uneven_road" };
         private final JCheckBox[] SIGN_CHECKBOXES = { signFilter.maxspeed,
                         signFilter.stop, signFilter.giveWay, signFilter.roundabout,
                         signFilter.access, signFilter.intersection, signFilter.direction,
-                        signFilter.direction };
+                        signFilter.direction, signFilter.intersection, signFilter.uneven };
 
         public MapillaryFilterDialog() {
@@ -85 +86 @@
                 signChooserPanel.add(signChooser);
 
-                JPanel comboPanel = new JPanel();
-                comboPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
-                comboPanel.add(new JLabel("From"));
+                JPanel fromPanel = new JPanel();
+                fromPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
+                fromPanel.add(new JLabel("From"));
                 time = new JComboBox<>(TIME_LIST);
-                comboPanel.add(time);
+                fromPanel.add(time);
 
                 JPanel userSearchPanel = new JPanel();
                 userSearchPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
-                user = new JTextField(15);
+                user = new JTextField(10);
                 user.addActionListener(new UpdateAction());
                 userSearchPanel.add(new JLabel("User"));
@@ -104 +105 @@
                 panel.add(imported);
                 panel.add(onlySigns);
-                panel.add(comboPanel);
+                panel.add(fromPanel);
                 panel.add(userSearchPanel);
                 panel.add(signChooserPanel);
@@ -283 +284 @@
                                         JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
                         JDialog dlg = pane.createDialog(Main.parent, tr("Choose signs"));
-                        dlg.setMinimumSize(new Dimension(400, 150));
                         dlg.setVisible(true);
                         if ((int) pane.getValue() == JOptionPane.OK_OPTION)

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

@@ -3 +3 @@
 import static org.junit.Assert.*;
 
+import org.junit.Before;
 import org.junit.Test;
 
 public class ImportTest {
 
+        @Before
+        public void setUp() {
+                MapillaryData.TEST_MODE = true;
+
+        }
+        
         @Test
         public void test() {