diff --git a/data/tags.yml b/data/tags.yml
index 9a5f016..5f08054 100644
--- a/data/tags.yml
+++ b/data/tags.yml
@@ -111,7 +111,7 @@ tags:
- tags: {building: garages}
icon: [garages]
- tags: {building: garage}
- icon: [garage]
+ icon: [garages]
- tags: {tourism: hotel}
icon: [hotel]
- tags: {tourism: hostel}
@@ -122,8 +122,12 @@ tags:
icon: [clinic]
- tags: {amenity: bank}
icon: [money]
+- tags: {building: kindergarten}
+ icon: [toy_horse]
- tags: {amenity: kindergarten}
icon: [toy_horse]
+- tags: {building: kindergarten, amenity: kindergarten}
+ icon: [toy_horse]
- tags: {amenity: post_office}
icon: [letter]
@@ -145,6 +149,8 @@ tags:
icon: [shop_convenience]
- tags: {building: store}
icon: [shop_convenience]
+- tags: {building: 'yes', shop: kiosk}
+ icon: [kiosk]
- tags: {amenity: shop, shop: kiosk}
icon: [kiosk]
- tags: {shop: gift}
@@ -241,17 +247,22 @@ tags:
icon: [tram]
- tags: {railway: tram_stop}
icon: [tram]
+- tags: {highway: bus_stop, public_transport: platform}
+ icon: [bus_stop_sign]
+ with_icon: [bus_stop_bench]
+ with_icon: [bus_stop_shelter]
+ over_icon: [platform]
- tags: {highway: bus_stop, shelter: 'yes'}
icon: [bus_stop_sign]
under_icon: [bus_stop_sign]
with_icon: [bus_stop_bench]
+ with_icon: [platform]
over_icon: [bus_stop_shelter]
- tags: {highway: bus_stop, bench: 'yes'}
under_icon: [bus_stop_sign]
with_icon: [bus_stop_shelter]
+ with_icon: [platform]
over_icon: [bus_stop_bench]
-- tags: {public_transport: platform}
- icon: [railway_platform]
# Road signs
@@ -277,6 +288,8 @@ tags:
icon: [toucan_crossing]
- tags: {traffic_calming: bump}
icon: [bump]
+- tags: {highway: bump}
+ icon: [bump]
- tags: {sloped_curb: yes}
icon: [lowered_kerb]
- tags: {kerb: lowered}
diff --git a/doc/grid.png b/doc/grid.png
index 4322ed9..beb409f 100644
Binary files a/doc/grid.png and b/doc/grid.png differ
diff --git a/engine/mapper.py b/engine/mapper.py
index 9e9acf6..1af6df8 100644
--- a/engine/mapper.py
+++ b/engine/mapper.py
@@ -382,7 +382,7 @@ def draw_ways(show_missed_tags=False):
c = line_center(way['nodes'])
if way['tags']['leisure'] == 'playground':
style = 'fill:#' + playground_color + ';opacity:0.2;'
- draw_point_shape('playground', c.x, c.y, '444444')
+ draw_point_shape('toy_horse', c.x, c.y, '444444')
elif way['tags']['leisure'] == 'garden':
style = 'fill:#' + grass_color + ';'
elif way['tags']['leisure'] == 'pitch':
diff --git a/icons/icons.svg b/icons/icons.svg
index 3851010..06fe18f 100644
--- a/icons/icons.svg
+++ b/icons/icons.svg
@@ -24,13 +24,13 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="22.627417"
- inkscape:cx="315.6361"
- inkscape:cy="453.31033"
+ inkscape:zoom="8"
+ inkscape:cx="163.60814"
+ inkscape:cy="425.02606"
inkscape:current-layer="layer1"
inkscape:document-units="px"
- showgrid="true"
- showguides="true"
+ showgrid="false"
+ showguides="false"
inkscape:guide-bbox="true"
inkscape:object-paths="true"
inkscape:snap-bbox="true"
@@ -387,13 +387,13 @@
sodipodi:nodetypes="ccccccccc"
inkscape:connector-curvature="0"
id="path5206"
- d="m 279,151 -2.5,2 -1.5,0 0,1 10,0 0,-1 -1,0 -2,-2 z"
+ d="m 311,151 -2.5,2 -1.5,0 0,1 10,0 0,-1 -1,0 -2,-2 z"
style="fill:#808080;stroke:#808080;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
@@ -441,7 +441,7 @@
id="rect4583"
width="4"
height="4"
- x="243"
+ x="275"
y="156"
rx="1"
ry="1" />
@@ -449,7 +449,7 @@
ry="1"
rx="1"
y="156"
- x="249"
+ x="281"
height="4"
width="4"
id="rect4585"
@@ -486,7 +486,7 @@
inkscape:connector-curvature="0" />
+ transform="translate(249.5,-3)" />
@@ -2562,18 +2562,18 @@
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path4432"
- d="m 357,186 c 0,-3 -4,-1 -4,-4"
+ d="m 389,186 c 0,-3 -4,-1 -4,-4"
style="fill:#aa8800;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+ transform="translate(172,-2)" />
@@ -4105,7 +4105,7 @@
id="rect4508"
width="12"
height="1"
- x="194"
+ x="226"
y="156"
rx="0.5"
ry="0.5" />
@@ -4114,13 +4114,13 @@
id="rect4510"
width="1"
height="5"
- x="205"
+ x="237"
y="154"
rx="0.5"
ry="0.5" />
@@ -4128,13 +4128,13 @@
sodipodi:nodetypes="sssssssss"
inkscape:connector-curvature="0"
id="path4517"
- d="m 199.5,154 4.5,0.5 c 0.27531,0.0306 0.5,0.5 0.5,0.5 l 0,0 c 0,0 -0.223,0.5 -0.5,0.5 l -4.5,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-0.5 c 0,-0.277 0.22469,-0.53059 0.5,-0.5 z"
+ d="m 231.5,154 4.5,0.5 c 0.27531,0.0306 0.5,0.5 0.5,0.5 l 0,0 c 0,0 -0.223,0.5 -0.5,0.5 l -4.5,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-0.5 c 0,-0.277 0.22469,-0.53059 0.5,-0.5 z"
style="fill:#808080;stroke:none" />
+ inkscape:label="#rect4536"
+ inkscape:connector-curvature="0" />
+ inkscape:label="#path4547"
+ inkscape:connector-curvature="0" />
+ inkscape:label="#motel"
+ inkscape:connector-curvature="0" />
+ d="m 340,175 0,0.5 c 0,-0.277 0.223,-0.5 0.5,-0.5 l -0.5,0 z m 1.5,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,-0.5 -0.5,0 z m -1.5,1.5 0,0.5 0.5,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 z m 2,0 c 0,0.277 -0.223,0.5 -0.5,0.5 l 0.5,0 0,-0.5 z"
+ id="rect3642"
+ inkscape:connector-curvature="0" />
+ inkscape:label="#path5022"
+ inkscape:connector-curvature="0" />
@@ -5115,7 +5120,7 @@
id="rect5194"
width="4"
height="4"
- x="275"
+ x="307"
y="155"
rx="2"
ry="2" />
@@ -5123,7 +5128,7 @@
ry="2"
rx="2"
y="155"
- x="281"
+ x="313"
height="4"
width="4"
id="rect5196"
@@ -5131,7 +5136,7 @@
@@ -5177,7 +5182,7 @@
id="rect5245"
width="1"
height="8"
- x="311"
+ x="343"
y="149"
ry="0.5"
rx="0.5" />
@@ -5192,10 +5197,10 @@
d="m 313.26777,147.73223 a 2.5,2.5 0 1 1 -3.53554,0 L 311.5,149.5 z"
sodipodi:start="5.4977871"
sodipodi:end="10.210176"
- transform="translate(0,-1.5)" />
+ transform="translate(32,-1.5)" />
@@ -5204,15 +5209,42 @@
id="rect5253"
width="5"
height="4"
- x="309"
+ x="341"
y="147"
rx="2"
ry="2" />
+
+
+
+