Merge pull request #77 from smsm1/master
authorRichard Fairhurst <richard@systemeD.net>
Wed, 3 Oct 2012 16:41:57 +0000 (09:41 -0700)
committerRichard Fairhurst <richard@systemeD.net>
Wed, 3 Oct 2012 16:41:57 +0000 (09:41 -0700)
Readme need MOAR ram to be able to compile on OSX.

net/systemeD/potlatch2/mapfeatures/editors/RelationMemberEditorFactory.as
resources/map_features.xml

index cc2b5ab..62eabb8 100644 (file)
@@ -41,7 +41,7 @@ package net.systemeD.potlatch2.mapfeatures.editors {
                                var match:Boolean=true;
                 for ( var k:String in _relationTagPatterns ) {
                     var relVal:String = relation.getTag(k);
-                    if (k.indexOf(relVal) < 0) { match=false; break; }
+                    if (_relationTagPatterns[k].indexOf(relVal) < 0) { match=false; break; }
                                        if ( _role && !relation.hasMemberInRole(entity,_role) ) { match=false; break; }
                 }
                                if (match) { return true; }
index f430346..3e743fd 100644 (file)
       <choice value="dirt" text="Dirt"/>
       <choice value="grass" text="Grass"/>
     </input>
+    <input type="choice" presence="onTagMatch"
+        name="Sidewalks" category="Details" description="Whether there is a sidewalk at the side of the street"
+        key="sidewalk" layout="horizontal">
+      <choice value="both" text="Both" description="There is a sidewalk on both sides of the road"/>
+      <choice value="left" text="Left" description="The sidewalk is on the left of the direction of the road"/>
+      <choice value="right" text="Right" description="The sidewalk is on the right of the direction of the road"/>
+      <choice value="none" text="None" decription="There is no sidewalk on this section of road"/>
+    </input>
     <inputSet ref="bridge"/>
     <inputSet ref="tunnel"/>
     <inputSet ref="embankment-cutting"/>