Changeset 614 in josm

Timestamp:

2008-04-19T17:55:29+02:00 (17 years ago)

Author:

framm

Message:

• support for sub-menus in tagging presets (simply name them "Foo/Bar" instead of "Foo")
• support for re-using the last used tags in a preset (set use_last_as_default=true in the preset definition)
• presets for address tagging according to the "Karlsruhe Schema"

Location:

trunk

Files:

• .settings/org.eclipse.jdt.core.prefs (modified) (2 diffs)
• presets/presets.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (10 diffs)

trunk/.settings/org.eclipse.jdt.core.prefs

@@ -1 @@
-#Thu Nov 01 00:40:05 CET 2007
+#Sat Apr 19 17:30:55 CEST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
@@ -21 +21 @@
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

trunk/presets/presets.xml

@@ -7 +7 @@
 
 <annotations>
-
         <item name="Road" icon="presets/ways.png">
     <label text="Road" />
@@ -118 +117 @@
         </item>
 
+    <item name="Addresses" icon="presets/addresses.png">
+    <label text="These attributes are used for nodes:" />
+       <text key="addr:street" text="Street name" use_last_as_default="true" delete_if_empty="true" />
+       <text key="addr:housenumber" text="House number" default="" delete_if_empty="true" />
+       <text key="addr:housename" text="House name" default="" delete_if_empty="true" />
+       <text key="addr:postcode" text="Post code" use_last_as_default="true" delete_if_empty="true" />
+       <text key="addr:city" text="City" use_last_as_default="true" delete_if_empty="true" />
+    <label text=" " />
+    <label text="These attributes are used for ways:" />
+       <combo key="addr:interpolation" text="Numbering scheme:" values="odd,even,all" default="odd" />
+    </item>   
+    
         <item name="Boundaries" icon="presets/boundaries.png">
                 <label text="Boundaries" />
@@ -123 +134 @@
                 <text key="name" text="Name:" default="" delete_if_empty="true" />
  </item>
+ 
+ 
 
         <item name="Landuse" icon="presets/landuse.png">

trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

@@ -9 +9 @@
 import java.awt.event.ActionListener;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.StringTokenizer;
 
@@ -19 +20 @@
 import javax.swing.JLabel;
 import javax.swing.JList;
+import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
@@ -125 +127 @@
                 else
                 {
+                        HashMap<String,JMenu> submenus = new HashMap<String,JMenu>();
                         for (final TaggingPreset p : taggingPresets) {
                                 if (p.getValue(Action.NAME).equals(" ")) {
                                         Main.main.menu.presetsMenu.add(new JSeparator());
                                 } else {
-                                        Main.main.menu.presetsMenu.add(new JMenuItem(p));
+                                        String name = (String) p.getValue(Action.NAME);
+                                        String[] sp = name.split("/");
+                                        if (sp.length <= 1) {
+                                                Main.main.menu.presetsMenu.add(new JMenuItem(p));
+                                        } else {
+                                                p.setName(sp[1]);
+                                                JMenu submenu = submenus.get(sp[0]);
+                                                if (submenu == null) {
+                                                        submenu = new JMenu(sp[0]);
+                                                        submenus.put(sp[0], submenu);
+                                                        Main.main.menu.presetsMenu.add(submenu);
+                                                }
+                                                submenu.add(new JMenuItem(p));
+                                        }
                                 }
                         }               

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -16 +16 @@
 import java.net.URL;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -44 +45 @@
 import org.xml.sax.SAXException;
 
-
 /**
  * This class read encapsulate one tagging preset. A class method can
@@ -53 +53 @@
  */
 public class TaggingPreset extends AbstractAction {
-
+        
         public static abstract class Item {
                 public boolean focus = false;
@@ -71 +71 @@
                 returnValue.values = new HashSet<String>();
                 for (OsmPrimitive s : sel) {
-                        returnValue.values.add(s.get(key));
+                        String v = s.get(key);
+                        /* if (v != null) */ returnValue.values.add(v);
                 }
                 return returnValue;
@@ -94 +95 @@
         
         public static class Text extends Item {
+                
                 public String key;
                 public String text;
                 public String default_;
                 public String originalValue;
+                public boolean use_last_as_default = false;
                 public boolean delete_if_empty = false;
 
@@ -106 +109 @@
                         // find out if our key is already used in the selection.
                         Usage usage = determineTextUsage(sel, key);
-                        
-                        if (usage.values.size() == 1) {
+                        if (usage.values.size() == 1 && usage.values.toArray()[0] == null) {
+                                value = new JTextField();
+                                if (use_last_as_default && lastValue.containsKey(key)) {
+                                        ((JTextField)value).setText(lastValue.get(key));
+                                } else {
+                                        ((JTextField)value).setText(default_);
+                                }
+                        } else if (usage.values.size() == 1) {
                                 // all objects use the same value
                                 value = new JTextField();
@@ -130 +139 @@
                                 ((JTextField)value).getText();
 
+                        if (use_last_as_default) lastValue.put(key, v);
                         if (v.equals(originalValue) || (originalValue == null && v.length() == 0)) return;
 
@@ -144 +154 @@
                 public String text;
                 public boolean default_ = false; // not used!
+                public boolean use_last_as_default = false;
 
                 private QuadStateCheckBox check;
@@ -205 +216 @@
                 public boolean delete_if_empty = false;
                 public boolean editable = true;
+                public boolean use_last_as_default = false;
 
                 private JComboBox combo;
@@ -285 +297 @@
         public Collection<Class<?>> types;
         private List<Item> data = new LinkedList<Item>();
+        private static HashMap<String,String> lastValue = new HashMap<String,String>();
 
         /**