Merge remote branch 'gravitystorm/autocompletekeys'

diff --git a/net/systemeD/potlatch2/mapfeatures/Feature.as b/net/systemeD/potlatch2/mapfeatures/Feature.as
index 007c87e0fd2a4095b382ecde2010c3c84e13288a..beb69ffaa88fc46e423109fa376a1cd93d4463d7 100644 (file)
--- a/net/systemeD/potlatch2/mapfeatures/Feature.as
+++ b/net/systemeD/potlatch2/mapfeatures/Feature.as
@@ -81,7 +81,6 @@ package net.systemeD.potlatch2.mapfeatures {
             var inputType:String = inputXML.@type;
             var presenceStr:String = inputXML.@presence;
             var sortOrderStr:String = inputXML.@priority;
-//          _tags.push( { k:String(inputXML.@key) } ); /* add the key to tags so that e.g. addr:housenumber shows up on autocomplete */
             var editor:EditorFactory = EditorFactory.createFactory(inputType, inputXML);
             if ( editor != null ) {
                 editor.presence = Presence.getPresence(presenceStr);

diff --git a/net/systemeD/potlatch2/mapfeatures/MapFeatures.as b/net/systemeD/potlatch2/mapfeatures/MapFeatures.as
index e7ce89592f70d4a0932213c35555328351c9eb90..605d0a854095a2e30163f0254b03f387a201ada1 100644 (file)
--- a/net/systemeD/potlatch2/mapfeatures/MapFeatures.as
+++ b/net/systemeD/potlatch2/mapfeatures/MapFeatures.as
@@ -59,6 +59,10 @@ package net.systemeD.potlatch2.mapfeatures {
                     if (f.isType('relation'))                 { addToTagList('relation',tag); }
                     if (f.isType('point'))                    { addToTagList('node',tag); }
                 }
+
+                for each (var inputSet:XML in feature..inputSet) {
+                    tagsFromInputSet(definition.inputSet.(@id == String(inputSet.@ref)), f);
+                }
             }
 
             _categories = new Array();
@@ -69,6 +73,28 @@ package net.systemeD.potlatch2.mapfeatures {
             dispatchEvent(new Event("featuresLoaded"));
         }
 
+        private function tagsFromInputSet(inputSet:XMLList, f:Feature):void {
+            for each (var input:XML in inputSet.input) {
+                // Take all the k/v pairs from inputs that have choice
+                for each (var choice:XML in input..choice ) {
+                    if (f.isType('line') || f.isType('area')) { addToTagList('way', {k:String(input.@key), v:String(choice.@value)}); }
+                    if (f.isType('relation'))                 { addToTagList('relation',{k:String(input.@key), v:String(choice.@value)}); }
+                    if (f.isType('point'))                    { addToTagList('node',{k:String(input.@key), v:String(choice.@value)}); }
+                }
+
+                if (input.@type == 'freetext') {
+                    if (f.isType('line') || f.isType('area')) { addToTagList('way', {k:String(input.@key), v:''}); }
+                    if (f.isType('relation'))                 { addToTagList('relation',{k:String(input.@key), v:''}); }
+                    if (f.isType('point'))                    { addToTagList('node',{k:String(input.@key), v:''}); }
+                }
+            }
+
+            // inputSets can have their own inputSets, so recurse
+            for each (var i:XML in inputSet.inputSet) {
+                tagsFromInputSet(definition.inputSet.(@id == String(i.@ref)), f);
+            }
+        }
+
         /** Add one item to tagList index, which will end up being a list like: ["way"]["highway"]["residential"] */
                private function addToTagList(type:String,tag:Object):void {
                        if (tag.v=='*') { return; }