From da469602e10e91bd162308f4a6130b42d5d704fd Mon Sep 17 00:00:00 2001 From: vng Date: Thu, 24 May 2012 14:48:51 +0300 Subject: [PATCH] Add new types to classificator and basic rules for them. TODO: Fix drawing rules for new types. --- data/classificator.txt | 32 ++ data/drules_proto.bin | Bin 202861 -> 205540 bytes data/drules_proto.txt | 839 +++++++++++++++++++++++++++++++++++++++++ data/types.txt | 43 +++ data/visibility.txt | 32 ++ 5 files changed, 946 insertions(+) diff --git a/data/classificator.txt b/data/classificator.txt index a22703d509..cb14cae9f1 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -104,6 +104,8 @@ world + village_green 15|3|4|10893 16|3|6|11553 17|3|7|11787 - vineyard 15|3|4|10893 16|3|6|11553 17|3|7|11787 - tree 16|2|0|59 17|2|0|63 - + bay - + spring - {} landuse + residential 6|1|1|1 7|1|1|1 8|1|1|1 9|1|1|1 10|1|1|1 11|1|1|1 12|1|46|-9578 13|1|16|-9548 14|1|21|-9430 15|1|21|-9231 16|1|22|-8621 17|1|89|-8346 - @@ -250,6 +252,13 @@ world + car_sharing 17|2|80|1592 17|3|19|11829 - telephone 17|2|81|1593 17|3|19|11829 - fast_food 17|2|82|1594 17|3|19|11829 - + police - + car_rental - + taxi - + marketplace - + nightclub - + embassy - + townhall - {} leisure + park 6|1|5|19 7|1|5|20 8|1|5|20 9|1|5|20 10|1|5|20 11|1|5|20 12|1|8|20 13|1|11|25 14|1|16|46 15|1|16|46 16|1|16|46 17|1|16|46 17|3|19|11829 + @@ -325,6 +334,9 @@ world + office 17|2|20|1432 - {} tourism-attraction 17|3|20|11833 17|3|21|11838 - + museum - + guest_house - + motel - {} building 6|1|15|39 7|1|15|40 10|1|15|44 11|1|15|44 12|1|45|188 13|1|51|198 13|2|0|199 14|1|69|260 14|2|3|261 15|1|70|364 15|2|4|365 16|1|71|679 16|2|5|680 17|1|71|720 17|2|2|721 17|3|18|11829 17|3|19|11830 17|3|20|11831 17|3|21|11832 + entrance - @@ -442,6 +454,7 @@ world + oneway 16|0|288|1088 16|0|289|1090 16|0|290|1092 16|0|291|1094 16|0|292|1096 16|0|293|1098 16|0|294|1100 16|0|295|1102 16|0|296|1104 16|0|297|1106 16|0|298|1108 16|0|299|1110 16|0|300|1112 16|0|301|1114 16|0|302|1116 17|0|309|1241 17|0|310|1243 17|0|311|1245 17|0|312|1247 17|0|313|1249 17|0|314|1251 17|0|315|1253 17|0|316|1255 17|0|317|1257 17|0|318|1259 17|0|319|1261 17|0|320|1263 17|0|321|1265 17|0|322|1267 17|0|323|1269 - disused 17|0|268|1042 17|0|260|1047 - junction 17|3|2|11745 - + private - {} minor 6|0|38|94 7|0|39|95 10|0|33|100 11|0|33|100 12|0|62|215 13|0|63|226 14|0|80|291 14|5|3|10607 15|0|96|395 15|5|8|10818 16|0|141|709 16|5|8|11449 16|5|21|11544 17|0|147|751 17|5|4|11727 17|5|13|11777 + tunnel 6|0|47|110 7|0|48|111 10|0|42|118 11|0|42|118 12|0|103|293 12|0|101|294 12|0|105|303 13|0|107|304 13|0|108|305 13|0|109|314 14|0|139|384 14|0|121|385 14|0|140|392 15|0|153|492 15|0|137|493 15|0|154|500 16|0|203|812 16|0|204|813 16|0|205|820 17|0|208|857 17|0|192|858 17|0|209|865 - @@ -893,6 +906,7 @@ world + level_crossing 16|2|19|1278 17|2|23|1439 - crossing 16|2|20|1279 17|2|24|1440 - subway_entrance 16|2|23|1360 17|2|27|1521 - + platform - {} route + ferry 6|0|61|142 7|0|62|143 8|0|18|62 9|0|14|62 10|0|56|152 11|0|56|152 12|0|176|420 13|0|183|444 14|0|217|561 15|0|224|748 16|0|345|1273 17|0|366|1425 - @@ -939,6 +953,7 @@ world + survey_point 17|2|43|1542 - windmill 17|2|44|1543 - cairn 17|4|2|1639 17|4|7|1640 - + cutline - {} aerialway + cable_car 12|0|174|414 12|0|175|416 15|0|214|704 16|0|318|1195 17|0|339|1348 - @@ -1013,6 +1028,11 @@ world + city_wall 16|0|349|1328 16|0|353|1334 17|0|370|1489 17|0|374|1495 - cycle_barrier 16|6|0|1356 17|6|0|1517 - chicane 16|6|0|1357 17|6|0|1518 - + gate - + lift_gate - + stile - + block - + toll_booth - {} noexit + vehicle 16|6|0|1352 17|6|0|1513 - @@ -1029,10 +1049,19 @@ world + hairdresser 17|2|63|1574 17|3|19|11829 - convenience 17|2|122|1572 17|3|19|11829 - supermarket 17|2|122|1572 17|3|19|11829 - + closes - + car_repair - + car - + kiosk - {} historic + battlefield 17|2|68|1579 17|3|19|11829 - museum 17|2|118|1636 17|1|81|1637 17|2|119|1638 17|3|19|11829 - + memorial - + ruins - + monument - + castle - + archaeological_site - {} military + bunker 17|2|68|1580 - @@ -1057,6 +1086,9 @@ world + soccer 17|2|115|1633 - swimming 17|2|116|1634 - tennis 17|2|117|1635 - + multi - + golf - + skiing - {} mapswithme + grid 0|0|0|0 1|0|0|0 2|0|0|0 3|0|0|0 4|0|0|0 5|0|0|0 6|0|62|0 7|0|63|0 8|0|22|0 9|0|18|0 10|0|60|0 11|0|60|0 12|0|183|0 13|0|190|0 14|0|225|0 15|0|236|0 16|0|365|0 17|0|387|0 - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 1f820aa3374ad6adcaeaecb57c86b59fba56d09f..c624c4edee74d986d32f677144cf7b110e85af05 100644 GIT binary patch delta 1343 zcmb7^UuYaf9LJs6T(X(_x4V~XV=D2Idi3tvi?%@zLzAE=D6|iK6f5W4c5^q}?#{70 zYjSOZK~c~b(Iqa`Cw)65!T4=a>iu|C$X!ERmbv`F`Tp3wBk#mJmD~?NdK;ib)TEA? z=Js+~_rlbl*>?bvBcPKdR=tZh+>fWdSMQ3q8PT=-i$_l*CF;+pu2*Z6vc`S%fVrJc z<=`_hu;Q*3im?@?AP&3hg*>mX7qWc5QOFBzWzIeNNQPI_#XM-cU@qHvsrViMXWd?@ zvj3cNLL5<~(FcODwJ5FM{(B^M)?GLpGI79uAF$p`$VLaOH((2oR=~N=%L{4fPR$$x zt3k-x|AwpvA$@jl2>0=jKD#%B`*_G&5Yl<$=#?8o8xS4vfCR=yS{8YQpP?tG!0ynt zfF=UjKRpgI*B(BJ9%>MqQH!W$Y^e>bQJvO_iuI~Zxaq4dc+8_+@Z7M9ZKj7p|7H(d zhGuX#4zJ+;%cs$QAT=HS&RB3iy-&N~S$Pqq242e{rtR~LEp6;JK$3yYs)5gFWz}Ii zF*Wy;ebfKwdH9E%`4XVGiJ4r6{Jnr+xwB-o`R~*MI*-c=$o(XMj@C8k=w1 zta~^nWW6Jj@Qr_!!Ba2HA4igfiN1{6W&V2E615B^A*Lrp@zRI>@c0hol@wK<#CRn~ z)%BP!e+OHo_$(6b25t3!4llI}OUfKdM*{y!T9|}->IwcU1PgU)Yj&{K`}!6Xy|->b zEBQD=0c{d$H~)pcunS*@$s?S$sKv^4sxNux_u!QG<{mtgD)XL!Za6w4A^3F<*3vU5 z5dynO`aADi{1bn{gG2kCL>WdMi`YiF?r1ivHmGB38|y;;G8Hl)Ig64JH|WNiP(b{U R?kL_DT~P5~1H$&ce*iWJzAXR% delta 233 zcmaEIl;`aRo(*StH}mk>Fl{apSjn=vT{NF{v%K_m=E<`1-!|JRcrk81u6T!WvVlt9 z)DdN5nk=rPD$Xoq#layYz{vmxoDKpF z|NgTpFij5D0jk?vsk5AMbDo0{^W-2yBQRt0Hk19&w)e^~YM-9Y{({kC`pXxLX4?~9 zGHyxTE*ik}RdD;UBqnXi?RRRJ0wcF)Ut`MGntp(hnPYl4BXbd$wcUn^xtVGDTNdV& c=?$#RN!x|kn3Y+!7jQ8PGj9LM&HP#n0AV^yJOBUy diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 69879e9bc2..60101fd947 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -1158,6 +1158,24 @@ cont { } } } +cont { + name: "amenity-car_rental" + element { + scale: 17 + symbol { + name: "car_sharing" + priority: 1592 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "amenity-car_sharing" element { @@ -1341,6 +1359,20 @@ cont { } } } +cont { + name: "amenity-embassy" + element { + scale: 17 + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "amenity-fast_food" element { @@ -1720,6 +1752,38 @@ cont { } } } +cont { + name: "amenity-marketplace" + element { + scale: 17 + symbol { + name: "supermarket" + priority: 1581 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} +cont { + name: "amenity-nightclub" + element { + scale: 17 + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "amenity-parking" element { @@ -2085,6 +2149,20 @@ cont { } } } +cont { + name: "amenity-police" + element { + scale: 17 + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "amenity-post_box" element { @@ -2400,6 +2478,20 @@ cont { } } } +cont { + name: "amenity-taxi" + element { + scale: 17 + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "amenity-telephone" element { @@ -2484,6 +2576,20 @@ cont { } } } +cont { + name: "amenity-townhall" + element { + scale: 17 + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "amenity-university" element { @@ -2595,6 +2701,25 @@ cont { } } } +cont { + name: "barrier-block" + element { + scale: 16 + circle { + radius: 1.2 + color: 0x707070 + priority: 1355 + } + } + element { + scale: 17 + circle { + radius: 1.6 + color: 0x707070 + priority: 1516 + } + } +} cont { name: "barrier-bollard" element { @@ -2712,6 +2837,43 @@ cont { } } } +cont { + name: "barrier-gate" + element { + scale: 16 + lines { + width: 1 + color: 0xB0B0B0 + priority: 1298 + } + lines { + width: 1 + color: 0xB0B0B0 + dashdot { + dd: 0.0004 + dd: 1.9996 + } + priority: 1304 + } + } + element { + scale: 17 + lines { + width: 1 + color: 0xB0B0B0 + priority: 1459 + } + lines { + width: 1 + color: 0xB0B0B0 + dashdot { + dd: 0.0008 + dd: 3.9992 + } + priority: 1465 + } + } +} cont { name: "barrier-hedge" element { @@ -2749,6 +2911,43 @@ cont { } } } +cont { + name: "barrier-lift_gate" + element { + scale: 16 + lines { + width: 1 + color: 0xB0B0B0 + priority: 1298 + } + lines { + width: 1 + color: 0xB0B0B0 + dashdot { + dd: 0.0004 + dd: 1.9996 + } + priority: 1304 + } + } + element { + scale: 17 + lines { + width: 1 + color: 0xB0B0B0 + priority: 1459 + } + lines { + width: 1 + color: 0xB0B0B0 + dashdot { + dd: 0.0008 + dd: 3.9992 + } + priority: 1465 + } + } +} cont { name: "barrier-retaining_wall" element { @@ -2786,6 +2985,44 @@ cont { } } } +cont { + name: "barrier-stile" + element { + scale: 16 + circle { + radius: 1.2 + color: 0x707070 + priority: 1355 + } + } + element { + scale: 17 + circle { + radius: 1.6 + color: 0x707070 + priority: 1516 + } + } +} +cont { + name: "barrier-toll_booth" + element { + scale: 16 + circle { + radius: 1.2 + color: 0x707070 + priority: 1355 + } + } + element { + scale: 17 + circle { + radius: 1.6 + color: 0x707070 + priority: 1516 + } + } +} cont { name: "barrier-wall" element { @@ -18784,6 +19021,93 @@ cont { } } } +cont { + name: "highway-residential-private" + element { + scale: 13 + lines { + width: 1 + color: 0xFFFFFF + priority: 460 + } + } + element { + scale: 14 + lines { + width: 3 + color: 0xFFFFFF + priority: 460 + } + lines { + width: 5 + color: 0xC8C8AF + priority: 440 + } + } + element { + scale: 15 + lines { + width: 4 + color: 0xFFFFFF + priority: 460 + } + lines { + width: 6 + color: 0xC8C8AF + priority: 440 + } + path_text { + primary { + height: 12 + color: 0x505050 + stroke_color: 0xFFFFFF + } + priority: 1100 + } + } + element { + scale: 16 + lines { + width: 6 + color: 0xFFFFFF + priority: 460 + } + lines { + width: 10 + color: 0xC8C8AF + priority: 440 + } + path_text { + primary { + height: 12 + color: 0x505050 + stroke_color: 0xFFFFFF + } + priority: 1100 + } + } + element { + scale: 17 + lines { + width: 8 + color: 0xFFFFFF + priority: 460 + } + lines { + width: 12 + color: 0xC8C8AF + priority: 440 + } + path_text { + primary { + height: 12 + color: 0x505050 + stroke_color: 0xFFFFFF + } + priority: 1100 + } + } +} cont { name: "highway-residential-tunnel" element { @@ -31935,6 +32259,28 @@ cont { } } } +cont { + name: "historic-archaeological_site" + element { + scale: 17 + area { + color: 0xFFFFFFFF + priority: 1637 + } + symbol { + name: "museum" + priority: 1638 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "historic-battlefield" element { @@ -31953,6 +32299,56 @@ cont { } } } +cont { + name: "historic-castle" + element { + scale: 17 + area { + color: 0xFFFFFFFF + priority: 1637 + } + symbol { + name: "museum" + priority: 1638 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} +cont { + name: "historic-memorial" + element { + scale: 17 + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} +cont { + name: "historic-monument" + element { + scale: 17 + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "historic-museum" element { @@ -31975,6 +32371,28 @@ cont { } } } +cont { + name: "historic-ruins" + element { + scale: 17 + area { + color: 0xFFFFFFFF + priority: 1637 + } + symbol { + name: "museum" + priority: 1638 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "landuse-allotments" element { @@ -41329,6 +41747,85 @@ cont { } } } +cont { + name: "man_made-cutline" + element { + scale: 12 + lines { + width: 1 + color: 0xC0BC9C + dashdot { + dd: 2.25 + dd: 3 + } + priority: 195 + } + } + element { + scale: 13 + lines { + width: 1 + color: 0xC0BC9C + dashdot { + dd: 2.25 + dd: 3 + } + priority: 206 + } + } + element { + scale: 14 + lines { + width: 1 + color: 0xC0BC9C + dashdot { + dd: 3 + dd: 4 + } + priority: 268 + } + } + element { + scale: 15 + lines { + width: 1 + color: 0xC0BC9C + priority: 300 + } + } + element { + scale: 16 + lines { + width: 1 + color: 0xB0AC8C + priority: 300 + } + path_text { + primary { + height: 12 + color: 0x606060 + stroke_color: 0xFFFFFF + } + priority: 11529 + } + } + element { + scale: 17 + lines { + width: 3 + color: 0xB0AC8C + priority: 300 + } + path_text { + primary { + height: 12 + color: 0x606060 + stroke_color: 0xFFFFFF + } + priority: 11762 + } + } +} cont { name: "man_made-lighthouse" element { @@ -42425,6 +42922,81 @@ cont { } } } +cont { + name: "natural-bay" + element { + scale: 14 + area { + color: 0xcde5ea + border { + width: 0 + color: 0xB0B0B0 + } + priority: 107 + } + caption { + primary { + height: 12 + color: 0x202020 + } + priority: 10629 + } + } + element { + scale: 15 + area { + color: 0xcde5ea + border { + width: 0 + color: 0xB0B0B0 + } + priority: 112 + } + caption { + primary { + height: 12 + color: 0x202020 + } + priority: 10893 + } + } + element { + scale: 16 + area { + color: 0xcde5ea + border { + width: 0 + color: 0xB0B0B0 + } + priority: 114 + } + caption { + primary { + height: 16 + color: 0x202020 + } + priority: 11553 + } + } + element { + scale: 17 + area { + color: 0xcde5ea + border { + width: 0 + color: 0xB0B0B0 + } + priority: 116 + } + caption { + primary { + height: 16 + color: 0x202020 + } + priority: 11787 + } + } +} cont { name: "natural-beach" element { @@ -44991,6 +45563,89 @@ cont { } } } +cont { + name: "natural-spring" + element { + scale: 14 + lines { + width: 4 + color: 0xB0B0B0 + priority: 89 + } + lines { + width: 4 + color: 0xcde5ea + priority: 99 + } + path_text { + primary { + height: 12 + color: 0x507CEA + } + priority: 10604 + } + } + element { + scale: 15 + lines { + width: 5 + color: 0xB0B0B0 + priority: 94 + } + lines { + width: 5 + color: 0xcde5ea + priority: 104 + } + path_text { + primary { + height: 12 + color: 0x507CEA + } + priority: 10815 + } + } + element { + scale: 16 + lines { + width: 8 + color: 0xB0B0B0 + priority: 96 + } + lines { + width: 8 + color: 0xcde5ea + priority: 106 + } + path_text { + primary { + height: 12 + color: 0x507CEA + } + priority: 11433 + } + } + element { + scale: 17 + lines { + width: 16 + color: 0xB0B0B0 + priority: 98 + } + lines { + width: 16 + color: 0xcde5ea + priority: 108 + } + path_text { + primary { + height: 12 + color: 0x507CEA + } + priority: 11711 + } + } +} cont { name: "natural-street" element { @@ -51672,6 +52327,30 @@ cont { } } } +cont { + name: "railway-platform" + element { + scale: 15 + area { + color: 0xcdcdb4 + priority: 364 + } + } + element { + scale: 16 + area { + color: 0xcdcdb4 + priority: 679 + } + } + element { + scale: 17 + area { + color: 0xcdcdb4 + priority: 720 + } + } +} cont { name: "railway-preserved" element { @@ -54539,6 +55218,60 @@ cont { } } } +cont { + name: "shop-car" + element { + scale: 17 + symbol { + name: "supermarket" + priority: 1572 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} +cont { + name: "shop-car_repair" + element { + scale: 17 + symbol { + name: "supermarket" + priority: 1572 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} +cont { + name: "shop-closes" + element { + scale: 17 + symbol { + name: "supermarket" + priority: 1572 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "shop-convenience" element { @@ -54575,6 +55308,24 @@ cont { } } } +cont { + name: "shop-kiosk" + element { + scale: 17 + symbol { + name: "supermarket" + priority: 1572 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "shop-supermarket" element { @@ -54713,6 +55464,16 @@ cont { } } } +cont { + name: "sport-golf" + element { + scale: 17 + symbol { + name: "gymnastics-borderless" + priority: 1630 + } + } +} cont { name: "sport-gymnastics" element { @@ -54733,6 +55494,16 @@ cont { } } } +cont { + name: "sport-multi" + element { + scale: 17 + symbol { + name: "gymnastics-borderless" + priority: 1630 + } + } +} cont { name: "sport-scuba_diving" element { @@ -54753,6 +55524,16 @@ cont { } } } +cont { + name: "sport-skiing" + element { + scale: 17 + symbol { + name: "gymnastics-borderless" + priority: 1630 + } + } +} cont { name: "sport-soccer" element { @@ -55111,6 +55892,24 @@ cont { } } } +cont { + name: "tourism-guest_house" + element { + scale: 17 + symbol { + name: "hostel" + priority: 1427 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "tourism-hostel" element { @@ -55177,6 +55976,46 @@ cont { } } } +cont { + name: "tourism-motel" + element { + scale: 17 + symbol { + name: "hostel" + priority: 1427 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} +cont { + name: "tourism-museum" + element { + scale: 17 + area { + color: 0xFFFFFFFF + priority: 1637 + } + symbol { + name: "museum" + priority: 1638 + } + caption { + primary { + height: 12 + color: 0x404040 + stroke_color: 0xFFFFFF + } + priority: 11829 + } + } +} cont { name: "tourism-picnic_site" element { diff --git a/data/types.txt b/data/types.txt index 3e84b09cb6..8ce05d78ac 100644 --- a/data/types.txt +++ b/data/types.txt @@ -700,4 +700,47 @@ highway|tertiary_link|area| highway|unsurfaced|tunnel| highway|secondary_link|area| natural|allotments| + railway|station|subway + +amenity|police +amenity|car_rental +amenity|taxi +amenity|marketplace +amenity|nightclub +amenity|embassy +amenity|townhall + +barrier|gate +barrier|lift_gate +barrier|stile +barrier|block +barrier|toll_booth + +historic|memorial +historic|ruins +historic|monument +historic|castle +historic|archaeological_site + +highway|residential|private + +man_made|cutline + +natural|bay +natural|spring + +railway|platform + +shop|closes +shop|car_repair +shop|car +shop|kiosk + +sport|multi +sport|golf +sport|skiing + +tourism|museum +tourism|guest_house +tourism|motel diff --git a/data/visibility.txt b/data/visibility.txt index ee28459361..9d680ed1d0 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -35,11 +35,13 @@ world 000000000000000000 + bureau_de_change 000000000000000001 - bus_station 000000000000000011 - cafe 000000000000000011 - + car_rental 000000000000000001 - car_sharing 000000000000000001 - cinema 000000000000000011 - college 000000000000000111 - doctors 000000000000000001 - drinking_water 000000000000000001 - + embassy 000000000000000001 - fast_food 000000000000000011 - fire_station 000000000000000001 - fountain 000000000000000011 - @@ -52,6 +54,8 @@ world 000000000000000000 + hunting_stand 000000000000000001 - kindergarten 000000000000000111 - library 000000000000000001 - + marketplace 000000000000000011 - + nightclub 000000000000000001 - parking 000000000000000111 + [access] 000000000000000000 - destination 000000000000000111 - @@ -74,6 +78,7 @@ world 000000000000000000 + {} pharmacy 000000000000000001 - place_of_worship 000000000000000001 - + police 000000000000000001 - post_box 000000000000000001 - post_office 000000000000000001 - pub 000000000000000011 - @@ -88,19 +93,26 @@ world 000000000000000000 + school 000000000000000111 - shelter 000000000000001111 - speed_trap 000000000000000011 - + taxi 000000000000000011 - telephone 000000000000000001 - theatre 000000000000000011 - toilets 000000000000000011 - + townhall 000000000000000011 - university 000000000000000111 - {} barrier 000000000000000000 + + block 000000000000000011 - bollard 000000000000000011 - chicane 000000000000000011 - city_wall 000000000000000011 - cycle_barrier 000000000000000011 - fence 000000000000000011 - + gate 000000000000000011 - hedge 000000000000000011 - + lift_gate 000000000000000011 - retaining_wall 000000000000000011 - + stile 000000000000000011 - + toll_booth 000000000000000011 - wall 000000000000000011 - {} boundary 000000000000000000 + @@ -394,6 +406,7 @@ world 000000000000000000 + disused 000000000000000001 - junction 000000000000000001 - oneway 000000000000000011 - + private 000000000000011111 - tunnel 000000000000011111 - turning_circle 000000000000000111 - {} @@ -600,8 +613,13 @@ world 000000000000000000 + {} {} historic 000000000000000000 + + archaeological_site 000000000000000001 - battlefield 000000000000000001 - + castle 000000000000000001 - + memorial 000000000000000001 - + monument 000000000000000001 - museum 000000000000000001 - + ruins 000000000000000001 - {} landuse 000000000000000000 + allotments 000000000000111111 - @@ -731,6 +749,7 @@ world 000000000000000000 + man_made 000000000000000000 + breakwater 000000000000000111 - cairn 000000000000000001 - + cutline 000000000000001111 - lighthouse 000000000000000001 - pier 000000000000001111 - pipeline 000000000000000011 + @@ -781,6 +800,7 @@ world 000000000000000000 + natural 000000000000000000 + allotments 000000000000000100 - basin 000000000000000100 - + bay 000000000000001111 - beach 000000000000001111 - brownfield 000000000000000100 - cave_entrance 000000000000001111 - @@ -825,6 +845,7 @@ world 000000000000000000 + deciduous 000000000000111111 - mixed 000000000000111111 - {} + spring 000000000000001111 - street 000000000000000100 - tree 000000000000000001 - village_green 000000000000000100 - @@ -949,6 +970,7 @@ world 000000000000000000 + bridge 000000000000000011 - tunnel 000000000000111111 - {} + platform 000000000000000111 - preserved 000000000011111111 + bridge 000000000000000011 - tunnel 000000000011111111 - @@ -993,8 +1015,12 @@ world 000000000000000000 + {} shop 000000000000000000 + bakery 000000000000000001 - + car 000000000000000001 - + car_repair 000000000000000001 - + closes 000000000000000001 - convenience 000000000000000001 - hairdresser 000000000000000001 - + kiosk 000000000000000001 - supermarket 000000000000000001 - {} sport 000000000000000000 + @@ -1010,10 +1036,13 @@ world 000000000000000000 + diving 000000000000000001 - equestrian 000000000000000001 - football 000000000000000001 - + golf 000000000000000001 - gymnastics 000000000000000001 - handball 000000000000000001 - + multi 000000000000000001 - scuba_diving 000000000000000001 - shooting 000000000000000001 - + skiing 000000000000000001 - soccer 000000000000000001 - swimming 000000000000000001 - tennis 000000000000000001 - @@ -1023,6 +1052,7 @@ world 000000000000000000 + attraction 000000000011111111 - camp_site 000000000000011111 - caravan_site 000000000011111111 - + guest_house 000000000000000001 - hostel 000000000000000001 - hotel 000000000000000001 + [amenity] 000000000000000000 - @@ -1032,6 +1062,8 @@ world 000000000000000000 + guidepost 000000000000000001 - office 000000000000000001 - {} + motel 000000000000000001 - + museum 000000000000000001 - picnic_site 000000000000000111 - tourism-attraction 000000000000000000 - viewpoint 000000000000000111 -