forked from organicmaps/organicmaps
Merge pull request #2884 from Zverik/newcat2
[types] New classificator types
This commit is contained in:
Viktor Govako
commit
82d8f4a66d
17 changed files with 8473 additions and 730 deletions
|
|
@ -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:Йога-центр|Студия йоги
|
||||
|
|
|
|||
|
|
@ -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 -
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
|
@ -336,6 +336,8 @@
|
|||
<type id="amenity-waste_disposal">
|
||||
<include field="operator" />
|
||||
</type>
|
||||
<type id="amenity-waste_basket">
|
||||
</type>
|
||||
<type id="amenity-car_wash">
|
||||
<include group="poi" />
|
||||
<include field="internet" />
|
||||
|
|
@ -697,6 +699,11 @@
|
|||
<include field="operator" />
|
||||
<include field="internet" />
|
||||
</type>
|
||||
<type id="tourism-chalet" group="accomodation">
|
||||
<include group="poi" />
|
||||
<include field="operator" />
|
||||
<include field="internet" />
|
||||
</type>
|
||||
<type id="tourism-guest_house" group="accomodation">
|
||||
<include group="poi" />
|
||||
<include field="operator" />
|
||||
|
|
@ -748,6 +755,113 @@
|
|||
<include field="internet" />
|
||||
<include field="opening_hours" />
|
||||
</type>
|
||||
<type id="amenity-bicycle_parking">
|
||||
<include field="operator" />
|
||||
</type>
|
||||
<type id="amenity-community_centre">
|
||||
<include group="poi" />
|
||||
<include field="internet" />
|
||||
</type>
|
||||
<type id="amenity-courthouse">
|
||||
<include group="poi" />
|
||||
</type>
|
||||
<type id="emergency-phone">
|
||||
<include field="phone" />
|
||||
<include field="operator" />
|
||||
</type>
|
||||
<type id="highway-rest_area">
|
||||
<include field="internet" />
|
||||
</type>
|
||||
<type id="leisure-fitness_centre">
|
||||
<include group="poi" />
|
||||
<include field="internet" />
|
||||
</type>
|
||||
<type id="leisure-sauna">
|
||||
<include group="poi" />
|
||||
</type>
|
||||
<type id="man_made-chimney">
|
||||
</type>
|
||||
<type id="man_made-water_well">
|
||||
</type>
|
||||
<type id="shop-cosmetics" group="shop">
|
||||
<include group="poi" />
|
||||
</type>
|
||||
<type id="shop-pet" group="shop">
|
||||
<include group="poi" />
|
||||
</type>
|
||||
<type id="shop-bookmaker">
|
||||
<include group="poi" />
|
||||
</type>
|
||||
<type id="shop-seafood" group="shop">
|
||||
<include group="poi" />
|
||||
</type>
|
||||
<type id="shop-ticket" group="shop">
|
||||
<include group="poi" />
|
||||
</type>
|
||||
<type id="shop-wine" group="shop">
|
||||
<include group="poi" />
|
||||
</type>
|
||||
<type id="shop-car_parts" group="shop">
|
||||
<include group="poi" />
|
||||
<include field="operator" />
|
||||
</type>
|
||||
<!-- Uncomment this after our editor core supports complex types
|
||||
<type id="amenity-vending_machine-cigarettes">
|
||||
<tag k="amenity" v="vending_machine" />
|
||||
<tag k="vending" v="cigarettes" />
|
||||
<include field="operator" />
|
||||
</type>
|
||||
<type id="amenity-vending_machine-drinks">
|
||||
<tag k="amenity" v="vending_machine" />
|
||||
<tag k="vending" v="drinks" />
|
||||
<include field="operator" />
|
||||
</type>
|
||||
<type id="shop-car_repair-tyres">
|
||||
<tag k="shop" v="car_repair" />
|
||||
<tag k="service" v="tyres" />
|
||||
<include group="poi" />
|
||||
</type>
|
||||
<type id="tourism-information-office">
|
||||
<tag k="tourism" v="information" />
|
||||
<tag k="information" v="board" />
|
||||
<include group="poi" />
|
||||
<include group="internet" />
|
||||
</type>
|
||||
<type id="tourism-information-board">
|
||||
<tag k="tourism" v="information" />
|
||||
<tag k="information" v="board" />
|
||||
</type>
|
||||
<type id="tourism-information-map">
|
||||
<tag k="tourism" v="information" />
|
||||
<tag k="information" v="board" />
|
||||
</type>
|
||||
<type id="leisure-sports_centre-climbing">
|
||||
<tag k="leisure" v="sports_centre" />
|
||||
<tag k="sport" v="climbing" />
|
||||
<include group="poi" />
|
||||
<include field="internet" />
|
||||
</type>
|
||||
<type id="leisure-sports_centre-shooting">
|
||||
<tag k="leisure" v="sports_centre" />
|
||||
<tag k="sport" v="shooting" />
|
||||
<include group="poi" />
|
||||
<include field="internet" />
|
||||
</type>
|
||||
<type id="leisure-sports_centre-swimming">
|
||||
<tag k="leisure" v="sports_centre" />
|
||||
<tag k="sport" v="swimming" />
|
||||
<include group="poi" />
|
||||
<include field="internet" />
|
||||
</type>
|
||||
<type id="leisure-sports_centre-yoga">
|
||||
<tag k="leisure" v="sports_centre" />
|
||||
<tag k="sport" v="yoga" />
|
||||
<include group="poi" />
|
||||
<include field="internet" />
|
||||
</type-->
|
||||
<type id="natural-beach" can_add="no">
|
||||
<include field="name" />
|
||||
</type>
|
||||
<type id="building" can_add="no">
|
||||
<include field="street" />
|
||||
<include field="housename" />
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 -
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 47b2d42a6a523650afc62792fb1b878ce14a88e7
|
||||
Subproject commit c32d9c5e22d6f42c582c2234e9881cda5f6db4f5
|
||||
Loading…
Add table
Reference in a new issue