Changeset 29230 in osm for applications/editors/josm/plugins/roadsigns/src/org/openstreetmap

Timestamp:

2013-02-06T13:52:07+01:00 (12 years ago)

Author:

bastik

Message:

add filter option, in order to show only signs with tag info

Location:

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

Files:

• RoadSignInputDialog.java (modified) (6 diffs)
• RoadSignsPlugin.java (modified) (1 diff)
• RoadSignsReader.java (modified) (3 diffs)
• Sign.java (modified) (2 diffs)

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java

@@ -29 +29 @@
 import javax.swing.BorderFactory;
 import javax.swing.Box;
+import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -36 +37 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
@@ -694 +696 @@
             fireTableDataChanged();
         }
-
-
     }
 
@@ -814 +814 @@
         private List<PresetMetaData> presetsData;
         private JComboBox selectionBox;
+        JRadioButton rbAll, rbUseful;
 
         public SettingsPanel(boolean standalone, final Action update) {
@@ -831 +832 @@
             this.add(selectionBox, GBC.eol().insets(0, 5, 5, 5));
             if (!standalone) {
+                String snd = "Hide signs that do not have an OSM tag assigned";
+
+                rbAll = new JRadioButton(tr("Show all signs"));
+                rbUseful = new JRadioButton(tr("Show a selection of the most useful signs"));
+
+                ButtonGroup grp = new ButtonGroup();
+                grp.add(rbAll);
+                grp.add(rbUseful);
+
+                String filterPref = Main.pref.get("plugin.roadsigns.preset.filter");
+                if (filterPref.equals("useful")) {
+                    rbUseful.setSelected(true);
+                } else {
+                    rbAll.setSelected(true);
+                }
+
+                JPanel pnFilter = new JPanel(new GridBagLayout());
+                pnFilter.setBorder(BorderFactory.createTitledBorder(tr("Filter")));
+                pnFilter.add(rbAll, GBC.eop());
+                pnFilter.add(rbUseful, GBC.eop());
+
+                this.add(pnFilter, GBC.eol().insets(5, 0, 5, 5));
+
                 JButton apply = new JButton(new AbstractAction(tr("Apply")) {
                     @Override
@@ -848 +872 @@
 
         public void apply() throws IOException {
+            String filter = null;
+            if (rbAll != null) {
+                if (rbAll.isSelected()) {
+                    filter = "all";
+                } else if (rbUseful.isSelected()) {
+                    filter = "useful";
+                }
+            }
+            if (filter != null) {
+                Main.pref.put("plugin.roadsigns.preset.filter", filter);
+            }
             RoadSignsPlugin.setSelectedPreset(presetsData.get(selectionBox.getSelectedIndex()));
         }

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java

@@ -183 +183 @@
         List<PresetMetaData> presetsData =  getAvailablePresetsMetaData();
         String code = Main.pref.get("plugin.roadsigns.preset.selection", null);
-        if (selectedPreset != null && selectedPreset.code.equals(code)) return;
 
         for (PresetMetaData data : presetsData) {

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java

@@ -22 +22 @@
 import org.xml.sax.helpers.DefaultHandler;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.OsmDataParsingException;
 import org.openstreetmap.josm.plugins.roadsigns.Sign.SignParameter;
 import org.openstreetmap.josm.plugins.roadsigns.Sign.Tag;
-import org.openstreetmap.josm.tools.LanguageInfo;
-
 import org.openstreetmap.josm.plugins.roadsigns.javacc.ParseException;
 import org.openstreetmap.josm.plugins.roadsigns.javacc.TokenMgrError;
+import org.openstreetmap.josm.tools.LanguageInfo;
 
 /**
@@ -113 +113 @@
 
                 curSign.help = getLocalized(atts, "help");
+
+                String useful = atts.getValue("useful");
+                if (useful != null) {
+                    curSign.useful = Boolean.parseBoolean(useful);
+                }
 
             } else if (curSign != null && qname.equals("tag")) {
@@ -312 +317 @@
             factory.newSAXParser().parse(inputSource, parser);
             parser.wireSupplements();
-            return parser.allSigns;
+            String filterPref = Main.pref.get("plugin.roadsigns.preset.filter");
+            if (filterPref.equals("useful")) {
+                List<Sign> filtered = new ArrayList<Sign>();
+                for (Sign s : parser.allSigns) {
+                    if (s.isUseful()) {
+                        filtered.add(s);
+                    }
+                }
+                return filtered;
+            } else {
+                return parser.allSigns;
+            }
         } catch (ParserConfigurationException e) {
             e.printStackTrace(); // broken SAXException chaining

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java

@@ -34 +34 @@
     public String wiki;
     public String help;
+    public Boolean useful;
 
     public JLabel label; // FIXME: don't put gui stuff here
@@ -120 +121 @@
     }
 
+    public boolean isUseful() {
+        if (useful != null) return useful;
+        return !tags.isEmpty();
+    }
+
     @Override
     public String toString() {