Add pedestrian crossings and traffic signals to map_features.

resources/map_features.xml

@@ -315,6 +315,13 @@
       <role role="via"/>
     </input>
   </inputSet>
+
+  <inputSet id="trafficSignals">
+    <!-- can't add as standalone feature due to current limitations, would conflict with junction node feature -->
+    <input type="choice" key="highway" name="Traffic signals" description="Intersection controlled by traffic lights" category="Restrictions" presence="always">
+      <choice value="traffic_signals" text="Yes"/>
+    </input>
+  </inputSet>
 
   <inputSet id="pedestrians">
     <input type="choice" name="Pedestrians" description="Can pedestrians use this road, including footpaths if any?" category="Walk" key="foot">
@@ -503,14 +510,18 @@
       <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
     </input>
 
-    <input type="choice" name="Horses" category="Restrictions" key="horse" description="Are cars and other private vehicles allowed?">
+    <inputSet ref="hores-permission" />
+
+  </inputSet>
+
+  <inputSet id="horse-permission">
+    <input type="choice" name="Horses" category="Restrictions" key="horse" description="Are horses allowed?">
       <choice value="yes" text="Allowed" description="General right of way."/>
       <choice value="no" text="Prohibited" description="No access to the public."/>
       <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
       <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
       <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
     </input>
-
   </inputSet>
 
   <inputSet id="places">

resources/map_features/roads.xml

@@ -302,6 +302,28 @@
     <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>
@@ -329,13 +351,14 @@
     <inputSet ref="common"/>
   </feature>
 
-
+    
   <!-- Junction nodes (for turn restrictions) -->
 
-  <feature>
+  <feature name="Intersection">
     <point/>
     <within entity="way" k="highway" minimum="2"/>
     <inputSet ref="junctionNode"/>
+    <inputSet ref="trafficSignals"/>    
     <inputSet ref="common"/>
   </feature>