ADD @vmatch attribute to <tag> element of feature in map_features.xml. Matching tag...

[potlatch2.git] / net / systemeD / potlatch2 / mapfeatures / Feature.as

diff --git a/net/systemeD/potlatch2/mapfeatures/Feature.as b/net/systemeD/potlatch2/mapfeatures/Feature.as
index b7083ea..0dda070 100644 (file)
--- a/net/systemeD/potlatch2/mapfeatures/Feature.as
+++ b/net/systemeD/potlatch2/mapfeatures/Feature.as
@@ -26,6 +26,7 @@ package net.systemeD.potlatch2.mapfeatures {
         public var missingIconCls:Class;
 
 
+        /** Create this Feature from an XML subtree. */
         public function Feature(mapFeatures:MapFeatures, _xml:XML) {
             this.mapFeatures = mapFeatures;
             this._xml = _xml;
@@ -39,7 +40,7 @@ package net.systemeD.potlatch2.mapfeatures {
 
                        // parse tags
             for each(var tag:XML in definition.tag) {
-                _tags.push( { k:String(tag.@k), v:String(tag.@v)} );
+                _tags.push( { k:String(tag.@k), v:String(tag.@v), vmatch:String(tag.@vmatch)} );
             }
 
                        // parse 'within'
@@ -79,6 +80,7 @@ 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);
@@ -98,14 +100,14 @@ package net.systemeD.potlatch2.mapfeatures {
         }
 
         [Bindable(event="nameChanged")]
-        /** The human-readable name of the feature, or null if none. */
+        /** The human-readable name of the feature (@name), or null if none. */
         public function get name():String {
                        if (_xml.attribute('name').length()>0) { return _xml.@name; }
                        return null;
         }
 
         [Bindable(event="imageChanged")]
-        /** An icon for the feature. If none is defined, return default "missing icon". */
+        /** An icon for the feature (from icons[0]/@image). If none is defined, return default "missing icon". */
         public function get image():ByteArray {
             var icon:XMLList = _xml.icon;
             var imageURL:String = null;
@@ -133,6 +135,7 @@ package net.systemeD.potlatch2.mapfeatures {
             return makeHTMLIcon(icon, entity);
         }
 
+        /** Convert the contents of the "icon" tag as an HTML string, with variable substitution. */
         public static function makeHTMLIcon(icon:XMLList, entity:Entity):String {
             if ( icon == null )
                 return "";
@@ -146,6 +149,7 @@ package net.systemeD.potlatch2.mapfeatures {
             return txt;
         }
 
+        /** Basic HTML escaping. */
         public static function htmlEscape(str:String):String {
             var newStr:String = str.replace(/&/g, "&");
             newStr = newStr.replace(/</g, "&lt;");