From 50dab6801f103f2843877f094cc5d8e3e2d713b3 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Thu, 12 May 2016 16:58:46 +0300 Subject: [PATCH] [booking] Add two hotel types and types for booking --- data/mapcss-mapping.csv | 11 +++++++++++ data/styles/clear/include/POI.mapcss | 24 ++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 3e42426922..8e3e75b161 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1107,3 +1107,14 @@ leisure|sports_centre|shooting;[leisure=sports_centre][sport=shooting];;name;int 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; +tourism|apartment;1110; +tourism|resort;1111; +tourism|hotel|booking;[tourism=hotel][provider=booking];;name;int_name;1112; +tourism|motel|booking;[tourism=motel][provider=booking];;name;int_name;1113; +tourism|hostel|booking;[tourism=hostel][provider=booking];;name;int_name;1114; +tourism|chalet|booking;[tourism=chalet][provider=booking];;name;int_name;1115; +tourism|guest_house|booking;[tourism=guest_house][provider=booking];;name;int_name;1116; +tourism|alpine_hut|booking;[tourism=alpine_hut][provider=booking];;name;int_name;1117; +tourism|camp_site|booking;[tourism=camp_site][provider=booking];;name;int_name;1118; +tourism|apartment|booking;[tourism=apartment][provider=booking];;name;int_name;1119; +tourism|resort|booking;[tourism=resort][provider=booking];;name;int_name;1120; diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss index c6c7f7d9f2..d497367e06 100644 --- a/data/styles/clear/include/POI.mapcss +++ b/data/styles/clear/include/POI.mapcss @@ -110,17 +110,21 @@ node|z15[amenity=charging_station], area|z15[amenity=charging_station] { icon-im 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=chalet], area|z14[tourism=chalet] +node|z14[tourism=chalet], area|z14[tourism=chalet], +node|z14[tourism=resort], area|z14[tourism=resort] { 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] +node|z14[tourism=motel], area|z14[tourism=motel], +node|z14[tourism=apartment], area|z14[tourism=apartment] { 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=chalet], area|z15-16[tourism=chalet] +node|z15-16[tourism=chalet], area|z15-16[tourism=chalet], +node|z15-16[tourism=resort], area|z15-16[tourism=resort] { 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] +node|z15-16[tourism=motel], area|z15-16[tourism=motel], +node|z15-16[tourism=apartment], area|z15-16[tourism=apartment] { icon-image: motel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} /* TOURISM, HISTORIC */ @@ -175,9 +179,11 @@ node|z17-[tourism=hostel] 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=chalet], area|z17-[tourism=chalet] +node|z17-[tourism=chalet], area|z17-[tourism=chalet], +node|z17-[tourism=resort], area|z17-[tourism=resort] { 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] +node|z17-[tourism=motel], area|z17-[tourism=motel], +node|z17-[tourism=apartment], area|z17-[tourism=apartment] { icon-image: motel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 10;} node|z17-[tourism=artwork] @@ -555,7 +561,9 @@ node|z16-[tourism=caravan_site], area|z16-[tourism=caravan_site]{ icon-image: ca 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=resort], area|z16-[tourism=resort]{ 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=apartment], area|z16-[tourism=apartment]{ 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;} @@ -629,7 +637,9 @@ node|z17-[tourism=caravan_site], area|z17-[tourism=caravan_site]{ icon-image: ca 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=resort], area|z17-[tourism=resort]{ 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=apartment], area|z17-[tourism=apartment]{ 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;} @@ -653,7 +663,9 @@ node|z18-[tourism=caravan_site], area|z18-[tourism=caravan_site]{ icon-image: ca 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=resort], area|z18-[tourism=resort]{ 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=apartment], area|z18-[tourism=apartment]{ 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;} node|z17-[power=station], area|z17-[power=station]{ icon-image: power-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}