Add pedestrian crossings and traffic signals to map_features. #41

Merged
merged 1 commit into from Mar 25, 2012
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -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">
@@ -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>
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.0"
+ width="580"
+ height="580"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="zebra_crossing.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <metadata
+ id="metadata2975">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="http://web.resource.org/cc/PublicDomain" />
+ <dc:language>en</dc:language>
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ inkscape:window-height="990"
+ inkscape:window-width="1680"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:zoom="0.44968965"
+ inkscape:cx="-318.82651"
+ inkscape:cy="-104.02337"
+ inkscape:window-x="-4"
+ inkscape:window-y="-4"
+ inkscape:current-layer="svg2"
+ showgrid="false"
+ inkscape:window-maximized="1" />
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient5225"
+ osb:paint="solid">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop5227" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 290 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="580 : 290 : 1"
+ inkscape:persp3d-origin="290 : 193.33333 : 1"
+ id="perspective2441" />
+ <inkscape:perspective
+ id="perspective3452"
+ inkscape:persp3d-origin="30 : 20 : 1"
+ inkscape:vp_z="60 : 30 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 30 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <symbol
+ viewBox="244.5 110 489 219.9"
+ id="symbol-university">
+ <path
+ id="path4460"
+ d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" />
+ <path
+ id="path4462"
+ d="M94,176l-21,39"
+ stroke-width="20"
+ stroke="#000000"
+ fill="none" />
+ <path
+ id="path4464"
+ d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" />
+ <path
+ id="path4466"
+ d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
+ stroke-width="20"
+ stroke="#000000"
+ ill="none" />
+ </symbol>
+ <inkscape:perspective
+ id="perspective4471"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective4668"
+ inkscape:persp3d-origin="6 : 4 : 1"
+ inkscape:vp_z="12 : 6 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 6 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <g
+ id="g1327"
+ style="fill:#0092da;fill-opacity:1">
+ <path
+ d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.599,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.841 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z"
+ style="fill:#0092da;stroke:#eeeeee;stroke-width:3.40799999000000000;fill-opacity:1"
+ id="path1329" />
+ </g>
+ <g
+ id="layer3"
+ inkscape:label="Layout"
+ style="display:none;stroke:#757575;stroke-opacity:1"
+ transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
+ <rect
+ style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ id="rect4134"
+ width="10"
+ height="10"
+ x="1"
+ y="1" />
+ <rect
+ style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ id="rect4136"
+ width="8"
+ height="8"
+ x="2"
+ y="2" />
+ </g>
+ <g
+ id="g6676"
+ style="opacity:0.48430493000000002;stroke:#ffffff;stroke-opacity:1">
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect3023-9-6-6"
+ d="M 34.675271,236.14779 91.267408,224.23341 245.66589,526.52496 165.90902,546.86654 z"
+ style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:20;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect3023-9-6-6-4"
+ d="m 164.95622,205.22317 62.66497,-13.40152 182.12871,294.84103 -73.52434,19.02839 z"
+ style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:20;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect3023-9-6-6-4-9"
+ d="m 318.25367,170.54492 57.44928,-16.78489 196.05496,290.40459 -72.89106,21.3261 z"
+ style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:20;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ </g>
+ <g
+ id="g5357"
+ transform="matrix(1.3308688,-0.28299462,0.20605761,0.96904894,-134.69524,-21.09008)"
+ style="stroke:#ffffff;stroke-opacity:1;">
+ <path
+ sodipodi:nodetypes="cc"
+ id="path4817"
+ d="M 256.05495,237.14675 241.67023,317.3127"
+ style="fill:none;stroke:#ffffff;stroke-width:74.19999695;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccc"
+ id="path5329"
+ d="M 330.52502,307.73122 296.11201,278.04332 273.66832,225.7194"
+ style="fill:none;stroke:#ffffff;stroke-width:32.59999847;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path5331"
+ d="M 313.55883,487.77682 302.16655,393.38367"
+ style="fill:none;stroke:#ffffff;stroke-width:41.29999924;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path5333"
+ d="m 245.20517,315.8077 54.24893,74.86352"
+ style="fill:none;stroke:#ffffff;stroke-width:45.09999847;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#ffffff;stroke-width:45.09999847;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 226.76053,316.89268 1.62747,87.34077"
+ id="path5335"
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#ffffff;stroke-width:45.30612183;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 192.04122,489.40429 37.43176,-80.83092"
+ id="path5337"
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:45.09999847;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 278.89197,151.40646 c -9.43171,0.42792 -13.14501,14.03074 -5.34375,19.21875 7.10539,5.86065 18.86748,-1.24234 16.9375,-10.3125 -0.85188,-5.43638 -6.10237,-9.52 -11.59375,-8.90625 z"
+ id="path5339"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#ffffff;stroke-width:32.59999847;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 177.5811,312.56103 16.29998,-55.44688 51.61336,-38.63946"
+ id="path5417"
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>