Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Sat, 6 Oct 2012 07:59:01 +0000 (08:59 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sat, 6 Oct 2012 07:59:01 +0000 (08:59 +0100)
resources/map_features.xml
resources/map_features/roads.xml
resources/map_features/transport.xml

index 3e743fd3db135e70cfc48942f046a7071bd167b6..ed01d3e1af277bed1063b5631d2b4b05719cc23a 100644 (file)
       <choice value="dirt" text="Dirt"/>
       <choice value="grass" text="Grass"/>
     </input>
-    <input type="choice" presence="onTagMatch"
-        name="Sidewalks" category="Details" description="Whether there is a sidewalk at the side of the street"
-        key="sidewalk" layout="horizontal">
-      <choice value="both" text="Both" description="There is a sidewalk on both sides of the road"/>
-      <choice value="left" text="Left" description="The sidewalk is on the left of the direction of the road"/>
-      <choice value="right" text="Right" description="The sidewalk is on the right of the direction of the road"/>
-      <choice value="none" text="None" decription="There is no sidewalk on this section of road"/>
-    </input>
     <inputSet ref="bridge"/>
     <inputSet ref="tunnel"/>
     <inputSet ref="embankment-cutting"/>
       <choice value="no" text="Prohibited"/>
       <choice value="designated" text="Designated"/>
     </input>
+    <input type="choice" presence="onTagMatch"
+        name="Sidewalks" category="Walk" description="Whether there is a sidewalk at the side of the street"
+        key="sidewalk" layout="horizontal">
+      <choice value="both" text="Both" description="There is a sidewalk on both sides of the road." match="yes"/>
+      <choice value="left" text="Left" description="The sidewalk is on the left of the direction of the road."/>
+      <choice value="right" text="Right" description="The sidewalk is on the right of the direction of the road."/>
+      <choice value="separate" text="Separate" description="The sidewalk has been mapped as a separate line parallel."/>
+      <choice value="none" text="None" description="There is no sidewalk on this section of road." match="no"/>
+    </input>
     <input type="route" name="National Walking Route" description="National walking route" category="Walk" priority="low">
       <match k="type" v="route"/>
       <match k="route" v="hiking|foot"/>
index b731d6dd2289a062d7f6becce365c029ad174e86..fc3d517bd7de6ec33d171000abe83dfd1cc2c947 100644 (file)
     <icon image="features/pois/transport_turning_circle.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle</help>
     <point draganddrop="no"/>
+    <within entity="way" k="highway"/>
     <tag k="highway" v="turning_circle"/>
     <inputSet ref="common"/>
   </feature>
     <category>transport</category>
     <icon image="features/pois/transport_miniroundabout_anticlockwise.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help>
-    <point/>
+    <point draganddrop="no"/>
+    <within entity="way" k="highway"/>
     <tag k="highway" v="mini_roundabout"/>
     <inputSet ref="common"/>
   </feature>
     <category>transport</category>
     <icon image="features/pois/transport_speedbump.n.24.png"/>
 <!--    <help>http://wiki.openstreetmap.org/wiki/Key:traffic_calming</help>-->
-    <point/>
+    <point draganddrop="no"/>
+    <within entity="way" k="highway"/>
     <tag k="traffic_calming" v="yes" vmatch="*"/>
     <input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch">
       <choice value="yes" text="Unspecified"/>
   <feature name="Pedestrian crossing">
     <category>transport</category>
     <icon image="features/pois/transport_zebracrossing.n.24.png"/>
-    <point />
+    <point draganddrop="no"/>
     <within entity="way" k="highway"/>
     <tag k="highway" v="crossing"/>
     <input type="choice" key="crossing" name="Type of crossing" presence="always">
index a6462be6d90e6bffd3b64ba2a290318fb377eb28..edd35b93bbaa351d0ee7be7cf4710bb808eb611d 100755 (executable)
         <tag k="railway" v="platform"/>
         <input type="freetext" presence="onTagMatch" category="Details" name="Reference" key="ref" description="The number of the platform" priority="low"/>
         <inputSet ref="common"/>
+           <inputSet ref="bridge"/>
+           <inputSet ref="tunnel"/>
       </feature>
     
   <feature name="Car Wash">
         presence="always" category="Cycle" name="Capacity" key="capacity"
         description="The number of bicycles that can be parked in the group of bicycle parking racks"/>
     <inputSet ref="fee"/>
+    <input type="choice" presence="always" category="Cycle" name="Type" key="bicycle_parking" description="They type of bicycle parking">
+      <choice value="anchors" text="Anchors" description="Small loops, usually attached to a wall for putting a lock through to secure the bicycle."/>
+      <choice value="building" text="Building" description="Similar to shed, but instead a building structure."/>
+      <choice value="ground_slots" text="Slots in the ground that hold your wheel."/>
+      <choice value="informal" text="Informal" description="Notable large or well used railing, fences or other street furnature which nobody objects to having bikes stored at. Only use for longer railings."/>
+      <choice value="lockers" text="Lockers" description="A cabinet for storing bikes induvidually."/>
+      <choice value="shed" text="Shed" description="A custom built shed in which many bikes can be stored."/>
+      <choice value="stands" text="Stands" description="Bent piece of metal, often called Sheffield stands in the UK, or staple racks in the US."/>
+      <choice value="wall_hoops" text="Wall Hoops" description="Hoops to lock the wheel. Sometimes called 'Wheelbenders'."/>
+    </input>
     <input type="choice" presence="always" category="Cycle" name="Covered" key="covered" description="Is the cycle parking covered, so that the bikes are kept dry?">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>