ADD icons for vending machine and mini roundabout.

diff --git a/resources/features/pois/amenity_vendingmachine.png b/resources/features/pois/amenity_vendingmachine.png
new file mode 100644 (file)
index 0000000..d6d91b5
Binary files /dev/null and b/resources/features/pois/amenity_vendingmachine.png differ

diff --git a/resources/features/pois/amenity_vendingmachine.svg b/resources/features/pois/amenity_vendingmachine.svg
new file mode 100644 (file)
index 0000000..3f65d20
--- /dev/null
+++ b/resources/features/pois/amenity_vendingmachine.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   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"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg5535"
+   version="1.1"
+   inkscape:version="0.48+devel r9797"
+   sodipodi:docname="amenity_vendingmachine.svg">
+  <defs
+     id="defs5537" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="105.49299"
+     inkscape:cy="348.10106"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="990"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5569" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5540">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#784421;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect3069"
+       width="360"
+       height="365.85367"
+       x="195"
+       y="349.43536"
+       ry="40"
+       inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\pois\amenity_vendingmachine.png"
+       inkscape:export-xdpi="5.9039998"
+       inkscape:export-ydpi="5.9039998" />
+    <path
+       style="fill:#ffffff;stroke:#ffffff;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50802141000000001;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 280,412.36218 0,260 140,0 0,-260 z"
+       id="path5571"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\pois\amenity_vendingmachine.png"
+       inkscape:export-xdpi="5.9039998"
+       inkscape:export-ydpi="5.9039998" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:0.79144383;fill-rule:evenodd;stroke:#ffffff;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path6091"
+       sodipodi:cx="640"
+       sodipodi:cy="412.36218"
+       sodipodi:rx="60"
+       sodipodi:ry="60"
+       d="m 611.04566,464.91355 a 60,60 0 1 1 0.2425,0.13288"
+       sodipodi:start="2.0743857"
+       sodipodi:end="8.3529623"
+       sodipodi:open="true"
+       transform="matrix(0.49536774,0,0,0.64460671,160.82179,217.67579)"
+       inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\pois\amenity_vendingmachine.png"
+       inkscape:export-xdpi="5.9039998"
+       inkscape:export-ydpi="5.9039998" />
+    <rect
+       style="fill:#ffffff;fill-opacity:0.79144383;fill-rule:evenodd;stroke:#ffffff;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect6095"
+       width="140"
+       height="100"
+       x="280"
+       y="412.36218"
+       ry="40"
+       rx="0"
+       inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\pois\amenity_vendingmachine.png"
+       inkscape:export-xdpi="5.9039998"
+       inkscape:export-ydpi="5.9039998" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.79144383;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.89500713;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path6099"
+       d="m 483.13867,471.14976 c -2.49614,-0.0739 -4.99355,-0.079 -7.49033,-0.0683 -2.11347,0.0102 -4.22191,-0.0874 -6.31756,0.26433 -2.79416,1.16402 -8.50384,5.42194 2.88049,-2.36288 -1.11015,0.8867 -2.15929,1.95167 -2.89006,3.29849 -0.58462,1.27229 -0.69811,2.67202 -0.59413,4.09218 0.2467,1.58019 0.735,3.08193 1.27691,4.5458 0.64332,2.01761 1.57436,3.81699 2.82848,5.36047 2.04816,2.17781 4.45786,3.79033 6.86661,5.31788 2.34296,1.65139 4.81925,2.92372 7.45488,3.71121 1.18122,0.25052 0.60248,0.14856 1.73549,0.31163 0,0 -6.10265,5.15146 -6.10265,5.15146 l 0,0 c -1.14854,-0.23595 -0.56138,-0.0962 -1.7604,-0.42562 -2.61934,-0.94721 -5.09182,-2.31385 -7.46886,-3.93572 -2.46924,-1.59145 -4.95767,-3.24048 -7.05285,-5.49914 -1.32224,-1.62522 -2.32,-3.47376 -3.02286,-5.59045 -0.57392,-1.54584 -1.10331,-3.1255 -1.41088,-4.78181 -0.15088,-1.56516 -0.12524,-3.11577 0.40021,-4.5923 0.58391,-1.43748 0.80265,-1.51501 1.71253,-2.57359 0.99847,-1.16162 -0.0577,-0.1792 1.03868,-1.12392 2.07212,-1.44872 6.75277,-5.53127 10.11503,-6.26154 2.07983,-0.2373 4.17205,-0.024 6.25773,-0.0824 2.5491,0.011 5.09875,0.003 7.64726,-0.0683 0,0 -6.10372,5.3126 -6.10372,5.3126 z"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\pois\amenity_vendingmachine.png"
+       inkscape:export-xdpi="5.9039998"
+       inkscape:export-ydpi="5.9039998" />
+  </g>
+</svg>

diff --git a/resources/features/pois/miniroundabout.png b/resources/features/pois/miniroundabout.png
new file mode 100644 (file)
index 0000000..55c68bc
Binary files /dev/null and b/resources/features/pois/miniroundabout.png differ

diff --git a/resources/features/pois/miniroundabout.svg b/resources/features/pois/miniroundabout.svg
new file mode 100644 (file)
index 0000000..3371d37
--- /dev/null
+++ b/resources/features/pois/miniroundabout.svg
@@ -0,0 +1,203 @@
+<?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"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r9797"
+   sodipodi:docname="miniroundabout.svg"
+   inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\miniroundabout.png"
+   inkscape:export-xdpi="5.9040003"
+   inkscape:export-ydpi="5.9040003">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5494"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5496" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Sstart"
+       style="overflow:visible">
+      <path
+         id="path3861"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.2) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Send"
+       style="overflow:visible;">
+      <path
+         id="path3864"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.2) rotate(180) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Sstart"
+       style="overflow:visible">
+      <path
+         id="path3879"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.3) translate(-2.3,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mstart"
+       style="overflow:visible">
+      <path
+         id="path3855"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.4) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3849"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3852"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="319.07278"
+     inkscape:cy="585.55613"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="990"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3071" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect3069"
+       width="360"
+       height="365.85367"
+       x="160"
+       y="172.36218"
+       ry="40" />
+    <g
+       id="g5484"
+       transform="translate(3.4045305,61.770767)">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 240.32254,259.90188 c -11.76291,46.28008 9.27025,94.76891 51.09375,117.8125 l 9.625,-17.5 c -33.93577,-18.69767 -33.9903,-62.0711 -24.44582,-99.62296 z"
+         id="path4348"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4pt;stroke-opacity:0.6524064"
+         d="m 275.20761,357.38865 -27.16857,7.86568 70.96137,16.26294 -51.65847,-51.29719 7.86567,27.16857 z"
+         id="path5490"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g5484-3"
+       transform="matrix(-0.67465716,0.73813123,-0.73813123,-0.67465716,779.01492,301.71509)">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 221.81517,256.54751 c -11.76291,46.28008 27.77762,98.12328 69.60112,121.16687 l 9.625,-17.5 c -33.93577,-18.69767 -50.88823,-57.82314 -41.34375,-95.375 z"
+         id="path4348-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4pt;stroke-opacity:0.6524064"
+         d="m 275.20761,357.38865 -27.16857,7.86568 70.96137,16.26294 -51.65847,-51.29719 7.86567,27.16857 z"
+         id="path5490-5"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g5484-1"
+       transform="matrix(-0.47177945,-0.88171659,0.88171659,-0.47177945,234.96591,793.87305)">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 220.39358,248.39189 c -11.76291,46.28008 29.19921,106.2789 71.02271,129.32249 l 9.625,-17.5 c -33.93577,-18.69767 -50.88823,-57.82314 -41.34375,-95.375 z"
+         id="path4348-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4pt;stroke-opacity:0.6524064"
+         d="m 275.20761,357.38865 -27.16857,7.86568 70.96137,16.26294 -51.65847,-51.29719 7.86567,27.16857 z"
+         id="path5490-3"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

diff --git a/resources/map_features/amenities.xml b/resources/map_features/amenities.xml
index 6d9b8019eb2eb1a2f3eb7f42707f241108eb392e..4f8ace64bf4f150ffbc41d5a9a6fece8c37d5ea7 100644 (file)
--- a/resources/map_features/amenities.xml
+++ b/resources/map_features/amenities.xml
@@ -307,8 +307,8 @@
   <feature name="Vending machine">\r
     <category>amenity</category>\r
     <category>foodanddrink</category>\r
-    <icon>A vending machine.</icon>\r
-    <!-- icon needed -->\r
+    <icon image="features/pois/amenity_vendingmachine.png">A vending machine.</icon>\r
+\r
     <point/>\r
     <tag k="amenity" v="vending_machine"/>\r
     <inputSet ref="common"/>\r
@@ -397,5 +397,4 @@
     <inputSet ref="common"/>\r
   </feature>\r
 \r
-\r
 </featureGroup>
\ No newline at end of file

diff --git a/resources/map_features/roads.xml b/resources/map_features/roads.xml
index a3e2067e59d37368b8f4bf8f3ebd15a80d4de4d0..a9d485f4fbc9786c8130489a90884e74c8ece308 100644 (file)
--- a/resources/map_features/roads.xml
+++ b/resources/map_features/roads.xml
@@ -268,13 +268,14 @@
     <category>transport</category>\r
     <icon image="features/pois/transport_turning_circle.n.24.png"/>\r
     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle</help>\r
-    <point/>\r
+    <point draganddrop="no"/>\r
     <tag k="highway" v="turning_circle"/>\r
     <inputSet ref="common"/>\r
   </feature>\r
 \r
   <feature name="Mini Roundabout">\r
     <category>transport</category>\r
+    <icon image="features/pois/miniroundabout.png"/>\r
     <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help>\r
     <point/>\r
     <tag k="highway" v="mini_roundabout"/>\r
@@ -286,7 +287,7 @@
 \r
     <category>transport</category>\r
     <icon image="icons/speed_hump_16.png"/>\r
-    <help>http://wiki.openstreetmap.org/wiki/Key:traffic%3Dcalming</help>\r
+<!--    <help>http://wiki.openstreetmap.org/wiki/Key:traffic_calming</help>-->\r
     <point/>\r
     <tag k="traffic_calming" v="yes" vmatch="*"/>\r
     <input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch">\r