From d9ae7d7c6aaebb63b082abd0b6e6496574211c43 Mon Sep 17 00:00:00 2001 From: Lev Dragunov Date: Wed, 24 Feb 2016 13:06:32 +0300 Subject: [PATCH] Feb clear style source --- data/styles/clear/include/POI.mapcss | 625 ++++++++++++++++----- data/styles/clear/include/labels.mapcss | 145 ++--- data/styles/clear/include/roads.mapcss | 60 +- data/styles/clear/include/transport.mapcss | 156 ++++- 4 files changed, 742 insertions(+), 244 deletions(-) diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss index d4739dfd7d..4bd69c0d33 100644 --- a/data/styles/clear/include/POI.mapcss +++ b/data/styles/clear/include/POI.mapcss @@ -3,24 +3,116 @@ /* NAMED AMENITIES BY DEFAULT — TEMPORARY */ node|z19-[amenity], area|z19-[amenity] { icon-image: none.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; } +/* ZOOM 12 */ + +node|z12-14[tourism=museum], area|z12-14[tourism=museum] +{ icon-image: museum-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 10; } +node|z12-14[historic=museum],area|z12-14[historic=museum] +{ icon-image: museum-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 10; } +node|z12-14[tourism=zoo], area|z12-14[tourism=zoo] +{ icon-image: zoo-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 10; } +node|z12-14[tourism=gallery] +{ icon-image: gallery-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 12; } /* <-- <-- не показывается, непонятно почему, позже разобраться */ +node|z12-14[historic=monument],area|z12-14[historic=monument] +{ icon-image: monument-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;icon-min-distance: 30; } +node|z12-14[historic=fort],area|z12-14[historic=fort] +{ icon-image: remains-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 12; } +node|z12-14[historic=castle],area|z12-14[historic=castle] +{ icon-image: remains-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 12; } +node|z12-14[tourism=viewpoint] +{ icon-image: viewpoint-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 12;} +node|z12-14[tourism=information] +{ icon-image: information-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 30;} + +node|z14[amenity=university][name] +{ icon-image: college-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 1; icon-min-distance: 12; -x-me-text-priority:16000;} +node|z14[amenity=university][!name] { } + +node|z14[amenity=hospital] +{ icon-image: hospital-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; icon-min-distance: 15; } + +node|z12[natural=spring],area|z12[natural=spring]{ icon-image: drinking-water-s.svg; z-index: 2700; icon-min-distance: 15; } +node|z13-14[natural=spring],area|z13-14[natural=spring]{ icon-image: drinking-water-s.svg; text-offset:6; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; icon-min-distance: 12; } +node|z13-14[tourism=camp_site],area|z15[tourism=camp_site] +{ icon-image: campsite-s.svg; z-index: 2700; icon-min-distance: 12;} + +node|z13-14[amenity=cafe], area|z13-14[amenity=cafe] { icon-image: cafe-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;} +node|z13-14[amenity=restaurant], area|z13-14[amenity=restaurant] { icon-image: restaurant-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;icon-min-distance: 10;} +node|z12-14[amenity=theatre], area|z12-14[amenity=theatre] { icon-image: theatre-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;} + +node|z13-14[amenity=fuel], area|z13-14[amenity=fuel] { icon-image: fuel-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; -x-me-text-priority:15500;icon-min-distance: 20; } +node|z13-14[tourism=attraction], area|z13-14[tourism=attraction] { icon-image: tourism-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 20;} +node|z13-14[leisure=water_park], area|z13-14[leisure=water_park] { icon-image: swimming-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 20;} + + /* ZOOM 15 */ - -/* z=15 icons — small icons -node|z15-[tourism], area|z15-[tourism] { z-index: 2700; } -node|z15-[amenity], area|z15-[amenity] { z-index: 2700; } -*/ node|z15[tourism=museum], area|z15[tourism=museum] -{ icon-image: museum-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 1; } +{ icon-image: museum-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 5; } +node|z15[historic=museum],area|z15[historic=museum] +{ icon-image: museum-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 5; } +node|z15[historic=monument],area|z15[historic=monument] +{ icon-image: monument-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 20; } +node|z15-[historic=fort],area|z15-[historic=fort] +{ icon-image: remains-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 5;} +node|z15-[historic=castle],area|z15-[historic=castle] +{ icon-image: remains-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 5; } +node|z15[historic=memorial], area|z15[historic=memorial] { icon-image: monument-m.svg; text-offset: 10; font-size: 10; text: name; z-index: 2600; text-color: @poi_label; icon-min-distance: 20;} node|z15[tourism=gallery] -{ icon-image: gallery-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } /* <-- <-- не показывается, непонятно почему, позже разобраться */ +{ icon-image: gallery-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 5; } /* <-- <-- не показывается, непонятно почему, позже разобраться */ node|z15[tourism=zoo], area|z15[tourism=zoo] -{ icon-image: zoo-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } +{ icon-image: zoo-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 5; } node|z15[amenity=university][name] -{ icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 1; icon-min-distance: 12; -x-me-text-priority:16000;} +{ icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 1; icon-min-distance: 10; -x-me-text-priority:16000;} node|z15[amenity=university][!name] { } node|z15[amenity=hospital] -{ icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } +{ icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; icon-min-distance: 5;} +node|z15[tourism=camp_site],area|z15[tourism=camp_site] +{ text-offset: 12; icon-image: campsite-m.svg; z-index: 2700; icon-min-distance: 5;} +node|z15[amenity=place_of_worship], area|z15[amenity=place_of_worship] { icon-image: place-of-worship-m.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 15; } + +node|z15-[natural=spring],area|z15-[natural=spring]{ icon-image: drinking-water-m.svg; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; icon-min-distance: 5; } +node|z15-[amenity=hunting_stand], area|z15-[amenity=hunting_stand] { icon-image: hunting-tower-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; icon-min-distance: 5;} +node|z15-[tourism=attraction], area|z15-[tourism=attraction ] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 5;} + +node|z15[tourism=camp_site], area|z15[tourism=camp_site] +{ icon-image: campsite-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 10; } +node|z15[tourism=artwork] +{ icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;icon-min-distance: 20; } +node|z15[tourism=viewpoint] +{ icon-image: viewpoint-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 10;} +node|z15[tourism=information] +{ icon-image: information-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 10;} + +node|z15[amenity=cafe], area|z15[amenity=cafe] { icon-image: cafe-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 20;} +node|z15[amenity=restaurant], area|z15[amenity=restaurant] { icon-image: restaurant-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;icon-min-distance: 20;} +node|z15[amenity=theatre], area|z15[amenity=theatre] { icon-image: theatre-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;} +node|z15-[tourism=attraction], area|z15-[tourism=attraction] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 20;} +node|z15-[leisure=water_park], area|z15-[leisure=water_park] { icon-image: swimming-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 20;} + +node|z14[tourism=hotel] +{ icon-image: hotel-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 20;} +node|z14[tourism=hostel] +{ icon-image: hotel-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 20; } +node|z15-16[tourism=hotel] +{ icon-image: hotel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 20;} +node|z15-16[tourism=hostel] +{ icon-image: hotel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 20; } +node|z15[amenity=fuel], area|z15[amenity=fuel] { icon-image: fuel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; -x-me-text-priority:15500;icon-min-distance: 20; } + +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] +{ 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] +{ 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;} /* TOURISM, HISTORIC */ @@ -36,17 +128,24 @@ node|z16-[historic=fort],area|z16-[historic=fort] { icon-image: remains-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } node|z16-[historic=castle],area|z16-[historic=castle] { icon-image: remains-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } - -/*node|z16[historic=memorial], area|z16[historic=memorial] { icon-image: monument-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; }*/ +node|z16[historic=memorial], area|z16[historic=memorial] { icon-image: monument-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; icon-min-distance: 12;} node|z16[tourism=gallery],area|z16[tourism=gallery] { icon-image: gallery-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } node|z16[tourism=zoo], area|z16[tourism=zoo] -{ icon-image: zoo-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } +{ icon-image: zoo-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;icon-min-distance: 5; } -node|z15[tourism=camp_site], area|z15[tourism=camp_site] -{ text-offset: 12; icon-image: campsite-m.svg; z-index: 2700; } node|z16[tourism=camp_site], area|z16-17[tourism=camp_site] { icon-image: campsite-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } +node|z16[tourism=artwork] +{ icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;icon-min-distance: 10; } +node|z16[tourism=viewpoint] +{ icon-image: viewpoint-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 10;} +node|z16[tourism=information] +{ icon-image: information-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 10;} +node|z16-[tourism=picnic_site], area|z16-[tourism=picnic_site] { icon-image: picnic-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; icon-min-distance: 10; } +node|z16-[amenity=shelter], area|z16-[amenity=shelter] { icon-image: picnic-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500;icon-min-distance: 10; } +node|z17-[tourism=picnic_site], area|z17-[tourism=picnic_site] { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; icon-min-distance: 10; } +node|z17-[amenity=shelter], area|z17-[amenity=shelter] { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500;icon-min-distance: 10; } node|z18-[tourism], area|z18-[tourism] { font-size: 11; text: name;text-offset: 12; text-color: @poi_label;z-index: 2700; } @@ -64,10 +163,17 @@ node|z17-[tourism=hotel] { icon-image: hotel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } 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] +{ 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;} + node|z17-[tourism=artwork] { icon-image: tourism-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; } node|z17-[tourism=viewpoint] -{ icon-image: tourism-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; } +{ icon-image: viewpoint-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; } node|z17-[tourism=information] { icon-image: information-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; } node|z17-[tourism=camp_site], area|z17-[tourism=camp_site] @@ -87,6 +193,11 @@ node|z17-[historic=fort],area|z17-[historic=fort] { icon-image: remains-l.svg; node|z17-[historic=castle],area|z17-[historic=castle] { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; } /*node|z17-[amenity=fire_station], area|z17-[amenity=fire_station] { icon-image: fire_station-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }*/ +node|z16-[highway=speed_camera] { icon-image: speedcam-m.svg; z-index: 2400; } +node|z16[building=hospital], area|z16-[building=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } +node|z17-[building=hospital], area|z17-[building=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } +node|z17-[highway=speed_camera] { icon-image: speedcam-l.svg; z-index: 2400; } + node|z18-[tourism=museum],area|z18-[tourism=museum] { icon-image: museum-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2700; } node|z18-[historic=museum],area|z18-[historic=museum] @@ -106,13 +217,18 @@ node|z19-[amenity=fire_station], area|z19-[amenity=fire_station] { icon-image: f /* NATURAL*/ -node|z12-14[natural=cave_entrance],area|z12-[natural=cave] { icon-image: cave-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } -node|z15-17[natural=cave_entrance],area|z15-[natural=cave] { icon-image: cave-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } -node|z18-[natural=cave_entrance],area|z16-[natural=cave] { icon-image: cave-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2700; } +node|z11[natural=cave_entrance],area|z11[natural=cave] { icon-image: cave-s.svg;z-index: 2700; icon-min-distance: 20; } +node|z12-13[natural=cave_entrance],area|z12-13[natural=cave] { icon-image: cave-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 15; } +node|z14[natural=cave_entrance],area|z14[natural=cave] { icon-image: cave-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } +node|z15-17[natural=cave_entrance],area|z15-17[natural=cave] { icon-image: cave-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } +node|z18-[natural=cave_entrance],area|z18-[natural=cave] { icon-image: cave-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2700; } +node|z11[natural=waterfall],area|z11[natural=waterfall] { icon-image: waterfall-s.svg;z-index: 2700; icon-min-distance: 15; } node|z12-14[natural=waterfall],area|z12-14[natural=waterfall] { icon-image: waterfall-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } -node|z15-16[natural=waterfall],area|z15-17[natural=waterfall] { icon-image: waterfall-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} +node|z15-16[natural=waterfall],area|z15-16[natural=waterfall] { icon-image: waterfall-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} node|z17-[natural=waterfall],area|z18-[natural=waterfall] { icon-image: waterfall-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2700; } + +node|z11[waterway=waterfall],area|z11[waterway=waterfall] { icon-image: waterfall-s.svg; z-index: 2700; icon-min-distance: 15; } node|z12-14[waterway=waterfall],area|z12-14[waterway=waterfall] { icon-image: waterfall-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } node|z15-16[waterway=waterfall],area|z15-17[waterway=waterfall] { icon-image: waterfall-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} node|z17-[waterway=waterfall],area|z18-[waterway=waterfall] { icon-image: waterfall-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } @@ -125,14 +241,15 @@ area|z10-14[natural=volcano],{ icon-image: volcano-s.svg; text-offset: 10; font- area|z15-16[natural=volcano],{ icon-image: volcano-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} area|z17-[natural=volcano],{ icon-image: volcano-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } + node|z12[natural=peak][name], -{ icon-image: peakt-s.svg; z-index: 2700; } +{ icon-image: peakt-s.svg; z-index: 2700; icon-min-distance: 10; } node|z12[natural=peak][!name], node|z12[natural=bare_rock][!name], node|z12[natural=rock][!name] { } area|z12[natural=peak][name], -{ icon-image: peakt-s.svg; z-index: 2700;} +{ icon-image: peakt-s.svg; z-index: 2700;icon-min-distance: 10;} area|z12[natural=peak][!name], area|z12[natural=bare_rock][!name], area|z12[natural=rock][!name] @@ -169,39 +286,49 @@ area|z15-16[natural=peak],area|z15-16[natural=bare_rock],area|z15-16[natural=roc node|z17-[natural=peak],node|z17-[natural=bare_rock],node|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 6; font-size: 11; text: name; text-color: @poi_label;z-index: 2700; } area|z17-[natural=peak],area|z17-[natural=bare_rock],area|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 6; font-size: 11; text: name; text-color: @poi_label; z-index: 2700;} -node|z12-13[landuse=forest][boundary=national_park],area|z12-14[landuse=forest][boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; -text-halo-radius:0.5; z-index: 2700;} -node|z14[landuse=forest][boundary=national_park],area|z14-[landuse=forest][boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; + +node|z11[landuse=forest][boundary=national_park],area|z11[landuse=forest][boundary=national_park] { icon-image: nparkf-s.svg; z-index: 2700;icon-min-distance: 20;} +node|z12-13[landuse=forest][boundary=national_park],area|z12-13[landuse=forest][boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 2700;icon-min-distance: 12;} +node|z14[landuse=forest][boundary=national_park],area|z14-[landuse=forest][boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 11; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; text-halo-radius:0.5; z-index: 2700;} node|z15-16[landuse=forest][boundary=national_park],area|z15-16[landuse=forest][boundary=national_park] { icon-image: nparkf-m.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label;text-halo-opacity: 0.9; text-halo-color: @label_halo_light; text-halo-radius:0.5; z-index: 2700;} node|z17-[landuse=forest][boundary=national_park],area|z17-[landuse=forest][boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.9; text-halo-color: @label_halo_light; text-halo-radius:0.5; z-index: 2700;} -node|z12-13[leisure=nature_reserve],area|z12-14[leisure=nature_reserve] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; -text-halo-radius:0.5; z-index: 30;} -node|z14[leisure=nature_reserve],area|z14-[leisure=nature_reserve]{ icon-image: nparkf-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; +node|z11[leisure=nature_reserve],area|z11[leisure=nature_reserve] { icon-image: nparkf-s.svg; z-index: 30;icon-min-distance: 20;} +node|z12-13[leisure=nature_reserve],area|z12-13[leisure=nature_reserve] { icon-image: nparkf-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 30;icon-min-distance: 12;} +node|z14[leisure=nature_reserve],area|z14-[leisure=nature_reserve]{ icon-image: nparkf-s.svg; text-offset: 8; font-size: 11; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; text-halo-radius:0.5; z-index: 30;} node|z15-16[leisure=nature_reserve],area|z15-16[leisure=nature_reserve] { icon-image: nparkf-m.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.9; text-halo-color: @label_halo_light; text-halo-radius:0.5; z-index: 30; } node|z17-[leisure=nature_reserve],area|z17-[leisure=nature_reserve] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.9; text-halo-color: @label_halo_light; text-halo-radius:0.5; z-index: 30; } +node|z12-13[natural=beach], area|z12-13[natural=beach]{ icon-image: beach-s.svg;z-index: 2400;icon-min-distance: 10; } +node|z14[natural=beach], area|z14[natural=beach]{ icon-image: beach-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; icon-min-distance: 5; } node|z15-16[natural=beach], area|z15-16[natural=beach]{ icon-image: beach-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } node|z17-[natural=beach], area|z17-[natural=beach]{ icon-image: beach-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; } /* AMENITY */ +node|z13-14[amenity=fast_food], area|z13-14[amenity=fast_food] { icon-image: fastfood-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;icon-min-distance: 20;} +node|z13-14[amenity=bar], area|z13-14[amenity=bar] { icon-image: beer-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;icon-min-distance: 20;} +node|z13-14[amenity=pub], area|z13-14[amenity=pub] { icon-image: beer-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 20;} -node|z15-[natural=spring],area|z17-[natural=spring]{ icon-image: drinking-water-m.svg; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } -node|z15-[amenity=hunting_stand], area|z18-[amenity=hunting_stand] { icon-image: hunting-tower-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } -node|z15-[tourism=attraction], area|z15-[tourism=attraction ] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; } - +node|z15-16[amenity=fast_food], area|z15-16[amenity=fast_food] { icon-image: fastfood-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;icon-min-distance: 20;} +node|z15-16[amenity=bar], area|z15-16[amenity=bar] { icon-image: beer-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;icon-min-distance: 20;} +node|z15-16[amenity=pub], area|z15-16[amenity=pub] { icon-image: beer-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 20;} +node|z15-16[shop=car_repair], area|z15-16[shop=car_repair] { icon-image: car-repair-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;icon-min-distance: 20;} +node|z15-16[amenity=fountain],area|z15-16[amenity=fountain] { icon-image: fountain-m.svg; z-index: 1000; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;icon-min-distance: 20;} +node|z15-16[amenity=drinking_water],area|z15-16[amenity=drinking_water],node|z15-16[amenity=water_point] ,area|z15-16[amenity=water_point]{ icon-image: drinking-water-m.svg;z-index: 2400; icon-min-distance: 20;} node|z16[amenity=place_of_worship], area|z16[amenity=place_of_worship] { icon-image: place-of-worship-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;} -/*node|z16[amenity=theatre], area|z16[amenity=theatre] { icon-image: theatre-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} +/* node|z16[amenity=kindergarten], area|z16[amenity=kindergarten] { icon-image: kindergarten-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } node|z16[amenity=school], area|z16[amenity=school] { icon-image: school-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}*/ node|z16[amenity=college], area|z16[amenity=college] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; } @@ -217,6 +344,8 @@ node|z16[amenity=theatre], area|z16[amenity=theatre] { icon-image: theatre-m.svg node|z16-[tourism=attraction], area|z16-[tourism=attraction] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } node|z16-[leisure=water_park], area|z16-[leisure=water_park] { icon-image: swimming-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } + + node|z17[amenity=place_of_worship], area|z17[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;} node|z17[amenity=theatre], area|z17[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; } node|z17[amenity=kindergarten], area|z17[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2100; } @@ -248,7 +377,7 @@ node|z17-[historic=fort],area|z17-[historic=fort] { icon-image: remains-l.svg; node|z17-[historic=castle],area|z17-[historic=castle] { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} node|z17-[tourism=attraction],area|z17-[tourism=attraction] { icon-image: tourism-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } node|z17-[leisure=water_park], area|z17-[leisure=water_park] { icon-image: swimming-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } -node|z16[amenity=theatre], area|z16[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;} +node|z17-[amenity=theatre], area|z17-[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;} node|z18-[amenity=place_of_worship], area|z18-[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;} @@ -274,13 +403,13 @@ node|z18-[amenity=atm], area|z18-[amenity=atm] { z-index: 4200; icon-image: atm- node|z18-[amenity=pharmacy], area|z18-[amenity=pharmacy] { icon-image: pharmacy-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; } node|z18-[amenity=cafe], area|z18-[amenity=cafe] { icon-image: cafe-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;} node|z18-[amenity=restaurant], area|z18-[amenity=restaurant] { icon-image: restaurant-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2600; } -node|z18-[amenity=fast_food], area|z18-[amenity=fast_food] { icon-image: fastfood-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} -node|z18-[amenity=bar], area|z18-[amenity=bar] { icon-image: beer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;} -node|z18-[amenity=pub], area|z18-[amenity=pub] { icon-image: beer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2600; } +node|z17-[amenity=fast_food], area|z17-[amenity=fast_food] { icon-image: fastfood-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} +node|z17-[amenity=bar], area|z17-[amenity=bar] { icon-image: beer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;} +node|z17-[amenity=pub], area|z17-[amenity=pub] { icon-image: beer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2600; } node|z18-[amenity=nightclub], area|z18-[amenity=nightclub] { icon-image: bar-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} node|z18-[amenity=bureau_de_change] { icon-image: banknote-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; } node|z18-[amenity=bench] { icon-image: bench.svg;z-index: 2400; } -node|z18-[natural=tree] { icon-image: tree-m.svg; z-index: 2400;} +node|z18-[natural=tree] { icon-image: tree-s.svg; z-index: 2400;} node|z19-[man_made=survey_point] { icon-image: survey_point-l.svg; z-index: 2400;} node|z18-[amenity=fountain],area|z18-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; } @@ -295,106 +424,6 @@ node|z18-[historic=monument],area|z18-[historic=monument] { icon-image: monumen node|z18-[amenity=hunting_stand], area|z18-[amenity=hunting_stand] { icon-image: hunting-tower-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} node|z18-[office], area|z18-[office] { icon-image: office-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; } - -node|z19-[amenity=telephone] { icon-image: phone-l.svg; z-index: 2500; } -node|z19-[amenity=recycling], area|z19-[amenity=recycling], { icon-image: recycling-l.svg;z-index: 2500; } - - -/* SHOPS */ -node|z19-[shop], area|z19-[shop] { icon-image: shop-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} - -node|z16-[shop=mall] { icon-image: shop-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; } -node|z17-[shop=mall] { icon-image: shop-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;} -node|z17-[shop=supermarket] { icon-image: grocery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;} -node|z17-[shop=car_repair], area|z17-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;} - -node|z18-[shop=alcohol] { icon-image: alcohol-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; } -node|z17-19[shop=laundry], area|z18-[shop=laundry] { icon-image:laundry-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 25001; } -node|z18-[shop=car_repair], area|z18-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500; } - - -/* SPORT */ -/* LEISURE */ - -node|z16-[sport=soccer], area|z17-[sport=soccer] { icon-image: soccer-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; } -node|z17-[leisure=swimming_pool],area|z17-[leisure=swimming_pool] { icon-image: swimming-l.svg;z-index: 2600; } -node|z17-[leisure=stadium] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; } -node|z17-[leisure=pitch] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; } -node|z17-[sport=multi] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; } - -node|z17-[leisure=sports_centre] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; -x-me-text-priority: 15500;} -node|z18-[leisure=playground] { icon-image: pitch-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; } -node|z17-[leisure=swimming_pool],area|z18-[leisure=swimming_pool] { icon-image: swimming-l.svg;z-index: 2600; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; } -node|z17-[leisure=golf_course], area|z18-[leisure=golf_course] { icon-image: golf-l.svg;z-index: 50; } /* нельзя другой z-inex^иначе пропадают все объекты на поле */ - -node|z17-[sport=soccer], area|z17-[sport=soccer] { icon-image: soccer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; } -node|z17-[sport=football], area|z17-[sport=football] { icon-image: soccer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; } -node|z17-[sport=tennis] { icon-image: tennis-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;} -node|z17-[leisure=skiing] { icon-image: skiing-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; } - -node|z18-[sport=swimming] { icon-image: swimming-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} -node|z18-[sport=baseball] { icon-image: baseball-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} -node|z18-[sport=basketball] { icon-image: basketball-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} -node|z18-[sport=american_football] { icon-image: america-football-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; } -node|z18-[sport=athletics] { icon-image: pitch-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} -node|z18-[sport=golf] { icon-image: golf-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; } -node|z18-[sport=gymnastics] { icon-image: pitch-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} - -node|z16-[highway=speed_camera] { icon-image: speedcam-m.svg; z-index: 2400; } -node|z17-[highway=speed_camera] { icon-image: speedcam-l.svg; z-index: 2400; } - -/* We don't have separate building=hospital type -node|z16-[building=hospital], area|z16-[building=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } -node|z17-[building=hospital], area|z17-[building=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } -*/ - -/* PARKINGS */ -area|z16-[amenity=parking] {fill-color: @parking;fill-oppacity:1;fill-position:background;z-index: 6; } - -node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 6; } -node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 6; } -node|z17[amenity=parking][access=permissive], -node|z17[amenity=parking][access=private] { icon-image: zero-icon.svg; z-index: 6; } - -node|z18-[amenity=parking], area|z18-[amenity=parking] { icon-image: parking-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 6; } - - -area|z17-[aeroway=heliport], -area|z17-[aeroway=helipad], -node|z17-[aeroway=heliport], -node|z17-[aeroway=helipad] - -{ icon-image: heliport-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } - -/* MAN MADE */ - -node|z14-[landuse=landfill],area|z14-[landuse=landfill] -{ icon-image: recycling-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } - -node|z15-16[man_made=lighthouse], area|z15-16[man_made=lighthouse] { icon-image: lighthouse-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} -node|z17-[man_made=lighthouse], area|z17-[man_made=lighthouse] { icon-image: lighthouse-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } - -/* BORDER */ -node|z15-[barrier=toll_booth],area|z15-[barrier=toll_booth] { icon-image: toll_booth-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } -node|z17-[barrier=toll_booth],area|z15-[barrier=toll_booth] { icon-image: toll_booth-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } - -node|z15-[barrier=border_control] -{ icon-image:bcontrol-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } -node|z17-[barrier=border_control] -{ icon-image:bcontrol-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } - -line|z17-[barrier=block], -line|z17-[barrier=bollard], -line|z17-[barrier=entrance], -line|z17-[barrier=gate], -line|z17-[barrier=stile], -line|z17-[power=tower], -{ icon-image: dot-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; } - - - - -/* NEW POI */ node|z18-[craft], area|z18-[craft]{ icon-image: hand-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} @@ -407,10 +436,121 @@ node|z18-[amenity=bbq], area|z18-[amenity=bbq]{ icon-image: bbq-l.svg; text-offs node|z18-[amenity=car_rental], area|z18-[amenity=car_rental]{ icon-image: car_sharing-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} /*node|z18-[], area|z18-[] { icon-image: none.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }*/ +node|z17-[amenity=vending_machine], area|z17-[amenity=vending_machine] { icon-image: vending-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } node|z18-[amenity=vending_machine], area|z18-[amenity=vending_machine] { icon-image: vending-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; } /*node|z18-[vending=parking_tickets], area|z18-[vending=parking_tickets] { icon-image: parking-meter-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }*/ +node|z16-[amenity=casino], area|z16-[amenity=casino]{ icon-image: casino-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[amenity=marketplace], area|z16-[amenity=marketplace]{ icon-image: marketplace-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[amenity=taxi], area|z16-[amenity=taxi]{ icon-image: taxi-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[barrier=lift_gate], area|z16-[barrier=lift_gate] { icon-image: lift_gate-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[barrier=toll_booth], area|z16-[barrier=toll_booth] { icon-image: toll_booth-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[historic=boundary_stone], area|z16-[historic=boundary_stone]{ icon-image: boundary_stone-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[historic=ship], area|z16-[historic=ship]{ icon-image: historic-ship-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[historic=tomb], area|z16-[historic=tomb] { icon-image: tomb-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[historic=wayside_cross], area|z16-[historic=wayside_cross]{ icon-image: wayside_cross-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[historic=wayside_shrine], area|z16-[historic=wayside_shrine] { icon-image: wayside_shrine-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[leisure=dog_park], area|z16-[leisure=dog_park] { icon-image: dog_park-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[leisure=water_park], area|z16-[leisure=water_park]{ icon-image: swimming-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[man_made=windmill], area|z16-[man_made=windmill]{ icon-image: windmill-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[sport=equestrian], area|z16-[sport=equestrian]{ icon-image: equestrian-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} + + +node|z16-[shop=books], area|z16-[shop=books]{ icon-image: book-shop-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=bakery], area|z16-[shop=bakery] { icon-image: bakery-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=beauty], area|z16-[shop=beauty] { icon-image: beauty-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=beverages], area|z16-[shop=beverages] { icon-image: alcohol-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=bicycle], area|z16-[shop=bicycle]{ icon-image: shop-bicycle-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=butcher], area|z16-[shop=butcher] { icon-image: butcher-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=car], area|z16-[shop=car]{ icon-image: car_sharing-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=car_repair], area|z16-[shop=car_repair] { icon-image: car-repair-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=chemist], area|z16-[shop=chemist] { icon-image: chemist-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=clothes], area|z16-[shop=clothes] { icon-image: clothes-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=computer], area|z16-[shop=computer]{ icon-image: computer-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=confectionery], area|z16-[shop=confectionery]{ icon-image: sweets-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=convenience], area|z16-[shop=convenience] { icon-image: convenience-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=department_store], area|z16-[shop=department_store]{ icon-image: department_store-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=doityourself], area|z16-[shop=doityourself] { icon-image: doityourself-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=electronics], area|z16-[shop=electronics] { icon-image: electronics-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=florist], area|z16-[shop=florist]{ icon-image: florist-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=furniture], area|z16-[shop=furniture]{ icon-image: furniture-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=garden_centre], area|z16-[shop=garden_centre]{ icon-image: garden_center-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=gift], area|z16-[shop=gift]{ icon-image: gift-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=greengrocer], area|z16-[shop=greengrocer]{ icon-image: greengrocer-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=hairdresser], area|z16-[shop=hairdresser] { icon-image: hairdresser-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=hardware], area|z16-[shop=hardware]{ icon-image: hardware-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=jewelry], area|z16-[shop=jewelry] { icon-image: jewelry-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=kiosk], area|z16-[shop=kiosk]{ icon-image: kiosk-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=mobile_phone], area|z16-[shop=mobile_phone]{ icon-image: mobile_phone-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=optician], area|z16-[shop=optician]{ icon-image: optician-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=shoes], area|z16-[shop=shoes]{ icon-image: shoes-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} +node|z16-[shop=sports], area|z16-[shop=sports]{ icon-image: sports-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 30; } +node|z16-[shop=toys], area|z16-[shop=toys]{ icon-image: toys-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;} + +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=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;} + + + +node|z17-[amenity=casino], area|z17-[amenity=casino]{ icon-image: casino-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[amenity=marketplace], area|z17-[amenity=marketplace]{ icon-image: marketplace-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[amenity=taxi], area|z17-[amenity=taxi]{ icon-image: taxi-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[barrier=lift_gate], area|z17-[barrier=lift_gate] { icon-image: lift_gate-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[barrier=toll_booth], area|z17-[barrier=toll_booth] { icon-image: toll_booth-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[historic=boundary_stone], area|z17-[historic=boundary_stone]{ icon-image: boundary_stone-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[historic=ship], area|z17-[historic=ship]{ icon-image: historic-ship-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[historic=tomb], area|z17-[historic=tomb] { icon-image: tomb-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[historic=wayside_cross], area|z17-[historic=wayside_cross]{ icon-image: wayside_cross-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[historic=wayside_shrine], area|z17-[historic=wayside_shrine] { icon-image: wayside_shrine-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[leisure=dog_park], area|z17-[leisure=dog_park] { icon-image: dog_park-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[leisure=water_park], area|z17-[leisure=water_park]{ icon-image: swimming-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[man_made=windmill], area|z17-[man_made=windmill]{ icon-image: windmill-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[sport=equestrian], area|z17-[sport=equestrian]{ icon-image: equestrian-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} + + +node|z17-[shop=books], area|z17-[shop=books]{ icon-image: book-shop-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=bakery], area|z17-[shop=bakery] { icon-image: bakery-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=beauty], area|z17-[shop=beauty] { icon-image: beauty-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=beverages], area|z17-[shop=beverages] { icon-image: alcohol-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=bicycle], area|z17-[shop=bicycle]{ icon-image: shop-bicycle-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=butcher], area|z17-[shop=butcher] { icon-image: butcher-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=car], area|z17-[shop=car]{ icon-image: car_sharing-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=car_repair], area|z17-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=chemist], area|z17-[shop=chemist] { icon-image: chemist-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=clothes], area|z17-[shop=clothes] { icon-image: clothes-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=computer], area|z17-[shop=computer]{ icon-image: computer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=confectionery], area|z17-[shop=confectionery]{ icon-image: sweets-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=convenience], area|z17-[shop=convenience] { icon-image: convenience-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=department_store], area|z17-[shop=department_store]{ icon-image: department_store-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=doityourself], area|z17-[shop=doityourself] { icon-image: doityourself-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=electronics], area|z17-[shop=electronics] { icon-image: electronics-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=florist], area|z17-[shop=florist]{ icon-image: florist-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=furniture], area|z17-[shop=furniture]{ icon-image: furniture-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=garden_centre], area|z17-[shop=garden_centre]{ icon-image: garden_center-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=gift], area|z17-[shop=gift]{ icon-image: gift-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=greengrocer], area|z17-[shop=greengrocer]{ icon-image: greengrocer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=hairdresser], area|z17-[shop=hairdresser] { icon-image: hairdresser-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=hardware], area|z17-[shop=hardware]{ icon-image: hardware-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=jewelry], area|z17-[shop=jewelry] { icon-image: jewelry-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=kiosk], area|z17-[shop=kiosk]{ icon-image: kiosk-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=mobile_phone], area|z17-[shop=mobile_phone]{ icon-image: mobile_phone-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=optician], area|z17-[shop=optician]{ icon-image: optician-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=shoes], area|z17-[shop=shoes]{ icon-image: shoes-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z17-[shop=sports], area|z17-[shop=sports]{ icon-image: sports-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=toys], area|z17-[shop=toys]{ icon-image: toys-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} + +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=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;} + + + node|z18-[amenity=casino], area|z18-[amenity=casino]{ icon-image: casino-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; } node|z18-[amenity=marketplace], area|z18-[amenity=marketplace]{ icon-image: marketplace-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[amenity=taxi], area|z18-[amenity=taxi]{ icon-image: taxi-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} @@ -458,6 +598,141 @@ node|z18-[shop=shoes], area|z18-[shop=shoes]{ icon-image: shoes-l.svg; text-offs node|z18-[shop=sports], area|z18-[shop=sports]{ icon-image: sports-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; } node|z18-[shop=toys], area|z18-[shop=toys]{ icon-image: toys-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} +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=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;} + +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;} +node|z17-[power=substation], area|z17-[power=substation]{ icon-image: power-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} + +node|z19-[power=station], area|z19-[power=station]{ icon-image: power-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} +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-[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-[amenity=recycling], area|z19-[amenity=recycling], { icon-image: recycling-l.svg;z-index: 2500; } + +/* SHOPS */ +node|z15-16[shop], area|z15-16[shop] { icon-image: shop-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;icon-min-distance: 20;} +node|z17-[shop], area|z17-[shop] { icon-image: shop-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;icon-min-distance: 10;} + + +node|z13-14[shop=mall] { icon-image: shop-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 20;} +node|z15-16[shop=mall] { icon-image: shop-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 15;} +node|z17-[shop=mall] { icon-image: shop-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;} + + +node|z13-14[shop=supermarket] { icon-image: grocery-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 20;} +node|z15-16[shop=supermarket] { icon-image: grocery-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 15;} +node|z17-[shop=supermarket] { icon-image: grocery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;} + +node|z13-14[amenity=marketplace], area|z13-14[amenity=marketplace]{ icon-image: marketplace-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;} +node|z15-16[amenity=marketplace], area|z17-[amenity=marketplace]{ icon-image: marketplace-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 15;} +node|z17-[amenity=marketplace], area|z17-[amenity=marketplace]{ icon-image: marketplace-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} + +node|z13-14[shop=alcohol] { icon-image: alcohol-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z15-16[shop=alcohol] { icon-image: alcohol-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z17-[shop=alcohol] { icon-image: alcohol-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 20; } +node|z18-[shop=alcohol] { icon-image: alcohol-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; } + +node|z15-16[shop=laundry], area|z15-16[shop=laundry] { icon-image:laundry-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 25001;icon-min-distance: 20; } +node|z17-19[shop=laundry], area|z17-19[shop=laundry] { icon-image:laundry-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 25001; } + +node|z17-[shop=car_repair], area|z17-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;} +node|z18-[shop=car_repair], area|z18-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500; } + + +/* SPORT */ +/* LEISURE */ +node|z13-14[sport=soccer], area|z13-14[sport=soccer] { icon-image: soccer-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6;icon-min-distance: 50; } + +node|z13-14[leisure=swimming_pool],area|z13-14[leisure=swimming_pool] { icon-image: swimming-s.svg;z-index: 2600;icon-min-distance: 50; } +node|z13-14[leisure=stadium] { icon-image: pitch-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; icon-min-distance: 50; } +node|z13-14[leisure=pitch] { icon-image: pitch-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6;icon-min-distance: 50; } +node|z13-14[sport=multi] { icon-image: pitch-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; icon-min-distance: 50; } +node|z13-14[leisure=sports_centre] { icon-image: pitch-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; -x-me-text-priority: 15500;icon-min-distance: 50; } +node|z13-14[leisure=swimming_pool],area|z13-14[leisure=swimming_pool] { icon-image: swimming-s.svg;z-index: 2600; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;icon-min-distance: 50; } +node|z13-14[leisure=golf_course], area|z13-14[leisure=golf_course] { icon-image: golf-s.svg;z-index: 50;icon-min-distance: 40; } /* нельзя другой z-inex^иначе пропадают все объекты на поле */ + +node|z13-14[sport=soccer], area|z13-14[sport=soccer] { icon-image: soccer-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; icon-min-distance: 50; } +node|z13-14[sport=football], area|z13-14[sport=football] { icon-image: soccer-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6;icon-min-distance: 50; } +node|z13-14[sport=tennis] { icon-image: tennis-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;icon-min-distance: 50; } +node|z13-14[leisure=skiing] { icon-image: skiing-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 50; } + +node|z13-14[sport=archery], area|z13-14[sport=archery]{ icon-image: archery-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 50;} +node|z13-14[sport=shooting], area|z13-14[sport=shooting]{ icon-image: archery-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 50;} +node|z13-14[sport=australian_football], area|z13-14[sport=australian_football]{ icon-image: australian-football-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; icon-min-distance: 50;} +node|z13-14[sport=bowls], area|z13-14[sport=bowls] { icon-image: bowls-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 50;} +node|z13-14[sport=cricket], area|z13-14[sport=cricket]{ icon-image: cricket-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 50;} +node|z13-14[sport=curling], area|z13-14[sport=curling] { icon-image: curling-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 50;} +node|z13-14[sport=diving], area|z13-14[sport=diving] { icon-image: diving-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 50; } +node|z13-14[sport=scuba_diving], area|z13-14[sport=scuba_diving]{ icon-image: diving-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; icon-min-distance: 50;} + + + +node|z15-16[sport=soccer], area|z15-16[sport=soccer] { icon-image: soccer-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6;icon-min-distance: 40; } + +node|z15-16[leisure=swimming_pool],area|z15-16[leisure=swimming_pool] { icon-image: swimming-m.svg;z-index: 2600;icon-min-distance: 40; } +node|z15-16[leisure=stadium] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; icon-min-distance: 40; } +node|z15-16[leisure=pitch] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6;icon-min-distance: 40; } +node|z15-16[sport=multi] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; icon-min-distance: 40; } +node|z15-16[leisure=sports_centre] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; -x-me-text-priority: 15500;icon-min-distance: 40; } +node|z15-16[leisure=playground] { icon-image: pitch-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 40; } +node|z15-16[leisure=swimming_pool],area|z15-16[leisure=swimming_pool] { icon-image: swimming-m.svg;z-index: 2600; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;icon-min-distance: 40; } +node|z15-16[leisure=golf_course], area|z15-16[leisure=golf_course] { icon-image: golf-m.svg;z-index: 50;icon-min-distance: 20; } /* нельзя другой z-inex^иначе пропадают все объекты на поле */ + +node|z15-16[sport=soccer], area|z15-16[sport=soccer] { icon-image: soccer-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; icon-min-distance: 40; } +node|z15-16[sport=football], area|z15-16[sport=football] { icon-image: soccer-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6;icon-min-distance: 40; } +node|z15-16[sport=tennis] { icon-image: tennis-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;icon-min-distance: 40; } +node|z15-16[leisure=skiing] { icon-image: skiing-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 40; } + +node|z15-16[sport=archery], area|z15-16[sport=archery]{ icon-image: archery-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 40;} +node|z15-16[sport=shooting], area|z15-16[sport=shooting]{ icon-image: archery-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 40;} +node|z15-16[sport=australian_football], area|z15-16[sport=australian_football]{ icon-image: australian-football-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; icon-min-distance: 40;} +node|z15-16[sport=bowls], area|z15-16[sport=bowls] { icon-image: bowls-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 40;} +node|z15-16[sport=cricket], area|z15-16[sport=cricket]{ icon-image: cricket-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 40;} +node|z15-16[sport=curling], area|z15-16[sport=curling] { icon-image: curling-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 40;} +node|z15-16[sport=diving], area|z15-16[sport=diving] { icon-image: diving-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 40; } +node|z15-16[sport=scuba_diving], area|z15-16[sport=scuba_diving]{ icon-image: diving-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; icon-min-distance: 40;} + + +node|z17-[leisure=swimming_pool],area|z17-[leisure=swimming_pool] { icon-image: swimming-l.svg;z-index: 2600;icon-min-distance: 10; } +node|z17-[leisure=stadium] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6;icon-min-distance: 10; } +node|z17-[leisure=pitch] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; icon-min-distance: 10; } +node|z17-[sport=multi] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; icon-min-distance: 10; } + +node|z17-[leisure=sports_centre] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; -x-me-text-priority: 15500;icon-min-distance: 10; } +node|z17-[leisure=playground] { icon-image: pitch-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; icon-min-distance: 10; } +node|z17-[leisure=swimming_pool],area|z17-[leisure=swimming_pool] { icon-image: swimming-l.svg;z-index: 2600; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;icon-min-distance: 10; } +node|z17-[leisure=golf_course], area|z17-[leisure=golf_course] { icon-image: golf-l.svg;z-index: 50;icon-min-distance: 10; } /* нельзя другой z-inex^иначе пропадают все объекты на поле */ + +node|z17-[sport=soccer], area|z17-[sport=soccer] { icon-image: soccer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6;icon-min-distance: 10; } +node|z17-[sport=football], area|z17-[sport=football] { icon-image: soccer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; icon-min-distance: 10; } +node|z17-[sport=tennis] { icon-image: tennis-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;icon-min-distance: 10; } +node|z17-[leisure=skiing] { icon-image: skiing-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; icon-min-distance: 10; } + +node|z17-[sport=archery], area|z17-[sport=archery]{ icon-image: archery-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 10; } +node|z17-[sport=shooting], area|z17-[sport=shooting]{ icon-image: archery-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 10; } +node|z17-[sport=australian_football], area|z17-[sport=australian_football]{ icon-image: australian-football-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; icon-min-distance: 10; } +node|z17-[sport=bowls], area|z17-[sport=bowls] { icon-image: bowls-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 10; } +node|z17-[sport=cricket], area|z17-[sport=cricket]{ icon-image: cricket-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 10; } +node|z17-[sport=curling], area|z17-[sport=curling] { icon-image: curling-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 10; } +node|z17-[sport=diving], area|z17-[sport=diving] { icon-image: diving-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; icon-min-distance: 10; } +node|z17-[sport=scuba_diving], area|z17-[sport=scuba_diving]{ icon-image: diving-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400;icon-min-distance: 10; } + + +node|z18-[sport=swimming] { icon-image: swimming-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} +node|z18-[sport=baseball] { icon-image: baseball-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} +node|z18-[sport=basketball] { icon-image: basketball-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} +node|z18-[sport=american_football] { icon-image: america-football-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; } +node|z18-[sport=athletics] { icon-image: pitch-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} +node|z18-[sport=golf] { icon-image: golf-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; } +node|z18-[sport=gymnastics] { icon-image: pitch-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;} + node|z18-[sport=archery], area|z18-[sport=archery]{ icon-image: archery-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[sport=shooting], area|z18-[sport=shooting]{ icon-image: archery-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[sport=australian_football], area|z18-[sport=australian_football]{ icon-image: australian-football-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; } @@ -466,13 +741,73 @@ node|z18-[sport=cricket], area|z18-[sport=cricket]{ icon-image: cricket-l.svg; t node|z18-[sport=curling], area|z18-[sport=curling] { icon-image: curling-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[sport=diving], area|z18-[sport=diving] { icon-image: diving-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; } node|z18-[sport=scuba_diving], area|z18-[sport=scuba_diving]{ icon-image: diving-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=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=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;} +/* PARKINGS */ -node|z18-[power=station], area|z18-[power=station]{ icon-image: power-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} -node|z18-[power=substation], area|z18-[power=substation]{ icon-image: power-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;} +area|z15-[amenity=parking] {fill-color: @parking;fill-oppacity:1;fill-position:background;z-index: 6; } + +node|z16[amenity=parking] area|z16[amenity=parking]{ icon-image: parking-s.svg; z-index: 6;icon-min-distance: 25; } +node|z16[amenity=parking][access=permissive], +node|z16[amenity=parking][access=private] { icon-image: zero-icon.svg; z-index: 6; } + +node|z17[amenity=parking] area|z17[amenity=parking]{ icon-image: parking-m.svg; z-index: 6; } +node|z17[amenity=parking][access=permissive], +node|z17[amenity=parking][access=private] { icon-image: zero-icon.svg; z-index: 6; } + +node|z18-[amenity=parking], area|z18-[amenity=parking] { icon-image: parking-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 6; } + +area|z14[aeroway=heliport], +area|z14[aeroway=helipad], +node|z14[aeroway=heliport], +node|z14[aeroway=helipad] +{ icon-image: heliport-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 30; } + + +area|z15-16[aeroway=heliport], +area|z15-16[aeroway=helipad], +node|z15-16[aeroway=heliport], +node|z15-16[aeroway=helipad] + +{ icon-image: heliport-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 10; } + +area|z17-[aeroway=heliport], +area|z17-[aeroway=helipad], +node|z17-[aeroway=heliport], +node|z17-[aeroway=helipad] + +{ icon-image: heliport-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } + +/* MAN MADE */ + +node|z14-[landuse=landfill],area|z14-[landuse=landfill] +{ icon-image: recycling-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } +node|z15-16[landuse=landfill],area|z15-[landuse=landfill] +{ icon-image: recycling-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } + +node|z17-[landuse=landfill],area|z17-[landuse=landfill] +{ icon-image: recycling-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } + + +node|z12[man_made=lighthouse], area|z11-12[man_made=lighthouse] { icon-image: lighthouse-s.svg; z-index: 2700;icon-min-distance: 10; } +node|z13-14[man_made=lighthouse], area|z15-16[man_made=lighthouse] { icon-image: lighthouse-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;icon-min-distance: 5; } +node|z15-16[man_made=lighthouse], area|z15-16[man_made=lighthouse] { icon-image: lighthouse-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} +node|z17-[man_made=lighthouse], area|z17-[man_made=lighthouse] { icon-image: lighthouse-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } + +/* BORDER */ +node|z12-14[barrier=toll_booth],area|z12-14[barrier=toll_booth] { icon-image: toll_booth-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 10; } +node|z15-16[barrier=toll_booth],area|z15-16[barrier=toll_booth] { icon-image: toll_booth-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } +node|z17-[barrier=toll_booth],area|z17-[barrier=toll_booth] { icon-image: toll_booth-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } + +node|z15-[barrier=border_control] +{ icon-image:bcontrol-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } +node|z17-[barrier=border_control] +{ icon-image:bcontrol-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } + +line|z16-[barrier=block], +line|z16-[barrier=bollard], +line|z16-[barrier=entrance], +line|z16-[barrier=gate], +line|z16-[barrier=stile], +line|z16-[power=tower], +{ icon-image: dot-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; } diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss index 4c05913975..f533e6ddc0 100644 --- a/data/styles/clear/include/labels.mapcss +++ b/data/styles/clear/include/labels.mapcss @@ -15,6 +15,7 @@ node|z1[place=continent] text-color: @country_label; max-width: 5; z-index: 999; + -x-me-text-priority:16000; } node|z2[place=continent] @@ -24,6 +25,7 @@ node|z2[place=continent] text-color: @country_label; max-width: 5; z-index: 999; + -x-me-text-priority:16000; } /* COUNTRIES */ @@ -34,6 +36,7 @@ node|z3[place=country] font-size: 10; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z3[place=country]::int_name { @@ -41,6 +44,7 @@ node|z3[place=country]::int_name font-size: 8; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z4[place=country] @@ -49,6 +53,7 @@ node|z4[place=country] font-size: 12; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z4[place=country]::int_name @@ -57,6 +62,7 @@ node|z4[place=country]::int_name font-size: 10; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z5[place=country] @@ -65,6 +71,7 @@ node|z5[place=country] font-size: 13; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z5[place=country]::int_name { @@ -72,6 +79,7 @@ node|z5[place=country]::int_name font-size: 11; text-color: @country_label; z-index: 1000; +-x-me-text-priority:16000; } node|z6[place=country] { @@ -79,6 +87,7 @@ node|z6[place=country] font-size: 15; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z6[place=country]::int_name { @@ -86,6 +95,7 @@ node|z6[place=country]::int_name font-size: 13; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z7[place=country] { @@ -93,6 +103,7 @@ node|z7[place=country] font-size: 17; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z7[place=country]::int_name { @@ -100,6 +111,7 @@ node|z7[place=country]::int_name font-size: 15; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z8[place=country] { @@ -107,6 +119,7 @@ node|z8[place=country] font-size: 19; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z8[place=country]::int_name { @@ -114,6 +127,7 @@ node|z8[place=country]::int_name font-size: 17; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z9-[place=country] { @@ -121,6 +135,7 @@ node|z9-[place=country] font-size: 21; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } node|z9-[place=country]::int_name { @@ -128,6 +143,7 @@ node|z9-[place=country]::int_name font-size: 19; text-color: @country_label; z-index: 1000; + -x-me-text-priority:16000; } /* Z-INDEXES */ @@ -1316,8 +1332,9 @@ area|z16[building], node|z16[building], area|z16[addr:housenumber][addr:street], node|z16[addr:housenumber][addr:street], + { - text: addr:housename; + text: "addr:housename"; font-size: 9; text-color: @housename; text-position: center; @@ -1373,7 +1390,7 @@ node|z18-[entrance] { font-size: 10; text: ref; - text-offset-x: 9; + text-offset-x: 10; z-index: 10; text-color: @building_label; } @@ -1411,6 +1428,7 @@ node|z15-[landuse=construction], node|z15-[landuse=landfill], node|z15-[landuse=railway], node|z15-[landuse=quarry], + { text: name; font-size: 10; @@ -1419,8 +1437,7 @@ node|z15-[landuse=quarry], } /* COMMERCIAL */ -area|z17-[landuse=commercial] -{ +area|z17-[landuse=commercial]{ text: name; font-size: 10; text-color: @poi_label; @@ -1428,6 +1445,17 @@ area|z17-[landuse=commercial] } +/* +area|z16[addr:housenumber][addr:street], +node|z16[addr:housenumber][addr:street] +{ + text: "addr:housenumber"; + font-size: 10; + text-color: @addr_z16; + text-position: center; +} +*/ + /* NATURAL LABELS - курсив бы */ node|z1-2[place=ocean]{ @@ -1510,12 +1538,10 @@ line[waterway] area|z10-[natural=lake][bbox_area>=4000000], area|z10-[landuse=reservoir][bbox_area>=4000000], area|z10-[natural=water][bbox_area>=4000000] -{ - text: name; - font-size: 9; - text-color: @water_label; - z-index: 10000; -} +{text: name; +font-size: 9; +text-color: @water_label; +z-index: 10000;} area|z10-[natural=lake][bbox_area<4000000], area|z10-[landuse=reservoir][bbox_area<4000000], @@ -1525,18 +1551,16 @@ area|z10-[natural=water][bbox_area<4000000] area|z12-[natural=lake][bbox_area>=10000000], area|z12-[landuse=reservoir][bbox_area>=10000000], area|z12-[natural=water][bbox_area>=10000000] -{ - text: name; + {text: name; font-size: 10; text-color: @water_label; - z-index: 300; -} + z-index: 300;} area|z12-[natural=lake][bbox_area<10000000], area|z12-[landuse=reservoir][bbox_area<10000000], area|z12-[natural=water][bbox_area<10000000] -{} -*/ + {} + */ line[waterway] { text-position: line; @@ -1717,15 +1741,13 @@ line|z17-[route=ferry_motorcar] area|z10-[natural=lake][bbox_area>=100000000000], area|z10-[landuse=reservoir][bbox_area>=100000000000], area|z10-[natural=water][bbox_area>=100000000000] -{ - text: name; - font-size: 20; - text-color: #090909; - text-halo-opacity: 0.1; - text-halo-color: @halo_water_lable; - text-halo-radius: 0; - z-index: 100000; -} +{text: name; +font-size: 20; +text-color: #090909; +text-halo-opacity: 0.1; +text-halo-color: @halo_water_lable; +text-halo-radius: 0; +z-index: 100000;} area|z10-[natural=lake][bbox_area<100000000000], area|z10-[landuse=reservoir][bbox_area<100000000000], @@ -1738,21 +1760,21 @@ area|z10-[natural=water][bbox_area<100000000000] area|z14-[leisure=park][name], area|z14-[landuse=forest][name] { icon-image: park-s.svg; - text-offset: 8; + text-offset: 6; text: name; - font-size: 11; + font-size: 10; text-color: @park_label; text-halo-color: @halo_park_lable; text-halo-radius: 0.5; text-halo-opacity: 0.8; + icon-min-distance: 10; } area|z14-[leisure=park][!name], -area|z14-[landuse=forest][!name] -{} - +area|z14-[landuse=forest][!name] { +} area|z14-[leisure=park][name]::int_name, area|z14-[landuse=forest][name]::int_name { - text-offset: 18; + text-offset: 6; text: int_name; font-size: 10; text-color: @park_label; @@ -1781,22 +1803,12 @@ area|z15-[landuse=forest][name]::int_name { text-halo-radius: 0.5; text-halo-opacity: 0.8; } -/* -area|z15[leisure=garden][name] { - icon-image: garden-m.svg; - text-offset: 8; - text: name; - font-size: 10; - text-color: @park_label; - text-halo-color: @label_halo_light; - text-halo-radius: 0.4; - text-halo-opacity: 0.4; -} -*/ + area|z15[leisure=park][!name], -area|z15[landuse=forest][!name], -/*area|z15[leisure=garden][!name]*/ -{} +area|z15[landuse=forest][!name] + { + +} area|z16[leisure=park][name], area|z16[landuse=forest][name]{ @@ -1822,9 +1834,8 @@ area|z16[leisure=garden][name] { } area|z16[leisure=park][!name], area|z16[leisure=garden][!name], -area|z16[landuse=forest][!name] -{} - +area|z16[landuse=forest][!name] { +} area|z16[leisure=park][name]::int_name, area|z16[leisure=garden][name]::int_name, area|z16[landuse=forest][name]::int_name { @@ -1838,8 +1849,9 @@ area|z16[landuse=forest][name]::int_name { } area|z16[leisure=park][!name]::int_name, area|z16[leisure=garden][!name]::int_name, -area|z16[landuse=forest][!name]::int_name -{} +area|z16[landuse=forest][!name]::int_name { + +} area|z17[leisure=park][name], area|z17[landuse=forest][name] { @@ -1865,10 +1877,11 @@ area|z17[leisure=garden][name] { icon-min-distance: 10; } area|z17[leisure=park][!name], -area|z17[landuse=forest][!name], -area|z17[leisure=garden][!name], -{} +area|z17[landuse=forest][!name] { +} +area|z17[leisure=garden][!name] { +} area|z17[leisure=park][name]::int_name, area|z17[leisure=garden][name]::int_name, area|z17[leisure=forest][name]::int_name @@ -1883,8 +1896,9 @@ area|z17[leisure=forest][name]::int_name } area|z17[leisure=park][!name]::int_name, area|z17[leisure=garden][!name]::int_name, -area|z17[leisure=forest][!name]::int_name, -{} +area|z17[leisure=forest][!name]::int_name { + +} area|z18-[leisure=park], area|z18-[landuse=forest]{ @@ -1956,7 +1970,14 @@ area|z17-[landuse=vineyard], text-color: @poi_label; } + /* MILITARY */ +area|z16[landuse=military], +node|z16[landuse=military] { + icon-image: military-m.svg; + z-index: 1000; + icon-min-distance: 10; +} area|z17-[landuse=military], node|z17-[landuse=military] { @@ -1967,7 +1988,6 @@ node|z17-[landuse=military] { text-color: @poi_label; z-index: 1000; } - /* CEMETRY */ area|z15-16[landuse=cemetery] { @@ -2005,7 +2025,7 @@ line|z17-[man_made=pier], line|z17-[man_made=breakwater], node|z17-[man_made=pier], node|z17-[man_made=breakwater] -{ + { text: name; font-size: 10; text-color:@poi_label; @@ -2028,8 +2048,7 @@ node|z15-[waterway=wair] node|z14-[natural=cape], area|z14-[natural=cape] -{ - font-size: 8; - text: name; - text-color: @poi_label; -} +{font-size: 8; +text: name; +text-color: @poi_label; + } diff --git a/data/styles/clear/include/roads.mapcss b/data/styles/clear/include/roads.mapcss index f40ac5f3cd..808d960427 100644 --- a/data/styles/clear/include/roads.mapcss +++ b/data/styles/clear/include/roads.mapcss @@ -73,37 +73,39 @@ line|z7-[highway=residential_link], */ -line|z7-[highway=world_level] -{ - color: @trunk_orange_world; - width: 1.2; - opacity: 0; - z-index: 900; -} -line|z1-[highway=world_level] +line|z4[highway=world_level] { - color: @trunk_orange_world; - width: 1.2; + color: @trunk_orange_light; + width: 0.5; opacity: 1; z-index: 900; } -line|z7-[highway=world_towns_level] +line|z5[highway=world_level] { - color: @trunk_yellow_world; - width: 0.9; - opacity: 0; + color: @trunk_orange_light; + width: 0.7; + opacity: 1; z-index: 900; } -line|z1-[highway=world_towns_level] + +line|z6[highway=world_towns_level], + { - color: @trunk_yellow_world; + color: @trunk_orange_light; width: 0.9; opacity: 1; z-index: 900; } +line|z6[highway=world_level] +{ + color: @trunk_orange_light; + width: 0.7; + opacity: 1; + z-index: 900; +} /* ZOOM 7 */ @@ -116,6 +118,15 @@ line|z7[highway=motorway] { } +line|z7[highway=world_towns_level], +line|z7[highway=world_level] +{ + color: @trunk_orange_light; + width: 0.7; + opacity: 1; + z-index: 900; +} + /* ZOOM 8 */ line|z8[highway=trunk], @@ -134,7 +145,14 @@ line|z8[highway=primary] z-index: 850; } - +line|z8[highway=world_towns_level], +line|z8[highway=world_level] +{ + color: @trunk_orange_light; + width: 0.9; + opacity: 1; + z-index: 850; +} /* ZOOM 9 */ line|z9[highway=trunk], @@ -154,6 +172,14 @@ line|z9[highway=primary] z-index: 850; } +line|z9[highway=world_towns_level], +line|z9[highway=world_level] +{ + color: @trunk_orange_light; + width: 0.8; + opacity: 1; + z-index: 850; +} /* ZOOM 10 */ diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss index 6319dbdfe0..278a1cea27 100644 --- a/data/styles/clear/include/transport.mapcss +++ b/data/styles/clear/include/transport.mapcss @@ -219,6 +219,15 @@ line|z16-[railway=abandoned] /* FUNICULAR */ +line|z12[railway=funicular] +{ + color: @railway; + opacity: 1; + width: 1.4; + z-index: 950; +} + + line|z13-14[railway=funicular] { color: @railway; @@ -238,6 +247,13 @@ line|z15-[railway=funicular] /* TRAM LINES */ +line|z13-14[railway=tram] +{ + color: @tram; + opacity: 1; + width: 0.6; + z-index: 950; +} line|z15[railway=tram] { @@ -321,9 +337,14 @@ node|z17-[highway=motorway_junction] /* TRAIN STATIONS */ -node|z12[railway=halt], -{ - icon-image: train-s.svg; +node|z11[railway=halt], { + icon-image: train-s.svg; + z-index: 2800; + icon-min-distance: 10; +} + +node|z12[railway=halt] { + icon-image: train-s.svg; text-offset: 6; z-index: 2800; font-size: 9; @@ -486,7 +507,11 @@ area|z17-[building=train_station]::int_name, /* SUBWAY STATIONS - GENERIC STYLES */ - +node|z13[railway=station][transport=subway] { + icon-image: subway-s.svg; + z-index: 2900; + icon-min-distance: 1; +} node|z14[railway=station][transport=subway] { icon-image: subway-s.svg; text-offset: 6; @@ -497,6 +522,7 @@ node|z14[railway=station][transport=subway] { text-halo-radius: 1; text-halo-opacity: 0.7; text-halo-color: @label_halo_light; + icon-min-distance: 1; } node|z14[railway=station][transport=subway]::int_name { icon-image: subway-s.svg; @@ -508,6 +534,7 @@ node|z14[railway=station][transport=subway]::int_name { text-halo-radius: 1; text-halo-opacity: 0.7; text-halo-color: @label_halo_light; + icon-min-distance: 1; } node|z15[railway=station][transport=subway] { icon-image: subway-m.svg; @@ -583,7 +610,7 @@ node|z18-[railway=subway_entrance]::int_name { text-offset: 8; font-size: 11; te /* MOSCOW SUBWAY */ node|z11[railway=station][transport=subway][city=moscow] -{ icon-image: subway-moscow-s.svg; z-index: 2900; } +{ icon-image: subway-moscow-s.svg; z-index: 2900; icon-min-distance: 1;} node|z12-13[railway=station][transport=subway][city=moscow] { @@ -596,6 +623,7 @@ node|z12-13[railway=station][transport=subway][city=moscow] text-halo-radius: 1; text-halo-opacity:0.7; text-halo-color: @label_halo_light; + icon-min-distance: 1; } node|z12-13[railway=station][transport=subway][city=moscow]::int_name { @@ -651,11 +679,12 @@ node|z11[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; z-index: 2900; + icon-min-distance: 1; } node|z12[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; - text-offset: 8; + text-offset: 6; z-index: 2900; font-size: 10; text: name; @@ -680,7 +709,7 @@ node|z12[railway=station][transport=subway][city=spb]::int_name node|z13[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; - text-offset: 8; + text-offset: 6; z-index: 2900; font-size: 11; text: name; @@ -717,7 +746,6 @@ node|z16[railway=station][transport=subway][city=spb] node|z16[railway=station][transport=subway][city=spb]::int_name { font-size: 9; text: int_name; text-color: @district_label; text-halo-radius: 0;z-index: 2900 } - node|z17-[railway=station][transport=subway][city=spb] { icon-image: subway-spb-m.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; z-index: 2900} node|z17-[railway=station][transport=subway][city=spb]::int_name @@ -739,7 +767,7 @@ node|z18-[railway=subway_entrance][city=spb]::int_name { z-index: 2800; font-size: 12; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; } /* LONDON ICONS */ -node|z13[railway=station][transport=subway][city=london] { icon-image: subway-london-s.svg; } +node|z13[railway=station][transport=subway][city=london] { icon-image: subway-london-s.svg; icon-min-distance: 1; } node|z14[railway=station][transport=subway][city=london] { icon-image: subway-london-s.svg; } node|z15[railway=station][transport=subway][city=london] { icon-image: subway-london-m.svg; } node|z16-[railway=station][transport=subway][city=london] { icon-image: subway-london-m.svg; } @@ -747,7 +775,7 @@ node|z17[railway=subway_entrance][city=london] { icon-image: subway-london-s.svg node|z18-[railway=subway_entrance][city=london] { icon-image: subway-london-m.svg; } /* PARIS ICONS */ -node|z13[railway=station][transport=subway][city=paris] { icon-image: subway-paris-s.svg; } +node|z13[railway=station][transport=subway][city=paris] { icon-image: subway-paris-s.svg; icon-min-distance: 1; } node|z14[railway=station][transport=subway][city=paris] { icon-image: subway-paris-s.svg; } node|z15[railway=station][transport=subway][city=paris] { icon-image: subway-paris-m.svg; } node|z16-[railway=station][transport=subway][city=paris] { icon-image: subway-paris-m.svg; } @@ -755,7 +783,7 @@ node|z17-[railway=subway_entrance][city=paris] { icon-image: subway-paris-s.svg; /* BARCELONA ICONS */ -node|z13[railway=station][transport=subway][city=barcelona] { icon-image: subway-barcelona-s.svg; } +node|z13[railway=station][transport=subway][city=barcelona] { icon-image: subway-barcelona-s.svg; icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=barcelona] { icon-image: subway-barcelona-s.svg; } node|z15[railway=station][transport=subway][city=barcelona] { icon-image: subway-barcelona-m.svg; } node|z16-[railway=station][transport=subway][city=barcelona] { icon-image: subway-barcelona-m.svg; } @@ -764,6 +792,7 @@ node|z18-[railway=subway_entrance][city=barcelona] { icon-image: subway-barcelon /* MADRID ICONS */ +node|z13[railway=station][transport=subway][city=madrid] { icon-image: subway-madrid-s.svg; icon-min-distance: 1; } node|z14[railway=station][transport=subway][city=madrid] { icon-image: subway-madrid-s.svg; } node|z15[railway=station][transport=subway][city=madrid] { icon-image: subway-madrid-m.svg; } node|z16-[railway=station][transport=subway][city=madrid] { icon-image: subway-madrid-m.svg; } @@ -771,12 +800,14 @@ node|z17[railway=subway_entrance][city=madrid] { icon-image: subway-madrid-s.svg node|z18-[railway=subway_entrance][city=madrid] { icon-image: subway-madrid-m.svg; } /* BERLIN ICONS */ +node|z13[railway=station][transport=subway][city=berlin] { icon-image: subway-berlin-s.svg; icon-min-distance: 1; } node|z14[railway=station][transport=subway][city=berlin] { icon-image: subway-berlin-s.svg; } node|z15[railway=station][transport=subway][city=berlin] { icon-image: subway-berlin-m.svg; } node|z16-[railway=station][transport=subway][city=berlin] { icon-image: subway-berlin-m.svg; } node|z17-[railway=subway_entrance][city=berlin] { icon-image: subway-berlin-s.svg; } /* ROMA ICONS */ +node|z13[railway=station][transport=subway][city=roma] { icon-image: subway-rome-s.svg; icon-min-distance: 1; } node|z14[railway=station][transport=subway][city=roma] { icon-image: subway-rome-s.svg; } node|z15[railway=station][transport=subway][city=roma] { icon-image: subway-rome-m.svg; } node|z16[railway=station][transport=subway][city=roma] { icon-image: subway-rome-m.svg; } @@ -784,7 +815,7 @@ node|z17-[railway=station][transport=subway][city=roma] { icon-image: none.svg; node|z17-[railway=subway_entrance][city=roma] { icon-image: subway-rome-m.svg; } /* MINSK ICONS */ -node|z13[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-s.svg; text-offset: 4; z-index: 2800; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.7; text-halo-color: @label_halo_light; } +node|z13[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-s.svg; text-offset: 4; z-index: 2800; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.7; text-halo-color: @label_halo_light; icon-min-distance: 1; } node|z14[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-s.svg; text-offset: 5; } node|z15[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-m.svg; text-offset: 5; } node|z16[railway=station][transport=subway][city=minsk] { icon-image: none.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; } @@ -795,7 +826,7 @@ node|z18-[railway=subway_entrance][city=minsk] { icon-image: subway-minsk-m.svg; /* KIEV ICONS */ -node|z13[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-s.svg; text-offset: 8; z-index: 2; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.7; text-halo-color: @label_halo_light; } +node|z13[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-s.svg; text-offset: 8; z-index: 2; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.7; text-halo-color: @label_halo_light; icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-s.svg; } node|z15[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-m.svg; } node|z16-[railway=station][transport=subway][city=kiev] { icon-image: none.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; } @@ -804,7 +835,7 @@ node|z17[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; fo node|z18-[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; font-size: 13; } /* NEW YORK ICONS */ -node|z13[railway=station][transport=subway][city=newyork] { icon-image: subway-newyork-s.svg; } +node|z13[railway=station][transport=subway][city=newyork] { icon-image: subway-newyork-s.svg; icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=newyork] { icon-image: subway-newyork-s.svg; } node|z15[railway=station][transport=subway][city=newyork] { icon-image: subway-newyork-m.svg; } node|z16-[railway=station][transport=subway][city=newyork] { icon-image: subway-newyork-l.svg; } @@ -812,7 +843,11 @@ node|z17-[railway=subway_entrance][city=newyork] { icon-image: subway-newyork-s. /* TRAM STOPS */ - +node|z14[railway=tram_stop], +{ + icon-image: tram-s.svg; + z-index: 2800; +} node|z15-16[railway=tram_stop], area|z15-16[railway=tram_stop] @@ -878,6 +913,13 @@ area|z18-[railway=tram_stop]::int_name /* BUS STOPS */ +node|z15[highway=bus_stop], +area|z15[highway=bus_stop] +{ + icon-image: bus-m.svg; + z-index: 2700; + icon-min-distance: 15; +} node|z16[highway=bus_stop], area|z16[highway=bus_stop] @@ -932,10 +974,26 @@ area|z18-19[public_transport=station]::int_name text-halo-color: @label_halo_light; } -node|z15[amenity=bus_station], area|z16-[amenity=bus_station] { - icon-image: bus-m.svg; +node|z12-13[amenity=bus_station], area|z16-[amenity=bus_station] { + icon-image: bus-s.svg; + z-index: 2700; + icon-min-distance: 1; + } -node|z16[amenity=bus_station], area|z16-[amenity=bus_station] { + +node|z14[amenity=bus_station], area|z16-[amenity=bus_station] { + icon-image: bus-s.svg; + z-index: 2700; + text-offset: 6; + font-size: 10; + z-index: 2700; + text: name; + text-color: @label_dark; + text-halo-radius: 1; + text-halo-opacity: 0.8; + text-halo-color: @label_halo_light; +} +node|z15-16[amenity=bus_station], area|z16-[amenity=bus_station] { icon-image: bus-m.svg; text-offset: 8; font-size: 11; @@ -1027,7 +1085,13 @@ node|z19-[amenity=bus_station]::int_name, area|z19-[amenity=bus_station]::int_na } /* FERRY */ -node|z14[amenity=ferry_terminal] { +node|z11-12[amenity=ferry_terminal] { + icon-image: ship-s.svg; + z-index: 2700; + icon-min-distance: 12; +} + +node|z13-14[amenity=ferry_terminal] { icon-image: ship-s.svg; z-index: 2700; } @@ -1404,6 +1468,24 @@ line|z15-[aeroway=taxiway] { width: 1.2; opacity: 0.6; color: @unclassified;z-in /* AERIALWAYS */ +line|z12-13[aerialway=cable_car], +line|z12-13[aerialway=chair_lift], +line|z12-13[aerialway=gondola], +line|z12-13[aerialway=mixed_lift], +line|z12-13[aerialway=drag_lift], +line|z12-13[aerialway=j-bar], +line|z12-13[aerialway=t-bar], +line|z12-13[aerialway=magic_carpet], +line|z12-13[aerialway=platter], +line|z12-13[aerialway=rope_tow], + { + color: @aerialway; + width: 0.5; + opacity: 1; + z-index: 1050; +} + + line|z14-15[aerialway=cable_car], line|z14-15[aerialway=chair_lift], line|z14-15[aerialway=gondola], @@ -1453,6 +1535,23 @@ line|z17-[aerialway=rope_tow], width: 1; z-index: 1050; } +line|z12-13[aerialway=cable_car]::dash, +line|z12-13[aerialway=chair_lift]::dash, +line|z12-13[aerialway=gondola]::dash, +line|z12-13[aerialway=mixed_lift]::dash, +line|z12-13[aerialway=drag_lift] ::dash, +line|z12-13[aerialway=j-bar]::dash, +line|z12-13[aerialway=t-bar]::dash, +line|z12-13[aerialway=magic_carpet]::dash, +line|z12-13[aerialway=platter]::dash, +line|z12-13[aerialway=rope_tow]::dash, + { + color: @aerialway; + width: 2; + opacity: 0.6; + z-index: 1049; + dashes: 0.9,18; +} line|z14[aerialway=cable_car]::dash, line|z14[aerialway=chair_lift]::dash, @@ -1489,6 +1588,25 @@ line|z15-[aerialway=rope_tow]::dash, dashes: 0.9,18; } + +node|z12[aerialway=station], +node|z12[aerialway=cable_car], +node|z12[aerialway=chair_lift], +node|z12[aerialway=gondola], +node|z12[aerialway=mixed_lift] + { icon-image: cable-car-s.svg; + z-index: 2600; + icon-min-distance: 10;} + +node|z13[aerialway=station], +node|z13[aerialway=cable_car], +node|z13[aerialway=chair_lift], +node|z13[aerialway=gondola], +node|z13[aerialway=mixed_lift] + { icon-image: cable-car-s.svg; + z-index: 2600; + icon-min-distance: 10;} + node|z14[aerialway=station], node|z14[aerialway=cable_car], node|z14[aerialway=chair_lift],