diff --git a/data/categories.txt b/data/categories.txt
index 5ee0591ec6..56ec1b53aa 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -325,7 +325,7 @@ nb:3Butikk
fi:3Kauppa
sw:Duka
-shop-chemist
+shop-cosmetics
en:4Beauty Care|home care|shop|U+1F3EC|U+1F3EA
ar:ﻞﻴﻤﺠﺘﻟﺍ ﺕﺍﺮﻀﺤﺘﺴﻣ|تجميل|المتجر
cs:4Kosmetika|domácí péče|obchod
@@ -2811,16 +2811,16 @@ fi:Posti
sw:Posta
amenity-waste_disposal
-en:Trash|bin|garbage|waste disposal|dumpster|U+1F6AE
-ar:ﺔﻣﺎﻤﻗ
+en:Dumpster|Trash|bin|garbage|waste disposal|U+1F6AE
+ar:القمامة|ﺔﻣﺎﻤﻗ
cs:Odpadky|koš|popelnice|uložiště odpadu
da:Skraldespand|Genbrug|skrald
-de:Mülltonne|Abfälle|Müll
+de:Müllcontainer|Mülltonne|Abfälle|Müll
el:Σκουπίδια
es:Basura
fi:Roska
fr:Déchets|poubelle|déchet
-he:הפשא
+he:במכולה|הפשא
hu:Szemét
id:Sampah
it:Spazzatura
@@ -2828,15 +2828,15 @@ ja:ゴミ|ごみ|リサイクル|再利用|ダストボックス
ko:쓰레기|휴지통
nb:Søppel
nl:Uitschot|afval|prullenbak|vuilnis
-pl:Śmieci|ponowne odtworzenie|odpady
+pl:Wysypisko|Śmieci|ponowne odtworzenie|odpady
pt:Lixo|lixo
ro:Gunoi
-ru:Мусорный бак|мусорка
+ru:Мусорный контейнер|мусорка
sk:Odpadky|kôš
-sv:Soptunna|skräp|avfall
+sv:Avfallscontainer|Soptunna|skräp|avfall
th:ขยะ|ถังขยะ
-tr:Çöp|çöplük
-uk:Сміттєвий бак|сміття|смітник
+tr:Çöplüğü|Çöp|çöplük
+uk:Сміттєвий контейнер|сміття|смітник
vi:Rác
zh-Hans:垃圾
zh-Hant:垃圾|回收|回收場
@@ -5326,3 +5326,223 @@ uk:Дитяча кімната|ясла
vi:Nhà trẻ|Chăm sóc Trẻ em
zh-Hans:幼儿园|儿童看护
zh-Hant:幼兒園|兒童看護
+
+amenity-bicycle_parking
+en:Bicycle Parking
+ru:Велостоянка
+
+amenity-waste_basket
+en:Trash Bin|Waste Basket
+ru:Урна|Мусорная корзина
+
+emergency-phone
+en:Emergency Phone
+ru:Телефон для экстренных вызовов
+
+leisure-fitness_centre
+en:Fitness Centre|Gym|U+1F4AA
+ru:Фитнес-клуб|качалка|джим
+
+leisure-sauna
+en:Sauna
+ru:Баня|Сауна
+
+man_made-water_well
+en:Water Well
+ru:Колодец
+
+shop-car_repair-tyres
+en:Tyre Repair
+ru:Шиномонтаж
+
+shop-chemist
+en:Chemist Shop|shop
+ru:Бытовая химия|магазин
+
+shop-pet
+en:Petshop|shop
+ru:Зоотовары|магазин
+
+tourism-information-office
+en:Tourist Office|sights
+ru:Туристический офис|достопримечательност|достопримечательностьь
+
+amenity-community_centre
+en:Community Centre
+ru:Культурно-досуговый центр|Дом культуры
+
+amenity-courthouse
+en:Courthouse
+ru:Суд
+
+amenity-vending_machine-cigarettes
+en:Cigarette Dispenser
+ru:Сигаретный автомат
+
+amenity-vending_machine-drinks
+en:Drink Dispenser
+ru:Автомат с напитками
+
+building-garage
+en:Garage
+ru:Гараж
+
+highway-rest_area
+en:Highway Rest Area
+ru:Зона отдыха на трассе
+
+highway-traffic_signals
+en:Traffic Lights
+ru:Светофор
+
+man_made-chimney
+en:Factory Chimney
+ru:Заводская труба
+
+man_made-tower
+en:Tower
+ru:Башня
+
+power-substation
+en:Substation
+ru:Подстанция
+
+shop-bookmaker
+en:Bookmaker
+ru:Букмекерская контора
+
+shop-seafood
+en:Seafood Shop|shop
+ru:Рыбный магазин|магазин
+
+shop-ticket
+en:Ticket Shop|shop
+ru:Билетная касса|магазин
+
+shop-wine
+en:Wine Shop|shop
+ru:Винный магазин|магазин
+
+shop-car_parts
+en:Car Parts Shop|shop
+ru:Автозапчасти|магазин
+
+tourism-chalet
+en:Chalet
+ru:Шале
+
+tourism-information-board
+en:Information Board|sights
+ru:Информационный щит|достопримечательность
+
+tourism-information-map
+en:Tourist Map|sights
+ru:Карта|достопримечательность
+
+aerialway-station
+en:Aerialway Station
+ru:Канатная дорога
+
+aeroway-helipad
+en:Helipad
+ru:Вертолётная площадка
+
+amenity-vending_machine-parking_tickets
+en:Parking Tickets
+ru:Паркомат
+
+barrier-block
+en:Block
+ru:Блок
+
+barrier-bollard
+en:Pillar
+ru:Столбик
+
+barrier-border_control
+en:Border Control
+ru:Погранконтроль
+
+barrier-entrance
+en:Entrance
+ru:Проход
+
+barrier-gate
+en:Gate
+ru:Ворота
+
+barrier-lift_gate
+en:Lift Gate
+ru:Шлагбаум
+
+barrier-stile
+en:Stile
+ru:Перелаз
+
+barrier-toll_booth
+en:Toll Booth
+ru:Пункт оплаты
+
+entrance
+en:Entrance
+ru:Вход
+
+leisure-water_park
+en:Water Park
+ru:Аквапарк
+
+man_made-water_tower
+en:Water Tower
+ru:Водонапорная башня
+
+man_made-windmill
+en:Windmill
+ru:Ветряная мельница
+
+military-bunker
+en:Bunker
+ru:Бункер
+
+natural-cave_entrance
+en:Cave Entrance
+ru:Пещера
+
+natural-tree
+en:Tree
+ru:Дерево
+
+natural-volcano
+en:Volcano
+ru:Вулкан
+
+office-estate_agent
+en:Estate Agent|Realtor
+ru:Агентство недвижимости|риэлтор
+
+power-pole|power-tower
+en:Power Tower
+ru:Опора ЛЭП
+
+waterway-lock_gate
+en:Lock Gate
+ru:Шлюз
+
+amenity-public_bookcase
+en:Book Exchange|Bookcase
+ru:Книжный шкаф|Обмен книг
+
+leisure-sports_centre-climbing
+en:Climbing Centre
+ru:Скалодром
+
+leisure-sports_centre-shooting
+en:Shooting Range
+ru:Тир|стрельбище
+
+leisure-sports_centre-swimming
+en:Swimming Centre
+ru:Плавательный бассейн
+
+leisure-sports_centre-yoga
+en:Yoga Studio
+ru:Йога-центр|Студия йоги
diff --git a/data/classificator.txt b/data/classificator.txt
index 13608b5f08..d89b1f34b5 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -24,6 +24,7 @@ world +
bar -
bbq -
bench -
+ bicycle_parking -
bicycle_rental -
brothel -
bureau_de_change -
@@ -38,6 +39,8 @@ world +
cinema -
clinic -
college -
+ community_centre -
+ courthouse -
dentist -
doctors -
drinking_water -
@@ -85,6 +88,7 @@ world +
post_box -
post_office -
pub -
+ public_bookcase -
recycling -
restaurant -
school -
@@ -97,10 +101,13 @@ world +
townhall -
university -
vending_machine +
+ cigarettes -
+ drinks -
parking_tickets -
public_transport_tickets -
{}
veterinary -
+ waste_basket -
waste_disposal -
{}
area:highway +
@@ -163,6 +170,7 @@ world +
{}
building +
address -
+ garage -
train_station -
{}
building:part -
@@ -187,6 +195,9 @@ world +
earthquake:damage +
spontaneous_camp -
{}
+ emergency +
+ phone -
+ {}
entrance -
highway +
bridleway +
@@ -261,6 +272,7 @@ world +
bridge -
tunnel -
{}
+ rest_area -
road +
bridge -
tunnel -
@@ -318,6 +330,7 @@ world +
permissive -
tunnel -
{}
+ traffic_signals -
trunk +
bridge -
tunnel -
@@ -407,6 +420,7 @@ world +
dog_park +
tennis -
{}
+ fitness_centre -
garden -
golf_course -
landscape_reserve -
@@ -426,8 +440,14 @@ world +
tennis -
{}
recreation_ground -
+ sauna -
slipway -
- sports_centre -
+ sports_centre +
+ climbing -
+ shooting -
+ swimming -
+ yoga -
+ {}
stadium -
swimming_pool -
track -
@@ -436,15 +456,17 @@ world +
man_made +
breakwater -
cairn -
+ chimney -
cutline -
lighthouse -
pier -
pipeline +
overground -
{}
- survey_point -
+ tower -
wastewater_plant -
water_tower -
+ water_well -
windmill -
{}
mapswithme +
@@ -573,7 +595,7 @@ world +
minor_line -
pole -
station -
- sub_station -
+ substation -
tower -
{}
public_transport +
@@ -712,16 +734,21 @@ world +
beauty -
beverages -
bicycle -
+ bookmaker -
books -
butcher -
car -
- car_repair -
+ car_parts -
+ car_repair +
+ tyres -
+ {}
chemist -
clothes -
computer -
confectionery -
convenience -
copyshop -
+ cosmetics -
department_store -
doityourself -
dry_cleaning -
@@ -740,13 +767,17 @@ world +
mobile_phone -
optician -
outdoor -
+ pet -
photo -
+ seafood -
shoes -
sports -
supermarket -
+ ticket -
toys -
travel_agency -
tyres -
+ wine -
{}
sport +
american_football -
@@ -778,11 +809,14 @@ world +
attraction -
camp_site -
caravan_site -
+ chalet -
guest_house -
hostel -
hotel -
information +
+ board -
guidepost -
+ map -
office -
{}
motel -
@@ -791,6 +825,10 @@ world +
viewpoint -
zoo -
{}
+ traffic_calming +
+ bump -
+ hump -
+ {}
waterway +
canal +
tunnel -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 02ee469316..1ee259df7b 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 0f1f1045fe..c8d75af1ec 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -2708,6 +2708,54 @@ cont {
}
}
}
+cont {
+ name: "amenity-bicycle_parking"
+ element {
+ scale: 17
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-bicycle_rental"
element {
@@ -3753,6 +3801,102 @@ cont {
}
}
}
+cont {
+ name: "amenity-community_centre"
+ element {
+ scale: 17
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
+cont {
+ name: "amenity-courthouse"
+ element {
+ scale: 17
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-dentist"
element {
@@ -7097,6 +7241,54 @@ cont {
}
}
}
+cont {
+ name: "amenity-public_bookcase"
+ element {
+ scale: 17
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-recycling"
element {
@@ -8206,6 +8398,108 @@ cont {
apply_if: "!name"
}
}
+cont {
+ name: "amenity-vending_machine-cigarettes"
+ element {
+ scale: 17
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
+cont {
+ name: "amenity-vending_machine-drinks"
+ element {
+ scale: 17
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "amenity-vending_machine-parking_tickets"
element {
@@ -8356,6 +8650,54 @@ cont {
}
}
}
+cont {
+ name: "amenity-waste_basket"
+ element {
+ scale: 17
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-waste_disposal"
element {
@@ -11826,6 +12168,86 @@ cont {
}
}
}
+cont {
+ name: "building-garage"
+ element {
+ scale: 14
+ area {
+ color: 2160707771
+ priority: 1302
+ }
+ }
+ element {
+ scale: 15
+ area {
+ color: 1724500155
+ priority: 1302
+ }
+ }
+ element {
+ scale: 16
+ area {
+ color: 868862139
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 9
+ color: 6645086
+ text: "addr:housename"
+ }
+ priority: 15356
+ }
+ }
+ element {
+ scale: 17
+ area {
+ color: 12763315
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 9
+ color: 6381914
+ }
+ secondary {
+ height: 8
+ color: 6381914
+ offset_y: 20
+ text: "int_name"
+ }
+ priority: 15356
+ }
+ }
+ element {
+ scale: 18
+ area {
+ color: 12763315
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 11
+ color: 6381914
+ }
+ priority: 15356
+ }
+ }
+ element {
+ scale: 19
+ area {
+ color: 12763315
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 11
+ color: 6381914
+ }
+ priority: 15356
+ }
+ }
+}
cont {
name: "building-train_station"
element {
@@ -12707,6 +13129,36 @@ cont {
}
}
}
+cont {
+ name: "emergency-phone"
+ element {
+ scale: 17
+ symbol {
+ name: "phone-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "phone-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "phone-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ }
+}
cont {
name: "entrance"
element {
@@ -43886,6 +44338,554 @@ cont {
}
}
}
+cont {
+ name: "leisure-sports_centre-climbing"
+ element {
+ scale: 12
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
+cont {
+ name: "leisure-sports_centre-shooting"
+ element {
+ scale: 12
+ symbol {
+ name: "archery-s"
+ priority: 16849
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "archery-s"
+ priority: 16849
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "archery-s"
+ priority: 16849
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "archery-m"
+ priority: 16849
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "archery-m"
+ priority: 16849
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "archery-l"
+ priority: 16849
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "archery-l"
+ priority: 16849
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "archery-l"
+ priority: 16849
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
+cont {
+ name: "leisure-sports_centre-swimming"
+ element {
+ scale: 12
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "swimming-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "swimming-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
+cont {
+ name: "leisure-sports_centre-yoga"
+ element {
+ scale: 12
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
cont {
name: "leisure-stadium"
element {
@@ -45062,66 +46062,55 @@ cont {
}
}
}
-cont {
- name: "man_made-survey_point"
- element {
- scale: 19
- symbol {
- name: "survey_point-l"
- apply_for_type: 1
- priority: 16849
- }
- }
-}
cont {
name: "man_made-wastewater_plant"
element {
scale: 12
area {
color: 15000804
- priority: -16312
+ priority: -16344
}
}
element {
scale: 13
area {
color: 15000804
- priority: -16312
+ priority: -16344
}
}
element {
scale: 14
area {
color: 15000804
- priority: -16312
+ priority: -16344
}
}
element {
scale: 15
area {
color: 15000804
- priority: -16312
+ priority: -16344
}
}
element {
scale: 16
area {
color: 15000804
- priority: -16312
+ priority: -16344
}
}
element {
scale: 17
area {
color: 15000804
- priority: -16312
+ priority: -16344
}
}
element {
scale: 18
area {
color: 15000804
- priority: -16312
+ priority: -16344
}
}
}
@@ -57728,40 +58717,53 @@ cont {
}
}
cont {
- name: "power-sub_station"
- element {
- scale: 14
- area {
- color: 12500670
- priority: 1001
- }
- }
- element {
- scale: 15
- area {
- color: 12500670
- priority: 1001
- }
- }
- element {
- scale: 16
- area {
- color: 12500670
- priority: 1001
- }
- }
+ name: "power-substation"
element {
scale: 17
- area {
- color: 12500670
- priority: 1001
+ symbol {
+ name: "power-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
}
}
element {
scale: 18
- area {
- color: 12500670
- priority: 1001
+ symbol {
+ name: "power-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "power-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
}
}
}
@@ -71480,6 +72482,84 @@ cont {
}
}
}
+cont {
+ name: "shop-bookmaker"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-books"
element {
@@ -71714,6 +72794,84 @@ cont {
}
}
}
+cont {
+ name: "shop-car_parts"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-car_repair"
element {
@@ -71792,6 +72950,84 @@ cont {
}
}
}
+cont {
+ name: "shop-car_repair-tyres"
+ element {
+ scale: 15
+ symbol {
+ name: "car-repair-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "car-repair-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "car-repair-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "car-repair-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "car-repair-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-chemist"
element {
@@ -72260,6 +73496,84 @@ cont {
}
}
}
+cont {
+ name: "shop-cosmetics"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-department_store"
element {
@@ -73696,6 +75010,84 @@ cont {
}
}
}
+cont {
+ name: "shop-pet"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-photo"
element {
@@ -73774,6 +75166,84 @@ cont {
}
}
}
+cont {
+ name: "shop-seafood"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-shoes"
element {
@@ -74038,6 +75508,84 @@ cont {
}
}
}
+cont {
+ name: "shop-ticket"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-toys"
element {
@@ -74272,6 +75820,84 @@ cont {
}
}
}
+cont {
+ name: "shop-wine"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "sport-american_football"
element {
@@ -76688,6 +78314,105 @@ cont {
}
}
}
+cont {
+ name: "tourism-chalet"
+ element {
+ scale: 14
+ symbol {
+ name: "alpine_hut-s"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "alpine_hut-m"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "alpine_hut-m"
+ priority: 16849
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "tourism-guest_house"
element {
@@ -77127,6 +78852,142 @@ cont {
}
}
}
+cont {
+ name: "tourism-information-board"
+ element {
+ scale: 12
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+}
cont {
name: "tourism-information-guidepost"
element {
@@ -77263,6 +79124,142 @@ cont {
}
}
}
+cont {
+ name: "tourism-information-map"
+ element {
+ scale: 12
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+}
cont {
name: "tourism-information-office"
element {
@@ -77369,12 +79366,13 @@ cont {
element {
scale: 18
symbol {
- name: "office-l"
+ name: "information-l"
+ apply_for_type: 1
priority: 16863
}
caption {
primary {
- height: 11
+ height: 10
color: 4473924
offset_y: 10
}
@@ -77384,12 +79382,149 @@ cont {
element {
scale: 19
symbol {
- name: "office-l"
+ name: "information-l"
+ apply_for_type: 1
priority: 16863
}
caption {
primary {
- height: 11
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+}
+cont {
+ name: "tourism-information-office"
+ element {
+ scale: 12
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
color: 4473924
offset_y: 10
}
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index cd33258f5b..d0427b6cc4 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 023a77267d..ab02e77075 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -2524,6 +2524,24 @@ cont {
}
}
}
+cont {
+ name: "amenity-bicycle_parking"
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-bicycle_rental"
element {
@@ -3312,6 +3330,42 @@ cont {
}
}
}
+cont {
+ name: "amenity-community_centre"
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
+cont {
+ name: "amenity-courthouse"
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-dentist"
element {
@@ -6414,6 +6468,24 @@ cont {
}
}
}
+cont {
+ name: "amenity-public_bookcase"
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-recycling"
element {
@@ -7295,6 +7367,108 @@ cont {
apply_if: "!name"
}
}
+cont {
+ name: "amenity-vending_machine-cigarettes"
+ element {
+ scale: 17
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
+cont {
+ name: "amenity-vending_machine-drinks"
+ element {
+ scale: 17
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "amenity-vending_machine-parking_tickets"
element {
@@ -7415,6 +7589,24 @@ cont {
}
}
}
+cont {
+ name: "amenity-waste_basket"
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-waste_disposal"
element {
@@ -9299,6 +9491,86 @@ cont {
}
}
}
+cont {
+ name: "building-garage"
+ element {
+ scale: 14
+ area {
+ color: 2160707771
+ priority: 1302
+ }
+ }
+ element {
+ scale: 15
+ area {
+ color: 1724500155
+ priority: 1302
+ }
+ }
+ element {
+ scale: 16
+ area {
+ color: 868862139
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 9
+ color: 6645086
+ text: "addr:housename"
+ }
+ priority: 15356
+ }
+ }
+ element {
+ scale: 17
+ area {
+ color: 12763315
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 9
+ color: 6381914
+ }
+ secondary {
+ height: 8
+ color: 6381914
+ offset_y: 20
+ text: "int_name"
+ }
+ priority: 15356
+ }
+ }
+ element {
+ scale: 18
+ area {
+ color: 12763315
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 11
+ color: 6381914
+ }
+ priority: 15356
+ }
+ }
+ element {
+ scale: 19
+ area {
+ color: 12763315
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 11
+ color: 6381914
+ }
+ priority: 15356
+ }
+ }
+}
cont {
name: "building-train_station"
element {
@@ -9868,6 +10140,36 @@ cont {
}
}
}
+cont {
+ name: "emergency-phone"
+ element {
+ scale: 17
+ symbol {
+ name: "phone-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "phone-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "phone-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ }
+}
cont {
name: "entrance"
element {
@@ -38733,6 +39035,487 @@ cont {
}
}
}
+cont {
+ name: "leisure-sports_centre-climbing"
+ element {
+ scale: 13
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
+cont {
+ name: "leisure-sports_centre-shooting"
+ element {
+ scale: 13
+ symbol {
+ name: "archery-s"
+ priority: 16849
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "archery-s"
+ priority: 16849
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "archery-m"
+ priority: 16849
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "archery-m"
+ priority: 16849
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "archery-l"
+ priority: 16849
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "archery-l"
+ priority: 16849
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "archery-l"
+ priority: 16849
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
+cont {
+ name: "leisure-sports_centre-swimming"
+ element {
+ scale: 13
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "swimming-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "swimming-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
+cont {
+ name: "leisure-sports_centre-yoga"
+ element {
+ scale: 13
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
cont {
name: "leisure-stadium"
element {
@@ -39657,17 +40440,6 @@ cont {
}
}
}
-cont {
- name: "man_made-survey_point"
- element {
- scale: 19
- symbol {
- name: "survey_point-l"
- apply_for_type: 1
- priority: 16849
- }
- }
-}
cont {
name: "man_made-windmill"
element {
@@ -50835,6 +51607,57 @@ cont {
}
}
}
+cont {
+ name: "power-substation"
+ element {
+ scale: 17
+ symbol {
+ name: "power-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "power-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "power-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "power-tower"
element {
@@ -61235,6 +62058,84 @@ cont {
}
}
}
+cont {
+ name: "shop-bookmaker"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-books"
element {
@@ -61469,6 +62370,84 @@ cont {
}
}
}
+cont {
+ name: "shop-car_parts"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-car_repair"
element {
@@ -61547,6 +62526,84 @@ cont {
}
}
}
+cont {
+ name: "shop-car_repair-tyres"
+ element {
+ scale: 15
+ symbol {
+ name: "car-repair-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "car-repair-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "car-repair-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "car-repair-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "car-repair-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-chemist"
element {
@@ -62015,6 +63072,84 @@ cont {
}
}
}
+cont {
+ name: "shop-cosmetics"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-department_store"
element {
@@ -63451,6 +64586,84 @@ cont {
}
}
}
+cont {
+ name: "shop-pet"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-photo"
element {
@@ -63529,6 +64742,84 @@ cont {
}
}
}
+cont {
+ name: "shop-seafood"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-shoes"
element {
@@ -63793,6 +65084,84 @@ cont {
}
}
}
+cont {
+ name: "shop-ticket"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-toys"
element {
@@ -64027,6 +65396,84 @@ cont {
}
}
}
+cont {
+ name: "shop-wine"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "sport-american_football"
element {
@@ -66224,6 +67671,105 @@ cont {
}
}
}
+cont {
+ name: "tourism-chalet"
+ element {
+ scale: 14
+ symbol {
+ name: "alpine_hut-s"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "alpine_hut-m"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "alpine_hut-m"
+ priority: 16849
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "tourism-guest_house"
element {
@@ -66663,6 +68209,142 @@ cont {
}
}
}
+cont {
+ name: "tourism-information-board"
+ element {
+ scale: 12
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+}
cont {
name: "tourism-information-guidepost"
element {
@@ -66799,6 +68481,142 @@ cont {
}
}
}
+cont {
+ name: "tourism-information-map"
+ element {
+ scale: 12
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+}
cont {
name: "tourism-information-office"
element {
@@ -66905,12 +68723,13 @@ cont {
element {
scale: 18
symbol {
- name: "office-l"
+ name: "information-l"
+ apply_for_type: 1
priority: 16863
}
caption {
primary {
- height: 11
+ height: 10
color: 4473924
offset_y: 10
}
@@ -66920,12 +68739,149 @@ cont {
element {
scale: 19
symbol {
- name: "office-l"
+ name: "information-l"
+ apply_for_type: 1
priority: 16863
}
caption {
primary {
- height: 11
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+}
+cont {
+ name: "tourism-information-office"
+ element {
+ scale: 12
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
color: 4473924
offset_y: 10
}
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 697f4a2686..c52406fc3a 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 97792807f2..1d69bd8be5 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -2524,6 +2524,24 @@ cont {
}
}
}
+cont {
+ name: "amenity-bicycle_parking"
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-bicycle_rental"
element {
@@ -3312,6 +3330,42 @@ cont {
}
}
}
+cont {
+ name: "amenity-community_centre"
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
+cont {
+ name: "amenity-courthouse"
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-dentist"
element {
@@ -6414,6 +6468,24 @@ cont {
}
}
}
+cont {
+ name: "amenity-public_bookcase"
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-recycling"
element {
@@ -7295,6 +7367,108 @@ cont {
apply_if: "!name"
}
}
+cont {
+ name: "amenity-vending_machine-cigarettes"
+ element {
+ scale: 17
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
+cont {
+ name: "amenity-vending_machine-drinks"
+ element {
+ scale: 17
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "vending-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "amenity-vending_machine-parking_tickets"
element {
@@ -7415,6 +7589,24 @@ cont {
}
}
}
+cont {
+ name: "amenity-waste_basket"
+ element {
+ scale: 19
+ symbol {
+ name: "none"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "amenity-waste_disposal"
element {
@@ -9299,6 +9491,86 @@ cont {
}
}
}
+cont {
+ name: "building-garage"
+ element {
+ scale: 14
+ area {
+ color: 2149720610
+ priority: 1302
+ }
+ }
+ element {
+ scale: 15
+ area {
+ color: 1713512994
+ priority: 1302
+ }
+ }
+ element {
+ scale: 16
+ area {
+ color: 857874978
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 9
+ color: 5592405
+ text: "addr:housename"
+ }
+ priority: 15356
+ }
+ }
+ element {
+ scale: 17
+ area {
+ color: 3355443
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 9
+ color: 5592405
+ }
+ secondary {
+ height: 8
+ color: 5592405
+ offset_y: 20
+ text: "int_name"
+ }
+ priority: 15356
+ }
+ }
+ element {
+ scale: 18
+ area {
+ color: 3355443
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ }
+ priority: 15356
+ }
+ }
+ element {
+ scale: 19
+ area {
+ color: 3355443
+ priority: 1357
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ }
+ priority: 15356
+ }
+ }
+}
cont {
name: "building-train_station"
element {
@@ -9868,6 +10140,36 @@ cont {
}
}
}
+cont {
+ name: "emergency-phone"
+ element {
+ scale: 17
+ symbol {
+ name: "phone-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "phone-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "phone-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ }
+}
cont {
name: "entrance"
element {
@@ -38733,6 +39035,487 @@ cont {
}
}
}
+cont {
+ name: "leisure-sports_centre-climbing"
+ element {
+ scale: 13
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
+cont {
+ name: "leisure-sports_centre-shooting"
+ element {
+ scale: 13
+ symbol {
+ name: "archery-s"
+ priority: 16849
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "archery-s"
+ priority: 16849
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "archery-m"
+ priority: 16849
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "archery-m"
+ priority: 16849
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "archery-l"
+ priority: 16849
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "archery-l"
+ priority: 16849
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "archery-l"
+ priority: 16849
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
+cont {
+ name: "leisure-sports_centre-swimming"
+ element {
+ scale: 13
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "swimming-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "swimming-l"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
+cont {
+ name: "leisure-sports_centre-yoga"
+ element {
+ scale: 13
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "pitch-s"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 50
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "pitch-m"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 40
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "pitch-l"
+ apply_for_type: 1
+ priority: 16068
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15500
+ }
+ }
+}
cont {
name: "leisure-stadium"
element {
@@ -39657,17 +40440,6 @@ cont {
}
}
}
-cont {
- name: "man_made-survey_point"
- element {
- scale: 19
- symbol {
- name: "survey_point-l"
- apply_for_type: 1
- priority: 16849
- }
- }
-}
cont {
name: "man_made-windmill"
element {
@@ -50835,6 +51607,57 @@ cont {
}
}
}
+cont {
+ name: "power-substation"
+ element {
+ scale: 17
+ symbol {
+ name: "power-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "power-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "power-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "power-tower"
element {
@@ -61235,6 +62058,84 @@ cont {
}
}
}
+cont {
+ name: "shop-bookmaker"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-books"
element {
@@ -61469,6 +62370,84 @@ cont {
}
}
}
+cont {
+ name: "shop-car_parts"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-car_repair"
element {
@@ -61547,6 +62526,84 @@ cont {
}
}
}
+cont {
+ name: "shop-car_repair-tyres"
+ element {
+ scale: 15
+ symbol {
+ name: "car-repair-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "car-repair-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "car-repair-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "car-repair-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "car-repair-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-chemist"
element {
@@ -62015,6 +63072,84 @@ cont {
}
}
}
+cont {
+ name: "shop-cosmetics"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-department_store"
element {
@@ -63451,6 +64586,84 @@ cont {
}
}
}
+cont {
+ name: "shop-pet"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-photo"
element {
@@ -63529,6 +64742,84 @@ cont {
}
}
}
+cont {
+ name: "shop-seafood"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-shoes"
element {
@@ -63793,6 +65084,84 @@ cont {
}
}
}
+cont {
+ name: "shop-ticket"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "shop-toys"
element {
@@ -64027,6 +65396,84 @@ cont {
}
}
}
+cont {
+ name: "shop-wine"
+ element {
+ scale: 15
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "shop-m"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "shop-l"
+ priority: 16849
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "sport-american_football"
element {
@@ -66224,6 +67671,105 @@ cont {
}
}
}
+cont {
+ name: "tourism-chalet"
+ element {
+ scale: 14
+ symbol {
+ name: "alpine_hut-s"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "alpine_hut-m"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "alpine_hut-m"
+ priority: 16849
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "alpine_hut-l"
+ priority: 16849
+ min_distance: 20
+ }
+ caption {
+ primary {
+ height: 11
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15849
+ }
+ }
+}
cont {
name: "tourism-guest_house"
element {
@@ -66663,6 +68209,142 @@ cont {
}
}
}
+cont {
+ name: "tourism-information-board"
+ element {
+ scale: 12
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+}
cont {
name: "tourism-information-guidepost"
element {
@@ -66799,6 +68481,142 @@ cont {
}
}
}
+cont {
+ name: "tourism-information-map"
+ element {
+ scale: 12
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+}
cont {
name: "tourism-information-office"
element {
@@ -66905,12 +68723,13 @@ cont {
element {
scale: 18
symbol {
- name: "office-l"
+ name: "information-l"
+ apply_for_type: 1
priority: 16863
}
caption {
primary {
- height: 11
+ height: 10
color: 5592405
offset_y: 10
}
@@ -66920,12 +68739,149 @@ cont {
element {
scale: 19
symbol {
- name: "office-l"
+ name: "information-l"
+ apply_for_type: 1
priority: 16863
}
caption {
primary {
- height: 11
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+}
+cont {
+ name: "tourism-information-office"
+ element {
+ scale: 12
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "information-s"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 30
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 6
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "information-m"
+ apply_for_type: 1
+ priority: 16863
+ min_distance: 10
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
+ color: 5592405
+ offset_y: 10
+ }
+ priority: 15863
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information-l"
+ apply_for_type: 1
+ priority: 16863
+ }
+ caption {
+ primary {
+ height: 10
color: 5592405
offset_y: 10
}
diff --git a/data/drules_proto_legacy.bin b/data/drules_proto_legacy.bin
index 845d91ed16..68b4494213 100644
Binary files a/data/drules_proto_legacy.bin and b/data/drules_proto_legacy.bin differ
diff --git a/data/drules_proto_legacy.txt b/data/drules_proto_legacy.txt
index cf20da1baa..feb2c8ee9e 100644
--- a/data/drules_proto_legacy.txt
+++ b/data/drules_proto_legacy.txt
@@ -1542,6 +1542,45 @@ cont {
}
}
}
+cont {
+ name: "amenity-bicycle_parking"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "amenity-bicycle_rental"
element {
@@ -2294,6 +2333,84 @@ cont {
}
}
}
+cont {
+ name: "amenity-community_centre"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
+cont {
+ name: "amenity-courthouse"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "amenity-dentist"
element {
@@ -4865,6 +4982,45 @@ cont {
}
}
}
+cont {
+ name: "amenity-public_bookcase"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "amenity-recycling"
element {
@@ -5568,6 +5724,84 @@ cont {
}
}
}
+cont {
+ name: "amenity-vending_machine-cigarettes"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
+cont {
+ name: "amenity-vending_machine-drinks"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "amenity-vending_machine-parking_tickets"
element {
@@ -5685,6 +5919,45 @@ cont {
}
}
}
+cont {
+ name: "amenity-waste_basket"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "amenity-waste_disposal"
element {
@@ -8850,6 +9123,96 @@ cont {
}
}
}
+cont {
+ name: "building-garage"
+ element {
+ scale: 15
+ area {
+ color: 13487540
+ priority: 1001
+ }
+ }
+ element {
+ scale: 16
+ area {
+ color: 13487540
+ priority: 1001
+ }
+ caption {
+ primary {
+ height: 10
+ color: 8421488
+ }
+ secondary {
+ height: 11
+ color: 8421488
+ offset_y: 20
+ text: "int_name"
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 17
+ area {
+ color: 13487540
+ priority: 1001
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ }
+ secondary {
+ height: 11
+ color: 4210752
+ offset_y: 20
+ text: "int_name"
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ area {
+ color: 13487540
+ priority: 1001
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ }
+ secondary {
+ height: 11
+ color: 4210752
+ offset_y: 20
+ text: "int_name"
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ area {
+ color: 13487540
+ priority: 1001
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ }
+ secondary {
+ height: 11
+ color: 4210752
+ offset_y: 20
+ text: "int_name"
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "building-train_station"
element {
@@ -37217,7 +37580,7 @@ cont {
}
}
cont {
- name: "leisure-stadium"
+ name: "leisure-sports_centre-climbing"
element {
scale: 12
area {
@@ -37299,6 +37662,362 @@ cont {
}
}
}
+cont {
+ name: "leisure-sports_centre-shooting"
+ element {
+ scale: 12
+ area {
+ color: 13691076
+ priority: -16304
+ }
+ }
+ element {
+ scale: 13
+ area {
+ color: 13691076
+ priority: -16305
+ }
+ }
+ element {
+ scale: 14
+ area {
+ color: 13691076
+ priority: -16306
+ }
+ }
+ element {
+ scale: 15
+ area {
+ color: 13691076
+ priority: -16307
+ }
+ }
+ element {
+ scale: 16
+ area {
+ color: 13691076
+ priority: -16308
+ }
+ }
+ element {
+ scale: 17
+ area {
+ color: 13691076
+ priority: -16309
+ }
+ symbol {
+ name: "shooting-borderless"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ area {
+ color: 13691076
+ priority: -16310
+ }
+ symbol {
+ name: "shooting-borderless"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ area {
+ color: 13691076
+ priority: -16311
+ }
+ symbol {
+ name: "shooting-borderless"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+}
+cont {
+ name: "leisure-sports_centre-swimming"
+ element {
+ scale: 12
+ area {
+ color: 13691076
+ priority: -16312
+ }
+ }
+ element {
+ scale: 13
+ area {
+ color: 13691076
+ priority: -16313
+ }
+ }
+ element {
+ scale: 14
+ area {
+ color: 13691076
+ priority: -16314
+ }
+ }
+ element {
+ scale: 15
+ area {
+ color: 13691076
+ priority: -16315
+ }
+ }
+ element {
+ scale: 16
+ area {
+ color: 13691076
+ priority: -16316
+ }
+ }
+ element {
+ scale: 17
+ area {
+ color: 13691076
+ priority: -16317
+ }
+ symbol {
+ name: "swimming-borderless"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ area {
+ color: 13691076
+ priority: -16318
+ }
+ symbol {
+ name: "swimming-borderless"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ area {
+ color: 13691076
+ priority: -16319
+ }
+ symbol {
+ name: "swimming-borderless"
+ priority: 16000
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+}
+cont {
+ name: "leisure-sports_centre-yoga"
+ element {
+ scale: 12
+ area {
+ color: 13691076
+ priority: -16320
+ }
+ }
+ element {
+ scale: 13
+ area {
+ color: 13691076
+ priority: -16321
+ }
+ }
+ element {
+ scale: 14
+ area {
+ color: 13691076
+ priority: -16322
+ }
+ }
+ element {
+ scale: 15
+ area {
+ color: 13691076
+ priority: -16323
+ }
+ }
+ element {
+ scale: 16
+ area {
+ color: 13691076
+ priority: -16324
+ }
+ }
+ element {
+ scale: 17
+ area {
+ color: 13691076
+ priority: -16325
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ area {
+ color: 13691076
+ priority: -16326
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ area {
+ color: 13691076
+ priority: -16327
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+}
+cont {
+ name: "leisure-stadium"
+ element {
+ scale: 12
+ area {
+ color: 13691076
+ priority: -16328
+ }
+ }
+ element {
+ scale: 13
+ area {
+ color: 13691076
+ priority: -16329
+ }
+ }
+ element {
+ scale: 14
+ area {
+ color: 13691076
+ priority: -16330
+ }
+ }
+ element {
+ scale: 15
+ area {
+ color: 13691076
+ priority: -16331
+ }
+ }
+ element {
+ scale: 16
+ area {
+ color: 13691076
+ priority: -16332
+ }
+ }
+ element {
+ scale: 17
+ area {
+ color: 13691076
+ priority: -16333
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 18
+ area {
+ color: 13691076
+ priority: -16334
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+ element {
+ scale: 19
+ area {
+ color: 13691076
+ priority: -16335
+ }
+ caption {
+ primary {
+ height: 12
+ color: 4210752
+ stroke_color: 16777215
+ }
+ priority: 15000
+ }
+ }
+}
cont {
name: "leisure-swimming_pool"
element {
@@ -37357,56 +38076,56 @@ cont {
scale: 12
area {
color: 13691076
- priority: -16304
+ priority: -16336
}
}
element {
scale: 13
area {
color: 13691076
- priority: -16305
+ priority: -16337
}
}
element {
scale: 14
area {
color: 13691076
- priority: -16306
+ priority: -16338
}
}
element {
scale: 15
area {
color: 13691076
- priority: -16307
+ priority: -16339
}
}
element {
scale: 16
area {
color: 13691076
- priority: -16308
+ priority: -16340
}
}
element {
scale: 17
area {
color: 13691076
- priority: -16309
+ priority: -16341
}
}
element {
scale: 18
area {
color: 13691076
- priority: -16310
+ priority: -16342
}
}
element {
scale: 19
area {
color: 13691076
- priority: -16311
+ priority: -16343
}
}
}
@@ -38055,56 +38774,56 @@ cont {
scale: 12
area {
color: 15000804
- priority: -16312
+ priority: -16344
}
}
element {
scale: 13
area {
color: 15000804
- priority: -16313
+ priority: -16345
}
}
element {
scale: 14
area {
color: 15000804
- priority: -16314
+ priority: -16346
}
}
element {
scale: 15
area {
color: 15000804
- priority: -16315
+ priority: -16347
}
}
element {
scale: 16
area {
color: 15000804
- priority: -16316
+ priority: -16348
}
}
element {
scale: 17
area {
color: 15000804
- priority: -16317
+ priority: -16349
}
}
element {
scale: 18
area {
color: 15000804
- priority: -16318
+ priority: -16350
}
}
element {
scale: 19
area {
color: 15000804
- priority: -16319
+ priority: -16351
}
}
}
@@ -38775,7 +39494,7 @@ cont {
scale: 14
area {
color: 15649877
- priority: -16320
+ priority: -16352
}
caption {
primary {
@@ -38790,7 +39509,7 @@ cont {
scale: 15
area {
color: 15649877
- priority: -16321
+ priority: -16353
}
caption {
primary {
@@ -38805,7 +39524,7 @@ cont {
scale: 16
area {
color: 15649877
- priority: -16322
+ priority: -16354
}
caption {
primary {
@@ -38820,7 +39539,7 @@ cont {
scale: 17
area {
color: 15649877
- priority: -16323
+ priority: -16355
}
caption {
primary {
@@ -38835,7 +39554,7 @@ cont {
scale: 18
area {
color: 15649877
- priority: -16324
+ priority: -16356
}
caption {
primary {
@@ -38850,7 +39569,7 @@ cont {
scale: 19
area {
color: 15649877
- priority: -16325
+ priority: -16357
}
caption {
primary {
@@ -39173,140 +39892,140 @@ cont {
scale: 0
area {
color: 16777215
- priority: -16326
+ priority: -16358
}
}
element {
scale: 1
area {
color: 16777215
- priority: -16327
+ priority: -16359
}
}
element {
scale: 2
area {
color: 16777215
- priority: -16328
+ priority: -16360
}
}
element {
scale: 3
area {
color: 16777215
- priority: -16329
+ priority: -16361
}
}
element {
scale: 4
area {
color: 16777215
- priority: -16330
+ priority: -16362
}
}
element {
scale: 5
area {
color: 16777215
- priority: -16331
+ priority: -16363
}
}
element {
scale: 6
area {
color: 16777215
- priority: -16332
+ priority: -16364
}
}
element {
scale: 7
area {
color: 16777215
- priority: -16333
+ priority: -16365
}
}
element {
scale: 8
area {
color: 16777215
- priority: -16334
+ priority: -16366
}
}
element {
scale: 9
area {
color: 16777215
- priority: -16335
+ priority: -16367
}
}
element {
scale: 10
area {
color: 16777215
- priority: -16336
+ priority: -16368
}
}
element {
scale: 11
area {
color: 16777215
- priority: -16337
+ priority: -16369
}
}
element {
scale: 12
area {
color: 16777215
- priority: -16338
+ priority: -16370
}
}
element {
scale: 13
area {
color: 16777215
- priority: -16339
+ priority: -16371
}
}
element {
scale: 14
area {
color: 16777215
- priority: -16340
+ priority: -16372
}
}
element {
scale: 15
area {
color: 16777215
- priority: -16341
+ priority: -16373
}
}
element {
scale: 16
area {
color: 16777215
- priority: -16342
+ priority: -16374
}
}
element {
scale: 17
area {
color: 16777215
- priority: -16343
+ priority: -16375
}
}
element {
scale: 18
area {
color: 16777215
- priority: -16344
+ priority: -16376
}
}
element {
scale: 19
area {
color: 16777215
- priority: -16345
+ priority: -16377
}
}
}
@@ -39316,28 +40035,28 @@ cont {
scale: 12
area {
color: 13691076
- priority: -16346
+ priority: -16378
}
}
element {
scale: 13
area {
color: 13691076
- priority: -16347
+ priority: -16379
}
}
element {
scale: 14
area {
color: 13691076
- priority: -16348
+ priority: -16380
}
}
element {
scale: 15
area {
color: 13691076
- priority: -16349
+ priority: -16381
}
caption {
primary {
@@ -39351,7 +40070,7 @@ cont {
scale: 16
area {
color: 13691076
- priority: -16350
+ priority: -16382
}
caption {
primary {
@@ -39365,7 +40084,7 @@ cont {
scale: 17
area {
color: 13691076
- priority: -16351
+ priority: -16383
}
caption {
primary {
@@ -39379,7 +40098,7 @@ cont {
scale: 18
area {
color: 13691076
- priority: -16352
+ priority: -16384
}
caption {
primary {
@@ -39393,7 +40112,7 @@ cont {
scale: 19
area {
color: 13691076
- priority: -16353
+ priority: -16385
}
caption {
primary {
@@ -40329,56 +41048,56 @@ cont {
scale: 12
area {
color: 13691076
- priority: -16354
+ priority: -16386
}
}
element {
scale: 13
area {
color: 13691076
- priority: -16355
+ priority: -16387
}
}
element {
scale: 14
area {
color: 13691076
- priority: -16356
+ priority: -16388
}
}
element {
scale: 15
area {
color: 13691076
- priority: -16357
+ priority: -16389
}
}
element {
scale: 16
area {
color: 13691076
- priority: -16358
+ priority: -16390
}
}
element {
scale: 17
area {
color: 13691076
- priority: -16359
+ priority: -16391
}
}
element {
scale: 18
area {
color: 13691076
- priority: -16360
+ priority: -16392
}
}
element {
scale: 19
area {
color: 13691076
- priority: -16361
+ priority: -16393
}
}
}
@@ -40949,42 +41668,42 @@ cont {
scale: 14
area {
color: 10535864
- priority: -16362
+ priority: -16394
}
}
element {
scale: 15
area {
color: 10535864
- priority: -16363
+ priority: -16395
}
}
element {
scale: 16
area {
color: 10535864
- priority: -16364
+ priority: -16396
}
}
element {
scale: 17
area {
color: 10535864
- priority: -16365
+ priority: -16397
}
}
element {
scale: 18
area {
color: 10535864
- priority: -16366
+ priority: -16398
}
}
element {
scale: 19
area {
color: 10535864
- priority: -16367
+ priority: -16399
}
}
}
@@ -40994,56 +41713,56 @@ cont {
scale: 12
area {
color: 10535864
- priority: -16368
+ priority: -16400
}
}
element {
scale: 13
area {
color: 10535864
- priority: -16369
+ priority: -16401
}
}
element {
scale: 14
area {
color: 10535864
- priority: -16370
+ priority: -16402
}
}
element {
scale: 15
area {
color: 10535864
- priority: -16371
+ priority: -16403
}
}
element {
scale: 16
area {
color: 10535864
- priority: -16372
+ priority: -16404
}
}
element {
scale: 17
area {
color: 10535864
- priority: -16373
+ priority: -16405
}
}
element {
scale: 18
area {
color: 10535864
- priority: -16374
+ priority: -16406
}
}
element {
scale: 19
area {
color: 10535864
- priority: -16375
+ priority: -16407
}
}
}
@@ -41053,42 +41772,42 @@ cont {
scale: 14
area {
color: 10535864
- priority: -16376
+ priority: -16408
}
}
element {
scale: 15
area {
color: 10535864
- priority: -16377
+ priority: -16409
}
}
element {
scale: 16
area {
color: 10535864
- priority: -16378
+ priority: -16410
}
}
element {
scale: 17
area {
color: 10535864
- priority: -16379
+ priority: -16411
}
}
element {
scale: 18
area {
color: 10535864
- priority: -16380
+ priority: -16412
}
}
element {
scale: 19
area {
color: 10535864
- priority: -16381
+ priority: -16413
}
}
}
@@ -41098,42 +41817,42 @@ cont {
scale: 10
area {
color: 11720357
- priority: -16382
+ priority: -16414
}
}
element {
scale: 11
area {
color: 11720357
- priority: -16383
+ priority: -16415
}
}
element {
scale: 12
area {
color: 11720357
- priority: -16384
+ priority: -16416
}
}
element {
scale: 13
area {
color: 11720357
- priority: -16385
+ priority: -16417
}
}
element {
scale: 14
area {
color: 11720357
- priority: -16386
+ priority: -16418
}
}
element {
scale: 15
area {
color: 11720357
- priority: -16387
+ priority: -16419
}
caption {
primary {
@@ -41147,7 +41866,7 @@ cont {
scale: 16
area {
color: 11720357
- priority: -16388
+ priority: -16420
}
caption {
primary {
@@ -41162,7 +41881,7 @@ cont {
scale: 17
area {
color: 11720357
- priority: -16389
+ priority: -16421
}
caption {
primary {
@@ -41177,7 +41896,7 @@ cont {
scale: 18
area {
color: 11720357
- priority: -16390
+ priority: -16422
}
caption {
primary {
@@ -41192,7 +41911,7 @@ cont {
scale: 19
area {
color: 11720357
- priority: -16391
+ priority: -16423
}
caption {
primary {
@@ -41210,42 +41929,42 @@ cont {
scale: 10
area {
color: 11720357
- priority: -16392
+ priority: -16424
}
}
element {
scale: 11
area {
color: 11720357
- priority: -16393
+ priority: -16425
}
}
element {
scale: 12
area {
color: 11720357
- priority: -16394
+ priority: -16426
}
}
element {
scale: 13
area {
color: 11720357
- priority: -16395
+ priority: -16427
}
}
element {
scale: 14
area {
color: 11720357
- priority: -16396
+ priority: -16428
}
}
element {
scale: 15
area {
color: 11720357
- priority: -16397
+ priority: -16429
}
caption {
primary {
@@ -41259,7 +41978,7 @@ cont {
scale: 16
area {
color: 11720357
- priority: -16398
+ priority: -16430
}
caption {
primary {
@@ -41274,7 +41993,7 @@ cont {
scale: 17
area {
color: 11720357
- priority: -16399
+ priority: -16431
}
caption {
primary {
@@ -41289,7 +42008,7 @@ cont {
scale: 18
area {
color: 11720357
- priority: -16400
+ priority: -16432
}
caption {
primary {
@@ -41304,7 +42023,7 @@ cont {
scale: 19
area {
color: 11720357
- priority: -16401
+ priority: -16433
}
caption {
primary {
@@ -41322,42 +42041,42 @@ cont {
scale: 10
area {
color: 11720357
- priority: -16402
+ priority: -16434
}
}
element {
scale: 11
area {
color: 11720357
- priority: -16403
+ priority: -16435
}
}
element {
scale: 12
area {
color: 11720357
- priority: -16404
+ priority: -16436
}
}
element {
scale: 13
area {
color: 11720357
- priority: -16405
+ priority: -16437
}
}
element {
scale: 14
area {
color: 11720357
- priority: -16406
+ priority: -16438
}
}
element {
scale: 15
area {
color: 11720357
- priority: -16407
+ priority: -16439
}
caption {
primary {
@@ -41371,7 +42090,7 @@ cont {
scale: 16
area {
color: 11720357
- priority: -16408
+ priority: -16440
}
caption {
primary {
@@ -41386,7 +42105,7 @@ cont {
scale: 17
area {
color: 11720357
- priority: -16409
+ priority: -16441
}
caption {
primary {
@@ -41401,7 +42120,7 @@ cont {
scale: 18
area {
color: 11720357
- priority: -16410
+ priority: -16442
}
caption {
primary {
@@ -41416,7 +42135,7 @@ cont {
scale: 19
area {
color: 11720357
- priority: -16411
+ priority: -16443
}
caption {
primary {
@@ -41434,42 +42153,42 @@ cont {
scale: 10
area {
color: 11720357
- priority: -16412
+ priority: -16444
}
}
element {
scale: 11
area {
color: 11720357
- priority: -16413
+ priority: -16445
}
}
element {
scale: 12
area {
color: 11720357
- priority: -16414
+ priority: -16446
}
}
element {
scale: 13
area {
color: 11720357
- priority: -16415
+ priority: -16447
}
}
element {
scale: 14
area {
color: 11720357
- priority: -16416
+ priority: -16448
}
}
element {
scale: 15
area {
color: 11720357
- priority: -16417
+ priority: -16449
}
caption {
primary {
@@ -41483,7 +42202,7 @@ cont {
scale: 16
area {
color: 11720357
- priority: -16418
+ priority: -16450
}
caption {
primary {
@@ -41498,7 +42217,7 @@ cont {
scale: 17
area {
color: 11720357
- priority: -16419
+ priority: -16451
}
caption {
primary {
@@ -41513,7 +42232,7 @@ cont {
scale: 18
area {
color: 11720357
- priority: -16420
+ priority: -16452
}
caption {
primary {
@@ -41528,7 +42247,7 @@ cont {
scale: 19
area {
color: 11720357
- priority: -16421
+ priority: -16453
}
caption {
primary {
@@ -45490,7 +46209,7 @@ cont {
scale: 14
area {
color: 14539465
- priority: -16422
+ priority: -16454
}
caption {
primary {
@@ -45504,7 +46223,7 @@ cont {
scale: 15
area {
color: 14539465
- priority: -16423
+ priority: -16455
}
caption {
primary {
@@ -45518,7 +46237,7 @@ cont {
scale: 16
area {
color: 14539465
- priority: -16424
+ priority: -16456
}
caption {
primary {
@@ -45532,7 +46251,7 @@ cont {
scale: 17
area {
color: 14539465
- priority: -16425
+ priority: -16457
}
caption {
primary {
@@ -45546,7 +46265,7 @@ cont {
scale: 18
area {
color: 14539465
- priority: -16426
+ priority: -16458
}
caption {
primary {
@@ -45560,7 +46279,7 @@ cont {
scale: 19
area {
color: 14539465
- priority: -16427
+ priority: -16459
}
caption {
primary {
@@ -46605,14 +47324,14 @@ cont {
scale: 11
area {
color: 14539465
- priority: -16428
+ priority: -16460
}
}
element {
scale: 12
area {
color: 14539465
- priority: -16429
+ priority: -16461
}
caption {
primary {
@@ -46627,7 +47346,7 @@ cont {
scale: 13
area {
color: 14539465
- priority: -16430
+ priority: -16462
}
caption {
primary {
@@ -46649,7 +47368,7 @@ cont {
scale: 14
area {
color: 14539465
- priority: -16431
+ priority: -16463
}
caption {
primary {
@@ -46671,7 +47390,7 @@ cont {
scale: 15
area {
color: 14539465
- priority: -16432
+ priority: -16464
}
caption {
primary {
@@ -46693,7 +47412,7 @@ cont {
scale: 16
area {
color: 14539465
- priority: -16433
+ priority: -16465
}
caption {
primary {
@@ -46715,7 +47434,7 @@ cont {
scale: 17
area {
color: 14539465
- priority: -16434
+ priority: -16466
}
caption {
primary {
@@ -46737,7 +47456,7 @@ cont {
scale: 18
area {
color: 14539465
- priority: -16435
+ priority: -16467
}
caption {
primary {
@@ -46759,7 +47478,7 @@ cont {
scale: 19
area {
color: 14539465
- priority: -16436
+ priority: -16468
}
caption {
primary {
@@ -47517,51 +48236,6 @@ cont {
}
}
}
-cont {
- name: "power-sub_station"
- element {
- scale: 14
- area {
- color: 12500670
- priority: 1001
- }
- }
- element {
- scale: 15
- area {
- color: 12500670
- priority: 1001
- }
- }
- element {
- scale: 16
- area {
- color: 12500670
- priority: 1001
- }
- }
- element {
- scale: 17
- area {
- color: 12500670
- priority: 1001
- }
- }
- element {
- scale: 18
- area {
- color: 12500670
- priority: 1001
- }
- }
- element {
- scale: 19
- area {
- color: 12500670
- priority: 1001
- }
- }
-}
cont {
name: "power-tower"
element {
@@ -62246,6 +62920,45 @@ cont {
}
}
}
+cont {
+ name: "shop-bookmaker"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "shop-books"
element {
@@ -62387,6 +63100,45 @@ cont {
}
}
}
+cont {
+ name: "shop-car_parts"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "shop-car_repair"
element {
@@ -62445,6 +63197,64 @@ cont {
}
}
}
+cont {
+ name: "shop-car_repair-tyres"
+ element {
+ scale: 16
+ symbol {
+ name: "car_repair"
+ priority: 16000
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "car_repair"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "car_repair"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "car_repair"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "shop-chemist"
element {
@@ -62717,6 +63527,45 @@ cont {
}
}
}
+cont {
+ name: "shop-cosmetics"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "shop-department_store"
element {
@@ -63569,6 +64418,45 @@ cont {
}
}
}
+cont {
+ name: "shop-pet"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "shop-photo"
element {
@@ -63608,6 +64496,45 @@ cont {
}
}
}
+cont {
+ name: "shop-seafood"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "shop-shoes"
element {
@@ -63768,6 +64695,45 @@ cont {
}
}
}
+cont {
+ name: "shop-ticket"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "shop-toys"
element {
@@ -63885,6 +64851,45 @@ cont {
}
}
}
+cont {
+ name: "shop-wine"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "sport-american_football"
element {
@@ -64644,21 +65649,21 @@ cont {
scale: 12
area {
color: 13626551
- priority: -16437
+ priority: -16469
}
}
element {
scale: 13
area {
color: 13626551
- priority: -16438
+ priority: -16470
}
}
element {
scale: 14
area {
color: 13626551
- priority: -16439
+ priority: -16471
}
symbol {
name: "campsite"
@@ -64669,7 +65674,7 @@ cont {
scale: 15
area {
color: 13626551
- priority: -16440
+ priority: -16472
}
symbol {
name: "campsite"
@@ -64680,7 +65685,7 @@ cont {
scale: 16
area {
color: 13626551
- priority: -16441
+ priority: -16473
}
symbol {
name: "campsite"
@@ -64754,35 +65759,35 @@ cont {
scale: 12
area {
color: 13626551
- priority: -16442
+ priority: -16474
}
}
element {
scale: 13
area {
color: 13626551
- priority: -16443
+ priority: -16475
}
}
element {
scale: 14
area {
color: 13626551
- priority: -16444
+ priority: -16476
}
}
element {
scale: 15
area {
color: 13626551
- priority: -16445
+ priority: -16477
}
}
element {
scale: 16
area {
color: 13626551
- priority: -16446
+ priority: -16478
}
}
element {
@@ -64834,6 +65839,45 @@ cont {
}
}
}
+cont {
+ name: "tourism-chalet"
+ element {
+ scale: 17
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "tourism-guest_house"
element {
@@ -65059,6 +66103,57 @@ cont {
}
}
}
+cont {
+ name: "tourism-information-board"
+ element {
+ scale: 17
+ symbol {
+ name: "information"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "tourism-information-guidepost"
element {
@@ -65110,6 +66205,108 @@ cont {
}
}
}
+cont {
+ name: "tourism-information-map"
+ element {
+ scale: 17
+ symbol {
+ name: "information"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
+cont {
+ name: "tourism-information-office"
+ element {
+ scale: 17
+ symbol {
+ name: "information"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "information"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "information"
+ priority: 16003
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4210752
+ stroke_color: 16777215
+ offset_y: 10
+ }
+ priority: 15003
+ }
+ }
+}
cont {
name: "tourism-information-office"
element {
@@ -65283,35 +66480,35 @@ cont {
scale: 12
area {
color: 13626551
- priority: -16447
+ priority: -16479
}
}
element {
scale: 13
area {
color: 13626551
- priority: -16448
+ priority: -16480
}
}
element {
scale: 14
area {
color: 13626551
- priority: -16449
+ priority: -16481
}
}
element {
scale: 15
area {
color: 13626551
- priority: -16450
+ priority: -16482
}
}
element {
scale: 16
area {
color: 13626551
- priority: -16451
+ priority: -16483
}
}
element {
@@ -65446,35 +66643,35 @@ cont {
scale: 12
area {
color: 13626551
- priority: -16452
+ priority: -16484
}
}
element {
scale: 13
area {
color: 13626551
- priority: -16453
+ priority: -16485
}
}
element {
scale: 14
area {
color: 13626551
- priority: -16454
+ priority: -16486
}
}
element {
scale: 15
area {
color: 13626551
- priority: -16455
+ priority: -16487
}
}
element {
scale: 16
area {
color: 13626551
- priority: -16456
+ priority: -16488
}
}
element {
diff --git a/data/editor.config b/data/editor.config
index 7619a6756d..f62a2801b3 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -336,6 +336,8 @@
+
+
@@ -697,6 +699,11 @@
+
+
+
+
+
@@ -748,6 +755,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index f1d9b9d16c..3e42426922 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1,231 +1,231 @@
building;[building];;addr:housenumber;name;1;
-highway|residential;[highway=residential];;name;int_name;2;
-highway|service;[highway=service];;name;int_name;3;
-waterway|stream;[waterway=stream];;name;int_name;4;
-highway|unclassified;[highway=unclassified];;name;int_name;5;
-natural|water;[natural=water];;name;int_name;6;
-highway|footway;[highway=footway];;name;int_name;7;
-highway|track;[highway=track];;name;int_name;8;
-highway|tertiary;[highway=tertiary];;name;int_name;9;
-power|tower;[power=tower];;name;int_name;10;
-landuse|forest;[landuse=forest];;name;int_name;11;
-landuse|grass;[landuse=grass];;name;int_name;12;
-highway|secondary;[highway=secondary];;name;int_name;13;
-natural|wood;[natural=wood];;name;int_name;14;
-landuse|residential;[landuse=residential];;name;int_name;15;
-highway|path;[highway=path];;name;int_name;16;
-highway|bus_stop;[highway=bus_stop];;name;int_name;17;
-natural|tree;[natural=tree];;name;int_name;18;
-place|locality;[place=locality];;name;int_name;19;
-natural|coastline;[natural=coastline];;name;int_name;20;
-place|village;[place=village];;name;int_name;21;
+highway|residential;2;
+highway|service;3;
+waterway|stream;4;
+highway|unclassified;5;
+natural|water;6;
+highway|footway;7;
+highway|track;8;
+highway|tertiary;9;
+power|tower;10;
+landuse|forest;11;
+landuse|grass;12;
+highway|secondary;13;
+natural|wood;14;
+landuse|residential;15;
+highway|path;16;
+highway|bus_stop;17;
+natural|tree;18;
+place|locality;19;
+natural|coastline;20;
+place|village;21;
highway|residential|oneway;[highway=residential][oneway?];x;name;int_name;22;highway|residential
-waterway|river;[waterway=river];;name;int_name;23;
+waterway|river;23;
addr:interpolation|even;[addr:interpolation=even];x;name;int_name;24;hwtag|oneway
addr:interpolation|odd;[addr:interpolation=odd];x;name;int_name;25;hwtag|private
amenity|parking;[amenity=parking][access?];;name;int_name;26;
-highway|primary;[highway=primary];;name;int_name;27;
-railway|rail;[railway=rail];;name;int_name;28;
+highway|primary;27;
+railway|rail;28;
highway|service|parking_aisle;[highway=service][service=parking_aisle];;name;int_name;29;
-place|hamlet;[place=hamlet];;name;int_name;30;
-highway|road;[highway=road];;name;int_name;31;
+place|hamlet;30;
+highway|road;31;
highway|track|grade2;[highway=track][tracktype=grade2];;name;int_name;32;
-natural|wetland;[natural=wetland];;name;int_name;33;
+natural|wetland;33;
highway|track|grade3;[highway=track][tracktype=grade3];;name;int_name;34;
boundary|administrative|8;[boundary=administrative][admin_level=8];;name;int_name;35;
-amenity|school;[amenity=school];;name;int_name;36;
-highway|cycleway;[highway=cycleway];;name;int_name;37;
-landuse|farm;[landuse=farm];;name;int_name;38;
-amenity|place_of_worship;[amenity=place_of_worship];;name;int_name;39;
+amenity|school;36;
+highway|cycleway;37;
+landuse|farm;38;
+amenity|place_of_worship;39;
highway|track|grade1;[highway=track][tracktype=grade1];;name;int_name;40;
highway|secondary|oneway;[highway=secondary][oneway?];x;name;int_name;41;highway|secondary
highway|service|driveway;[highway=service][service=driveway];;name;int_name;42;
-man_made|survey_point;[man_made=survey_point];;name;int_name;43;
+man_made|survey_point;43;x
highway|motorway_link|oneway;[highway=motorway_link][oneway?];x;name;int_name;44;highway|motorway_link
waterway|stream|intermittent;[waterway=stream][intermittent=yes];;name;int_name;45;
highway|track|grade4;[highway=track][tracktype=grade4];;name;int_name;46;
highway|tertiary|oneway;[highway=tertiary][oneway?];x;name;int_name;47;highway|tertiary
-landuse|farmland;[landuse=farmland];;name;int_name;48;
-barrier|fence;[barrier=fence];;name;int_name;49;
+landuse|farmland;48;
+barrier|fence;49;
highway|primary|oneway;[highway=primary][oneway?];x;name;int_name;50;highway|primary
-power|pole;[power=pole];;name;int_name;51;
-waterway|riverbank;[waterway=riverbank];;name;int_name;52;
+power|pole;51;
+waterway|riverbank;52;
highway|path|bicycle;[highway=path][bicycle?];;name;int_name;53;
-landuse|meadow;[landuse=meadow];;name;int_name;54;
-highway|living_street;[highway=living_street];;name;int_name;55;
+landuse|meadow;54;
+highway|living_street;55;
highway|unclassified|oneway;[highway=unclassified][oneway?];x;name;int_name;56;highway|unclassified
-natural|peak;[natural=peak];;name;int_name;57;
+natural|peak;57;
highway|motorway|oneway;[highway=motorway][oneway?];x;name;int_name;58;highway|motorway
-highway|steps;[highway=steps];;name;int_name;59;
-waterway|ditch;[waterway=ditch];;name;int_name;60;
-amenity|restaurant;[amenity=restaurant];;name;int_name;61;
-landuse|reservoir;[landuse=reservoir];;name;int_name;62;
+highway|steps;59;
+waterway|ditch;60;
+amenity|restaurant;61;
+landuse|reservoir;62;
highway|track|grade5;[highway=track][tracktype=grade5];;name;int_name;63;
-amenity|bench;[amenity=bench];;name;int_name;64;
+amenity|bench;64;
highway|service|oneway;[highway=service][oneway?];x;name;int_name;65;highway|service
-highway|trunk;[highway=trunk];;name;int_name;66;
-amenity|fuel;[amenity=fuel];;name;int_name;67;
-leisure|park;[leisure=park];;name;int_name;68;
-leisure|pitch;[leisure=pitch];;name;int_name;69;
-highway|pedestrian;[highway=pedestrian];;name;int_name;70;
-natural|scrub;[natural=scrub];;name;int_name;71;
+highway|trunk;66;
+amenity|fuel;67;
+leisure|park;68;
+leisure|pitch;69;
+highway|pedestrian;70;
+natural|scrub;71;
highway|motorway|bridge;[highway=motorway][bridge?];;name;int_name;72;
highway|trunk|oneway;[highway=trunk][oneway?];x;name;int_name;73;highway|trunk
-railway|level_crossing;[railway=level_crossing];;name;int_name;74;
-landuse|industrial;[landuse=industrial];;name;int_name;75;
-barrier|wall;[barrier=wall];;name;int_name;76;
-amenity|post_box;[amenity=post_box];;name;int_name;77;
-place|town;[place=town];;name;int_name;78;
-power|line;[power=line];;name;int_name;79;
-landuse|farmyard;[landuse=farmyard];;name;int_name;80;
+railway|level_crossing;74;
+landuse|industrial;75;
+barrier|wall;76;
+amenity|post_box;77;
+place|town;78;
+power|line;79;
+landuse|farmyard;80;
highway|residential|bridge;[highway=residential][bridge?];;name;int_name;81;
railway|rail|bridge;[railway=rail][bridge?];;name;int_name;82;
boundary|administrative|10;[boundary=administrative][admin_level=10];;name;int_name;83;
boundary|administrative|6;[boundary=administrative][admin_level=6];;name;int_name;84;
highway|secondary|bridge;[highway=secondary][bridge?];;name;int_name;85;
highway|tertiary|bridge;[highway=tertiary][bridge?];;name;int_name;86;
-barrier|bollard;[barrier=bollard];;name;int_name;87;
-leisure|playground;[leisure=playground];;name;int_name;88;
-waterway|drain;[waterway=drain];;name;int_name;89;
-waterway|canal;[waterway=canal];;name;int_name;90;
+barrier|bollard;87;
+leisure|playground;88;
+waterway|drain;89;
+waterway|canal;90;
highway|trunk_link|oneway;[highway=trunk_link][oneway?];x;name;int_name;91;highway|trunk_link
highway|unclassified|bridge;[highway=unclassified][bridge?];;name;int_name;92;
landuse|forest|deciduous;[landuse=forest][wood=deciduous];;name;int_name;93;
-place|island;[place=island];;name;int_name;94;
+place|island;94;
highway|primary|bridge;[highway=primary][bridge?];;name;int_name;95;
highway|primary_link|oneway;[highway=primary_link][oneway?];x;name;int_name;96;highway|primary_link
-amenity|fast_food;[amenity=fast_food];;name;int_name;97;
+amenity|fast_food;97;
highway|footway|bridge;[highway=footway][bridge?];;name;int_name;98;
-amenity|bank;[amenity=bank];;name;int_name;99;
-barrier|hedge;[barrier=hedge];;name;int_name;100;
-amenity|pub;[amenity=pub];;name;int_name;101;
-leisure|swimming_pool;[leisure=swimming_pool];;name;int_name;102;
-natural|land;[natural=land];;name;int_name;103;
-tourism|hotel;[tourism=hotel];;name;int_name;104;
-landuse|cemetery;[landuse=cemetery];;name;int_name;105;
-sport|soccer;[sport=soccer];;name;int_name;106;
+amenity|bank;99;
+barrier|hedge;100;
+amenity|pub;101;
+leisure|swimming_pool;102;
+natural|land;103;
+tourism|hotel;104;
+landuse|cemetery;105;
+sport|soccer;106;
boundary|administrative|4;[boundary=administrative][admin_level=4];;name;int_name;107;
-amenity|cafe;[amenity=cafe];;name;int_name;108;
-amenity|recycling;[amenity=recycling];;name;int_name;109;
-leisure|garden;[leisure=garden];;name;int_name;110;
-landuse|commercial;[landuse=commercial];;name;int_name;111;
-railway|station;[railway=station];;name;int_name;112;
+amenity|cafe;108;
+amenity|recycling;109;
+leisure|garden;110;
+landuse|commercial;111;
+railway|station;112;
highway|path|hiking;[highway=path][route=hiking];;name;int_name;113;
-amenity|hospital;[amenity=hospital];;name;int_name;114;
+amenity|hospital;114;
waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115;
highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
-amenity|post_office;[amenity=post_office];;name;int_name;117;
-landuse|quarry;[landuse=quarry];;name;int_name;118;
-amenity|pharmacy;[amenity=pharmacy];;name;int_name;119;
-man_made|pier;[man_made=pier];;name;int_name;120;
-highway|motorway_junction;[highway=motorway_junction];;name;int_name;121;
-amenity|telephone;[amenity=telephone];;name;int_name;122;
+amenity|post_office;117;
+landuse|quarry;118;
+amenity|pharmacy;119;
+man_made|pier;120;
+highway|motorway_junction;121;
+amenity|telephone;122;
waterway|stream|tunnel;[waterway=stream][tunnel?];;name;int_name;123;
tourism|information|guidepost;[tourism=information][information=guidepost];;name;int_name;124;
amenity|parking|fee;[amenity=parking][fee?];;name;int_name;125;
-amenity|kindergarten;[amenity=kindergarten];;name;int_name;126;
+amenity|kindergarten;126;
power|generator|wind;[power=generator][power_source=wind];;name;int_name;127;
-place|suburb;[place=suburb];;name;int_name;128;
-landuse|allotments;[landuse=allotments];;name;int_name;129;
+place|suburb;128;
+landuse|allotments;129;
landuse|forest|coniferous;[landuse=forest][wood=coniferous];;name;int_name;130;
landuse|forest|mixed;[landuse=forest][wood=mixed];;name;int_name;131;
natural|wood|mixed;[natural=wood][wood=mixed];;name;int_name;132;
-sport|tennis;[sport=tennis];;name;int_name;133;
-landuse|vineyard;[landuse=vineyard];;name;int_name;134;
-aeroway|taxiway;[aeroway=taxiway];;name;int_name;135;
-aeroway|aerodrome;[aeroway=aerodrome];;name;int_name;136;
+sport|tennis;133;
+landuse|vineyard;134;
+aeroway|taxiway;135;
+aeroway|aerodrome;136;
highway|secondary|junction;[highway=secondary][junction?];x;name;int_name;137;highway|secondary
-amenity|fire_station;[amenity=fire_station];;name;int_name;138;
-landuse|retail;[landuse=retail];;name;int_name;139;
-leisure|nature_reserve;[leisure=nature_reserve];;name;int_name;140;
+amenity|fire_station;138;
+landuse|retail;139;
+leisure|nature_reserve;140;
leisure|pitch|tennis;[leisure=pitch][sport=tennis];;name;int_name;141;
-tourism|information;[tourism=information];;name;int_name;142;
+tourism|information;142;
highway|motorway_link|bridge;[highway=motorway_link][bridge?];;name;int_name;143;
-railway|abandoned;[railway=abandoned];;name;int_name;144;
+railway|abandoned;144;
amenity|parking|private;[amenity=parking][access=private];;name;int_name;145;
boundary|administrative|7;[boundary=administrative][admin_level=7];;name;int_name;146;
-tourism|attraction;[tourism=attraction];;name;int_name;147;
+tourism|attraction;147;
highway|tertiary|junction;[highway=tertiary][junction?];x;name;int_name;148;highway|tertiary
highway|track|private;[highway=track][access=private];x;name;int_name;149;highway|track
-railway|tram;[railway=tram];;name;int_name;150;
-amenity|toilets;[amenity=toilets];;name;int_name;151;
+railway|tram;150;
+amenity|toilets;151;
highway|residential|junction;[highway=residential][junction?];x;name;int_name;152;highway|residential
highway|footway|permissive;[highway=footway][access=permissive];;name;int_name;153;
highway|primary|junction;[highway=primary][junction?];x;name;int_name;154;highway|primary
-landuse|construction;[landuse=construction];;name;int_name;155;
-tourism|viewpoint;[tourism=viewpoint];;name;int_name;156;
-amenity|atm;[amenity=atm];;name;int_name;157;
+landuse|construction;155;
+tourism|viewpoint;156;
+amenity|atm;157;
highway|pedestrian|area;[highway=pedestrian][area?];;name;int_name;158;
-tourism|picnic_site;[tourism=picnic_site];;name;int_name;159;
-shop|supermarket;[shop=supermarket];;name;int_name;160;
-shop|convenience;[shop=convenience];;name;int_name;161;
-shop|bakery;[shop=bakery];;name;int_name;162;
-highway|construction;[highway=construction];;name;int_name;163;
+tourism|picnic_site;159;
+shop|supermarket;160;
+shop|convenience;161;
+shop|bakery;162;
+highway|construction;163;
highway|cycleway|bridge;[highway=cycleway][bridge?];;name;int_name;164;
-leisure|sports_centre;[leisure=sports_centre];;name;int_name;165;
+leisure|sports_centre;165;
highway|path|mountain_hiking;[highway=path][sac_scale=mountain_hiking];;name;int_name;166;
-tourism|camp_site;[tourism=camp_site];;name;int_name;167;
-highway|bridleway;[highway=bridleway];;name;int_name;168;
-natural|heath;[natural=heath];;name;int_name;169;
-landuse|basin;[landuse=basin];;name;int_name;170;
-amenity|library;[amenity=library];;name;int_name;171;
+tourism|camp_site;167;
+highway|bridleway;168;
+natural|heath;169;
+landuse|basin;170;
+amenity|library;171;
natural|wood|coniferous;[natural=wood][wood=coniferous];;name;int_name;172;
-landuse|recreation_ground;[landuse=recreation_ground];;name;int_name;173;
-landuse|village_green;[landuse=village_green];;name;int_name;174;
-amenity|drinking_water;[amenity=drinking_water];;name;int_name;175;
-amenity|university;[amenity=university];;name;int_name;176;
+landuse|recreation_ground;173;
+landuse|village_green;174;
+amenity|drinking_water;175;
+amenity|university;176;
highway|secondary_link|oneway;[highway=secondary_link][oneway?];x;name;int_name;177;highway|secondary_link
-power|sub_station;[power=sub_station];;name;int_name;178;
-railway|tram_stop;[railway=tram_stop];;name;int_name;179;
-place|city;[place=city];;name;int_name;180;
-amenity|shelter;[amenity=shelter];;name;int_name;181;
-natural|beach;[natural=beach];;name;int_name;182;
+power|sub_station;178;power|substation
+railway|tram_stop;179;
+place|city;180;
+amenity|shelter;181;
+natural|beach;182;
highway|footway|tunnel;[highway=footway][tunnel?];;name;int_name;183;
-shop|hairdresser;[shop=hairdresser];;name;int_name;184;
-amenity|hunting_stand;[amenity=hunting_stand];;name;int_name;185;
+shop|hairdresser;184;
+amenity|hunting_stand;185;
boundary|administrative|9;[boundary=administrative][admin_level=9];;name;int_name;186;
-amenity|fountain;[amenity=fountain];;name;int_name;187;
-highway|primary_link;[highway=primary_link];;name;int_name;188;
-amenity|bar;[amenity=bar];;name;int_name;189;
-landuse|garages;[landuse=garages];;name;int_name;190;
+amenity|fountain;187;
+highway|primary_link;188;
+amenity|bar;189;
+landuse|garages;190;
boundary|administrative|2;[boundary=administrative][admin_level=2];;name;int_name;191;
-leisure|common;[leisure=common];;name;int_name;192;
+leisure|common;192;
highway|track|bridge;[highway=track][bridge?];;name;int_name;193;
highway|path|bridge;[highway=path][bridge?];;name;int_name;194;
piste:type|nordic;[piste:type=nordic];;name;int_name;195;
-highway|motorway;[highway=motorway];;name;int_name;196;
-railway|crossing;[railway=crossing];;name;int_name;197;
-boundary|national_park;[boundary=national_park];;name;int_name;198;
+highway|motorway;196;
+railway|crossing;197;
+boundary|national_park;198;
natural|wood|deciduous;[natural=wood][wood=deciduous];;name;int_name;199;
-waterway|dam;[waterway=dam];;name;int_name;200;
-highway|motorway_link;[highway=motorway_link];;name;int_name;201;
-leisure|golf_course;[leisure=golf_course];;name;int_name;202;
+waterway|dam;200;
+highway|motorway_link;201;
+leisure|golf_course;202;
highway|service|bridge;[highway=service][bridge?];;name;int_name;203;
-power|minor_line;[power=minor_line];;name;int_name;204;
-natural|marsh;[natural=marsh];x;name;int_name;205;natural|wetland|marsh
-leisure|stadium;[leisure=stadium];;name;int_name;206;
-amenity|doctors;[amenity=doctors];;name;int_name;207;
-railway|disused;[railway=disused];;name;int_name;208;
-aeroway|runway;[aeroway=runway];;name;int_name;209;
-railway|halt;[railway=halt];;name;int_name;210;
+power|minor_line;204;
+natural|marsh;205;natural|wetland|marsh
+leisure|stadium;206;
+amenity|doctors;207;
+railway|disused;208;
+aeroway|runway;209;
+railway|halt;210;
addr:interpolation|all;[addr:interpolation=all];x;name;int_name;211;
railway|rail|tunnel;[railway=rail][tunnel?];;name;int_name;212;
-man_made|wastewater_plant;[man_made=wastewater_plant];;name;int_name;213;
+man_made|wastewater_plant;213;
highway|trunk|motorroad;[highway=trunk][motorroad?];x;name;int_name;214;highway|trunk
-place|county;[place=county];;name;int_name;215;
+place|county;215;
highway|footway|private;[highway=footway][access=private];x;name;int_name;216;highway|footway
-landuse|conservation;[landuse=conservation];x;name;int_name;217;
+landuse|conservation;217;x
highway|unclassified|junction;[highway=unclassified][junction?];x;name;int_name;218;highway|unclassified
-power|station;[power=station];;name;int_name;219;
-sport|swimming;[sport=swimming];;name;int_name;220;
-leisure|track;[leisure=track];;name;int_name;221;
-highway|trunk_link;[highway=trunk_link];;name;int_name;222;
-barrier|retaining_wall;[barrier=retaining_wall];;name;int_name;223;
-amenity|college;[amenity=college];;name;int_name;224;
-sport|baseball;[sport=baseball];;name;int_name;225;
+power|station;219;
+sport|swimming;220;
+leisure|track;221;
+highway|trunk_link;222;
+barrier|retaining_wall;223;
+amenity|college;224;
+sport|baseball;225;
highway|service|area;[highway=service][area?];;name;int_name;226;
highway|residential|area;[highway=residential][area?];;name;int_name;227;
-amenity|bus_station;[amenity=bus_station];;name;int_name;228;
+amenity|bus_station;228;
highway|track|permissive;[highway=track][access=permissive];;name;int_name;229;
waterway|drain|tunnel;[waterway=drain][tunnel?];;name;int_name;230;
landuse|cemetery|christian;[landuse=cemetery][religion=christian];;name;int_name;231;
@@ -236,143 +236,143 @@ highway|unclassified|tunnel;[highway=unclassified][tunnel?];;name;int_name;235;
highway|track|destination;[highway=track][access=destination];x;name;int_name;236;highway|track
highway|trunk|junction;[highway=trunk][junction?];x;name;int_name;237;highway|trunk
highway|residential|tunnel;[highway=residential][tunnel?];;name;int_name;238;
-aeroway|helipad;[aeroway=helipad];;name;int_name;239;
+aeroway|helipad;239;
highway|path|permissive;[highway=path][access=permissive];;name;int_name;240;
-place|islet;[place=islet];;name;int_name;241;
-sport|basketball;[sport=basketball];;name;int_name;242;
-amenity|cinema;[amenity=cinema];;name;int_name;243;
-amenity|theatre;[amenity=theatre];;name;int_name;244;
-highway|secondary_link;[highway=secondary_link];;name;int_name;245;
-railway|spur;[railway=spur];;name;int_name;246;
-aerialway|station;[aerialway=station];;name;int_name;247;
-landuse|brownfield;[landuse=brownfield];;name;int_name;248;
-aeroway|apron;[aeroway=apron];;name;int_name;249;
-natural|glacier;[natural=glacier];;name;int_name;250;
-amenity|grave_yard;[amenity=grave_yard];;name;int_name;251;
+place|islet;241;
+sport|basketball;242;
+amenity|cinema;243;
+amenity|theatre;244;
+highway|secondary_link;245;
+railway|spur;246;
+aerialway|station;247;
+landuse|brownfield;248;
+aeroway|apron;249;
+natural|glacier;250;
+amenity|grave_yard;251;
waterway|canal|tunnel;[waterway=canal][tunnel?];;name;int_name;252;
piste:type|downhill|easy;[piste:type=downhill][piste:difficulty=easy];;name;int_name;253;
waterway|ditch|tunnel;[waterway=ditch][tunnel?];;name;int_name;254;
-landuse|wood;[landuse=wood];x;name;int_name;255;landuse|forest
+landuse|wood;255;landuse|forest
piste:type|downhill|intermediate;[piste:type=downhill][piste:difficulty=intermediate];;name;int_name;256;
-railway|subway_entrance;[railway=subway_entrance];;name;int_name;257;
+railway|subway_entrance;257;
highway|trunk_link|motorroad;[highway=trunk_link][motorroad?];x;name;int_name;258;highway|trunk_link
-man_made|pipeline;[man_made=pipeline];;name;int_name;259;
-route|ferry;[route=ferry];;name;int_name;260;
+man_made|pipeline;259;
+route|ferry;260;
highway|trunk_link|bridge;[highway=trunk_link][bridge?];;name;int_name;261;
-landuse|military;[landuse=military];;name;int_name;262;
+landuse|military;262;
highway|service|tunnel;[highway=service][tunnel?];;name;int_name;263;
-railway|light_rail;[railway=light_rail];;name;int_name;264;
-place|region;[place=region];;name;int_name;265;
-railway|narrow_gauge;[railway=narrow_gauge];;name;int_name;266;
-railway|subway;[railway=subway];;name;int_name;267;
-natural|cave_entrance;[natural=cave_entrance];;name;int_name;268;
+railway|light_rail;264;
+place|region;265;
+railway|narrow_gauge;266;
+railway|subway;267;
+natural|cave_entrance;268;
highway|tertiary|tunnel;[highway=tertiary][tunnel?];;name;int_name;269;
-landuse|landfill;[landuse=landfill];;name;int_name;270;
-amenity|bicycle_rental;[amenity=bicycle_rental];;name;int_name;271;
+landuse|landfill;270;
+amenity|bicycle_rental;271;
highway|track|oneway;[highway=track][oneway?];x;name;int_name;272;highway|track
highway|tertiary_link|oneway;[highway=tertiary_link][oneway?];x;name;int_name;273;highway|tertiary_link
-landuse|greenfield;[landuse=greenfield];;name;int_name;274;
-tourism|alpine_hut;[tourism=alpine_hut];;name;int_name;275;
+landuse|greenfield;274;
+tourism|alpine_hut;275;
highway|footway|area;[highway=footway][area?];;name;int_name;276;
-tourism|hostel;[tourism=hostel];;name;int_name;277;
+tourism|hostel;277;
waterway|river|tunnel;[waterway=river][tunnel?];;name;int_name;278;
boundary|administrative|county;[boundary=administrative][border_type=county];;name;int_name;279;
highway|road|bridge;[highway=road][bridge?];;name;int_name;280;
boundary|administrative|3;[boundary=administrative][admin_level=3];;name;int_name;281;
man_made|pipeline|water;[man_made=pipeline][water];x;name;int_name;282;man_made|pipeline
-boundary|administrative;[boundary=administrative];;name;int_name;283;
+boundary|administrative;283;
highway|road|oneway;[highway=road][oneway?];x;name;int_name;284;highway|road
highway|path|destination;[highway=path][access=destination];x;name;int_name;285;highway|path
-sport|athletics;[sport=athletics];;name;int_name;286;
-landuse|railway;[landuse=railway];;name;int_name;287;
-leisure|slipway;[leisure=slipway];;name;int_name;288;
-tourism|caravan_site;[tourism=caravan_site];;name;int_name;289;
-place|state;[place=state];;name;int_name;290;
+sport|athletics;286;
+landuse|railway;287;
+leisure|slipway;288;
+tourism|caravan_site;289;
+place|state;290;
highway|path|private;[highway=path][access=private];x;name;int_name;291;highway|path
railway|subway|tunnel;[railway=subway][tunnel?];;name;int_name;292;
-barrier|city_wall;[barrier=city_wall];;name;int_name;293;
-place|farm;[place=farm];;name;int_name;294;
+barrier|city_wall;293;
+place|farm;294;
boundary|administrative|11;[boundary=administrative][admin_level=11];;name;int_name;295;
-waterway|weir;[waterway=weir];;name;int_name;296;
+waterway|weir;296;
highway|secondary|tunnel;[highway=secondary][tunnel?];;name;int_name;297;
railway|abandoned|bridge;[railway=abandoned][bridge?];;name;int_name;298;
-man_made|lighthouse;[man_made=lighthouse];;name;int_name;299;
+man_made|lighthouse;299;
highway|path|demanding_mountain_hiking;[highway=path][sac_scale=demanding_mountain_hiking];;name;int_name;300;
highway|primary|motorroad;[highway=primary][motorroad?];x;name;int_name;301;highway|primary
amenity|restaurant|hotel;[amenity=restaurant][hotel];x;name;int_name;302;tourism|hotel
-power|generator;[power=generator];;name;int_name;303;
+power|generator;303;
highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304;
man_made|pipeline|overground;[man_made=pipeline][location=overground];;name;int_name;305;
amenity|parking|destination;[amenity=parking][access=destination];x;name;int_name;306;amenity|parking
-highway|unsurfaced;[highway=unsurfaced];x;name;int_name;307;highway|unclassified
-highway|raceway;[highway=raceway];;name;int_name;308;
+highway|unsurfaced;307;highway|unclassified
+highway|raceway;308;
highway|primary|tunnel;[highway=primary][tunnel?];;name;int_name;309;
highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310;
landuse|conservation|private;[landuse=conservation][access=private];x;name;int_name;311;
-sport|equestrian;[sport=equestrian];;name;int_name;312;
+sport|equestrian;312;
tourism|information|office;[tourism=information][office];;name;int_name;313;
highway|footway|hiking;[highway=footway][sac_scale=hiking];;name;int_name;314;
-aeroway|gate;[aeroway=gate];;name;int_name;315;
-railway|preserved;[railway=preserved];;name;int_name;316;
+aeroway|gate;315;
+railway|preserved;316;
highway|path|horse;[highway=path][horse?];;name;int_name;317;
-landuse|field;[landuse=field];;name;int_name;318;
-highway|tertiary_link;[highway=tertiary_link];;name;int_name;319;
-leisure|water_park;[leisure=water_park];;name;int_name;320;
+landuse|field;318;
+highway|tertiary_link;319;
+leisure|water_park;320;
natural|wetland|bog;[natural=wetland][wetland=bog];;name;int_name;321;
-man_made|windmill;[man_made=windmill];;name;int_name;322;
-military|bunker;[military=bunker];;name;int_name;323;
-aerialway|chair_lift;[aerialway=chair_lift];;name;int_name;324;
+man_made|windmill;322;
+military|bunker;323;
+aerialway|chair_lift;324;
amenity|grave_yard|christian;[amenity=grave_yard][religion=christian];;name;int_name;325;
highway|trunk|tunnel;[highway=trunk][tunnel?];;name;int_name;326;
highway|steps|tunnel;[highway=steps][tunnel?];;name;int_name;327;
-amenity|car_sharing;[amenity=car_sharing];;name;int_name;328;
-sport|football;[sport=football];;name;int_name;329;
+amenity|car_sharing;328;
+sport|football;329;
highway|steps|bridge;[highway=steps][bridge?];;name;int_name;330;
highway|track|tunnel;[highway=track][tunnel?];;name;int_name;331;
highway|pedestrian|tunnel;[highway=pedestrian][tunnel?];;name;int_name;332;
power|generator|hydro;[power=generator][power_source=hydro];;name;int_name;333;
-sport|cricket;[sport=cricket];;name;int_name;334;
-sport|bowls;[sport=bowls];;name;int_name;335;
+sport|cricket;334;
+sport|bowls;335;
highway|path|tunnel;[highway=path][tunnel?];;name;int_name;336;
-man_made|breakwater;[man_made=breakwater];;name;int_name;337;
+man_made|breakwater;337;
amenity|parking|permissive|fee;[amenity=parking][access=permissive][fee?];;name;int_name;338;
railway|disused|bridge;[railway][disused?][bridge?];x;name;int_name;339;
-tourism|zoo;[tourism=zoo];;name;int_name;340;
-sport|gymnastics;[sport=gymnastics];;name;int_name;341;
+tourism|zoo;340;
+sport|gymnastics;341;
highway|trunk_link|junction;[highway=trunk_link][junction?];x;name;int_name;342;highway|trunk_link
railway|subway|bridge;[railway=subway][bridge?];;name;int_name;343;
railway|light_rail|bridge;[railway=light_rail][bridge?];;name;int_name;344;
-aeroway|terminal;[aeroway=terminal];;name;int_name;345;
+aeroway|terminal;345;
railway|tram|bridge;[railway=tram][bridge?];;name;int_name;346;
piste:type|downhill|advanced;[piste:type=downhill][piste:difficulty=advanced];;name;int_name;347;
-sport|shooting;[sport=shooting];;name;int_name;348;
-place|country;[place=country];;name;int_name;349;
+sport|shooting;348;
+place|country;349;
highway|path|alpine_hiking;[highway=path][sac_scale=alpine_hiking];;name;int_name;350;
highway|footway|destination;[highway=footway][access=destination];x;name;int_name;351;highway|footway
-sport|scuba_diving;[sport=scuba_diving];;name;int_name;352;
+sport|scuba_diving;352;
highway|cycleway|permissive;[highway=cycleway][access=permissive];;name;int_name;353;
highway|unclassified|area;[highway=unclassified][area?];;name;int_name;354;
-natural|volcano;[natural=volcano];;name;int_name;355;
+natural|volcano;355;
amenity|parking|underground|fee;[amenity=parking][location=underground][fee?];;name;int_name;356;
amenity|parking|underground;[amenity=parking][location=underground];;name;int_name;357;
man_made|pipeline|gas;[man_made=pipeline][gas];x;name;int_name;358;man_made|pipeline
amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_name;359;
-leisure|recreation_ground;[leisure=recreation_ground];;name;int_name;360;
+leisure|recreation_ground;360;
highway|footway|mountain_hiking;[highway=footway][sac_scale=mountain_hiking];;name;int_name;361;
highway|service|driveway|bridge;[highway=service][service=driveway][bridge?];;name;int_name;362;
amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee?];;name;int_name;363;
leisure|track|area;[leisure=track][area?];x;name;int_name;364;
-highway|byway;[highway=byway];x;name;int_name;365;highway|track
+highway|byway;365;highway|track
piste:type|downhill|novice;[piste:type=downhill][piste:difficulty=novice];;name;int_name;366;
railway|narrow_gauge|bridge;[railway=narrow_gauge][bridge?];;name;int_name;367;
-noexit|motorcar;[noexit=motorcar];x;name;int_name;368;
+noexit|motorcar;368;x
highway|service|parking_aisle|tunnel;[highway=service][service=parking_aisle][tunnel?];x;name;int_name;369;highway|service|parking_aisle
highway|bridleway|permissive;[highway=bridleway][access=permissive];;name;int_name;370;
-railway|construction;[railway=construction];;name;int_name;371;
+railway|construction;371;
highway|primary_link|junction;[highway=primary_link][junction?];x;name;int_name;372;highway|primary_link
-landuse|greenhouse_horticulture;[landuse=greenhouse_horticulture];;name;int_name;373;
+landuse|greenhouse_horticulture;373;
highway|primary_link|motorroad;[highway=primary_link][motorroad?];x;name;int_name;374;highway|primary_link
-amenity|bureau_de_change;[amenity=bureau_de_change];;name;int_name;375;
+amenity|bureau_de_change;375;
power|generator|photovoltaic;[power=generator][generator:type=photovoltaic];;name;int_name;376;
highway|motorway_link|junction;[highway=motorway_link][junction?];x;name;int_name;377;highway|motorway_link
highway|bridleway|bridge;[highway=bridleway][bridge?];;name;int_name;378;
@@ -380,17 +380,17 @@ highway|service|driveway|tunnel;[highway=service][service=driveway][tunnel?];;na
highway|track|cutting;[highway=track][cutting?];x;name;int_name;380;highway|track
landuse|basin|retention;[landuse=basin][basin=retention];x;name;int_name;381;natural|water
railway|narrow_gauge|tunnel;[railway=narrow_gauge][tunnel?];;name;int_name;382;
-railway|dismantled;[railway=dismantled];x;name;int_name;383;
-waterway|dock;[waterway=dock];;name;int_name;384;
-natural|forest;[natural=forest];x;name;int_name;385;natural|wood
+railway|dismantled;383;x
+waterway|dock;384;
+natural|forest;385;natural|wood
highway|service|driveway|area;[highway=service][service=driveway][area?];;name;int_name;386;
man_made|pipeline|heat;[man_made=pipeline][type=heat];x;name;int_name;387;man_made|pipeline
place|city|capital;[place=city][capital?];;name;int_name;388;
-aerialway|cable_car;[aerialway=cable_car];;name;int_name;389;
+aerialway|cable_car;389;
piste:type|downhill;[piste:type=downhill];;name;int_name;390;
-sport|american_football;[sport=american_football];;name;int_name;391;
+sport|american_football;391;
highway|cycleway|destination;[highway=cycleway][access=destination];x;name;int_name;392;highway|cycleway
-man_made|cairn;[man_made=cairn];;name;int_name;393;
+man_made|cairn;393;
railway|preserved|bridge;[railway=preserved][bridge?];;name;int_name;394;
highway|path|demanding_alpine_hiking;[highway=path][sac_scale=demanding_alpine_hiking];;name;int_name;395;
landuse|basin|infiltration;[landuse=basin][basin=infiltration];x;name;int_name;396;natural|water
@@ -401,17 +401,17 @@ railway|abandoned|tunnel;[railway=abandoned][tunnel?];;name;int_name;400;
highway|living_street|area;[highway=living_street][area?];x;name;int_name;401;area:highway|living_street
piste:type|sled;[piste:type=sled];;name;int_name;402;
aerialway|chair_lift|4;[aerialway=chair_lift][piste:lift:occupancy=4];x;name;int_name;403;aerialway|chair_lift
-leisure|dog_park;[leisure=dog_park];;name;int_name;404;
-aerialway|gondola;[aerialway=gondola];;name;int_name;405;
-historic|museum;[historic=museum];;name;int_name;406;
+leisure|dog_park;404;
+aerialway|gondola;405;
+historic|museum;406;
highway|living_street|bridge;[highway=living_street][bridge?];;name;int_name;407;
highway|service|cutting;[highway=service][cutting?];x;name;int_name;408;highway|service
-railway|monorail;[railway=monorail];;name;int_name;409;
+railway|monorail;409;
highway|road|junction;[highway=road][junction?];x;name;int_name;410;highway|road
man_made|pipeline|oil;[man_made=pipeline][type=oil];x;name;int_name;411;man_made|pipeline
leisure|park|private;[leisure=park][access=private];;name;int_name;412;
highway|secondary|motorroad;[highway=secondary][motorroad?];x;name;int_name;413;highway|secondary
-noexit|motor_vehicle;[noexit=motor_vehicle];;name;int_name;414;
+noexit|motor_vehicle;414;
highway|service|parking_aisle|bridge;[highway=service][service=parking_aisle][bridge?];x;name;int_name;415;highway|service|parking_aisle
highway|motorway|tunnel;[highway=motorway][tunnel?];;name;int_name;416;
railway|light_rail|tunnel;[railway=light_rail][tunnel?];;name;int_name;417;
@@ -419,21 +419,21 @@ highway|service|parking_aisle|area;[highway=service][service=parking_aisle][area
highway|residential|construction;[highway=residential][construction?];x;name;int_name;419;highway|construction
highway|motorway|construction;[highway=motorway][construction?];x;name;int_name;420;highway|construction
highway|path|cutting;[highway=path][cutting?];x;name;int_name;421;highway|path
-landuse|scrub;[landuse=scrub];x;name;int_name;422;natural|scrub
+landuse|scrub;422;natural|scrub
highway|road|tunnel;[highway=road][tunnel?];;name;int_name;423;
-sport|archery;[sport=archery];;name;int_name;424;
+sport|archery;424;
railway|construction|bridge;[railway][construction?][bridge?];x;name;int_name;425;
highway|track|grade2|area;[highway=track][tracktype=grade2][area?];x;name;int_name;426;
-highway|ford;[highway=ford];;name;int_name;427;
+highway|ford;427;
highway|path|area;[highway=path][area?];x;name;int_name;428;area:highway|path
-railway|siding;[railway=siding];;name;int_name;429;
+railway|siding;429;
highway|track|area;[highway=track][area?];;name;int_name;430;
-highway|minor;[highway=minor];x;name;int_name;431;highway|unclassified
-railway|funicular;[railway=funicular];;name;int_name;432;
+highway|minor;431;highway|unclassified
+railway|funicular;432;
amenity|parking|public|fee;[amenity=parking][access=public][fee?];x;name;int_name;433;amenity|parking|fee
-historic|battlefield;[historic=battlefield];;name;int_name;434;
+historic|battlefield;434;
highway|primary|construction;[highway=primary][construction?];x;name;int_name;435;highway|construction
-sport|australian_football;[sport=australian_football];;name;int_name;436;
+sport|australian_football;436;
railway|disused|tunnel;[railway][disused?][tunnel?];x;name;int_name;437;
highway|secondary_link|junction;[highway=secondary_link][junction?];x;name;int_name;438;highway|secondary_link
highway|cycleway|private;[highway=cycleway][access=private];x;name;int_name;439;highway|cycleway
@@ -444,42 +444,42 @@ amenity|parking|public;[amenity=parking][access=public];x;name;int_name;443;amen
highway|path|difficult_alpine_hiking;[highway=path][sac_scale=difficult_alpine_hiking];;name;int_name;444;
earthquake:damage|spontaneous_camp;[earthquake:damage=spontaneous_camp];;name;int_name;445;
highway|cycleway|cutting;[highway=cycleway][cutting?];x;name;int_name;446;highway|cycleway
-railway|yard;[railway=yard];;name;int_name;447;
+railway|yard;447;
highway|trunk|cutting;[highway=trunk][cutting?];x;name;int_name;448;highway|trunk
-natural|meadow;[natural=meadow];;name;int_name;449;
+natural|meadow;449;
highway|motorway|cutting;[highway=motorway][cutting?];x;name;int_name;450;highway|motorway
-railway|razed;[railway=razed];;name;int_name;451;
+railway|razed;451;
highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_mountain_hiking];;name;int_name;452;
aerialway|chair_lift|6;[aerialway=chair_lift][piste:lift:occupancy=6];x;name;int_name;453;aerialway|chair_lift
landuse|basin|detention;[landuse=basin][basin=detention];x;name;int_name;454;natural|water
-landuse|orchard;[landuse=orchard];;name;int_name;455;
+landuse|orchard;455;
highway|track|grade1|area;[highway=track][tracktype=grade1][area?];x;name;int_name;456;highway|track
highway|living_street|tunnel;[highway=living_street][tunnel?];;name;int_name;457;
highway|secondary|construction;[highway=secondary][construction?];x;name;int_name;458;highway|construction
highway|living_street|junction;[highway=living_street][junction?];x;name;int_name;459;highway|living_street
railway|construction|tunnel;[railway][construction?][tunnel?];x;name;int_name;460;
-sport|handball;[sport=handball];;name;int_name;461;
+sport|handball;461;
boundary|administrative|city;[boundary=administrative][border_type=city];;name;int_name;462;
piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride];;name;int_name;463;
amenity|restaurant|vegetarian;[amenity=restaurant][cuisine=vegetarian];x;name;int_name;464;amenity|restaurant
communication|line|submarine;[communication=line][location=submarine];x;name;int_name;465;communication|line
piste:type|downhill|expert;[piste:type=downhill][piste:difficulty=expert];;name;int_name;466;
-landuse|salt_pond;[landuse=salt_pond];;name;int_name;467;
+landuse|salt_pond;467;
landuse|reservoir|water_storage;[landuse=reservoir][reservoir=water_storage];x;name;int_name;468;natural|water
railway|monorail|bridge;[railway=monorail][bridge?];;name;int_name;469;
highway|steps|area;[highway=steps][area?];x;name;int_name;470;area:highway|steps
-railway|proposed;[railway=proposed];x;name;int_name;471;
+railway|proposed;471;x
highway|tertiary|construction;[highway=tertiary][construction?];x;name;int_name;472;
landuse|wood|deciduous;[landuse=wood][wood=deciduous];x;name;int_name;473;highway|construction
-natural|grass;[natural=grass];x;name;int_name;474;natural|grassland
+natural|grass;474;natural|grassland
highway|road|area;[highway=road][area?];x;name;int_name;475;
highway|tertiary|area;[highway=tertiary][area?];x;name;int_name;476;
piste:lift|platter;[piste:lift=platter];;name;int_name;477;
man_made|pipeline|natural_gas;[man_made=pipeline][type=natural_gas];x;name;int_name;478;man_made|pipeline
highway|unclassified|disused;[highway=unclassified][disused?];x;name;int_name;479;
railway|preserved|tunnel;[railway=preserved][tunnel?];;name;int_name;480;
-noexit|vehicle;[noexit=vehicle];x;name;int_name;481;
-highway|disused;[highway=disused];x;name;int_name;482;
+noexit|vehicle;481;x
+highway|disused;482;x
highway|unclassified|construction;[highway=unclassified][construction?];x;name;int_name;483;highway|construction
highway|service|disused;[highway=service][disused?];x;name;int_name;484;
highway|service|construction;[highway=service][construction?];x;name;int_name;485;highway|construction
@@ -496,31 +496,31 @@ amenity|parking|park_and_ride;[amenity=parking][parking=park_and_ride];;name;int
highway|track|dyke;[highway=track][dyke?];x;name;int_name;496;highway|track
highway|track|grade3|area;[highway=track][tracktype=grade3][area?];x;name;int_name;497;
landuse|wood|mixed;[landuse=wood][wood=mixed];x;name;int_name;498;landuse|forest
-waterway|lock;[waterway=lock];;name;int_name;499;
+waterway|lock;499;
highway|path|dyke;[highway=path][dyke?];x;name;int_name;500;highway|path
highway|motorway|junction;[highway=motorway][junction?];x;name;int_name;501;highway|motorway
highway|motorway_link|construction;[highway=motorway_link][construction?];x;name;int_name;502;highway|construction
highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;
-highway|footpath;[highway=footpath];x;name;int_name;504;highway|footway
+highway|footpath;504;highway|footway
highway|path|disused;[highway=path][disused?];x;name;int_name;505;
highway|tertiary|motorroad;[highway=tertiary][motorroad?];x;name;int_name;506;highway|tertiary
-leisure|green;[leisure=green];x;name;int_name;507;
+leisure|green;507;x
landuse|reservoir|sewage;[landuse=reservoir][reservoir=sewage];x;name;int_name;508;natural|water
railway|spur|bridge;[railway=spur][bridge?];;name;int_name;509;
highway|track|disused;[highway=track][disused?];x;name;int_name;510;
highway|tertiary_link|junction;[highway=tertiary_link][junction?];x;name;int_name;511;highway|tertiary_link
highway|track|grade3|destination;[highway=track][tracktype=grade3][access=destination];x;name;int_name;512;highway|track
-sport|curling;[sport=curling];;name;int_name;513;
+sport|curling;513;
landuse|reservoir|evaporator;[landuse=reservoir][reservoir=evaporator];x;name;int_name;514;natural|water
landuse|wood|coniferous;[landuse=wood][wood=coniferous];x;name;int_name;515;landuse|forest
natural|scrub|deciduous;[natural=scrub][wood=deciduous];x;name;int_name;516;
highway|footway|disused;[highway=footway][disused?];x;name;int_name;517;
leisure|playground|tennis;[leisure=playground][sport=tennis];;name;int_name;518;
highway|secondary|area;[highway=secondary][area?];x;name;int_name;519;
-sport|diving;[sport=diving];;name;int_name;520;
+sport|diving;520;
highway|track|grade3|private;[highway=track][tracktype=grade3][access=private];x;name;int_name;521;highway|track|grade3
boundary|administrative|suburb;[boundary=administrative][border_type=suburb];;name;int_name;522;
-natural|quarry;[natural=quarry];x;name;int_name;523;
+natural|quarry;523;x
railway|monorail|tunnel;[railway=monorail][tunnel?];;name;int_name;524;
railway|funicular|bridge;[railway=funicular][bridge?];;name;int_name;525;
highway|trunk_link|construction;[highway=trunk_link][construction?];x;name;int_name;526;highway|construction
@@ -530,16 +530,16 @@ highway|footway|alpine_hiking;[highway=footway][sac_scale=alpine_hiking];;name;i
natural|scrub|mixed;[natural=scrub][wood=mixed];x;name;int_name;530;
highway|byway|bridge;[highway=byway][bridge?];x;name;int_name;531;highway|track
man_made|pipeline|hot_water;[man_made=pipeline][type=hot_water];x;name;int_name;532;man_made|pipeline
-leisure|landscape_reserve;[leisure=landscape_reserve];;name;int_name;533;
-leisure|playing_fields;[leisure=playing_fields];x;name;int_name;534;
+leisure|landscape_reserve;533;
+leisure|playing_fields;534;x
highway|secondary_link|motorroad;[highway=secondary_link][motorroad];x;name;int_name;535;highway|secondary_link
boundary|administrative|state;[boundary=administrative][border_type=state];;name;int_name;536;
highway|cycleway|dyke;[highway=cycleway][dyke?];x;name;int_name;537;highway|cycleway
highway|cycleway|area;[highway=cycleway][area?];x;name;int_name;538;
railway|funicular|tunnel;[railway=funicular][tunnel?];;name;int_name;539;
-barrier|cycle_barrier;[barrier=cycle_barrier];;name;int_name;540;
+barrier|cycle_barrier;540;
highway|unsurfaced|bridge;[highway=unsurfaced][bridge?];x;name;int_name;541;highway|unclassified
-amenity|speed_trap;[amenity=speed_trap];;name;int_name;542;
+amenity|speed_trap;542;
highway|track|grade4|area;[highway=track][tracktype=grade4][area?];x;name;int_name;543;area:highway|track
highway|primary|area;[highway=primary][area?];x;name;int_name;544;area:highway|primary
power|line|underground;[power=line][location=underground];;name;int_name;545;
@@ -547,7 +547,7 @@ amenity|restaurant|vegan;[amenity=restaurant][cuisine=vegan];x;name;int_name;546
highway|track|construction;[highway=track][construction?];x;name;int_name;547;highway|construction
highway|minor|oneway;[highway=minor][oneway?];x;name;int_name;548;highway|unclassified
highway|bridleway|cutting;[highway=bridleway][cutting?];x;name;int_name;549;highway|bridleway
-waterway|lock_gate;[waterway=lock_gate];;name;int_name;550;
+waterway|lock_gate;550;
railway|proposed|tunnel;[railway=proposed][tunnel?];x;name;int_name;551;
highway|primary|disused;[highway=primary][disused?];x;name;int_name;552;
highway|unsurfaced|private;[highway=unsurfaced][access=private];x;name;int_name;553;highway|unclassified
@@ -555,26 +555,26 @@ highway|path|construction;[highway=path][construction?];x;name;int_name;554;high
highway|footway|demanding_alpine_hiking;[highway=footway][sac_scale=demanding_alpine_hiking];;name;int_name;555;
railway|proposed|bridge;[railway=proposed][bridge?];x;name;int_name;556;
highway|track|grade4|destination;[highway=track][tracktype=grade4][access=destination];x;name;int_name;557;highway|track
-landuse|runway;[landuse=runway];x;name;int_name;558;
-natural|farm;[natural=farm];x;name;int_name;559;landuse|farmland
+landuse|runway;558;x
+natural|farm;559;landuse|farmland
highway|unsurfaced|oneway;[highway=unsurfaced][oneway?];x;name;int_name;560;highway|unclassified
highway|motorway_link|disused;[highway=motorway_link][disused?];x;name;int_name;561;
highway|crossing|uncontrolled;[highway=crossing][crossing=uncontrolled];x;name;int_name;562;
highway|track|junction;[highway=track][junction?];x;name;int_name;563;highway|track
-natural|lake;[natural=lake];;name;int_name;564;
+natural|lake;564;
man_made|pipeline|sewage;[man_made=pipeline][type=sewage];x;name;int_name;565;man_made|pipeline
highway|primary_link|construction;[highway=primary_link][construction?];x;name;int_name;566;highway|construction
landuse|reservoir|tailings;[landuse=reservoir][reservoir=tailings];x;name;int_name;567;natural|water
highway|secondary|disused;[highway=secondary][disused?];x;name;int_name;568;
highway|track|grade5|destination;[highway=track][tracktype=grade5][access=destination];x;name;int_name;569;highway|track
-natural|basin;[natural=basin];x;name;int_name;570;natural|water
+natural|basin;570;natural|water
aerialway|chair_lift|5;[aerialway=chair_lift][piste:lift:occupancy=5];x;name;int_name;571;
-natural|reservoir;[natural=reservoir];x;name;int_name;572;natural|water
+natural|reservoir;572;natural|water
highway|steps|construction;[highway=steps][construction?];x;name;int_name;573;highway|construction
highway|motorway|area;[highway=motorway][area?];x;name;int_name;574;
piste:lift|rope_tow;[piste:lift=rope_tow];;name;int_name;575;
-natural|pond;[natural=pond];;name;int_name;576;
-natural|industrial;[natural=industrial];x;name;int_name;577;
+natural|pond;576;
+natural|industrial;577;x
highway|secondary_link|tunnel;[highway=secondary_link][tunnel?];;name;int_name;578;
highway|pedestrian|junction;[highway=pedestrian][junction?];x;name;int_name;579;highway|pedestrian
highway|track|grade5|private;[highway=track][tracktype=grade5][access=private];x;name;int_name;580;highway|track|grade5
@@ -584,26 +584,26 @@ highway|living_street|construction;[highway=living_street][construction?];x;name
highway|track|racetrack;[highway=raceway];x;name;int_name;584;
highway|tertiary|disused;[highway=tertiary][disused?];x;name;int_name;585;
highway|steps|disused;[highway=steps][disused?];x;name;int_name;586;
-aerialway|mixed_lift;[aerialway=mixed_lift];;name;int_name;587;
-railway|planned;[railway=planned];x;name;int_name;588;
+aerialway|mixed_lift;587;
+railway|planned;588;x
highway|footway|cycleway;[highway=footway][cycleway?];x;name;int_name;589;highway|footway
power|line|submarine;[power=line][location=submarine];x;name;int_name;590;power|line
highway|track|grade3|permissive;[highway=track][tracktype=grade3][access=permissive];;name;int_name;591;
highway|track|grade4|private;[highway=track][tracktype=grade4][access=private];x;name;int_name;592;highway|track|grade4
highway|byway|permissive;[highway=byway][access=permissive];x;name;int_name;593;highway|track
-natural|railway;[natural=railway];x;name;int_name;594;
+natural|railway;594;x
highway|service|dyke;[highway=service][man_made][dyke?];x;name;int_name;595;highway|service
-railway|incline;[railway=incline];x;name;int_name;596;
+railway|incline;596;x
boundary|administrative|region;[boundary=administrative][border_type=region];;name;int_name;597;
highway|pedestrian|construction;[highway=pedestrian][construction?];x;name;int_name;598;highway|construction
highway|path|t1;[highway=path][t1];x;name;int_name;599;highway|path
-landuse|raceway;[landuse=raceway];x;name;int_name;600;
-place|continent;[place=continent];;name;int_name;601;
-natural|farmland;[natural=farmland];x;name;int_name;602;landuse|farmland
+landuse|raceway;600;x
+place|continent;601;
+natural|farmland;602;landuse|farmland
highway|footpath|private;[highway=footpath][access=private];x;name;int_name;603;highway|footway
boundary|administrative|nation;[boundary=administrative][type=nation];;name;int_name;604;
railway|dismantled|bridge;[railway=dismantled][bridge?];x;name;int_name;605;
-natural|landfill;[natural=landfill];x;name;int_name;606;
+natural|landfill;606;x
highway|byway|tunnel;[highway=byway][tunnel?];x;name;int_name;607;highway|track
piste:lift|magic_carpet;[piste:lift=magic_carpet];;name;int_name;608;
natural|scrub|coniferous;[natural=scrub][wood=coniferous];x;name;int_name;609;
@@ -612,14 +612,14 @@ highway|bridleway|destination;[highway=bridleway][access=destination];x;name;int
highway|motorway|disused;[highway=motorway][disused?];x;name;int_name;612;
landuse|runway|disused;[landuse=runway][disused?];x;name;int_name;613;
highway|unsurfaced|destination;[highway=unsurfaced][access=destination];x;name;int_name;614;highway|unclassified
-natural|brownfield;[natural=brownfield];x;name;int_name;615;
-natural|village_green;[natural=village_green];x;name;int_name;616;
+natural|brownfield;615;x
+natural|village_green;616;x
highway|track|embankment;[highway=track][embankment?];x;name;int_name;617;highway|track
highway|footpath|bridge;[highway=footpath][bridge?];x;name;int_name;618;highway|footway
piste:lift|j-bar;[piste:lift=j-bar];;name;int_name;619;
landuse|scrub|deciduous;[landuse=scrub][wood=deciduous];x;name;int_name;620;
highway|bridleway|area;[highway=bridleway][area?];x;name;int_name;621;
-natural|military;[natural=military];x;name;int_name;622;
+natural|military;622;x
highway|byway|private;[highway=byway][access=private];x;name;int_name;623;highway|track
natural|forest|mixed;[natural=forest][wood=mixed];x;name;int_name;624;landuse|forest
highway|raceway|disused;[highway=raceway][disused?];x;name;int_name;625;
@@ -630,19 +630,19 @@ highway|primary_link|area;[highway=primary_link][area?];x;name;int_name;629;
highway|primary_link|disused;[highway=primary_link][disused?];x;name;int_name;630;highway|primary_link
highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permissive];;name;int_name;631;
landuse|reservoir|cooling;[landuse=reservoir][reservoir=cooling];x;name;int_name;632;natural|water
-aeroway|airport;[aeroway=airport];x;name;int_name;633;aeroway|aerodrome
+aeroway|airport;633;aeroway|aerodrome
highway|tertiary_link|tunnel;[highway=tertiary_link][tunnel?];;name;int_name;634;
man_made|piste:halfpipe;[man_made=piste:halfpipe];x;name;int_name;635;
highway|footpath|permissive;[highway=footpath][access=permissive];x;name;int_name;636;highway|footway
highway|tertiary|cycleway;[highway=tertiary][cycleway?];x;name;int_name;637;
highway|trunk|area;[highway=trunk][area?];x;name;int_name;638;
highway|secondary_link|construction;[highway=secondary_link][construction?];x;name;int_name;639;highway|construction
-landuse|street;[landuse=street];x;name;int_name;640;
+landuse|street;640;x
leisure|park|destination;[leisure=park][access=destination];x;name;int_name;641;leisure|park
highway|footway|t2;[highway=footway][t2];x;name;int_name;642;highway|footway
landuse|raceway|disused;[landuse=raceway][disused?];x;name;int_name;643;
highway|motorway_link|area;[highway=motorway_link][area?];x;name;int_name;644;
-natural|recreation_ground;[natural=recreation_ground];x;name;int_name;645;
+natural|recreation_ground;645;x
highway|minor|bridge;[highway=minor][bridge?];x;name;int_name;646;highway|unclassified
highway|secondary|cycleway;[highway=secondary][cycleway?];x;name;int_name;647;highway|secondary
highway|track|dike;[highway=track][dike?];x;name;int_name;648;highway|track
@@ -658,7 +658,7 @@ boundary|administrative|municipality;[boundary=administrative][border_type=munic
highway|path|t2;[highway=path][t2];x;name;int_name;658;highway|path
highway|byway|destination;[highway=byway][access=destination];x;name;int_name;659;highway|bridleway
natural|construction;[natural][construction?];x;name;int_name;660;
-communication|line;[communication=line];;name;int_name;661;
+communication|line;661;
highway|tertiary_link|motorroad;[highway=tertiary_link][motorroad?];x;name;int_name;662;highway|tertiary_link
railway|dismantled|tunnel;[railway=dismantled][tunnel?];x;name;int_name;663;
leisure|recreation_ground|permissive;[leisure=recreation_ground][access=permissive];x;name;int_name;664;leisure|recreation_ground
@@ -681,58 +681,58 @@ highway|service|embankment;[highway=service][embankment?];x;name;int_name;680;hi
highway|crossing|island;[highway=crossing][crossing=island];x;name;int_name;681;
highway|unclassified|cycleway;[highway=unclassified][cycleway];x;name;int_name;682;highway|unclassified
highway|residential|cycleway;[highway=residential][cycleway];x;name;int_name;683;highway|residential
-natural|commercial;[natural=commercial];x;name;int_name;684;
+natural|commercial;684;x
highway|path|embankment;[highway=path][embankment?];x;name;int_name;685;highway|path
-natural|vineyard;[natural=vineyard];;name;int_name;686;
+natural|vineyard;686;
highway|cycleway|dike;[highway=cycleway][dike?];x;name;int_name;687;highway|cycleway
man_made|pipeline|water|overground;[man_made=pipeline][type=water][location=overground];x;name;int_name;688;man_made|pipeline
highway|footpath|area;[highway=footpath][area?];x;name;int_name;689;highway|footway
highway|road|turning_circle;[highway=road][turning_circle?];x;name;int_name;690;
boundary|administrative|country;[boundary=administrative][border_type=country];;name;int_name;691;
highway|service|levee;[highway=service][levee?];x;name;int_name;692;highway|service
-natural|orchard;[natural=orchard];;name;int_name;693;
-natural|retail;[natural=retail];x;name;int_name;694;
+natural|orchard;693;
+natural|retail;694;x
communication|line|underground;[communication=line][location=underground];;name;int_name;695;
-natural|cemetery;[natural=cemetery];x;name;int_name;696;
+natural|cemetery;696;x
highway|track|levee;[highway=track][levee?];x;name;int_name;697;highway|track
highway|path|dike;[highway=path][dike?];x;name;int_name;698;highway|path
highway|tertiary_link|area;[highway=tertiary_link][area?];x;name;int_name;699;
highway|unsurfaced|tunnel;[highway=unsurfaced][tunnel?];x;name;int_name;700;
highway|secondary_link|area;[highway=secondary_link][area?];x;name;int_name;701;
-natural|allotments;[natural=allotments];x;name;int_name;702;
+natural|allotments;702;x
railway|station|subway;[railway=station][transport=subway];;name;int_name;703;
-amenity|police;[amenity=police];;name;int_name;704;
-amenity|car_rental;[amenity=car_rental];;name;int_name;705;
-amenity|taxi;[amenity=taxi];;name;int_name;706;
-amenity|marketplace;[amenity=marketplace];;name;int_name;707;
-amenity|nightclub;[amenity=nightclub];;name;int_name;708;
-amenity|embassy;[amenity=embassy];;name;int_name;709;
-amenity|townhall;[amenity=townhall];;name;int_name;710;
-barrier|gate;[barrier=gate];;name;int_name;711;
-barrier|lift_gate;[barrier=lift_gate];;name;int_name;712;
-barrier|stile;[barrier=stile];;name;int_name;713;
-barrier|block;[barrier=block];;name;int_name;714;
-barrier|toll_booth;[barrier=toll_booth];;name;int_name;715;
-historic|memorial;[historic=memorial];;name;int_name;716;
-historic|ruins;[historic=ruins];;name;int_name;717;
-historic|monument;[historic=monument];;name;int_name;718;
-historic|castle;[historic=castle];;name;int_name;719;
-historic|archaeological_site;[historic=archaeological_site];;name;int_name;720;
+amenity|police;704;
+amenity|car_rental;705;
+amenity|taxi;706;
+amenity|marketplace;707;
+amenity|nightclub;708;
+amenity|embassy;709;
+amenity|townhall;710;
+barrier|gate;711;
+barrier|lift_gate;712;
+barrier|stile;713;
+barrier|block;714;
+barrier|toll_booth;715;
+historic|memorial;716;
+historic|ruins;717;
+historic|monument;718;
+historic|castle;719;
+historic|archaeological_site;720;
highway|residential|private;[highway=residential][access=private];x;name;int_name;721;highway|residential
-man_made|cutline;[man_made=cutline];;name;int_name;722;
-natural|bay;[natural=bay];;name;int_name;723;
-natural|spring;[natural=spring];;name;int_name;724;
-railway|platform;[railway=platform];;name;int_name;725;
-shop|clothes;[shop=clothes];;name;int_name;726;
-shop|car_repair;[shop=car_repair];;name;int_name;727;
-shop|car;[shop=car];;name;int_name;728;
-shop|kiosk;[shop=kiosk];;name;int_name;729;
-sport|multi;[sport=multi];;name;int_name;730;
-sport|golf;[sport=golf];;name;int_name;731;
-sport|skiing;[sport=skiing];;name;int_name;732;
-tourism|museum;[tourism=museum];;name;int_name;733;
-tourism|guest_house;[tourism=guest_house];;name;int_name;734;
-tourism|motel;[tourism=motel];;name;int_name;735;
+man_made|cutline;722;
+natural|bay;723;
+natural|spring;724;
+railway|platform;725;
+shop|clothes;726;
+shop|car_repair;727;
+shop|car;728;
+shop|kiosk;729;
+sport|multi;730;
+sport|golf;731;
+sport|skiing;732;
+tourism|museum;733;
+tourism|guest_house;734;
+tourism|motel;735;
boundary|administrative|4|state;[boundary=administrative][admin_level=4][border_type=state];;name;int_name;736;
place|state|USA;[place=state][addr:country=US];;name;int_name;737;
building|address;[addr:housenumber][addr:street];;addr:housenumber;name;738;
@@ -746,7 +746,7 @@ highway|byway|area;[highway=byway][area?];x;name;int_name;745;highway|track
highway|byway|construction;[highway=byway][construction?];x;name;int_name;746;highway|track
highway|byway|disused;[highway=byway][disused?];x;name;int_name;747;highway|track
highway|byway|no-access;[highway=byway][access=no];x;name;int_name;748;highway|track
-highway|cycleroad;[highway=cycleroad];x;name;int_name;749;highway|cycleway
+highway|cycleroad;749;highway|cycleway
highway|cycleroad|area;[highway=cycleroad][area?];x;name;int_name;750;highway|cycleway
highway|cycleroad|bridge;[highway=cycleroad][bridge?];x;name;int_name;751;highway|cycleway
highway|cycleroad|construction;[highway=cycleroad][construction?];x;name;int_name;752;highway|cycleway
@@ -853,13 +853,13 @@ man_made|pipeline|heat|overground;[man_made=pipeline][type=heat][location=overgr
man_made|pipeline|hot_water|overground;[man_made=pipeline][type=hot_water][location=overground];x;name;int_name;853;man_made|pipeline
man_made|pipeline|natural_gas|overground;[man_made=pipeline][type=natural_gas][location=overground];x;name;int_name;854;man_made|pipeline
man_made|pipeline|sewage|overground;[man_made=pipeline][type=sewage][location=overground];x;name;int_name;855;man_made|pipeline
-mapswithme|grid;[mapswithme=grid];;name;int_name;856;
-natural|farmyard;[natural=farmyard];x;name;int_name;857;
-natural|garages;[natural=garages];x;name;int_name;858;
-natural|greenfield;[natural=greenfield];x;name;int_name;859;
-natural|greenhouse_horticulture;[natural=greenhouse_horticulture];x;name;int_name;860;landuse|greenhouse_horticulture
-natural|salt_pond;[natural=salt_pond];;name;int_name;861;
-natural|street;[natural=street];x;name;int_name;862;
+mapswithme|grid;856;
+natural|farmyard;857;x
+natural|garages;858;x
+natural|greenfield;859;x
+natural|greenhouse_horticulture;860;landuse|greenhouse_horticulture
+natural|salt_pond;861;
+natural|street;862;x
railway|incline|bridge;[railway=incline][bridge?];;name;int_name;863;
railway|siding|tunnel;[railway=siding][tunnel?];;name;int_name;864;
railway|yard|tunnel;[railway=yard][tunnel?];;name;int_name;865;
@@ -880,9 +880,9 @@ area:highway|motorway;[area:highway=motorway];;name;int_name;879;
area:highway|trunk;[area:highway=trunk];;name;int_name;880;
area:highway|residental;[area:highway=residental];x;name;int_name;881;
entrance;[entrance];;ref;addr:flats;882;
-hwtag|oneway;[hwtag=oneway];;name;int_name;883;
-highway|proposed;[highway=proposed];;name;int_name;884;
-tourism|artwork;[tourism=artwork];;name;int_name;885;
+hwtag|oneway;883;
+highway|proposed;884;
+tourism|artwork;885;
railway|subway|red;[railway=subway][colour=red];;name;int_name;886;
railway|subway|blue;[railway=subway][colour=blue];;name;int_name;887;
railway|subway|orange;[railway=subway][colour=orange];;name;int_name;888;
@@ -909,91 +909,91 @@ railway|subway|violet;[railway=subway][colour=violet];;name;int_name;908;
railway|station|subway|violet;[railway=station][transport=subway][colour=violet];;name;int_name;909;
railway|subway|grey;[railway=subway][colour=grey];;name;int_name;910;
railway|station|subway|grey;[railway=station][transport=subway][colour=grey];;name;int_name;911;
-historic|ship;[historic=ship];;name;int_name;912;
+historic|ship;912;
marking|sport;[marking=sport][!colour];;name;int_name;913;
marking|sport|white;[marking=sport][colour=white];;name;int_name;914;
marking|sport|red;[marking=sport][colour=red];;name;int_name;915;
marking|sport|black;[marking=sport][colour=black];;name;int_name;916;
marking|sport|blue;[marking=sport][colour=blue];;name;int_name;917;
-shop|mall;[shop=mall];;name;int_name;918;
-shop|doityourself;[shop=doityourself];;name;int_name;919;
-place|sea;[place=sea];;name;int_name;920;
-place|ocean;[place=ocean];;name;int_name;921;
-natural|cliff;[natural=cliff];;name;int_name;922;
-shop|butcher;[shop=butcher];;name;int_name;923;
-shop|florist;[shop=florist];;name;int_name;924;
-shop|bicycle;[shop=bicycle];;name;int_name;925;
-shop|alcohol;[shop=alcohol];;name;int_name;926;
-shop|books;[shop=books];;name;int_name;927;
-shop|electronics;[shop=electronics];;name;int_name;928;
-shop|shoes;[shop=shoes];;name;int_name;929;
-shop|department_store;[shop=department_store];;name;int_name;930;
-shop|hardware;[shop=hardware];;name;int_name;931;
-shop|jewelry;[shop=jewelry];;name;int_name;932;
-shop|chemist;[shop=chemist];;name;int_name;933;
-shop|optician;[shop=optician];;name;int_name;934;
-shop|garden_centre;[shop=garden_centre];;name;int_name;935;
-shop|gift;[shop=gift];;name;int_name;936;
-shop|computer;[shop=computer];;name;int_name;937;
-shop|mobile_phone;[shop=mobile_phone];;name;int_name;938;
-shop|greengrocer;[shop=greengrocer];;name;int_name;939;
-shop|beverages;[shop=beverages];;name;int_name;940;
-shop|toys;[shop=toys];;name;int_name;941;
-shop|confectionery;[shop=confectionery];;name;int_name;942;
+shop|mall;918;
+shop|doityourself;919;
+place|sea;920;
+place|ocean;921;
+natural|cliff;922;
+shop|butcher;923;
+shop|florist;924;
+shop|bicycle;925;
+shop|alcohol;926;
+shop|books;927;
+shop|electronics;928;
+shop|shoes;929;
+shop|department_store;930;
+shop|hardware;931;
+shop|jewelry;932;
+shop|chemist;933;
+shop|optician;934;
+shop|garden_centre;935;
+shop|gift;936;
+shop|computer;937;
+shop|mobile_phone;938;
+shop|greengrocer;939;
+shop|beverages;940;
+shop|toys;941;
+shop|confectionery;942;
shop;[shop?];;name;int_name;943;
-hwtag|lit;[hwtag=lit];;name;int_name;944;
-office|company;[office=company];;name;int_name;945;
-office|telecommunication;[office=telecommunication];;name;int_name;946;
-office|government;[office=government];;name;int_name;947;
-office|estate_agent;[office=estate_agent];;name;int_name;948;
-office|lawyer;[office=lawyer];;name;int_name;949;
+hwtag|lit;944;
+office|company;945;
+office|telecommunication;946;
+office|government;947;
+office|estate_agent;948;
+office|lawyer;949;
office;[office];;name;int_name;950;
landuse|residential|rural;[landuse=residential][residential=rural];;name;int_name;951;
landuse|residential|urban;[landuse=residential][residential=urban];;name;int_name;952;
-amenity|ferry_terminal;[amenity=ferry_terminal];;name;int_name;953;
+amenity|ferry_terminal;953;
amenity;[amenity];;name;int_name;954;
-shop|furniture;[shop=furniture];;name;int_name;955;
-natural|grassland;[natural=grassland];;name;int_name;956;
-natural|waterfall;[natural=waterfall];x;name;int_name;957;waterway|waterfall
-waterway|waterfall;[waterway=waterfall];;name;int_name;958;
-railway|proposed;[railway=proposed];;name;int_name;959;
-amenity|casino;[amenity=casino];;name;int_name;960;
-amenity|brothel;[amenity=brothel];;name;int_name;961;
-place|neighbourhood;[place=neighbourhood];;name;int_name;962;
-place|isolated_dwelling;[place=isolated_dwelling];;name;int_name;963;
-historic|wayside_cross;[historic=wayside_cross];;name;int_name;964;
-historic|wayside_shrine;[historic=wayside_shrine];;name;int_name;965;
-historic|boundary_stone;[historic=boundary_stone];;name;int_name;966;
-historic|citywalls;[historic=citywalls];;name;int_name;967;
-historic|tomb;[historic=tomb];;name;int_name;968;
-natural|rock;[natural=rock];;name;int_name;969;
-natural|bare_rock;[natural=bare_rock];;name;int_name;970;
-natural|tree_row;[natural=tree_row];;name;int_name;971;
-natural|cape;[natural=cape];;name;int_name;972;
-craft|carpenter;[craft=carpenter];;name;int_name;973;
-craft|shoemaker;[craft=shoemaker];;name;int_name;974;
-craft|photographer;[craft=photographer];;name;int_name;975;
-craft|electrician;[craft=electrician];;name;int_name;976;
-craft|tailor;[craft=tailor];;name;int_name;977;
-craft|plumber;[craft=plumber];;name;int_name;978;
-craft|brewery;[craft=brewery];;name;int_name;979;
-craft|metal_construction;[craft=metal_construction];;name;int_name;980;
-craft|hvac;[craft=hvac];;name;int_name;981;
-craft|painter;[craft=painter];;name;int_name;982;
-craft|gardener;[craft=gardener];;name;int_name;983;
+shop|furniture;955;
+natural|grassland;956;
+natural|waterfall;957;waterway|waterfall
+waterway|waterfall;958;
+railway|proposed;959;
+amenity|casino;960;
+amenity|brothel;961;
+place|neighbourhood;962;
+place|isolated_dwelling;963;
+historic|wayside_cross;964;
+historic|wayside_shrine;965;
+historic|boundary_stone;966;
+historic|citywalls;967;
+historic|tomb;968;
+natural|rock;969;
+natural|bare_rock;970;
+natural|tree_row;971;
+natural|cape;972;
+craft|carpenter;973;
+craft|shoemaker;974;
+craft|photographer;975;
+craft|electrician;976;
+craft|tailor;977;
+craft|plumber;978;
+craft|brewery;979;
+craft|metal_construction;980;
+craft|hvac;981;
+craft|painter;982;
+craft|gardener;983;
internet_access;[internet_access=yes];;name;int_name;984;
-internet_access|wlan;[internet_access=wlan];;name;int_name;985;
-amenity|waste_disposal;[amenity=waste_disposal];;name;int_name;986;
-amenity|bbq;[amenity=bbq];;name;int_name;987;
-hwtag|private;[hwtag=private];;name;int_name;988;
+internet_access|wlan;985;
+amenity|waste_disposal;986;
+amenity|bbq;987;
+hwtag|private;988;
route|ferry|motorcar;[route=ferry];;name;int_name;989;
-junction|roundabout;[junction=roundabout];;name;int_name;990;
-highway|speed_camera;[highway=speed_camera];;name;int_name;991;
-shop|beauty;[shop=beauty];;name;int_name;992;
-shop|sports;[shop=sports];;name;int_name;993;
+junction|roundabout;990;
+highway|speed_camera;991;
+shop|beauty;992;
+shop|sports;993;
route|ferry|motor_vehicle;[route=ferry];;name;int_name;994;
railway|rail|motor_vehicle;[railway=rail];;name;int_name;995;
-hwtag|nofoot;[hwtag=nofoot];;name;int_name;996;
+hwtag|nofoot;996;
place|city|capital|2;[place=city][capital=2];;name;int_name;997;
place|city|capital|3;[place=city][capital=3];;name;int_name;998;
place|city|capital|4;[place=city][capital=4];;name;int_name;999;
@@ -1004,9 +1004,9 @@ place|city|capital|8;[place=city][capital=8];;name;int_name;1003;
place|city|capital|9;[place=city][capital=9];;name;int_name;1004;
place|city|capital|10;[place=city][capital=10];;name;int_name;1005;
place|city|capital|11;[place=city][capital=11];;name;int_name;1006;
-hwtag|yesfoot;[hwtag=yesfoot];;name;int_name;1007;
-public_transport|platform;[public_transport=platform];;name;int_name;1008;
-highway|platform;[highway=platform];;name;int_name;1009;
+hwtag|yesfoot;1007;
+public_transport|platform;1008;
+highway|platform;1009;
aeroway|aerodrome|international;[aeroway=aerodrome][aerodrome=international];;name;int_name;1010;
railway|station|light_rail;[railway=station][station=light_rail];;name;int_name;1011;
railway|station|monorail;[railway=station][station=monorail];;name;int_name;1012;
@@ -1032,12 +1032,12 @@ railway|subway_entrance|paris;[railway=subway_entrance][city=paris];;name;int_na
railway|subway_entrance|madrid;[railway=subway_entrance][city=madrid];;name;int_name;1032;
railway|subway_entrance|roma;[railway=subway_entrance][city=roma];;name;int_name;1033;
railway|subway_entrance|spb;[railway=subway_entrance][city=spb];;name;int_name;1034;
-aerialway|drag_lift;[aerialway=drag_lift];;name;int_name;1035;
-amenity|dentist;[amenity=dentist];;name;int_name;1036;
-amenity|clinic;[amenity=clinic];;name;int_name;1037;
-barrier|entrance;[barrier=entrance];;name;int_name;1038;
-barrier|border_control;[barrier=border_control];;name;int_name;1039;
-shop|laundry;[shop=laundry];;name;int_name;1040;
+aerialway|drag_lift;1035;
+amenity|dentist;1036;
+amenity|clinic;1037;
+barrier|entrance;1038;
+barrier|border_control;1039;
+shop|laundry;1040;
amenity|vending_machine|parking_tickets;[amenity=vending_machine][vending=parking_tickets];;name;int_name;1041;
amenity|vending_machine|public_transport_tickets;[amenity=vending_machine][vending=public_transport_tickets];;name;int_name;1042;
building:part;[building:part];;name;int_name;1043;
@@ -1048,23 +1048,62 @@ amenity|place_of_worship|hindu;[amenity=place_of_worship][religion=hindu];;name;
amenity|place_of_worship|shinto;[amenity=place_of_worship][religion=shinto];;name;int_name;1048;
amenity|place_of_worship|jewish;[amenity=place_of_worship][religion=jewish];;name;int_name;1049;
amenity|place_of_worship|taoist;[amenity=place_of_worship][religion=taoist];;name;int_name;1050;
-man_made|water_tower;[man_made=water_tower];;name;int_name;1051;
-highway|world_level;[highway=world_level];;name;int_name;1052;
-highway|world_towns_level;[highway=world_towns_level];;name;int_name;1053;
-building|train_station;[building=train_station];;name;int_name;1054;
-route|shuttle_train;[route=shuttle_train];;name;int_name;1055;
-shop|copyshop;[shop=copyshop];;name;int_name;1056;
-shop|photo;[shop=photo];;name;int_name;1057;
-shop|travel_agency;[shop=travel_agency];;name;int_name;1058;
-office|travel_agent;[office=travel_agent];x;name;int_name;1059;shop|travel_agency
-shop|outdoor;[shop=outdoor];;name;int_name;1060;
-shop|tailor;[shop=tailor];x;name;int_name;1061;craft|tailor
-shop|estate_agent;[shop=estate_agent];x;name;int_name;1062;office|estate_agent
-shop|dry_cleaning;[shop=dry_cleaning];;name;int_name;1063;
-shop|tyres;[shop=tyres];;name;int_name;1064;
-amenity|swimming_pool;[amenity=swimming_pool];x;name;int_name;1065;leisure|swimming_pool
-amenity|car_wash;[amenity=car_wash];;name;int_name;1066;
-amenity|veterinary;[amenity=veterinary];;name;int_name;1067;
-amenity|charging_station;[amenity=charging_station];;name;int_name;1068;
-amenity|childcare;[amenity=childcare];;name;int_name;1069;
+man_made|water_tower;1051;
+highway|world_level;1052;
+highway|world_towns_level;1053;
+building|train_station;1054;
+route|shuttle_train;1055;
+shop|copyshop;1056;
+shop|photo;1057;
+shop|travel_agency;1058;
+office|travel_agent;1059;shop|travel_agency
+shop|outdoor;1060;
+shop|tailor;1061;craft|tailor
+shop|estate_agent;1062;office|estate_agent
+shop|dry_cleaning;1063;
+shop|tyres;1064;
+amenity|swimming_pool;1065;leisure|swimming_pool
+amenity|car_wash;1066;
+amenity|veterinary;1067;
+amenity|charging_station;1068;
+amenity|childcare;1069;
natural|wetland|marsh;[natural=wetland][wetland=marsh];;name;int_name;1070;
+amenity|bicycle_parking;1071;
+amenity|community_centre;1072;
+amenity|courthouse;1073;
+amenity|vending_machine|cigarettes;[amenity=vending_machine][vending=cigarettes];;name;int_name;1074;
+amenity|vending_machine|drinks;[amenity=vending_machine][vending=drinks];;name;int_name;1075;
+amenity|waste_basket;1076;
+building|garage;[building=garage];;addr:housenumber;name;1077;
+building|garages;1078;building|garage
+emergency|phone;1079;
+highway|rest_area;1080;
+highway|traffic_signals;1081;
+leisure|fitness_centre;1082;
+leisure|sports_centre|fitness;[leisure=sports_centre][sport=fitness];x;name;int_name;1083;leisure|fitness_centre
+amenity|gym;1084;leisure|fitness_centre
+leisure|sauna;1085;
+amenity|sauna;1086;leisure|sauna
+man_made|chimney;1087;
+man_made|tower;1088;
+man_made|water_well;1089;
+power|substation;1090;
+shop|bookmaker;1091;
+shop|car_repair|tyres;[shop=car_repair][service=tyres];;name;int_name;1092;
+shop|cosmetics;1093;
+shop|pet;1094;
+shop|seafood;1095;
+shop|ticket;1096;
+shop|wine;1097;
+tourism|chalet;1098;
+tourism|information|board;[tourism=information][information=board];;name;int_name;1099;
+tourism|information|map;[tourism=information][information=map];;name;int_name;1100;
+tourism|information|office;[tourism=information][information=office];;name;int_name;1101;
+traffic_calming|bump;1102;
+traffic_calming|hump;1103;
+shop|car_parts;1104;
+leisure|sports_centre|climbing;[leisure=sports_centre][sport=climbing];;name;int_name;1105;
+leisure|sports_centre|shooting;[leisure=sports_centre][sport=shooting];;name;int_name;1106;
+leisure|sports_centre|swimming;[leisure=sports_centre][sport=swimming];;name;int_name;1107;
+leisure|sports_centre|yoga;[leisure=sports_centre][sport=yoga];;name;int_name;1108;
+amenity|public_bookcase;1109;
diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index c7ac29314d..0cde752d49 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -11,3 +11,6 @@ office=travel_agent : shop=travel_agency
shop=tailor : craft=tailor
shop=estate_agent : office=estate_agent
amenity=swimming_pool : leisure=swimming_pool
+building=garages : building=garage
+amenity=gym : leisure=fitness_centre
+amenity=sauna : leisure=sauna
diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss
index 89ed3b662c..4beb1aa2f8 100644
--- a/data/styles/clear/include/POI.mapcss
+++ b/data/styles/clear/include/POI.mapcss
@@ -102,14 +102,16 @@ node|z15[amenity=fuel], area|z15[amenity=fuel] { icon-image: fuel-m.svg; text-of
node|z14[tourism=guest_house], area|z14[tourism=guest_house]
{ icon-image: motel-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
-node|z14[tourism=alpine_hut], area|z14[tourism=alpine_hut]
+node|z14[tourism=alpine_hut], area|z14[tourism=alpine_hut],
+node|z14[tourism=chalet], area|z14[tourism=chalet]
{ icon-image: alpine_hut-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
node|z14[tourism=motel], area|z14[tourism=motel]
{ icon-image: motel-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
node|z15-16[tourism=guest_house], area|z15-16[tourism=guest_house]
{ icon-image: motel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
-node|z15-16[tourism=alpine_hut], area|z15-16[tourism=alpine_hut]
+node|z15-16[tourism=alpine_hut], area|z15-16[tourism=alpine_hut],
+node|z15-16[tourism=chalet], area|z15-16[tourism=chalet]
{ icon-image: alpine_hut-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
node|z15-16[tourism=motel], area|z15-16[tourism=motel]
{ icon-image: motel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
@@ -165,7 +167,8 @@ node|z17-[tourism=hostel]
{ icon-image: hotel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
node|z17-[tourism=guest_house], area|z17-[tourism=guest_house]
{ icon-image: motel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
-node|z17-[tourism=alpine_hut], area|z17-[tourism=alpine_hut]
+node|z17-[tourism=alpine_hut], area|z17-[tourism=alpine_hut],
+node|z17-[tourism=chalet], area|z17-[tourism=chalet]
{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 10;}
node|z17-[tourism=motel], area|z17-[tourism=motel]
{ icon-image: motel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 10;}
@@ -516,6 +519,7 @@ node|z15-16[shop=laundry], area|z15-16[shop=laundry] { icon-min-distance: 20; }
node|z16-[tourism=caravan_site], area|z16-[tourism=caravan_site]{ icon-image: caravan_site-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; }
node|z16-[tourism=guest_house], area|z16-[tourism=guest_house]{ icon-image: motel-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;}
node|z16-[tourism=alpine_hut], area|z16-[tourism=alpine_hut]{ icon-image: alpine_hut-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;}
+node|z16-[tourism=chalet], area|z16-[tourism=chalet]{ icon-image: alpine_hut-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;}
node|z16-[tourism=motel], area|z16-[tourism=motel]{ icon-image: motel-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;}
node|z16-[tourism=picnic_site], area|z16-[tourism=picnic_site]{ icon-image: picnic-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;}
@@ -576,6 +580,7 @@ node|z17-[shop=toys], area|z17-[shop=toys]{ icon-image: toys-l.svg; }
node|z17-[tourism=caravan_site], area|z17-[tourism=caravan_site]{ icon-image: caravan_site-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; }
node|z17-[tourism=guest_house], area|z17-[tourism=guest_house]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
node|z17-[tourism=alpine_hut], area|z17-[tourism=alpine_hut]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
+node|z17-[tourism=chalet], area|z17-[tourism=chalet]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
node|z17-[tourism=motel], area|z17-[tourism=motel]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
node|z17-[tourism=picnic_site], area|z17-[tourism=picnic_site]{ icon-image: picnic-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
@@ -599,6 +604,7 @@ node|z18-[sport=equestrian], area|z18-[sport=equestrian]{ icon-image: equestrian
node|z18-[tourism=caravan_site], area|z18-[tourism=caravan_site]{ icon-image: caravan_site-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
node|z18-[tourism=guest_house], area|z18-[tourism=guest_house]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
node|z18-[tourism=alpine_hut], area|z18-[tourism=alpine_hut]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
+node|z18-[tourism=chalet], area|z18-[tourism=chalet]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
node|z18-[tourism=motel], area|z18-[tourism=motel]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
node|z18-[tourism=picnic_site], area|z18-[tourism=picnic_site]{ icon-image: picnic-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
@@ -609,9 +615,11 @@ node|z19-[power=station], area|z19-[power=station]{ icon-image: power-l.svg; tex
node|z19-[power=substation], area|z19-[power=substation]{ icon-image: power-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
node|z17-[amenity=telephone] { icon-image: phone-l.svg; z-index: 2500;icon-min-distance: 30; }
+node|z17-[emergency=phone] { icon-image: phone-l.svg; z-index: 2500;icon-min-distance: 30; }
node|z17-[amenity=recycling], area|z17-[amenity=recycling], { icon-image: recycling-l.svg;z-index: 2500; icon-min-distance: 30;}
node|z19-[amenity=telephone] { icon-image: phone-l.svg; z-index: 2500; }
+node|z19-[emergency=phone] { icon-image: phone-l.svg; z-index: 2500; }
node|z19-[amenity=recycling], area|z19-[amenity=recycling], { icon-image: recycling-l.svg;z-index: 2500; }
node|z13-[shop=mall], area|z13-[shop=mall] { icon-image: shop-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
diff --git a/data/types.txt b/data/types.txt
index c4941c87c2..daac751374 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -40,7 +40,7 @@ amenity|place_of_worship
highway|track|grade1
highway|secondary
highway|service|driveway
-man_made|survey_point
+mapswithme
highway|motorway_link
waterway|stream|intermittent
highway|track|grade4
@@ -175,7 +175,7 @@ landuse|village_green
amenity|drinking_water
amenity|university
highway|secondary_link
-power|sub_station
+power|substation
railway|tram_stop
place|city
amenity|shelter
@@ -1068,3 +1068,42 @@ amenity|veterinary
amenity|charging_station
amenity|childcare
natural|wetland|marsh
+amenity|bicycle_parking
+amenity|community_centre
+amenity|courthouse
+amenity|vending_machine|cigarettes
+amenity|vending_machine|drinks
+amenity|waste_basket
+building|garage
+building|garage
+emergency|phone
+highway|rest_area
+highway|traffic_signals
+leisure|fitness_centre
+leisure|fitness_centre
+leisure|fitness_centre
+leisure|sauna
+leisure|sauna
+man_made|chimney
+man_made|tower
+man_made|water_well
+power|substation
+shop|bookmaker
+shop|car_repair|tyres
+shop|cosmetics
+shop|pet
+shop|seafood
+shop|ticket
+shop|wine
+tourism|chalet
+tourism|information|board
+tourism|information|map
+tourism|information|office
+traffic_calming|bump
+traffic_calming|hump
+shop|car_parts
+leisure|sports_centre|climbing
+leisure|sports_centre|shooting
+leisure|sports_centre|swimming
+leisure|sports_centre|yoga
+amenity|public_bookcase
diff --git a/data/visibility.txt b/data/visibility.txt
index de282d1cfe..59298725b8 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -24,6 +24,7 @@ world 00000000000000000000 +
bar 00000000000000001111 -
bbq 00000000000000000111 -
bench 00000000000000001111 -
+ bicycle_parking 00000000000000000111 -
bicycle_rental 00000000000000001111 -
brothel 00000000000000000111 -
bureau_de_change 00000000000000001111 -
@@ -38,6 +39,8 @@ world 00000000000000000000 +
cinema 00000000000000001111 -
clinic 00000000000000000111 -
college 00000000000001111111 -
+ community_centre 00000000000000000111 -
+ courthouse 00000000000000000111 -
dentist 00000000000000000111 -
doctors 00000000000000001111 -
drinking_water 00000000000000000111 -
@@ -85,6 +88,7 @@ world 00000000000000000000 +
post_box 00000000000000000111 -
post_office 00000000000000001111 -
pub 00000000000000001111 -
+ public_bookcase 00000000000000000111 -
recycling 00000000000000000111 -
restaurant 00000000000000001111 -
school 00000000000001111111 -
@@ -97,10 +101,13 @@ world 00000000000000000000 +
townhall 00000000000000001111 -
university 00000000000001111111 -
vending_machine 00000000000000000000 +
+ cigarettes 00000000000000000111 -
+ drinks 00000000000000000111 -
parking_tickets 00000000000000000111 -
public_transport_tickets 00000000000000000111 -
{}
veterinary 00000000000000000111 -
+ waste_basket 00000000000000000111 -
waste_disposal 00000000000000000111 -
{}
area:highway 00000000000000000000 +
@@ -163,6 +170,7 @@ world 00000000000000000000 +
{}
building 00000000000000011111 +
address 00000000000000001111 -
+ garage 00000000000000011111 -
train_station 00000000000000011111 -
{}
building:part 00000000000000011111 -
@@ -187,6 +195,9 @@ world 00000000000000000000 +
earthquake:damage 00000000000000000000 +
spontaneous_camp 00000000000000111111 -
{}
+ emergency 00000000000000000000 +
+ phone 00000000000000000000 -
+ {}
entrance 00000000000000000111 -
highway 00000000000000000000 +
bridleway 00000000000001111111 +
@@ -261,6 +272,7 @@ world 00000000000000000000 +
bridge 00000000000001111111 -
tunnel 00000000000001111111 -
{}
+ rest_area 00000000000000000000 -
road 00000000000001111111 +
bridge 00000000000001111111 -
tunnel 00000000000001111111 -
@@ -318,6 +330,7 @@ world 00000000000000000000 +
permissive 00000000000001111111 -
tunnel 00000000000001111111 -
{}
+ traffic_signals 00000000000000000000 -
trunk 00000001111111111111 +
bridge 00000001111111111111 -
tunnel 00000001111111111111 -
@@ -407,6 +420,7 @@ world 00000000000000000000 +
dog_park 00000000000011111111 +
tennis 00000000000011111111 -
{}
+ fitness_centre 00000000000000000000 -
garden 00000000000011111111 -
golf_course 00000000000011111111 -
landscape_reserve 00000000000000000000 -
@@ -426,8 +440,14 @@ world 00000000000000000000 +
tennis 00000000000001111111 -
{}
recreation_ground 00000000000011111111 -
+ sauna 00000000000000000000 -
slipway 00000000000000000111 -
- sports_centre 00000000000011111111 -
+ sports_centre 00000000000011111111 +
+ climbing 00000000000011111111 -
+ shooting 00000000000011111111 -
+ swimming 00000000000011111111 -
+ yoga 00000000000011111111 -
+ {}
stadium 00000000000011111111 -
swimming_pool 00000000000001111111 -
track 00000000000011111111 -
@@ -436,15 +456,17 @@ world 00000000000000000000 +
man_made 00000000000000000000 +
breakwater 00000000000000011111 -
cairn 00000000000000000111 -
+ chimney 00000000000000000000 -
cutline 00000000000011111111 -
lighthouse 00000000000000000111 -
pier 00000000000000111111 -
pipeline 00000000000000001111 +
overground 00000000000000001111 -
{}
- survey_point 00000000000000000000 -
+ tower 00000000000000000000 -
wastewater_plant 00000000000011111111 -
water_tower 00000000000000011111 -
+ water_well 00000000000000000000 -
windmill 00000000000000000111 -
{}
mapswithme 00000000000000000000 +
@@ -573,7 +595,7 @@ world 00000000000000000000 +
minor_line 00000000000000001111 -
pole 00000000000000001111 -
station 00000000000000111111 -
- sub_station 00000000000000111111 -
+ substation 00000000000000000000 -
tower 00000000000000001111 -
{}
public_transport 00000000000000000000 +
@@ -712,16 +734,21 @@ world 00000000000000000000 +
beauty 00000000000000000111 -
beverages 00000000000000000111 -
bicycle 00000000000000000111 -
+ bookmaker 00000000000000000111 -
books 00000000000000000111 -
butcher 00000000000000000111 -
car 00000000000000000111 -
- car_repair 00000000000000001111 -
+ car_parts 00000000000000000111 -
+ car_repair 00000000000000001111 +
+ tyres 00000000000000001111 -
+ {}
chemist 00000000000000000111 -
clothes 00000000000000001111 -
computer 00000000000000000111 -
confectionery 00000000000000000111 -
convenience 00000000000000001111 -
copyshop 00000000000000000111 -
+ cosmetics 00000000000000000111 -
department_store 00000000000000001111 -
doityourself 00000000000000001111 -
dry_cleaning 00000000000000000111 -
@@ -740,13 +767,17 @@ world 00000000000000000000 +
mobile_phone 00000000000000000111 -
optician 00000000000000000111 -
outdoor 00000000000000000111 -
+ pet 00000000000000000111 -
photo 00000000000000000111 -
+ seafood 00000000000000000111 -
shoes 00000000000000000111 -
sports 00000000000000000111 -
supermarket 00000000000000001111 -
+ ticket 00000000000000000111 -
toys 00000000000000000111 -
travel_agency 00000000000000000111 -
tyres 00000000000000000111 -
+ wine 00000000000000000111 -
{}
sport 00000000000000000000 +
american_football 00000000000000000111 -
@@ -778,11 +809,14 @@ world 00000000000000000000 +
attraction 00000000000000011111 -
camp_site 00000000000011111111 -
caravan_site 00000000000011111111 -
+ chalet 00000000000000000111 -
guest_house 00000000000000001111 -
hostel 00000000000000001111 -
hotel 00000000000000001111 -
information 00000000000000000111 +
+ board 00000000000000000111 -
guidepost 00000000000000000111 -
+ map 00000000000000000111 -
office 00000000000000000111 -
{}
motel 00000000000000001111 -
@@ -791,6 +825,10 @@ world 00000000000000000000 +
viewpoint 00000000000000011111 -
zoo 00000000000011111111 -
{}
+ traffic_calming 00000000000000000000 +
+ bump 00000000000000000000 -
+ hump 00000000000000000000 -
+ {}
waterway 00000000000000000000 +
canal 00000000000011111111 +
tunnel 00000000000000000000 -
diff --git a/tools/kothic b/tools/kothic
index 47b2d42a6a..c32d9c5e22 160000
--- a/tools/kothic
+++ b/tools/kothic
@@ -1 +1 @@
-Subproject commit 47b2d42a6a523650afc62792fb1b878ce14a88e7
+Subproject commit c32d9c5e22d6f42c582c2234e9881cda5f6db4f5