Update Potlatch 2 to r24481 build

diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index c262122fb00054f23dceb0b010f16dc07dd6e797..3df4673d65cdce940a92181dc410b902d6a5b780 100644 (file)
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -1614,7 +1614,8 @@ Quick documentation:
     </icon>
 
     <area/>
-    <tag k="building" v="*"/>
+    <!-- <tag k="building" v="*"/> -->
+    <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
     <inputSet ref="common"/>
@@ -1966,7 +1967,7 @@ Quick documentation:
     <point/>
     <area/>
     <!-- TODO: make this work -->
-    <tag k="place" v="*"/>
+    <!-- <tag k="place" v="*"/>-->
     <inputSet ref="names"/>
     <input type="choice" name="Type of place name" presence="always" key="place">
       <choice value="locality" text="Locality"/>
@@ -2707,7 +2708,7 @@ Quick documentation:
     <help>http://wiki.openstreetmap.org/wiki/Key:traffic%3Dcalming</help>
     <point/>
     <!-- Warning: creates "traffic_calming=*" by default, but it's the best we can do. Steve Bennett-->
-    <tag k="traffic_calming" v="*"/>
+    <!--<tag k="traffic_calming" v="*"/>-->
     <input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch">
       <choice value="yes" text="Unspecified"/>
       <choice value="bump" text="Short bump" description="A sharp speed bump, typically slowing cars to 15 kph or less."/>

diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 15a013194efd13da8caa24c7ab0f5bf8a874a04f..015c82cb46bdc02fc42bfd7e59bc8c0836d2a957 100644 (file)
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ