Changeset 7118 in josm

Timestamp:

2014-05-13T13:39:24+02:00 (10 years ago)

Author:

simon04

Message:

fix #9901 - Presets: add support for alternative_autocomplete_keys, esp. auto-complete addr:street also from name

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• data/tagging-preset.xsd (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -59 +59 @@
   match: none/key/key!/keyvalue (default is "none", see below for more information)
   length: length of input box (number of characters allowed)
+  alternative_autocomplete_keys: comma separated list of alternative keys to use for autocompletion
 
 combo: combo box, with multiple choices and possible to enter free form text
@@ -6682 +6683 @@
             <text key="addr:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
             <optional>
-                <text key="addr:housename" text="House name" match="key" />
-                <text key="addr:street" text="Street name" use_last_as_default="force" match="key" />
+                <text key="addr:housename" text="House name" match="key" alternative_autocomplete_keys="name" />
+                <text key="addr:street" text="Street name" use_last_as_default="force" match="key" alternative_autocomplete_keys="name" />
                 <text key="addr:city" text="City name" use_last_as_default="force" match="key" />
                 <text key="addr:postcode" text="Post code" use_last_as_default="force" match="key" />

trunk/data/tagging-preset.xsd

@@ -157 +157 @@
                 <attribute name="match" type="tns:match" />
                 <attribute name="length" type="positiveInteger" />
+                <attribute name="alternative_autocomplete_keys" type="string" />
 
                 <attribute name="type" use="prohibited" />

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -21 +22 @@
 public abstract class TaggingPresetItem {
 
-    protected void initAutoCompletionField(AutoCompletingTextField field, String key) {
+    protected void initAutoCompletionField(AutoCompletingTextField field, String... key) {
+        initAutoCompletionField(field, Arrays.asList(key));
+    }
+
+    protected void initAutoCompletionField(AutoCompletingTextField field, List<String> keys) {
         if (Main.main == null) return;
         OsmDataLayer layer = Main.main.getEditLayer();
@@ -28 +33 @@
         }
         AutoCompletionList list = new AutoCompletionList();
-        layer.data.getAutoCompletionManager().populateWithTagValues(list, key);
+        layer.data.getAutoCompletionManager().populateWithTagValues(list, keys);
         field.setAutoCompletionList(list);
     }

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

@@ -577 +577 @@
         public String auto_increment;
         public String length;
+        public String alternative_autocomplete_keys;
 
         private JComponent value;
@@ -585 +586 @@
             Usage usage = determineTextUsage(sel, key);
             AutoCompletingTextField textField = new AutoCompletingTextField();
-            initAutoCompletionField(textField, key);
+            if (alternative_autocomplete_keys != null) {
+                initAutoCompletionField(textField, (key + "," + alternative_autocomplete_keys).split(","));
+            } else {
+                initAutoCompletionField(textField, key);
+            }
             if (length != null && !length.isEmpty()) {
                 textField.setMaxChars(Integer.valueOf(length));