Merge pull request #43 from stevage/voltage-tweaks
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 17:07:36 +0000 (10:07 -0700)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 17:07:36 +0000 (10:07 -0700)
Voltage tweaks

1  2 
resources/map_features.xml

index b31e1721f721ab002ef209f758376c8e1caee3f0,3040a1becad3c036bd750c84670c670ac0548be3..77bb08a56a8c87a034747f43eee8ea276de0b286
@@@ -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">
        <choice value="750" text="750V"/>
        <choice value="1500" text="1500V"/>
        <choice value="3000" text="3000V"/>
+       <choice value="12000" text="12kV"/>
        <choice value="15000" text="15kV"/>
        <choice value="25000" text="25kV"/>
      </input>
        <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">
        <choice value="35000" text="35 kV"/>
        <choice value="110000" text="110 kV"/>
        <choice value="132000" text="132 kV"/>
-       <choice value="138000" text="238 kV"/>
+       <choice value="138000" text="138 kV"/>
        <choice value="220000" text="220 kV"/>
        <choice value="380000" text="380 kV"/>
+       <choice value="500000" text="500 kV"/>
      </input>
    </inputSet>