Merge pull request #41 from stevage/pedestrian-crossings
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 17:07:11 +0000 (10:07 -0700)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 17:07:11 +0000 (10:07 -0700)
Add pedestrian crossings and traffic signals to map_features.

1  2 
resources/map_features.xml

index 5d0a15ec4fe3763e123214fd535e9716819c9ad6,f46e360d7bcf693469d5b7d6647607a26e199247..b31e1721f721ab002ef209f758376c8e1caee3f0
@@@ -48,7 -48,7 +48,7 @@@
     </inputSet> 
  
    <inputSet id="source">
 -    <input type="freetext" category="Details" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, ...)" priority="lowest"/>
 +    <input type="freetext" category="Details" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Bing, ...)" priority="lowest"/>
    </inputSet>
  
    <inputSet id="designation">
        <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">
        <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">