Merge pull request #39 from stevage/fix-tram-route-editor
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 17:08:31 +0000 (10:08 -0700)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 17:08:31 +0000 (10:08 -0700)
Fix bug to make tram routes show up on simple editor for tram lines.

1  2 
resources/map_features.xml
resources/map_features/transport.xml

index 77bb08a56a8c87a034747f43eee8ea276de0b286,8c095ed4ecf03c78db4111dc9004d8aa35a341e7..bfcdc4d45bcab7b2294cbfffb66e6a7bb632575f
@@@ -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">
      <inputSet ref="cycle"/>
      <inputSet ref="bicycle-lane"/>
      <inputSet ref="bus-route"/>
+     <inputSet ref="tram-route"/>
      <inputSet ref="pedestrians"/>
      <inputSet ref="roadLanes"/>
      <inputSet ref="roadRoundabout"/>
      <inputSet ref="cycle"/>
      <inputSet ref="bicycle-lane"/>
      <inputSet ref="bus-route"/>
+     <inputSet ref="tram-route"/>
      <inputSet ref="pedestrians"/>
      <inputSet ref="roadLanes"/>
      <inputSet ref="roadRoundabout"/>
        <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>
  
index 2dba71d95025fa50d063d7caf65702f0ffabf4bb,e1ee5aca6aaf2fa77b14f42b34310e1cc4da3606..483ee8eb6c8532d598db7290a7cad00ed10c6358
      
          <line/>
          <tag k="railway" v="tram"/>
-         <input ref="tram-route"/>
+         <inputSet ref="tram-route"/>
          <inputSet ref="bridge"/>
          <inputSet ref="tunnel"/>
          <inputSet ref="embankment-cutting"/>
      <inputSet ref="names"/>
      <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
      <input type="number" minimum="0" maximum="99999" stepSize="1" presence="always" category="Parking" name="Capacity" key="capacity" description="The number of cars that can be parked in the car park"/>
 +    <input type="choice" presence="always" category="Parking" name="Type" key="parking" priority="high">
 +      <choice value="surface" text="Surface (outdoor)" />
 +      <choice value="multi-storey" text="Multi-storey" />
 +      <choice value="underground" text="Underground" />
 +      <choice value="garage" text="Garage" />
 +      <choice value="park_and_ride" text="Park-and-ride" />
 +      <choice value="garage_boxes" text="Garage boxes" />
 +    </input>
 +    <input type="freetext" presence="onTagMatch" category="Parking" name="Maximum stay" key="maxstay" description="The maximum permitted duration of parking (eg, 4h)."/>
      <inputSet ref="fee"/>
      <inputSet ref="common"/>
    </feature>