diff --git a/.gitattributes b/.gitattributes index 99b8b36..2badf03 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ *.md -diff +*.png -diff *.svg -diff diff --git a/README.md b/README.md index b37980b..625b950 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,9 @@ Map generation **Requirements**: Python 2.7. - python mapper.py -i -o + python mapper.py -i <input OSM XML file name> -o <output SVG file name> + + ### Options ### @@ -11,11 +13,22 @@ Map generation -bbox, --boundary-box +<longitude 1>,<longitude 2>,<latitude 1>,<latitude 2> + Boundary box to draw ---show-missed-tags +-s, --size -Show not drawed tags as text +<x>,<y> + +Result image size +Icons +----- + +Double size: + + + diff --git a/doc/readme.moi b/doc/readme.moi index 928108d..342ad1e 100644 --- a/doc/readme.moi +++ b/doc/readme.moi @@ -3,12 +3,28 @@ \b {Requirements}: Python 2.7. \code -{python mapper.py -i \formal {input OSM XML file name} -o \formal {output SVG file name} } +{python mapper.py -i \formal {input OSM XML file name} -o \formal {output SVG file name}} + +\image {https://raw.github.com/enzet/OSM/master/map.png} {Sample map} \3 {Options} \table { - {{\tt {-bbox}, \tt {--boundary-box}} {Boundary box to draw}} - {{\tt {--show-missed-tags}} {Show not drawed tags as text}} + { + {\tt {-bbox}, \tt {--boundary-box}} + {\tt {\formal {longitude 1},\formal {longitude 2},\formal {latitude 1},\formal {latitude 2}}} + {Boundary box to draw} + } + { + {\tt {-s}, \tt {--size}} + {\tt {\formal {x},\formal {y}}} + {Result image size} + } } + +\2 {Icons} + +Double size: + +\image {https://raw.github.com/enzet/OSM/master/grid.png} {Icons} diff --git a/grid.png b/grid.png new file mode 100644 index 0000000..f21127e Binary files /dev/null and b/grid.png differ diff --git a/icons.svg b/icons.svg index b540196..1f81dc1 100644 --- a/icons.svg +++ b/icons.svg @@ -13,7 +13,7 @@ height="600px" id="svg2987" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.5 r10040" sodipodi:docname="icons.svg"> @@ -24,9 +24,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="39.978746" - inkscape:cy="363.12941" + inkscape:zoom="22.627417" + inkscape:cx="140.48624" + inkscape:cy="438.6732" inkscape:current-layer="layer1" inkscape:document-units="px" showgrid="true" @@ -34,10 +34,10 @@ inkscape:guide-bbox="true" inkscape:object-paths="true" inkscape:snap-bbox="true" - inkscape:window-width="913" - inkscape:window-height="768" - inkscape:window-x="181" - inkscape:window-y="204" + inkscape:window-width="1440" + inkscape:window-height="969" + inkscape:window-x="29" + inkscape:window-y="46" inkscape:window-maximized="0"> + + @@ -351,7 +366,7 @@ - + d="m 163,183 0,1.5 5,-2 5,2 0,-1.5 -5,-2 z" + style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + d="m 163.5,180 3.5,0 0,1 -1,0 0,2 -1.5,0 0,-2 -1,0 z" + style="fill:#808080;stroke:none" /> + d="m 180,190 2,-10 1,0 -2,10 z" + style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + d="m 178,181 12,0 0,-1 -12,0 z" + style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + d="m 177,182 2,0 0,1 -2,0 z" + style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + d="m 189,184 2,0 0,1 -2,0 z" + style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + d="m 178,180 5,-3 2,0 0,1 -2,0 -5,3 z" + style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="fill:#808080;stroke:none" /> + x="180.99997" + y="186" /> + d="M 261.5 97 C 260.67157 97 260 97.671573 260 98.5 C 260 99.155838 260.41359 99.70241 261 99.90625 L 261 106.5 C 261 107.88071 262.11929 109 263.5 109 C 264.88071 109 266 107.88071 266 106.5 L 267.5 106.5 L 265.5 104 L 263.5 106.5 L 265 106.5 C 265 107.32843 264.32843 108 263.5 108 C 262.67157 108 262 107.32843 262 106.5 L 262 99.90625 C 262.58641 99.70241 263 99.155838 263 98.5 C 263 97.671573 262.32843 97 261.5 97 z M 261.5 98 C 261.77614 98 262 98.223858 262 98.5 C 262 98.776142 261.77614 99 261.5 99 C 261.22386 99 261 98.776142 261 98.5 C 261 98.223858 261.22386 98 261.5 98 z " + id="fishing" /> @@ -771,23 +776,23 @@ sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path3125" - d="m 108.5,93.5 -4,0 0,-9 c 3,0 1,2 4,2 z" + d="m 76.5,93.5 -4,0 0,-9 c 3,0 1,2 4,2 z" style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> @@ -844,14 +849,14 @@ inkscape:connector-curvature="0" id="path3963" d="m 16,-15 0,10" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -859,14 +864,14 @@ inkscape:connector-curvature="0" id="path3969" d="m 64,-15 0,10" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -874,14 +879,14 @@ inkscape:connector-curvature="0" id="path3975" d="m 112,-15 0,10" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -889,9 +894,9 @@ inkscape:connector-curvature="0" id="path3983" d="m 160,-15 0,10" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -899,24 +904,24 @@ inkscape:connector-curvature="0" id="path3987" d="m 192,-15 0,10" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -924,9 +929,9 @@ inkscape:connector-curvature="0" id="path3999" d="m 272,-15 0,10" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -934,14 +939,14 @@ inkscape:connector-curvature="0" id="path4003" d="m 304,-15 0,10" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -949,14 +954,14 @@ inkscape:connector-curvature="0" id="path4009" d="m 352,-15 0,10" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -964,14 +969,14 @@ inkscape:connector-curvature="0" id="path4015" d="m 400,-15 0,10" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -979,19 +984,19 @@ inkscape:connector-curvature="0" id="path4021" d="m 448,-15 0,10" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -999,9 +1004,9 @@ inkscape:connector-curvature="0" id="path4029" d="m -20,400 10,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -1009,14 +1014,14 @@ inkscape:connector-curvature="0" id="path4033" d="m -20,368 10,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -1024,14 +1029,14 @@ inkscape:connector-curvature="0" id="path4039" d="m -20,320 10,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -1039,14 +1044,14 @@ inkscape:connector-curvature="0" id="path4045" d="m -20,272 10,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -1054,19 +1059,19 @@ inkscape:connector-curvature="0" id="path4051" d="m -20,224 10,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -1074,14 +1079,14 @@ inkscape:connector-curvature="0" id="path4059" d="m -20,160 10,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -1089,14 +1094,14 @@ inkscape:connector-curvature="0" id="path4065" d="m -20,112 10,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -1104,9 +1109,9 @@ inkscape:connector-curvature="0" id="path4071" d="m -20,64 10,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -1114,88 +1119,88 @@ inkscape:connector-curvature="0" id="path4075" d="m -20,32 10,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + d="m 184,84 c -0.554,0 -1,0.446 -1,1 -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 0,0.554 0.446,1 1,1 l 0.5625,0 0,3 0.875,0 0,-3 0.5625,0 c 0.554,0 1,-0.446 1,-1 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 0,-0.554 -0.446,-1 -1,-1 l -2,0 z" /> + d="m 199,84 c -0.554,0 -1,0.446 -1,1 -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 0,0.554 0.446,1 1,1 l 0.5625,0 0,3 0.875,0 0,-3 0.5625,0 c 0.554,0 1,-0.446 1,-1 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 0,-0.554 -0.446,-1 -1,-1 l -2,0 z" /> @@ -1266,14 +1271,14 @@ inkscape:connector-curvature="0" id="path4250" d="m 325,180 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,2 2,0 0,-1 z" - style="fill:#808080;fill-opacity:1;stroke:none" /> + style="fill:#c8beb7;fill-opacity:1;stroke:none" /> + style="fill:#c8beb7;fill-opacity:1;stroke:none" /> @@ -1285,14 +1290,14 @@ inkscape:connector-curvature="0" /> @@ -1311,7 +1316,7 @@ id="rect4325" width="3" height="1" - x="330" + x="282" y="25" ry="0.5" rx="0.5" /> @@ -1320,7 +1325,7 @@ id="rect4327" width="3" height="1" - x="324" + x="276" y="27" ry="0.5" rx="0.5" /> @@ -1329,13 +1334,13 @@ id="rect4335" width="1" height="4" - x="328" + x="280" y="18" ry="0.5" rx="0.5" /> @@ -1344,13 +1349,13 @@ id="rect4341" width="3" height="1" - x="327" + x="279" y="21" ry="0.5" rx="0.5" /> @@ -1380,14 +1385,14 @@ inkscape:connector-curvature="0" /> @@ -1602,37 +1607,37 @@ sodipodi:nodetypes="cssc" inkscape:connector-curvature="0" id="path3279" - d="m 90.5,95 c 0,0 0,-7.5 0,-9.5 0,-2 -1,-3 -3,-3 -2,0 -2.5,0 -2.5,0" + d="m 56.5,95 c 0,0 0,-7.5 0,-9.5 0,-2 -1,-3 -3,-3 -2,0 -2.5,0 -2.5,0" style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> @@ -1658,37 +1663,25 @@ inkscape:connector-curvature="0" /> - - @@ -2215,14 +2208,14 @@ inkscape:connector-curvature="0" /> - - - - - @@ -2490,15 +2445,15 @@ inkscape:connector-curvature="0" id="path4434" d="m 357,181 c 0,-3 -4,-1 -4,-4" - style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:#808080;stroke:#ffd5d5;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:#aa8800;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /> - + d="m 292,130 0,10 1,0 0,-9 6,0 0,9 1,0 0,-10 -8,0 z m 6,2 -4,2 0,8 4,-2 0,-8 z" + style="fill:#d40000;fill-opacity:1;stroke:none" /> @@ -3092,7 +3042,7 @@ @@ -3260,7 +3210,7 @@ style="fill:#000000;fill-opacity:1;stroke:none" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/map.png b/map.png new file mode 100644 index 0000000..911d47e Binary files /dev/null and b/map.png differ diff --git a/mapper.py b/mapper.py index 1307094..f8246e1 100644 --- a/mapper.py +++ b/mapper.py @@ -43,7 +43,7 @@ water_border_color = '6688BB' wood_color = 'B8CC84' tags_to_write = set(['operator', 'opening_hours', 'cuisine', 'network', - 'website', 'website_2', 'STIF:zone', + 'website', 'website_2', 'STIF:zone', 'opening_hours:url', 'phone', 'branch', 'route_ref', 'brand', 'ref', 'wikipedia', 'description', 'level', 'wikidata', 'name', 'alt_name', 'image', 'fax', 'old_name', 'artist_name', 'int_name', @@ -82,7 +82,7 @@ def get_d_from_file(file_name): if path: return path, x, y else: - # print 'No such icon: ' + file_name + print 'No such icon: ' + file_name # TODO: add to missed icons return 'M 4,4 L 4,10 10,10 10,4 z', 0, 0 @@ -661,8 +661,8 @@ draw_nodes(show_missed_tags=options['show_missed_tags'], overlap=options['overlap'], draw=options['draw_nodes']) if flinger.space.x == 0: - output_file.rect(0, 0, w, flinger.space.y, color='FFFFFF') - output_file.rect(0, h - flinger.space.y, w, flinger.space.y, color='FFFFFF') + output_file.rect(0, 0, w, flinger.space.y, color='AAAAAA') + output_file.rect(0, h - flinger.space.y, w, flinger.space.y, color='AAAAAA') output_file.end() diff --git a/tags.yml b/tags.yml index d1ca9f4..30619da 100644 --- a/tags.yml +++ b/tags.yml @@ -55,16 +55,21 @@ tags: icon: [bicycle_parking] - tags: {amenity: cafe} icon: [cafe] +- tags: {amenity: nightclub} + icon: [night_club] - tags: {amenity: waste_basket} icon: [waste_basket] - tags: {amenity: clinic} icon: [clinic] - tags: {amenity: restaurant} icon: [restaurant] +- tags: {amenity: restaurant;bar} + icon: [restaurant] + add_icon: [bar] - tags: {amenity: pharmacy} icon: [pharmacy] - tags: {amenity: post_box} - icon: [post_box] + icon: [letter] - tags: {amenity: drinking_water} icon: [drinking_water] - tags: {amenity: toilets} @@ -76,21 +81,31 @@ tags: - tags: {amenity: bar} icon: [bar] - tags: {amenity: bank} - icon: [bank] + icon: [money] - tags: {amenity: pub} - icon: [pub] + icon: [beer] - tags: {amenity: kindergarten} icon: [kindergarten] - tags: {amenity: post_office} - icon: [post_office] + icon: [letter] - tags: {amenity: fast_food} icon: [fast_food] +- tags: {amenity: fountain} + icon: [fountain] + color: water_border +- tags: {amenity: '*', karaoke: 'yes'} + add_icon: [microphone] + + # Shop + - tags: {amenity: shop, shop: fishing} icon: [fishing] - tags: {shop: clothes} icon: [shop_clothes] - tags: {amenity: shop, shop: clothes} icon: [clothes] +- tags: {shop: bakery} + icon: [cupcake] - tags: {shop: convenience} icon: [shop_convenience] - tags: {amenity: shop, shop: convenience} @@ -103,11 +118,9 @@ tags: icon: [kiosk] - tags: {shop: gift} icon: [gift] -- tags: {amenity: fountain} - icon: [fountain] - color: water_border -- tags: {amenity: '*', karaoke: 'yes'} - add_icon: [microphone] + + # Place of worship + - tags: {amenity: place_of_worship, religion: christian} icon: [christian] - tags: {amenity: place_of_worship, religion: muslim} @@ -159,14 +172,14 @@ tags: - tags: {highway: bus_stop} icon: [bus_stop] + add_icon: [bus] - tags: {highway: bus_stop, shelter: 'yes'} - icon: [bus_stop_with_shelter] + icon: [bus_stop_sign] + under_icon: [bus_stop_sign] + over_icon: [bus_stop_shelter] - tags: {highway: bus_stop, bench: 'yes'} - icon: [bus_stop_with_bench] -- tags: {highway: bus_stop, bench: 'yes', shelter: 'no'} - icon: [bus_stop_with_bench] -- tags: {highway: bus_stop, shelter: 'yes', bench: 'yes'} - icon: [bus_stop_with_shelter_and_bench] + under_icon: [bus_stop_sign] + over_icon: [bus_stop_bench] - tags: {highway: crossing} icon: [crossing] - tags: {highway: crossing, crossing: zebra} @@ -232,7 +245,7 @@ tags: - tags: {amenity: atm} icon: [atm] - tags: {public_transport: stop_position} - icon: [public_transport_stop] + icon: [bus_stop] - tags: {crossing_ref: toucan} icon: [toucan_crossing]