Update Potlatch 2 to 2.3-367-ga54da3b build

[rails.git] / public / potlatch2 / map_features / roads.xml

diff --git a/public/potlatch2/map_features/roads.xml b/public/potlatch2/map_features/roads.xml
index a9da30379d0c5eb84a20b7ab533906aabdbc4e31..b731d6dd2289a062d7f6becce365c029ad174e86 100644 (file)
--- a/public/potlatch2/map_features/roads.xml
+++ b/public/potlatch2/map_features/roads.xml
@@ -274,7 +274,7 @@
 
   <feature name="Mini Roundabout">
     <category>transport</category>
 
   <feature name="Mini Roundabout">
     <category>transport</category>

-    <icon image="features/pois/transport_mini_roundabout.n.24.png"/>
+    <icon image="features/pois/transport_miniroundabout_anticlockwise.n.24.png"/>

     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help>
     <point/>
     <tag k="highway" v="mini_roundabout"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help>
     <point/>
     <tag k="highway" v="mini_roundabout"/>


@@ -284,7 +284,7 @@
 
   <feature name="Traffic calming">
     <category>transport</category>
 
   <feature name="Traffic calming">
     <category>transport</category>

-    <icon image="features/pois/transport_traffic_calming.n.24.png"/>
+    <icon image="features/pois/transport_speedbump.n.24.png"/>

 <!--    <help>http://wiki.openstreetmap.org/wiki/Key:traffic_calming</help>-->
     <point/>
     <tag k="traffic_calming" v="yes" vmatch="*"/>
 <!--    <help>http://wiki.openstreetmap.org/wiki/Key:traffic_calming</help>-->
     <point/>
     <tag k="traffic_calming" v="yes" vmatch="*"/>


@@ -302,6 +302,28 @@
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

+  <feature name="Pedestrian crossing">
+    <category>transport</category>
+    <icon image="features/pois/transport_zebracrossing.n.24.png"/>
+    <point />
+    <within entity="way" k="highway"/>
+    <tag k="highway" v="crossing"/>
+    <input type="choice" key="crossing" name="Type of crossing" presence="always">
+      <choice value="yes" text="Generic" vmatch="unknown" />
+      <choice value="uncontrolled" text="Uncontrolled (no lights)" />
+      <choice value="traffic_signals" text="Traffic lights" />
+      <choice value="island" text="Traffic island" />
+      <choice value="unmarked" text="Unmarked" />
+      <choice value="no" text="None" />
+    </input>
+    <inputSet ref="common"/>
+    <inputSet ref="bicycle-permission"/>
+    <inputSet ref="horse-permission"/>
+    <input type="checkbox" key="supervised" name="Supervised by crossing guard" category="Details" presence="onTagMatch" />
+    <input type="checkbox" key="segregated" name="Horses, pedestrians etc segregated from each other" category="Details" presence="onTagMatch" />
+    <input type="freetext" key="crossing_ref" name="Crossing category reference"  category="Details" presence="onTagMatch" />
+  </feature>
+

   <feature name="Turn restriction">
     <category>advanced</category>
     <help>http://wiki.openstreetmap.org/wiki/Turn_restrictions</help>
   <feature name="Turn restriction">
     <category>advanced</category>
     <help>http://wiki.openstreetmap.org/wiki/Turn_restrictions</help>


@@ -329,13 +351,14 @@
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  
+    

   <!-- Junction nodes (for turn restrictions) -->
 
   <!-- Junction nodes (for turn restrictions) -->
 

-  <feature>
+  <feature name="Intersection">

     <point/>
     <within entity="way" k="highway" minimum="2"/>
     <inputSet ref="junctionNode"/>
     <point/>
     <within entity="way" k="highway" minimum="2"/>
     <inputSet ref="junctionNode"/>

+    <inputSet ref="trafficSignals"/>    

     <inputSet ref="common"/>
   </feature>
   
     <inputSet ref="common"/>
   </feature>