diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss index ca328811b3..a7448d4c66 100755 --- a/data/styles/clear/include/Basemap_label.mapcss +++ b/data/styles/clear/include/Basemap_label.mapcss @@ -371,7 +371,7 @@ node|z13-[place=neighbourhood], node|z14-[place=farm], node|z14-[place=isolated_dwelling], {text: name;text-color: @district_label;} -node|z12-14[place=suburb]::int_name, +node|z13-14[place=suburb]::int_name, node|z13-[place=locality]::int_name, node|z13-[place=neighbourhood]::int_name, node|z14-[place=farm]::int_name, diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 75767da220..0a1a3f6e85 100755 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -299,6 +299,10 @@ area[building=train_station], node[railway=subway_entrance], node[railway=tram_stop], area[railway=tram_stop], +node[historic=monument], +area[historic=monument], +node[historic=memorial], +area[historic=memorial] {z-index: 2800;} node[tourism=motel], @@ -342,10 +346,6 @@ area[tourism=attraction] {z-index: 2842;} node[tourism=gallery] {z-index: 2844;} -node[historic=monument], -area[historic=monument], -node[historic=memorial], -area[historic=memorial] node[tourism=museum], area[tourism=museum], {z-index: 2846;} @@ -368,6 +368,8 @@ node[railway=station][transport=subway], node[amenity=hospital], node[building=hospital], area[building=hospital], +node[building=university], +area[building=university], area[amenity=hospital], node[amenity=pharmacy], area[amenity=pharmacy] @@ -2259,9 +2261,7 @@ node|z17[shop=copyshop], area|z17[shop=copyshop] {icon-image: copyshop-l.svg;icon-min-distance: 24;} node|z17[shop=photo], -area|z17[shop=photo], -node|z17[craft=photographer], -area|z17[craft=photographer] +area|z17[shop=photo] {icon-image: photo-shop-l.svg;icon-min-distance: 24;} node|z17[shop=pet], area|z17[shop=pet] @@ -2397,9 +2397,7 @@ node|z18-[shop=copyshop], area|z18-[shop=copyshop] {icon-image: copyshop-l.svg;} node|z18-[shop=photo], -area|z18-[shop=photo], -node|z18-[craft=photographer], -area|z18-[craft=photographer] +area|z18-[shop=photo] {icon-image: photo-shop-l.svg;} node|z18-[shop=pet], area|z18-[shop=pet] diff --git a/data/styles/clear/style-clear/symbols/bank-xl.svg b/data/styles/clear/style-clear/symbols/bank-xl.svg new file mode 100644 index 0000000000..c17b0b78a2 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/bank-xl.svg @@ -0,0 +1,19 @@ + + + +bank-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/buddhist-xl.svg b/data/styles/clear/style-clear/symbols/buddhist-xl.svg new file mode 100644 index 0000000000..327d312285 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/buddhist-xl.svg @@ -0,0 +1,23 @@ + + + +buddhist-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cafe-xl.svg b/data/styles/clear/style-clear/symbols/cafe-xl.svg new file mode 100644 index 0000000000..26f1aa8105 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/cafe-xl.svg @@ -0,0 +1,24 @@ + + + +cafe-l +Created with Sketch. + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-part-xl.svg b/data/styles/clear/style-clear/symbols/car-part-xl.svg new file mode 100644 index 0000000000..636af5b8d1 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/car-part-xl.svg @@ -0,0 +1,49 @@ + + + +car-part-l +Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-repair-xl.svg b/data/styles/clear/style-clear/symbols/car-repair-xl.svg new file mode 100644 index 0000000000..6f899f6083 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/car-repair-xl.svg @@ -0,0 +1,35 @@ + + + +car-repair-l +Created with Sketch. + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-wash-xl.svg b/data/styles/clear/style-clear/symbols/car-wash-xl.svg new file mode 100644 index 0000000000..f63137e745 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/car-wash-xl.svg @@ -0,0 +1,51 @@ + + + +car-wash-l +Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car_sharing-xl.svg b/data/styles/clear/style-clear/symbols/car_sharing-xl.svg new file mode 100644 index 0000000000..ad9564e488 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/car_sharing-xl.svg @@ -0,0 +1,50 @@ + + + +car_sharing-l +Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car_shop-xl.svg b/data/styles/clear/style-clear/symbols/car_shop-xl.svg new file mode 100644 index 0000000000..13aa7a70bf --- /dev/null +++ b/data/styles/clear/style-clear/symbols/car_shop-xl.svg @@ -0,0 +1,40 @@ + + + +car_shop-l +Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/charging-station-xl.svg b/data/styles/clear/style-clear/symbols/charging-station-xl.svg new file mode 100644 index 0000000000..bbc5b07356 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/charging-station-xl.svg @@ -0,0 +1,27 @@ + + + +charging-station-l +Created with Sketch. + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/christian-xl.svg b/data/styles/clear/style-clear/symbols/christian-xl.svg new file mode 100644 index 0000000000..702cccf2eb --- /dev/null +++ b/data/styles/clear/style-clear/symbols/christian-xl.svg @@ -0,0 +1,16 @@ + + + +christian-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/college-xl.svg b/data/styles/clear/style-clear/symbols/college-xl.svg new file mode 100644 index 0000000000..dbd8032642 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/college-xl.svg @@ -0,0 +1,24 @@ + + + +college-l +Created with Sketch. + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fastfood-xl.svg b/data/styles/clear/style-clear/symbols/fastfood-xl.svg new file mode 100644 index 0000000000..cd94f4b0be --- /dev/null +++ b/data/styles/clear/style-clear/symbols/fastfood-xl.svg @@ -0,0 +1,31 @@ + + + +fastfood-l +Created with Sketch. + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fuel-xl.svg b/data/styles/clear/style-clear/symbols/fuel-xl.svg new file mode 100644 index 0000000000..2428025266 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/fuel-xl.svg @@ -0,0 +1,34 @@ + + + +fuel-l +Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/garden-xl.svg b/data/styles/clear/style-clear/symbols/garden-xl.svg new file mode 100644 index 0000000000..cf0b3e1d0c --- /dev/null +++ b/data/styles/clear/style-clear/symbols/garden-xl.svg @@ -0,0 +1,19 @@ + + + +garden-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/grocery-xl.svg b/data/styles/clear/style-clear/symbols/grocery-xl.svg new file mode 100644 index 0000000000..d2da920e83 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/grocery-xl.svg @@ -0,0 +1,24 @@ + + + +grocery-l +Created with Sketch. + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hindu-xl.svg b/data/styles/clear/style-clear/symbols/hindu-xl.svg new file mode 100644 index 0000000000..69830ed448 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/hindu-xl.svg @@ -0,0 +1,23 @@ + + + +hindu-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hospital-xl.svg b/data/styles/clear/style-clear/symbols/hospital-xl.svg new file mode 100644 index 0000000000..b7bc67d0c5 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/hospital-xl.svg @@ -0,0 +1,18 @@ + + + +hospital-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/muslim-xl.svg b/data/styles/clear/style-clear/symbols/muslim-xl.svg new file mode 100644 index 0000000000..7b713d5e46 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/muslim-xl.svg @@ -0,0 +1,19 @@ + + + +muslim-l +Created with Sketch. + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/nparkF-xl.svg b/data/styles/clear/style-clear/symbols/nparkF-xl.svg new file mode 100644 index 0000000000..785b57e5a1 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/nparkF-xl.svg @@ -0,0 +1,17 @@ + + + +nparkF-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/park-xl.svg b/data/styles/clear/style-clear/symbols/park-xl.svg new file mode 100644 index 0000000000..2d01070c75 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/park-xl.svg @@ -0,0 +1,19 @@ + + + +park-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/parking-xl.svg b/data/styles/clear/style-clear/symbols/parking-xl.svg new file mode 100644 index 0000000000..afa862f24b --- /dev/null +++ b/data/styles/clear/style-clear/symbols/parking-xl.svg @@ -0,0 +1,18 @@ + + + +parking-l +Created with Sketch. + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-xl.svg b/data/styles/clear/style-clear/symbols/place-of-worship-xl.svg new file mode 100644 index 0000000000..72adb5ba10 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/place-of-worship-xl.svg @@ -0,0 +1,27 @@ + + + +place-of-worship-l +Created with Sketch. + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/railway-crossing_l.svg b/data/styles/clear/style-clear/symbols/railway-crossing_l.svg new file mode 100644 index 0000000000..a6d56d5bac --- /dev/null +++ b/data/styles/clear/style-clear/symbols/railway-crossing_l.svg @@ -0,0 +1,12 @@ + + + +railway-crossing +Created with Sketch. + + + diff --git a/data/styles/clear/style-clear/symbols/railway-crossing_xl.svg b/data/styles/clear/style-clear/symbols/railway-crossing_xl.svg new file mode 100644 index 0000000000..877682f73f --- /dev/null +++ b/data/styles/clear/style-clear/symbols/railway-crossing_xl.svg @@ -0,0 +1,16 @@ + + + + +railway-crossing +Created with Sketch. + + + diff --git a/data/styles/clear/style-clear/symbols/restaurant-xl.svg b/data/styles/clear/style-clear/symbols/restaurant-xl.svg new file mode 100644 index 0000000000..2f5d94b627 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/restaurant-xl.svg @@ -0,0 +1,26 @@ + + + +restaurant-l +Created with Sketch. + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shop-xl.svg b/data/styles/clear/style-clear/symbols/shop-xl.svg new file mode 100644 index 0000000000..a0317de58e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/shop-xl.svg @@ -0,0 +1,23 @@ + + + +shop-l +Created with Sketch. + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/speedcam-l.svg b/data/styles/clear/style-clear/symbols/speedcam-l.svg index 0cd6e606e9..f44d9d44c4 100644 --- a/data/styles/clear/style-clear/symbols/speedcam-l.svg +++ b/data/styles/clear/style-clear/symbols/speedcam-l.svg @@ -1,14 +1,16 @@ - - - - speedcam-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + +speedcam-l +Created with Sketch. + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/speedcam-m.svg b/data/styles/clear/style-clear/symbols/speedcam-m.svg index cd652205a6..eb397e127c 100644 --- a/data/styles/clear/style-clear/symbols/speedcam-m.svg +++ b/data/styles/clear/style-clear/symbols/speedcam-m.svg @@ -1,14 +1,14 @@ - - - - speedcam-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + +speedcam-m +Created with Sketch. + + + + + + diff --git a/data/styles/clear/style-clear/symbols/speedcam-xl.svg b/data/styles/clear/style-clear/symbols/speedcam-xl.svg new file mode 100644 index 0000000000..edac2684cf --- /dev/null +++ b/data/styles/clear/style-clear/symbols/speedcam-xl.svg @@ -0,0 +1,16 @@ + + + +speedcam-l +Created with Sketch. + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/speedcam1-l.svg b/data/styles/clear/style-clear/symbols/speedcam1-l.svg index a36e0375bb..50a9ab5fb6 100644 --- a/data/styles/clear/style-clear/symbols/speedcam1-l.svg +++ b/data/styles/clear/style-clear/symbols/speedcam1-l.svg @@ -1,29 +1,36 @@ + viewBox="0 0 26 24.5" style="enable-background:new 0 0 26 24.5;" xml:space="preserve"> + speedcam-l Created with Sketch. - - - - - + + + + + + + + + - - diff --git a/data/styles/clear/style-clear/symbols/speedcam1-m.svg b/data/styles/clear/style-clear/symbols/speedcam1-m.svg new file mode 100644 index 0000000000..345529cbb2 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/speedcam1-m.svg @@ -0,0 +1,34 @@ + + + + +speedcam-l +Created with Sketch. + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/speedcam1-xl.svg b/data/styles/clear/style-clear/symbols/speedcam1-xl.svg new file mode 100644 index 0000000000..aa030b761d --- /dev/null +++ b/data/styles/clear/style-clear/symbols/speedcam1-xl.svg @@ -0,0 +1,36 @@ + + + + +speedcam-l +Created with Sketch. + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/toll_booth-xl.svg b/data/styles/clear/style-clear/symbols/toll_booth-xl.svg new file mode 100644 index 0000000000..efb967efb9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/toll_booth-xl.svg @@ -0,0 +1,36 @@ + + + +toll_booth-l +Created with Sketch. + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/style.mapcss b/data/styles/clear/style-night/style.mapcss index d729a0d3c6..1bbe91fcdd 100644 --- a/data/styles/clear/style-night/style.mapcss +++ b/data/styles/clear/style-night/style.mapcss @@ -26,10 +26,10 @@ colors Selection-opacity: 0.64; Route-color: #0087FF; RouteOutline-color: #055FCD; - RouteTrafficG0-color: #9B2300; - RouteTrafficG1-color: #F03C0A; - RouteTrafficG2-color: #F03C0A; - RouteTrafficG3-color: #F5D728; + RouteTrafficG0-color: #5E0F0D; + RouteTrafficG1-color: #7F1311; + RouteTrafficG2-color: #7F1311; + RouteTrafficG3-color: #9E8216; RouteTrafficG3-opacity: @traffic_arrow_dark; RoutePedestrian-color: #FFB94B; RoutePedestrian-opacity: 0.7; @@ -45,25 +45,25 @@ colors TrackCarSpeed-color: #FFCA28; TrackPlaneSpeed-color: #FFF5A0; TrackUnknownDistance-color: #969696; - TrafficG0-color: #410F00; - TrafficG1-color: #781919; - TrafficG2-color: #781919; - TrafficG3-color: #8C5A00; + TrafficG0-color: #4C120F; + TrafficG1-color: #731816; + TrafficG2-color: #731816; + TrafficG3-color: #8C7012; TrafficG3-opacity: @traffic_arrow_dark; - TrafficG4-color: #555519; - TrafficG5-color: #285032; + TrafficG4-color: #376222; + TrafficG5-color: #376222; TrafficTempBlock-color: #232323; TrafficUnknown-color: #000000; - TrafficArrowLight-color: #AAAAAA; - TrafficArrowDark-color: #1E1E1E; - TrafficOutline-color: #000000; - RoadShieldBlackText-color: #000000; - RoadShieldWhiteText-color: #FFFFFF; - RoadShieldUKYellowText-color: #FFCC66; - RoadShieldBlueBackground-color: #2E6FC9; - RoadShieldGreenBackground-color: #22723B; - RoadShieldRedBackground-color: #CD2828; - RoadShieldOrangeBackground-color: #FFBE00; + TrafficArrowLight-color: #C4C4C4; + TrafficArrowDark-color: #191919; + TrafficOutline-color: #383838; + RoadShieldBlackText-color: #212121; + RoadShieldWhiteText-color: #B7B6B6; + RoadShieldUKYellowText-color: #B49E0E; + RoadShieldBlueBackground-color: #294C88; + RoadShieldGreenBackground-color: #136C30; + RoadShieldRedBackground-color: #9F1A17; + RoadShieldOrangeBackground-color: #136C30; PoiHotelTextOutline-color: #000000; PoiHotelTextOutline-opacity: 0.6; PoiDeletedMask-color: #FFFFFF; diff --git a/data/styles/clear/style-night/symbols/bank-xl.svg b/data/styles/clear/style-night/symbols/bank-xl.svg new file mode 100644 index 0000000000..931f30e7f3 --- /dev/null +++ b/data/styles/clear/style-night/symbols/bank-xl.svg @@ -0,0 +1,24 @@ + + + + +bank-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/buddhist-xl.svg b/data/styles/clear/style-night/symbols/buddhist-xl.svg new file mode 100644 index 0000000000..df32be7398 --- /dev/null +++ b/data/styles/clear/style-night/symbols/buddhist-xl.svg @@ -0,0 +1,28 @@ + + + + +buddhist-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cafe-xl.svg b/data/styles/clear/style-night/symbols/cafe-xl.svg new file mode 100644 index 0000000000..0b5f1d6aff --- /dev/null +++ b/data/styles/clear/style-night/symbols/cafe-xl.svg @@ -0,0 +1,22 @@ + + + + +cafe-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-part-xl.svg b/data/styles/clear/style-night/symbols/car-part-xl.svg new file mode 100644 index 0000000000..bbf857993e --- /dev/null +++ b/data/styles/clear/style-night/symbols/car-part-xl.svg @@ -0,0 +1,44 @@ + + + + +car-part-l +Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-repair-xl.svg b/data/styles/clear/style-night/symbols/car-repair-xl.svg new file mode 100644 index 0000000000..93fdf4479d --- /dev/null +++ b/data/styles/clear/style-night/symbols/car-repair-xl.svg @@ -0,0 +1,29 @@ + + + + +car-repair-l +Created with Sketch. + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-wash-xl.svg b/data/styles/clear/style-night/symbols/car-wash-xl.svg new file mode 100644 index 0000000000..707add6fdd --- /dev/null +++ b/data/styles/clear/style-night/symbols/car-wash-xl.svg @@ -0,0 +1,47 @@ + + + + +car-wash-l +Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car_sharing-xl.svg b/data/styles/clear/style-night/symbols/car_sharing-xl.svg new file mode 100644 index 0000000000..289f9a8316 --- /dev/null +++ b/data/styles/clear/style-night/symbols/car_sharing-xl.svg @@ -0,0 +1,43 @@ + + + + +car_sharing-l +Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car_shop-xl.svg b/data/styles/clear/style-night/symbols/car_shop-xl.svg new file mode 100644 index 0000000000..02261060c0 --- /dev/null +++ b/data/styles/clear/style-night/symbols/car_shop-xl.svg @@ -0,0 +1,36 @@ + + + + +car_shop-l +Created with Sketch. + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/charging-station-xl.svg b/data/styles/clear/style-night/symbols/charging-station-xl.svg new file mode 100644 index 0000000000..6b241d4364 --- /dev/null +++ b/data/styles/clear/style-night/symbols/charging-station-xl.svg @@ -0,0 +1,31 @@ + + + + +charging-station-l +Created with Sketch. + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/christian-xl.svg b/data/styles/clear/style-night/symbols/christian-xl.svg new file mode 100644 index 0000000000..712fb42377 --- /dev/null +++ b/data/styles/clear/style-night/symbols/christian-xl.svg @@ -0,0 +1,21 @@ + + + + +christian-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/college-xl-01.svg b/data/styles/clear/style-night/symbols/college-xl-01.svg new file mode 100644 index 0000000000..201066422e --- /dev/null +++ b/data/styles/clear/style-night/symbols/college-xl-01.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/college-xl.svg b/data/styles/clear/style-night/symbols/college-xl.svg new file mode 100644 index 0000000000..40ec0b90c4 --- /dev/null +++ b/data/styles/clear/style-night/symbols/college-xl.svg @@ -0,0 +1,20 @@ + + + + +college-l +Created with Sketch. + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fastfood-xl.svg b/data/styles/clear/style-night/symbols/fastfood-xl.svg new file mode 100644 index 0000000000..1f14d79e40 --- /dev/null +++ b/data/styles/clear/style-night/symbols/fastfood-xl.svg @@ -0,0 +1,30 @@ + + + + +fastfood-l +Created with Sketch. + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fuel-xl.svg b/data/styles/clear/style-night/symbols/fuel-xl.svg new file mode 100644 index 0000000000..aa420646ee --- /dev/null +++ b/data/styles/clear/style-night/symbols/fuel-xl.svg @@ -0,0 +1,39 @@ + + + + +fuel-l +Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/garden-xl.svg b/data/styles/clear/style-night/symbols/garden-xl.svg new file mode 100644 index 0000000000..963e0f07b1 --- /dev/null +++ b/data/styles/clear/style-night/symbols/garden-xl.svg @@ -0,0 +1,17 @@ + + + +garden-l +Created with Sketch. + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/grocery-xl.svg b/data/styles/clear/style-night/symbols/grocery-xl.svg new file mode 100644 index 0000000000..c5ce5a70e8 --- /dev/null +++ b/data/styles/clear/style-night/symbols/grocery-xl.svg @@ -0,0 +1,35 @@ + + + + +grocery-l +Created with Sketch. + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hindu-xl.svg b/data/styles/clear/style-night/symbols/hindu-xl.svg new file mode 100644 index 0000000000..1e90ee7da6 --- /dev/null +++ b/data/styles/clear/style-night/symbols/hindu-xl.svg @@ -0,0 +1,28 @@ + + + + +hindu-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hospital-xl.svg b/data/styles/clear/style-night/symbols/hospital-xl.svg new file mode 100644 index 0000000000..7181a19002 --- /dev/null +++ b/data/styles/clear/style-night/symbols/hospital-xl.svg @@ -0,0 +1,23 @@ + + + + +hospital-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/muslim-xl.svg b/data/styles/clear/style-night/symbols/muslim-xl.svg new file mode 100644 index 0000000000..fa5422c09b --- /dev/null +++ b/data/styles/clear/style-night/symbols/muslim-xl.svg @@ -0,0 +1,19 @@ + + + +muslim-l +Created with Sketch. + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/nparkF-xl.svg b/data/styles/clear/style-night/symbols/nparkF-xl.svg new file mode 100644 index 0000000000..de60692240 --- /dev/null +++ b/data/styles/clear/style-night/symbols/nparkF-xl.svg @@ -0,0 +1,15 @@ + + + +nparkF-l +Created with Sketch. + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/park-xl.svg b/data/styles/clear/style-night/symbols/park-xl.svg new file mode 100644 index 0000000000..e528c731e7 --- /dev/null +++ b/data/styles/clear/style-night/symbols/park-xl.svg @@ -0,0 +1,17 @@ + + + +park-l +Created with Sketch. + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/parking-xl.svg b/data/styles/clear/style-night/symbols/parking-xl.svg new file mode 100644 index 0000000000..71147e5bed --- /dev/null +++ b/data/styles/clear/style-night/symbols/parking-xl.svg @@ -0,0 +1,18 @@ + + + +parking-l +Created with Sketch. + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/place-of-worship-xl.svg b/data/styles/clear/style-night/symbols/place-of-worship-xl.svg new file mode 100644 index 0000000000..e7ae9dbb6f --- /dev/null +++ b/data/styles/clear/style-night/symbols/place-of-worship-xl.svg @@ -0,0 +1,18 @@ + + + +place-of-worship-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/railway-crossing_l.svg b/data/styles/clear/style-night/symbols/railway-crossing_l.svg new file mode 100644 index 0000000000..bf613f3f90 --- /dev/null +++ b/data/styles/clear/style-night/symbols/railway-crossing_l.svg @@ -0,0 +1,19 @@ + + + +railway-crossing +Created with Sketch. + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/railway-crossing_xl.svg b/data/styles/clear/style-night/symbols/railway-crossing_xl.svg new file mode 100644 index 0000000000..008d41b392 --- /dev/null +++ b/data/styles/clear/style-night/symbols/railway-crossing_xl.svg @@ -0,0 +1,24 @@ + + + + +railway-crossing +Created with Sketch. + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/restaurant-xl.svg b/data/styles/clear/style-night/symbols/restaurant-xl.svg new file mode 100644 index 0000000000..50f390f4e0 --- /dev/null +++ b/data/styles/clear/style-night/symbols/restaurant-xl.svg @@ -0,0 +1,19 @@ + + + +restaurant-l +Created with Sketch. + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shop-xl.svg b/data/styles/clear/style-night/symbols/shop-xl.svg new file mode 100644 index 0000000000..de2f986cda --- /dev/null +++ b/data/styles/clear/style-night/symbols/shop-xl.svg @@ -0,0 +1,26 @@ + + + +shop-l +Created with Sketch. + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/speedcam-l.svg b/data/styles/clear/style-night/symbols/speedcam-l.svg index a576a61e7d..26dd3c4afd 100644 --- a/data/styles/clear/style-night/symbols/speedcam-l.svg +++ b/data/styles/clear/style-night/symbols/speedcam-l.svg @@ -1,14 +1,15 @@ - - - - speedcam-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + +speedcam-l +Created with Sketch. + + + + + + diff --git a/data/styles/clear/style-night/symbols/speedcam-xl.svg b/data/styles/clear/style-night/symbols/speedcam-xl.svg new file mode 100644 index 0000000000..08ebd53fde --- /dev/null +++ b/data/styles/clear/style-night/symbols/speedcam-xl.svg @@ -0,0 +1,15 @@ + + + +speedcam-l +Created with Sketch. + + + + + + diff --git a/data/styles/clear/style-night/symbols/speedcam1-l.svg b/data/styles/clear/style-night/symbols/speedcam1-l.svg index e5e3ed57cf..50858220bc 100644 --- a/data/styles/clear/style-night/symbols/speedcam1-l.svg +++ b/data/styles/clear/style-night/symbols/speedcam1-l.svg @@ -1,13 +1,9 @@ + viewBox="0 0 26 24.5" enable-background="new 0 0 26 24.5" xml:space="preserve"> speedcam-l Created with Sketch. - - - - + + + + + + diff --git a/data/styles/clear/style-night/symbols/speedcam1-m.svg b/data/styles/clear/style-night/symbols/speedcam1-m.svg new file mode 100644 index 0000000000..5201afb574 --- /dev/null +++ b/data/styles/clear/style-night/symbols/speedcam1-m.svg @@ -0,0 +1,28 @@ + + + +speedcam-l +Created with Sketch. + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/speedcam1-xl.svg b/data/styles/clear/style-night/symbols/speedcam1-xl.svg new file mode 100644 index 0000000000..cea4700abc --- /dev/null +++ b/data/styles/clear/style-night/symbols/speedcam1-xl.svg @@ -0,0 +1,30 @@ + + + +speedcam-l +Created with Sketch. + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/toll_booth-xl.svg b/data/styles/clear/style-night/symbols/toll_booth-xl.svg new file mode 100644 index 0000000000..9a694f31ec --- /dev/null +++ b/data/styles/clear/style-night/symbols/toll_booth-xl.svg @@ -0,0 +1,27 @@ + + + +toll_booth-l +Created with Sketch. + + + + + + + + + + + diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index b1fee5caf0..07268b5407 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -61,8 +61,6 @@ area[sport=multi], area[sport=soccer], {z-index: 5;} -/*area[amenity=parking] -{z-index: 6;}*/ area[natural=wood], area[landuse=forest], @@ -127,7 +125,6 @@ area[landuse=salt_pond], area[landuse=basin], area[landuse=reservoir], area[leisure=swimming_pool], -area[amenity=fountain], {z-index: 100;} area[waterway=dam], @@ -333,16 +330,13 @@ area|z11-[natural=wetland], area|z12-[landuse=basin], area|z12-[landuse=reservoir], area|z13-[leisure=swimming_pool], -area|z16-[amenity=fountain], {fill-position: background; fill-opacity: 1;} line|z10-[waterway=river], line|z10-[waterway=riverbank], -line|z13-[waterway=stream], -line|z13-[waterway=stream][intermittent=yes], line|z13-[waterway=canal], line|z16-[waterway=lock], -{opacity: 1;color: @river;-x-me-line-priority: -15600;} +{opacity: 1;color: @river;} /* 6.1 Area water(lake,pond etc.) */ @@ -357,7 +351,6 @@ area|z10-[natural=bay], area|z12-[landuse=basin], area|z12-[landuse=reservoir], area|z13-[leisure=swimming_pool], -area|z16-[amenity=fountain], {fill-color: @water;} area|z11-[natural=wetland], @@ -381,29 +374,29 @@ line|z11-12[waterway=riverbank], line|z13[waterway=river], line|z13[waterway=riverbank], {width: 1.6;} -line|z13[waterway=stream], +/*line|z13[waterway=stream], line|z13[waterway=canal], {width: 0.7;} line|z13[waterway=stream][intermittent=yes] -{width: 0.7;dashes: 2.7,2.7;} +{width: 0.7;dashes: 2.7,2.7;}*/ line|z14[waterway=river], line|z14[waterway=riverbank], {width: 1.8;} -line|z14[waterway=stream], +/*line|z14[waterway=stream], line|z14[waterway=canal], {width: 1;} line|z14[waterway=stream][intermittent=yes] -{width: 1;dashes: 2.7,2.7;} +{width: 1;dashes: 2.7,2.7;}*/ line|z15-[waterway=river], line|z15-[waterway=riverbank], {width: 2.2;} -line|z15-[waterway=stream], +/*line|z15-[waterway=stream], line|z15-[waterway=canal], {width: 1.6;} line|z15-[waterway=stream][intermittent=yes] -{width: 1.4;dashes: 4.95,4.95;} +{width: 1.4;dashes: 4.95,4.95;}*/ area|z15-[waterway=dam], line|z15-[waterway=dam], line|z15-[waterway=weir], @@ -458,14 +451,11 @@ area|z15-[landuse=quarry] /* 7.2 Hostital */ -/*area|z14-[amenity=hospital], -area|z14-[amenity=doctors] -{fill-color: @hospital;fill-opacity: 0.25;}*/ + /* 7.3 University & Sport */ -/*area|z14-[amenity=university] -{fill-color: @unversity;fill-opacity: 0.25;}*/ + area|z15-[leisure=stadium], @@ -487,22 +477,7 @@ area|z16-[landuse=cemetery] /* 7.5 Pedestrian areas */ -/*area|z14-[highway=pedestrian][area?], -area|z14-[area:highway=pedestrian], -area|z14-[highway=footway][area?][!sac_scale], -area|z14-[area:highway=footway], -area|z14-[area:highway=living_street], -area|z16-[public_transport=platform], -area|z16-[railway=platform], -area|z16-[amenity=place_of_worship] -{fill-color: @pedestrian_area;fill-opacity: 1;} -area|z16-[highway=pedestrian][area?], -area|z16-[area:highway=pedestrian], -area|z16-[highway=footway][area?][!sac_scale], -area|z16-[area:highway=footway], -area|z16-[area:highway=living_street], -{fill-color: @pedestrian_area_light;fill-opacity: 1;}*/ /* 7.6 Airports */ @@ -565,10 +540,6 @@ line|z14-[man_made=cutline] /* 8.2 Building */ -/*area|z14[building], -area|z14[landuse=garages], -area|z14[building=train_station], -{fill-color: @building;fill-opacity: 0.55;casing-width: 1;casing-color: @building_border;}*/ area|z15[building], area|z15[landuse=garages], @@ -598,18 +569,7 @@ area|z18-[building=train_station], /* 8.3 Barrier */ -/*line|z16-[barrier=retaining_wall], -{fill-color: @fence;opacity: 1;}*/ -/*line|z16-[barrier=wall], -line|z16-[barrier=city_wall], -line|z16-[barrier=fence], -line|z16-[barrier=hedge], -line|z16-[historic=citywalls], -{fill-color: @fence;opacity: 0.35;}*/ - -/*line|z16[barrier=retaining_wall], -{width: 0.7;dashes: 0.12,0.12;opacity: 0.5;}*/ line|z16[barrier=wall], line|z16[barrier=city_wall], diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index 75b77a2602..cca86523fb 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -38,7 +38,7 @@ area[building], node[building], area[addr:housenumber][addr:street], node[addr:housenumber][addr:street], -{z-index: 300;} +{z-index: 50;} area[landuse=cemetery], node[landuse=cemetery], @@ -64,7 +64,8 @@ area[landuse=military], node[landuse=military] {z-index: 1000;} -node[place=state] +node[place=state], +node[place=suburb] {z-index: 1001;} node[place=hamlet] @@ -99,10 +100,9 @@ area[landuse=reservoir], area[natural=water], line[waterway=river], line[waterway=riverbank], -line[waterway=stream], line[waterway=canal], line[waterway], -{z-index: 10000;} +{z-index: 4500;} /* 2.CONTINENTS */ @@ -365,15 +365,11 @@ node|z13-[place=hamlet] /* 4.4 Districts & Small localities */ node|z8-9[place=region], -node|z13-14[place=suburb], node|z13-[place=locality], -node|z13-16[place=neighbourhood], node|z14-[place=farm], node|z14-[place=isolated_dwelling], {text: name;text-color: @district_label;} -node|z13-14[place=suburb]::int_name, node|z13-[place=locality]::int_name, -node|z13-16[place=neighbourhood]::int_name, node|z14-[place=farm]::int_name, node|z14-[place=isolated_dwelling]::int_name, {text: int_name;text-color: @district_label;} @@ -381,24 +377,18 @@ node|z14-[place=isolated_dwelling]::int_name, /*node|z10[place=suburb] {font-size: 8;} node|z11[place=suburb] -{font-size: 8.5;} +{font-size: 9;} node|z12[place=suburb] -{font-size: 9;} -node|z12[place=suburb]::int_name -{font-size: 8;}*/ -node|z13-14[place=suburb] -{font-size: 10;} -node|z13-14[place=suburb]::int_name -{font-size: 9;} +{font-size: 10;}*/ + + node|z8-9[place=region], node|z13-[place=locality], -node|z13-16[place=neighbourhood], node|z14-[place=farm], node|z14-[place=isolated_dwelling], {font-size: 10;} node|z13-[place=locality]::int_name, -node|z13-16[place=neighbourhood]::int_name, node|z14-[place=isolated_dwelling]::int_name, node|z14-[place=farm]::int_name, {font-size: 9;} @@ -409,22 +399,16 @@ node|z14-[place=farm]::int_name, area|z18-[leisure=park][name], area|z18-[landuse=forest][name], {text: name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;icon-min-distance: 10;} -area|z18-[leisure=park][name]::int_name, -area|z18-[landuse=forest][name]::int_name, -{text: int_name;text-color: @park_label;text-halo-color: @halo_park_label;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|z16-[leisure=garden][name] {text: name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;icon-min-distance: 10;} -area|z14-[leisure=park][name]::int_name, -area|z14-[landuse=forest][name]::int_name, -area|z16-[leisure=garden][name]::int_name -{text: int_name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;} + area|z14-[leisure=park][name], area|z14-[landuse=forest][name] -{icon-image: park-s.svg;text-offset: 6;font-size: 11;} +{icon-image: park-m.svg;text-offset: 6;font-size: 11;} area|z14-[leisure=park][name]::int_name, area|z14-[landuse=forest][name]::int_name {text-offset: 6;} @@ -434,7 +418,7 @@ area|z14-[landuse=forest][!name] area|z15-[leisure=park][name], area|z15-[landuse=forest][name] -{icon-image: park-m.svg;text-offset: 8;font-size: 12;} +{icon-image: park-l.svg;text-offset: 8;font-size: 12;} area|z15-17[leisure=park][name]::int_name, area|z15-17[landuse=forest][name]::int_name, area|z16-17[landuse=forest][name]::int_name @@ -445,54 +429,29 @@ area|z15[landuse=forest][!name] area|z16[leisure=park][name], area|z16[landuse=forest][name] -{icon-image: park-m.svg;text-offset: 10;font-size: 12.5;} -area|z16[leisure=garden][name] -{icon-image: garden-m.svg;text-offset: 10;font-size: 12.5;} +{icon-image: park-l.svg;text-offset: 10;font-size: 12.5;} area|z16[leisure=park][!name], -area|z16[leisure=garden][!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 {}/*check*/ area|z18-[leisure=park][name], area|z18-[landuse=forest][name] -{icon-image: park-l.svg;text-offset: 10;font-size: 13.5;} +{icon-image: park-xl.svg;text-offset: 10;font-size: 13.5;} area|z18-[leisure=park][name], area|z18-[landuse=forest][name] {} -/*area|z17[leisure=garden][name] -{icon-image: garden-l.svg;text-offset: 10;font-size: 12;} -area|z17[leisure=park][!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 -{}*/ + area|z18-[leisure=park], area|z18-[landuse=forest] -{icon-image: park-l.svg;text-offset: 10;font-size: 13.5;} -area|z18-[leisure=garden] -{icon-image: garden-l.svg;text-offset: 10;font-size: 13.5;} +{icon-image: park-xl.svg;text-offset: 10;font-size: 13.5;} area|z18-[leisure=park]::int_name, -area|z18-[leisure=garden]::int_name, area|z18-[leisure=forest]::int_name {text-offset: 18;font-size: 11;} -/*area|z15-[landuse=farmland], -area|z15-[landuse=allotments], -area|z15-[landuse=recreation_ground], -area|z15-[landuse=orchard], -area|z15-[landuse=vineyard], -node|z17-[landuse=farmland], -node|z17-[landuse=allotments], -node|z17-[landuse=recreation_ground], -node|z17-[landuse=orchard], -node|z17-[landuse=vineyard], -{text: name;font-size: 10;text-color: @poi_label;}*/ + /* 5.2 Beach & Glacier */ @@ -508,19 +467,20 @@ node|z1-[place=ocean], node|z4-[place=sea], area|z10-[natural=lake][bbox_area>=4000000], area|z10-[landuse=reservoir][bbox_area>=4000000], -area|z10-[natural=water][bbox_area>=4000000], +area|z10-[natural=water][bbox_area>=80000000], line|z11-[waterway=river], line|z11-[waterway=riverbank], -line|z13-[waterway=stream], line|z13-[waterway=canal], -node|z14-[natural=water], +node|z14-[natural=water][bbox_area>=1000000], node|z14-[natural=bay], -area|z14-[natural=water][bbox_area>=70000], +area|z14-[natural=water][bbox_area>=1000000], area|z14-[natural=bay], node|z16-[natural=wetland], area|z16-[natural=wetland], {text:name;text-color: @water_label;} + + /*6.1 Area water(ocean,sea,lake,pond etc.)*/ node|z1-2[place=ocean] @@ -566,15 +526,12 @@ line[waterway][tunnel] line|z11-14[waterway=river], line|z11-14[waterway=riverbank], -line|z13-14[waterway=stream], line|z13-14[waterway=canal] {font-size: 9.5;text:name;text-color: @water_label;} -line|z15-17[waterway=stream], line|z15-17[waterway=canal], {font-size: 10;text:name;text-color: @water_label;} line|z15-[waterway=river], line|z15-[waterway=riverbank], -line|z18-[waterway=stream], line|z18-[waterway=canal], {font-size: 11;text:name;text-color: @water_label;} @@ -583,9 +540,6 @@ line|z18-[waterway=canal], /*7.2 Hostital 7.3 University & Sport */ /* 7.1 Industrial */ -/*area|z15-[landuse=industrial], -node|z15-[landuse=industrial], -{text: name;font-size: 10;text-color: @city_label;text-position: center;}*/ @@ -598,42 +552,19 @@ node|z15-[landuse=quarry], /* 7.4 Cemetry */ -/*area|z15-[landuse=cemetery], -node|z15-[landuse=cemetery], -area|z17-[amenity=grave_yard], -node|z17-[amenity=grave_yard], -{text: name;text-offset: 10;font-size: 10;text-color: @poi_label;} -area|z15-16[landuse=cemetery] -{icon-image: cemetery-m.svg;} -area|z17-[landuse=cemetery], -node|z17-[landuse=cemetery], -area|z17-[amenity=grave_yard], -node|z17-[amenity=grave_yard], -{icon-image: cemetery-l.svg;}*/ /* 7.5 Pedestrian areas */ -/*area|z15-[highway=pedestrian][area?], -area|z15-[area:highway=pedestrian], -area|z15-[highway=footway][area?][!sac_scale], -area|z15-[area:highway=footway], -{text: name;font-size: 11;text-color: @city_label;text-position: center;}*/ + /* 7.6 Military */ -/*area|z16[landuse=military], -node|z16[landuse=military] -{icon-image: military-m.svg;icon-min-distance: 10;} -area|z17-[landuse=military], -node|z17-[landuse=military] -{icon-image: military-l.svg;text-offset: 10;text: name;font-size: 10;text-color: @poi_label;}*/ /* 7.7 Commercial */ -/*area|z17-[landuse=commercial] -{text: name;font-size: 10;text-color: @poi_label;text-position: center;}*/ + /* 8.BUILDINGS */ @@ -656,19 +587,7 @@ node|z18-[entrance] {text-color: @building_label;} /* 8.1 Pier */ -/*area|z15-[waterway=dam], -line|z15-[waterway=dam], -line|z15-[waterway=weir], -node|z15-[waterway=weir] -{text: name;font-size: 10;text-color:@poi_label;fill-opacity: 1;}*/ -/*area|z17-[man_made=pier], -area|z17-[man_made=breakwater], -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;fill-opacity: 1;-x-me-area-priority:16000;}*/ /* 8.2 Building */ @@ -677,13 +596,13 @@ area|z16[building], node|z16[building], area|z16[addr:housenumber][addr:street], node|z16[addr:housenumber][addr:street], -{text:"addr:housename";font-size: 11.5;text-color: @housename;} +{text:"addr:housename";font-size: 12.5;text-color: @housename;} area|z17[building], node|z17[building], area|z17[addr:housenumber][addr:street], node|z17[addr:housenumber][addr:street] -{font-size: 12.5;} +{font-size: 13;} area|z17[building]::int_name, node|z17[building]::int_name, area|z17[addr:housenumber][addr:street]::int_name, @@ -694,28 +613,25 @@ area|z18[building], node|z18[building], area|z18[addr:housenumber][addr:street], node|z18[addr:housenumber][addr:street] -{font-size: 13.5;} +{font-size: 14;} area|z18[building]::int_name, node|z18[building]::int_name, area|z18[addr:housenumber][addr:street]::int_name, node|z18[addr:housenumber][addr:street]::int_name -{font-size: 13.5;} +{font-size: 13;} area|z19[building], node|z19[building], area|z19[addr:housenumber][addr:street], node|z19[addr:housenumber][addr:street] -{font-size: 14;} +{font-size: 14.5;} area|z19[building]::int_name, node|z19[building]::int_name, area|z19[addr:housenumber][addr:street]::int_name, node|z19[addr:housenumber][addr:street]::int_name {font-size: 14;} -/*node|z18-[entrance] -{icon-image: entrance-s.svg;font-size: 10;text: ref;text-offset-x: 10;} -node|z19-[entrance]::flats -{text: "addr:flats";font-size: 12;text-offset-y: 10;}*/ + /* 8.3 Airports */ area|z14-[aeroway=terminal] diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 927be87af1..9bacb6bb4e 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -44,237 +44,12 @@ node[amenity=marketplace], area[amenity=marketplace] {z-index: 6;} -/*node|z17-[leisure=golf_course], -area|z17-[leisure=golf_course] -{z-index: 50;}*/ -/* нельзя другой z-inex^иначе пропадают все объекты на поле */ -/*node[amenity=fountain], -area[amenity=fountain] -{z-index: 2000;} -node[natural=spring], -area[natural=spring], -node[natural=tree], -node[amenity=drinking_water], -area[amenity=drinking_water], -node[amenity=water_point], -area[amenity=water_point], -node[amenity=bench], -node[amenity=waste_basket], -node[amenity=waste_disposal], -area[amenity=waste_disposal], -node[man_made=survey_point] -{z-index: 2100;}*/ - -/*node[natural=cave_entrance], -area[natural=cave_entrance], -node[waterway=waterfall], -area[waterway=waterfall], -node[natural=volcano], -area[natural=volcano], -node[natural=peak], -area[natural=peak], -node[tourism=information], -node[historic=wayside_shrine], -area[historic=wayside_shrine], -node[historic=tomb], -area[historic=tomb], -node[historic=wayside_cross], -area[historic=wayside_cross], -node[historic=boundary_stone], -area[historic=boundary_stone], -node[amenity=post_box], -area[amenity=post_box], -node[amenity=telephone], -node[emergency=phone], -node[amenity=recycling], -area[amenity=recycling], -node[amenity=vending_machine], -area[amenity=vending_machine], -node[aeroway=gate], -area[aeroway=gate], -node[amenity=hunting_stand], -area[amenity=hunting_stand], -node[man_made=chimney], -area[man_made=chimney], -node[vending=parking_tickets], -area[vending=parking_tickets] -{z-index: 2200;}*/ - -/*node[natural=beach], -area[natural=beach], -node[shop], -area[shop], -node[amenity=marketplace], -area[amenity=marketplace], -node[amenity=veterinary], -area[amenity=veterinary], -node[sport], -area[sport], -node[leisure=playground], -node[historic=ship], -area[historic=ship], -node[tourism=caravan_site], -area[tourism=caravan_site], -node[amenity=bicycle_parking], -area[amenity=bicycle_parking], -node[amenity=dentist], -area[amenity=dentist], -node[leisure=water_park], -area[leisure=water_park], -node[amenity=taxi], -area[amenity=taxi], -node[barrier=lift_gate], -area[barrier=lift_gate], -node[leisure=dog_park], -area[leisure=dog_park], -node[leisure=water_park], -area[leisure=water_park], -node[man_made=windmill], -area[man_made=windmill], -node[amenity=casino], -area[amenity=casino], -node[amenity=kindergarten], -area[amenity=kindergarten], -node[amenity=childcare], -area[amenity=childcare], -node[amenity=post_office], -node[amenity=car_sharing], -area[amenity=car_sharing], -node[power=station], -area[power=station], -node[power=substation], -area[power=substation], -node|z18-[tourism], -area|z18-[tourism], -node|z18-[craft], -area|z18-[craft], -node[amenity=bbq], -area[amenity=bbq], -{z-index: 2400;}*/ - -/*node|z18-[sport=archery], -area|z18-[sport=archery], -node|z18-[sport=shooting], -area|z18-[sport=shooting], -node|z18-[sport=australian_football], -area|z18-[sport=australian_football], -node|z18-[sport=bowls], -area|z18-[sport=bowls], -node|z18-[sport=cricket], -area|z18-[sport=cricket], -node|z18-[sport=curling], -area|z18-[sport=curling], -node|z18-[sport=diving], -area|z18-[sport=diving], -node|z18-[sport=scuba_diving], -area|z18-[sport=scuba_diving] -{z-index: 2440;} - -node|z18-[sport=swimming], -node|z18-[sport=baseball], -node|z18-[sport=basketball], -node|z18-[sport=american_football], -node|z18-[sport=athletics], -node|z18-[sport=golf], -node|z18-[sport=gymnastics] -{z-index: 2460;}*/ - -/*node[landuse=landfill], -area[landuse=landfill], -node|z17-[sport=tennis], -node|z17-[leisure=skiing], -node[tourism=camp_site], -area[tourism=camp_site], -node[tourism=picnic_site], -area[tourism=picnic_site], -node[amenity=shelter], -area[amenity=shelter], -node[highway=speed_camera], -node[amenity=school], -area[amenity=school], -node[amenity=bicycle_rental], -area[amenity=bicycle_rental], -node[amenity=car_wash], -area[amenity=car_wash], -node[amenity=car_rental], -area[amenity=car_rental], -node|z18-[office], -area|z18-[office], -node[amenity=nightclub], -area[amenity=nightclub], -node[amenity=fire_station], -area[amenity=fire_station], -node[amenity=toilets], -area[amenity=toilets], -node[amenity=atm], -area[amenity=atm], -node[amenity=bureau_de_change], -node[amenity=library], -{z-index: 2500;}*/ - -node[amenity=fuel], -area[amenity=fuel], -node[amenity=charging_station], -area[amenity=charging_station] -{z-index: 2590;} - -/*node[aerialway=station], -node[aerialway=cable_car], -node[aerialway=chair_lift], -node[aerialway=gondola], -node[aerialway=mixed_lift], -node[aerialway=drag_lift], -node[aerialway=j-bar], -node[aerialway=t-bar], -node[aerialway=magic_carpet], -node[aerialway=platter], -node[aerialway=rope_tow], -node[railway=level_crossing], -node[shop=supermarket], -area[shop=supermarket], -node[shop=car_repair][service=tyres], -area[shop=car_repair][service=tyres], -node[amenity=clinic], -area[amenity=clinic], -node[amenity=doctors], -area[amenity=doctors], -node[leisure=swimming_pool], -area[leisure=swimming_pool], -area[aeroway=heliport], -area[aeroway=helipad], -node[aeroway=heliport], -node[aeroway=helipad], -node[historic=archaeological_site], -area[historic=archaeological_site], -node[amenity=bank], -area[amenity=bank], -node[amenity=courthouse], -area[amenity=courthouse], -node[amenity=college], -area[amenity=college], -node[amenity=cinema], -area[amenity=cinema], -node[amenity=police], -area[amenity=police], -node[amenity=embassy], -area[amenity=embassy], -node[office=lawyer], -area[office=lawyer] -{z-index: 2600;}*/ node[shop=supermarket], area[shop=supermarket], {z-index: 2600;} -/*node[landuse=forest], -area[landuse=forest], -node[landuse=forest][boundary=national_park], -area[landuse=forest][boundary=national_park], -node[amenity=place_of_worship], -area[amenity=place_of_worship], -{z-index: 2650;}*/ - node[boundary=national_park], area[boundary=national_park], @@ -305,43 +80,10 @@ node[highway=bus_stop], area[highway=bus_stop], node[amenity=bus_station], area[amenity=bus_station], -node[amenity=ferry_terminal], node[public_transport=station], area[public_transport=station], {z-index: 2800;} -/*node[historic=monument], -area[historic=monument], -node[historic=memorial], -area[historic=memorial] -{z-index: 2800;}*/ - -/*node[tourism=motel], -area[tourism=motel], -node[tourism=apartment], -area[tourism=apartment] -{z-index: 2812;} - -node[tourism=alpine_hut], -area[tourism=alpine_hut], -node[tourism=chalet], -area[tourism=chalet], -node[tourism=resort], -area[tourism=resort] -{z-index: 2814;} - -node[tourism=guest_house], -area[tourism=guest_house] -{z-index: 2816;} - -node[tourism=hostel], -area[tourism=hostel] -{z-index: 2818;} - -node[tourism=hotel], -area[tourism=hotel], -{z-index: 2820;}*/ - node[amenity=car_wash], area[amenity=car_wash], @@ -351,34 +93,6 @@ node[shop=car_repair][service=tyres], area[shop=car_repair][service=tyres], {z-index: 2832;} -/*node[tourism=attraction], -area[tourism=attraction], -node[amenity=community_centre], -area[amenity=community_centre], -node[tourism=artwork] -{z-index: 2840;} -node[tourism=attraction], -area[tourism=attraction] -{z-index: 2842;} -node[tourism=gallery] -{z-index: 2844;} -node[tourism=museum], -area[tourism=museum], -{z-index: 2846;} -node[leisure=stadium], -area[leisure=stadium] -{z-index: 2848;} -node[tourism=viewpoint] -{z-index: 2850;} -node[tourism=zoo], -area[tourism=zoo] -{z-index: 2860;}*/ - -/*node[historic=fort], -area[historic=fort], -node[historic=castle], -area[historic=castle], -{z-index: 2890;}*/ node[amenity=hospital], node[building=hospital], @@ -388,9 +102,6 @@ node[building=university], area[building=university], {z-index: 2900;} -/*node[shop=mall], -area[shop=mall] -{z-index: 2930;}*/ node[railway=halt], node[barrier=border_control], @@ -412,43 +123,24 @@ area[aeroway=airport], area[aeroway=aerodrome], node[aeroway=airport], node[aeroway=aerodrome], -node|z16[amenity=parking], -area|z16[amenity=parking], +node[amenity=parking], +area[amenity=parking], node[railway=station][transport=subway], {z-index: 3100;} -area[olympics=transport_airport], -node[olympics=transport_airport], -area[olympics=transport_railway], -node[olympics=transport_railway], -area[olympics=transport_cable], -node[olympics=transport_cable], -node[olympics=transport_bus], -area[olympics=transport_bus], -node[olympics=transport_boat], -node[olympics=transport_tram], -area[olympics=transport_tram], -node[olympics=transport_subway], +node[amenity=fuel], +area[amenity=fuel], +node[amenity=charging_station], +area[amenity=charging_station] +{z-index: 3590;} + + area[building=train_station], node[highway=speed_camera], {z-index: 8000;} /* 2. NATURAL */ -/*node|z10-[natural=volcano], -area|z10-[natural=volcano], -node|z11-[natural=cave_entrance], -area|z11-[natural=cave_entrance], -node|z11-[waterway=waterfall], -area|z11-[waterway=waterfall], -node|z13-[natural=peak], -area|z13-[natural=peak], -node|z14-[natural=spring], -area|z14-[natural=spring], -node|z16-[natural=beach], -area|z16-[natural=beach], -{text: name;text-color: @poi_label;text-position: center;text-offset: 5;}*/ - node|z12-[landuse=forest][boundary=national_park], area|z12-[landuse=forest][boundary=national_park], node|z12-[boundary=national_park], @@ -457,147 +149,52 @@ node|z12-[leisure=nature_reserve], area|z12-[leisure=nature_reserve] {text: name;text-color: @park_label;text-halo-opacity: 0.75;text-halo-color: @label_halo_light;text-halo-radius:0.4;} -/*node|z11[natural=cave_entrance], -area|z11[natural=cave_entrance] -{icon-image: cave-s.svg;icon-min-distance: 20;} -node|z12-[natural=cave_entrance], -area|z12-[natural=cave_entrance] -{icon-image: cave-s.svg;text-offset: 8;font-size: 10;} -node|z15-[natural=cave_entrance], -area|z15-[natural=cave_entrance] -{icon-image: cave-m.svg;text-offset: 10;font-size: 10;} -node|z17-[natural=cave_entrance], -area|z17-[natural=cave_entrance] -{icon-image: cave-l.svg;text-offset: 10;font-size: 11;} -node|z11[waterway=waterfall], -area|z11[waterway=waterfall] -{icon-image: waterfall-s.svg;icon-min-distance: 15;} -node|z12-[waterway=waterfall], -area|z12-[waterway=waterfall] -{icon-image: waterfall-s.svg;text-offset: 10;font-size: 10;} -node|z15-[waterway=waterfall], -area|z15-[waterway=waterfall] -{icon-image: waterfall-m.svg;text-offset: 8;font-size: 10;} -node|z17-[waterway=waterfall], -area|z17-[waterway=waterfall] -{icon-image: waterfall-l.svg;text-offset: 10;font-size: 10;} -node|z10-[natural=volcano], -area|z10-[natural=volcano] -{icon-image: volcano-s.svg;text-offset: 10;font-size: 10;} -node|z15-[natural=volcano], -area|z15-[natural=volcano] -{icon-image: volcano-m.svg;text-offset: 8;font-size: 10;} -node|z17-[natural=volcano], -area|z17-[natural=volcano] -{icon-image: volcano-l.svg;text-offset: 10;font-size: 10;} -node|z12[natural=peak][name], -area|z12[natural=peak][name], -{icon-image: peakt-s.svg;icon-min-distance: 10;text-offset: 5;text: name;text-color: @poi_label;text-position: center;} -node|z12-14[natural=peak][!name], -node|z12-14[natural=bare_rock][!name], -node|z12-14[natural=rock][!name], -area|z12-14[natural=peak][!name], -area|z12-14[natural=bare_rock][!name], -area|z12-14[natural=rock][!name] -{font-size: 0;} -node|z13[natural=peak][name], -area|z13[natural=peak][name], -{icon-image: peakt-s.svg;text-offset: 5;font-size: 9;} -node|z14[natural=peak][name], -area|z14[natural=peak][name], -{icon-image: peakt-s.svg;text-offset: 5;font-size: 10;} -node|z15-16[natural=peak], -node|z15-16[natural=bare_rock], -node|z15-16[natural=rock], -area|z15-16[natural=peak], -area|z15-16[natural=bare_rock], -area|z15-16[natural=rock] -{icon-image: peakt-m.svg;text-offset: 5;font-size: 10;} -node|z17-[natural=peak], -node|z17-[natural=bare_rock], -node|z17-[natural=rock], -area|z17-[natural=peak], -area|z17-[natural=bare_rock], -area|z17-[natural=rock] -{icon-image: peakt-l.svg;text-offset: 6;font-size: 11;} - -node|z16[natural=beach], -area|z16[natural=beach] -{icon-image: beach-m.svg;} -node|z17-[natural=beach], -area|z17-[natural=beach] -{icon-image: beach-l.svg;font-size: 11;}*/ - -node|z11[landuse=forest][boundary=national_park], +/*node|z11[landuse=forest][boundary=national_park], area|z11[landuse=forest][boundary=national_park], node|z11[boundary=national_park], area|z11[boundary=national_park], node|z11[leisure=nature_reserve], area|z11[leisure=nature_reserve] -{icon-image: nparkf-s.svg;icon-min-distance: 20;} +{icon-image: nparkf-s.svg;icon-min-distance: 20;}*/ node|z12-13[landuse=forest][boundary=national_park], area|z12-13[landuse=forest][boundary=national_park], node|z12-13[boundary=national_park], area|z12-13[boundary=national_park], node|z12-13[leisure=nature_reserve], area|z12-13[leisure=nature_reserve] -{icon-image: nparkf-s.svg;text-offset: 6;font-size: 10;icon-min-distance: 12;} +{icon-image: nparkf-s.svg;text-offset: 6;font-size: 11;icon-min-distance: 12;} node|z14[landuse=forest][boundary=national_park], area|z14[landuse=forest][boundary=national_park], node|z14[boundary=national_park], area|z14[boundary=national_park], node|z14[leisure=nature_reserve], area|z14[leisure=nature_reserve] -{icon-image: nparkf-s.svg;text-offset: 8;font-size: 11;} +{icon-image: nparkf-m.svg;text-offset: 8;font-size: 12.25;} node|z15-16[landuse=forest][boundary=national_park], area|z15-16[landuse=forest][boundary=national_park], node|z15-16[boundary=national_park], area|z15-16[boundary=national_park], node|z15-16[leisure=nature_reserve], area|z15-16[leisure=nature_reserve] -{icon-image: nparkf-m.svg;text-offset: 10;font-size: 11;text-halo-opacity: 0.85;} +{icon-image: nparkf-m.svg;text-offset: 10;font-size: 12.5;text-halo-opacity: 0.85;} node|z17-[landuse=forest][boundary=national_park], area|z17-[landuse=forest][boundary=national_park], node|z17-[boundary=national_park], area|z17-[boundary=national_park], node|z17-[leisure=nature_reserve], area|z17-[leisure=nature_reserve] -{icon-image: nparkf-m.svg;text-offset: 10;font-size: 11;text-halo-opacity: 0.9;} +{icon-image: nparkf-l.svg;text-offset: 10;font-size: 12.75;text-halo-opacity: 0.9;} -/*node|z14[natural=spring], -area|z14[natural=spring] -{icon-image: drinking-water-s.svg;text-offset:6;font-size: 10;icon-min-distance: 24;} -node|z15-16[natural=spring], -area|z15-16[natural=spring] -{icon-image: drinking-water-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;} -node|z17-[natural=spring], -area|z17-[natural=spring] -{icon-image: drinking-water-l.svg;text-offset:8;font-size: 10;icon-min-distance: 24;} -node|z18-[natural=tree] -{icon-image: tree-s.svg;}*/ - -/*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;icon-min-distance: 36;} -node|z17-[amenity=drinking_water], -area|z17-[amenity=drinking_water], -node|z17-[amenity=water_point], -area|z17-[amenity=water_point], -{icon-image: drinking-water-l.svg;}*/ /* 3. TRANSPORT */ -/*node|z17-[highway=bus_stop], -area|z17-[highway=bus_stop], -{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}*/ + area|z11-[building=train_station], -{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light; icon-min-distance: 2; -x-me-icon-priority: 9100;} +{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light; icon-min-distance: 2; -x-me-icon-priority: 19100;} area|z11-[building=train_station]::int_name, -{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;icon-min-distance: 2; -x-me-icon-priority: 9100;} +{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;icon-min-distance: 2; -x-me-icon-priority: 19100;} node|z13-[railway=station], node|z14-[railway=halt], @@ -609,12 +206,6 @@ node|z14-15[railway=station][transport=subway]::int_name, {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;} -/*node|z17-[railway=tram_stop], -area|z17-[railway=tram_stop] -{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;} -node|z17-[railway=tram_stop]::int_name, -area|z17-[railway=tram_stop]::int_name -{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}*/ node|z12-15[railway=station][transport=subway][city=moscow], @@ -625,8 +216,6 @@ node|z12-15[railway=station][transport=subway][city=spb]::int_name, {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;} node|z17-[public_transport=station], area|z17-[public_transport=station], -node|z14-[amenity=bus_station], -area|z14-[amenity=bus_station], {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;} node|z17-[public_transport=station]::int_name, area|z17-[public_transport=station]::int_name @@ -636,18 +225,6 @@ area|z10-[aeroway=airport], area|z10-[aeroway=aerodrome], node|z10-[aeroway=airport], node|z10-[aeroway=aerodrome], -node|z15-[aerialway=station], -node|z15-[aerialway=cable_car], -node|z15-[aerialway=chair_lift], -node|z15-[aerialway=gondola], -node|z15-[aerialway=mixed_lift], -node|z15-[aerialway=drag_lift], -node|z15-[aerialway=j-bar], -node|z15-[aerialway=t-bar], -node|z15-[aerialway=magic_carpet], -node|z15-[aerialway=platter], -node|z15-[aerialway=rope_tow], -node|z16-[amenity=ferry_terminal], {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;} area|z12-[aeroway=airport]::int_name, area|z12-[aeroway=aerodrome]::int_name, @@ -680,37 +257,12 @@ node|z16-[railway=subway_entrance][city=moscow]::int_name, node|z17-[railway=tram_stop]::int_name, area|z17-[railway=tram_stop]::int_name {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;} -/*node|z17-[highway=bus_stop], -area|z17-[highway=bus_stop], -node|z17-[public_transport=station], -area|z17-[public_transport=station], -node|z14-[amenity=bus_station], -area|z14-[amenity=bus_station], -{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;} -node|z17-[highway=bus_stop]::int_name, -area|z17-[highway=bus_stop]::int_name, -node|z17-[public_transport=station]::int_name, -area|z17-[public_transport=station]::int_name, -node|z14-[amenity=bus_station]::int_name, -area|z14-[amenity=bus_station]::int_name -{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}*/ + area|z10-[aeroway=airport], area|z10-[aeroway=aerodrome], node|z10-[aeroway=airport], node|z10-[aeroway=aerodrome], -node|z15-[aerialway=station], -node|z15-[aerialway=cable_car], -node|z15-[aerialway=chair_lift], -node|z15-[aerialway=gondola], -node|z15-[aerialway=mixed_lift], -node|z15-[aerialway=drag_lift], -node|z15-[aerialway=j-bar], -node|z15-[aerialway=t-bar], -node|z15-[aerialway=magic_carpet], -node|z15-[aerialway=platter], -node|z15-[aerialway=rope_tow], -node|z16-[amenity=ferry_terminal], {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;} area|z12-[aeroway=airport]::int_name, area|z12-[aeroway=aerodrome]::int_name, @@ -722,22 +274,17 @@ node|z12-[aeroway=aerodrome]::int_name, /*check offset int_name*/ -/*node|z11[railway=halt] -{icon-image: train-s.svg;icon-min-distance: 10;} -node|z12[railway=halt] -{icon-image: train-s.svg;text-offset: 6;font-size: 9;} -node|z12[railway=halt]::int_name -{text-offset: 6;font-size: 8;}*/ + node|z13[railway=station], area|z13[building=train_station], -{icon-image: train-s.svg;text-offset: 6;font-size: 10;} +{icon-image: train-m.svg;text-offset: 6;font-size: 11.75;} node|z13[railway=station]::int_name, area|z13[building=train_station]::int_name, {text-offset: 6;font-size: 9;} node|z14[railway=station], node|z14[railway=halt], area|z14[building=train_station], -{icon-image: train-s.svg;text-offset: 6;font-size: 11;text-halo-opacity: 0.7;} +{icon-image: train-m.svg;text-offset: 6;font-size: 12.25;text-halo-opacity: 0.7;} node|z14[railway=station]::int_name, node|z14[railway=halt]::int_name, area|z14[building=train_station]::int_name, @@ -745,7 +292,7 @@ area|z14[building=train_station]::int_name, node|z15[railway=station], node|z15[railway=halt], area|z15[building=train_station], -{icon-image: train-m.svg;text-offset: 8;font-size: 12;text-halo-opacity: 0.8;} +{icon-image: train-m.svg;text-offset: 8;font-size: 12.5;text-halo-opacity: 0.8;} node|z15[railway=station]::int_name, node|z15[railway=halt]::int_name, area|z15[building=train_station]::int_name, @@ -753,7 +300,7 @@ area|z15[building=train_station]::int_name, node|z16[railway=station], node|z16[railway=halt], area|z16[building=train_station], -{icon-image: train-m.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.8;} +{icon-image: train-l.svg;text-offset: 8;font-size: 12.75;text-halo-opacity: 0.8;} node|z16[railway=station]::int_name, node|z16[railway=halt]::int_name, area|z16[building=train_station]::int_name, @@ -770,265 +317,197 @@ area|z17-[building=train_station]::int_name, /* 3.2 Subway Station */ node|z13[railway=station][transport=subway] -{icon-image: subway-s.svg;icon-min-distance: 1;} +{icon-image: subway-m.svg;icon-min-distance: 1;font-size: 11.75;} node|z14[railway=station][transport=subway] -{icon-image: subway-s.svg;text-offset: 6;font-size: 11;text-halo-opacity: 0.7;icon-min-distance: 1;} +{icon-image: subway-m.svg;text-offset: 6;font-size: 12.25;text-halo-opacity: 0.7;icon-min-distance: 1;} node|z14[railway=station][transport=subway]::int_name {text-offset: 7;font-size: 9;text-halo-opacity: 0.7;icon-min-distance: 1;} node|z15[railway=station][transport=subway] -{icon-image: subway-m.svg;text-offset: 7;font-size: 12;text-halo-opacity: 0.8;} +{icon-image: subway-m.svg;text-offset: 7;font-size: 12.5;text-halo-opacity: 0.8;} node|z15[railway=station][transport=subway]::int_name {text-offset: 7;font-size: 10;text-halo-opacity: 0.8;} /*check*/ node|z16-[railway=station][transport=subway] -{icon-image: zero-icon.svg;font-size: 9;text-opacity: 0;text-halo-opacity: 0} +{icon-image: zero-icon.svg;font-size: 12.75;text-opacity: 0;text-halo-opacity: 0} node|z16-[railway=station][transport=subway]::int_name {font-size: 9;text-opacity: 0;text-halo-opacity: 0} /*check*/ -/*node|z17-[railway=station][transport=subway] -{icon-image: subway-l.svg;text-offset: 7;font-size: 13;text-halo-opacity: 0.9;} -node|z17-[railway=station][transport=subway]::int_name -{text-offset: 7;font-size: 11;text-halo-opacity: 0.9;} /*check*/ + node|z17-[railway=subway_entrance] -{icon-image: subway-entrance-m.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.9;} +{icon-image: subway-entrance-l.svg;text-offset: 8;font-size: 13.25;text-halo-opacity: 0.9;} node|z17-[railway=subway_entrance]::int_name {text-offset: 8;font-size: 11;text-halo-opacity: 0.9;} /*check*/ /* 3.2.1 Moscow Subway Station */ -node|z11[railway=station][transport=subway][city=moscow] -{icon-image: subway-moscow-s.svg;icon-min-distance: 1;} -node|z12-13[railway=station][transport=subway][city=moscow] -{icon-image: subway-moscow-s.svg;text-offset: 5;font-size: 10;text-halo-opacity: 0.7;icon-min-distance: 1;} -node|z12-13[railway=station][transport=subway][city=moscow]::int_name +/*node|z11[railway=station][transport=subway][city=moscow] +{icon-image: subway-moscow-s.svg;icon-min-distance: 1;}*/ +node|z12[railway=station][transport=subway][city=moscow] +{icon-image: subway-moscow-s.svg;text-offset: 5;font-size: 11;text-halo-opacity: 0.7;icon-min-distance: 1;} +node|z12[railway=station][transport=subway][city=moscow]::int_name +{text-offset: 20;font-size: 9;text-halo-opacity: 0.7;} +node|z13[railway=station][transport=subway][city=moscow] +{icon-image: subway-moscow-m.svg;text-offset: 5;font-size: 11.75;text-halo-opacity: 0.7;icon-min-distance: 1;} +node|z13[railway=station][transport=subway][city=moscow]::int_name {text-offset: 20;font-size: 9;text-halo-opacity: 0.7;} node|z14[railway=station][transport=subway][city=moscow] -{icon-image: subway-moscow-s.svg;text-offset: 8;font-size: 11;} +{icon-image: subway-moscow-m.svg;text-offset: 8;font-size: 12.25;} node|z14[railway=station][transport=subway][city=moscow]::int_name {text-offset: 24;font-size: 9;} node|z15[railway=station][transport=subway][city=moscow] -{icon-image: subway-moscow-m.svg;text-offset: 9;font-size: 12;} +{icon-image: subway-moscow-m.svg;text-offset: 9;font-size: 12.5;} node|z15[railway=station][transport=subway][city=moscow]::int_name {text-offset: 24;font-size: 10;} node|z16-[railway=station][transport=subway][city=moscow] -{icon-image: zero-icon.svg;font-size: 9;text-opacity: 0;text-halo-opacity: 0} +{icon-image: zero-icon.svg;font-size: 12.75;text-opacity: 0;text-halo-opacity: 0} node|z16-[railway=station][transport=subway][city=moscow]::int_name {} -/* -node[railway=station][transport=subway][city=moscow]check -{icon-image: subway-moscow-m.svg;text-offset: 9;font-size: 10;text-color: @district_label;text-halo-radius: 0;} -node[railway=station][transport=subway][city=moscow]::int_name -{text-offset: 24;font-size: 9;text-color: @district_label;text-halo-radius: 0;} check -*/ + /* Moscow Subway Station entrance */ node|z16[railway=subway_entrance][city=moscow] -{icon-image: subway-moscow-m.svg;text-offset: 10;font-size: 12;} +{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 12.75;} node|z16[railway=subway_entrance][city=moscow]::int_name {text-offset: 25;font-size: 10;} node|z17[railway=subway_entrance][city=moscow] -{icon-image: subway-moscow-m.svg;text-offset: 10;font-size: 12;} +{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 12.75;} node|z17[railway=subway_entrance][city=moscow]::int_name {text-offset: 25;font-size: 11;} node|z18-[railway=subway_entrance][city=moscow] -{icon-image: subway-moscow-m.svg;text-offset: 10;font-size: 13;} +{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 13.5;} node|z18-[railway=subway_entrance][city=moscow]::int_name {text-offset: 25;font-size: 11;} /* 3.2.2 Saint Petersburg Subway Station */ -node|z11[railway=station][transport=subway][city=spb] -{icon-image: subway-spb-s.svg;icon-min-distance: 1;} +/*node|z11[railway=station][transport=subway][city=spb] +{icon-image: subway-spb-s.svg;icon-min-distance: 1;}*/ node|z12[railway=station][transport=subway][city=spb] -{icon-image: subway-spb-s.svg;text-offset: 6;font-size: 10;text-halo-opacity: 0.6;} +{icon-image: subway-spb-s.svg;text-offset: 6;font-size: 11;text-halo-opacity: 0.6;} node|z12[railway=station][transport=subway][city=spb]::int_name {text-offset: 5;font-size: 9;text-halo-opacity: 0.6;} node|z13[railway=station][transport=subway][city=spb] -{icon-image: subway-spb-s.svg;text-offset: 6;font-size: 11;text-halo-opacity: 0.6;} +{icon-image: subway-spb-m.svg;text-offset: 6;font-size: 11.75;text-halo-opacity: 0.6;} node|z13[railway=station][transport=subway][city=spb]::int_name {text-offset: 5;font-size: 10;text-halo-opacity: 0.6;} node|z14[railway=station][transport=subway][city=spb] -{icon-image: subway-spb-s.svg;text-offset: 8;font-size: 11;text-halo-opacity: 0.7;} +{icon-image: subway-spb-m.svg;text-offset: 8;font-size: 12.25;text-halo-opacity: 0.7;} node|z14[railway=station][transport=subway][city=spb]::int_name {text-offset: 24;font-size: 10;text-halo-opacity: 0.7;} node|z15[railway=station][transport=subway][city=spb] -{icon-image: subway-spb-m.svg;text-offset: 8;font-size: 11;text-halo-opacity: 0.8;} +{icon-image: subway-spb-m.svg;text-offset: 8;font-size: 12.5;text-halo-opacity: 0.8;} node|z15[railway=station][transport=subway][city=spb]::int_name {text-offset: 24;font-size: 10;text-halo-opacity: 0.8;} -/* -node[railway=station][transport=subway][city=spb] check -{icon-image: subway-spb-m.svg;text-offset: 8;font-size: 10;text-color: @district_label;text-halo-radius: 0;} -node[railway=station][transport=subway][city=spb]::int_name -{text-offset: 24;font-size: 9;text-color: @district_label;text-halo-radius: 0;} check -*/ + /* Saint Petersburg Subway Station entrance */ node|z16[railway=subway_entrance][city=spb] -{icon-image: subway-spb-m.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.8;} +{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 12.75;text-halo-opacity: 0.8;} node|z16[railway=subway_entrance][city=spb]::int_name {text-offset: 25;font-size: 11;text-halo-opacity: 0.8;} node|z17[railway=subway_entrance][city=spb] -{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.8;} +{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 12.75;text-halo-opacity: 0.8;} node|z17[railway=subway_entrance][city=spb]::int_name {text-offset: 25;font-size: 11;text-halo-opacity: 0.8;} node|z18-[railway=subway_entrance][city=spb] -{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.8;} +{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 13.5;text-halo-opacity: 0.8;} node|z18-[railway=subway_entrance][city=spb]::int_name {text-offset: 25;font-size: 12;text-halo-opacity: 0.8;} /* 3.2.3 Minsk Subway Station */ -node|z13[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-s.svg;text-offset: 4;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|z13[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 4;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-m.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;}/*check none*/ node|z17-[railway=station][transport=subway][city=minsk] {icon-image: none.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ -node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 6;font-size: 12;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;} -node|z17[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;} -node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;} +node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;text-offset: 6;font-size: 12;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;} +node|z17[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 13;} +node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 13;} /* 3.2.4 Kiev Subway Station */ -node|z13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;text-offset: 8;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|z13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;text-offset: 8;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-m.svg;} node|z15-16[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;} node|z17-[railway=station][transport=subway][city=kiev] {icon-image: none.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ -node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;font-size: 13;} +node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-l.svg;font-size: 13;} /* 3.2.5 London Subway Station */ -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|z13[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;icon-min-distance: 1;} +node|z14[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;} node|z15-16[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;} node|z17-[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;} -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;} +node|z17[railway=subway_entrance][city=london] {icon-image: subway-london-l.svg;} +node|z18-[railway=subway_entrance][city=london] {icon-image: subway-london-l.svg;} /* 3.2.6 Paris Subway Station */ -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|z13[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;icon-min-distance: 1;} +node|z14[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;} node|z15-16[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;} -node|z17-[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;} -node|z17-[railway=subway_entrance][city=paris] {icon-image: subway-paris-s.svg;} +node|z17-[railway=station][transport=subway][city=paris] {icon-image: subway-paris-l.svg;} +node|z17-[railway=subway_entrance][city=paris] {icon-image: subway-paris-l.svg;} /* 3.2.7 Barselona Subway Station */ -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|z13[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;icon-min-distance: 1;} +node|z14[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;} node|z15-16[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;} -node|z17-[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;} -node|z17[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-s.svg;} -node|z18-[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-m.svg;} +node|z17-[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-l.svg;} +node|z17[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-l.svg;} +node|z18-[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-l.svg;} /* 3.2.8 Madrid Subway Station */ -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|z13[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;icon-min-distance: 1;} +node|z14[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;} node|z15-16[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;} -node|z17-[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;} -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;} +node|z17-[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-l.svg;} +node|z17[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-l.svg;} +node|z18-[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-l.svg;} /* 3.2.9 Berlin Subway Station*/ -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|z13[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;icon-min-distance: 1;} +node|z14[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;} node|z15-16[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;} -node|z17-[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;} +node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-l.svg;} +node|z17-[railway=subway_entrance][city=berlin] {icon-image: subway-berlin-l.svg;} /* 3.2.10 Roma Subway Station */ -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|z13[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.svg;icon-min-distance: 1;} +node|z14[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.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;} +node|z16[railway=station][transport=subway][city=roma] {icon-image: subway-rome-l.svg;} node|z17-[railway=station][transport=subway][city=roma] {icon-image: none.svg;text: name;text-color: @district_label;text-halo-radius: 0;} -node|z17-[railway=subway_entrance][city=roma] {icon-image: subway-rome-m.svg;} +node|z17-[railway=subway_entrance][city=roma] {icon-image: subway-rome-l.svg;} /* 3.2.11 New York Subway Station */ -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|z13[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-m.svg;icon-min-distance: 1;} +node|z14[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-m.svg;} node|z15[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-m.svg;} node|z17-[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-l.svg;} -node|z17-[railway=subway_entrance][city=newyork] {icon-image: subway-newyork-s.svg;} +node|z17-[railway=subway_entrance][city=newyork] {icon-image: subway-newyork-l.svg;} + -/*node|z17-[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-l.svg;} -node|z17-[railway=subway_entrance][city=newyork] {icon-image: subway-newyork-s.svg;}*/ /* 3.3 Tram Station */ -/*node|z14[railway=tram_stop], -{icon-image: tram-s.svg;} -node|z15-16[railway=tram_stop], -area|z15-16[railway=tram_stop] -{icon-image: tram-s.svg;}*/ + node|z17[railway=tram_stop], area|z17[railway=tram_stop] -{icon-image: tram-s.svg;text-offset: 8;font-size: 11;text-opacity: 0;text-halo-opacity: 0;} +{icon-image: tram-l.svg;text-offset: 8;font-size: 12;text-opacity: 0;text-halo-opacity: 0;} node|z17-[railway=tram_stop]::int_name, area|z17-[railway=tram_stop]::int_name {text-offset: 8;font-size: 10;text-opacity: 0; text-halo-opacity: 0;} /*check*/ node|z18-[railway=tram_stop], area|z18-[railway=tram_stop] -{icon-image: tram-s.svg;text-offset: 8;font-size: 12;text-opacity: 0; text-halo-opacity: 0;} +{icon-image: tram-l.svg;text-offset: 8;font-size: 12;text-opacity: 0; text-halo-opacity: 0;} /* 3.4 Bus Station */ -/*node|z12-13[amenity=bus_station], -area|z12-13[amenity=bus_station] -{icon-image: bus-s.svg;icon-min-distance: 1;} -node|z14[amenity=bus_station], -area|z14[amenity=bus_station] -{icon-image: bus-s.svg;text-offset: 6;font-size: 10;text-halo-opacity: 0.8;} -node|z15-16[amenity=bus_station], -area|z15-16[amenity=bus_station] -{icon-image: bus-m.svg;text-offset: 8;font-size: 11;text-halo-opacity: 0.8;} -node|z15-16[amenity=bus_station]::int_name, -area|z15-16[amenity=bus_station]::int_name -{text-offset: 8;font-size: 9;text-halo-opacity: 0.8;} -node|z17[amenity=bus_station], -area|z17[amenity=bus_station] -{icon-image: bus-l.svg;text-offset: 8;font-size: 11;} -node|z17[amenity=bus_station]::int_name, -area|z17[amenity=bus_station]::int_name -{text-offset: 8;font-size: 9;} -node|z18[amenity=bus_station], -area|z18[amenity=bus_station] -{icon-image: bus-l.svg;text-offset: 8;font-size: 12;} -node|z18[amenity=bus_station]::int_name, -area|z18[amenity=bus_station]::int_name -{text-offset: 8;font-size: 10;} -node|z19-[amenity=bus_station], -area|z19-[amenity=bus_station] -{icon-image: bus-l.svg;text-offset: 10;font-size: 12;} -node|z19-[amenity=bus_station]::int_name, -area|z19-[amenity=bus_station]::int_name -{text-offset: 10;font-size: 10;} -node|z16[highway=bus_stop], -area|z16[highway=bus_stop] -{icon-image: bus-m.svg;} -node|z17-[highway=bus_stop], -area|z17-[highway=bus_stop], -node|z18-[public_transport=station], -area|z18-[public_transport=station] -{icon-image: bus-l.svg;text-offset: 10;font-size: 11;} -node|z18-19[highway=bus_stop]::int_name, -area|z18-19[highway=bus_stop]::int_name, -node|z18-19[public_transport=station]::int_name, -area|z18-19[public_transport=station]::int_name -{icon-image: bus-l.svg;text-offset: 10;font-size: 9;}*/ /* 3.5 Ferry terminal */ -/*node|z11-12[amenity=ferry_terminal] -{icon-image: ship-s.svg;icon-min-distance: 12;} -node|z13-14[amenity=ferry_terminal] -{icon-image: ship-s.svg;}*/ -node|z15[amenity=ferry_terminal] -{icon-image: ship-s.svg;} -node|z16[amenity=ferry_terminal] -{icon-image: ship-s.svg;text-offset: 8;font-size: 8.5;text-halo-opacity: 0.8;} -node|z17-18[amenity=ferry_terminal] -{icon-image: ship-s.svg;text-offset: 10;font-size: 9;} -node|z19[amenity=ferry_terminal] -{icon-image: ship-m.svg;text-offset: 10;font-size: 10;} + /* 3.6 Airport */ @@ -1072,9 +551,7 @@ area|z17-[aeroway=aerodrome]::int_name, node|z17-[aeroway=aerodrome]::int_name, {font-size: 11;} -/*area|z17-[aeroway=helipad], -node|z17-[aeroway=helipad] -{icon-image: helipad-l.svg;text-offset: 10;font-size: 10;text: name;text-color: @poi_label;}*/ + area|z17-[aeroway=heliport], @@ -1083,412 +560,20 @@ node|z17-[aeroway=heliport], /* 3.7 Aerialway */ -/*node|z12-13[aerialway=station], -node|z12-13[aerialway=cable_car], -node|z12-13[aerialway=chair_lift], -node|z12-13[aerialway=gondola], -node|z12-13[aerialway=mixed_lift] -{icon-image: cable-car-s.svg;icon-min-distance: 10;} -node|z14[aerialway=station], -node|z14[aerialway=cable_car], -node|z14[aerialway=chair_lift], -node|z14[aerialway=gondola], -node|z14[aerialway=mixed_lift] -{icon-image: cable-car-s.svg;} -node|z15-16[aerialway=station], -node|z15-16[aerialway=cable_car], -node|z15-16[aerialway=chair_lift], -node|z15-16[aerialway=gondola], -node|z15-16[aerialway=mixed_lift], -node|z15-16[aerialway=drag_lift], -node|z15-16[aerialway=j-bar], -node|z15-16[aerialway=t-bar], -node|z15-16[aerialway=magic_carpet], -node|z15-16[aerialway=platter], -node|z15-16[aerialway=rope_tow], -{icon-image: cable-car-m.svg;text-offset: 6;font-size: 10;} -node|z17-[aerialway=station], -node|z17-[aerialway=cable_car], -node|z17-[aerialway=chair_lift], -node|z17-[aerialway=gondola], -node|z17-[aerialway=mixed_lift], -node|z17-[aerialway=drag_lift], -node|z17-[aerialway=j-bar], -node|z17-[aerialway=t-bar], -node|z17-[aerialway=magic_carpet], -node|z17-[aerialway=platter], -node|z17-[aerialway=rope_tow], -{icon-image: cable-car-l.svg;text-offset: 8;font-size: 12;}*/ + +node|z15-[railway=level_crossing] +{icon-image: railway-crossing_l.svg;} node|z17-[railway=level_crossing] -{icon-image: railway-crossing.svg;} +{icon-image: railway-crossing_xl.svg;} /* 4.TOURISM */ /* 4.1 Main POI */ -/*node|z12-[historic=fort], -area|z12-[historic=fort], -node|z12-[historic=castle], -area|z12-[historic=castle], -node|z13-[historic=monument], -area|z13-[historic=monument], -node|z13-[tourism=museum], -area|z13-[tourism=museum], -node|z13-[tourism=zoo], -area|z13-[tourism=zoo], -node|z14-[amenity=theatre], -area|z14-[amenity=theatre], -node|z14-[tourism=attraction], -area|z14-[tourism=attraction], -node|z14-[amenity=community_centre], -area|z14-[amenity=community_centre], -node|z14-[tourism=viewpoint], -node|z15-[historic=memorial], -area|z15-[historic=memorial], -node|z15-[tourism=gallery], -area|z15-[tourism=gallery], -node|z15-[tourism=artwork], -node|z16-[tourism=information], -node|z16-[historic=boundary_stone], -area|z16-[historic=boundary_stone], -node|z16-[historic=wayside_cross], -area|z16-[historic=wayside_cross], -node|z16-[historic=ship], -area|z16-[historic=ship], -node|z16-[historic=tomb], -area|z16-[historic=tomb], -node|z16-[historic=museum], -area|z16-[historic=museum], -node|z17-[historic=ruins], -area|z17-[historic=ruins], -node|z17-[historic=wayside_shrine], -area|z17-[historic=wayside_shrine], -node|z17-[historic=archaeological_site], -area|z17-[historic=archaeological_site] -{text: name;text-offset: 10;font-size: 10;text-color: @poi_label;} -node|z12-14[historic=fort], -area|z12-14[historic=fort] -node|z12-14[historic=castle], -area|z12-14[historic=castle] -{icon-image: remains-s.svg;text-offset: 6;icon-min-distance: 12;} -node|z15[historic=fort], -area|z15[historic=fort] -node|z15[historic=castle], -area|z15[historic=castle] -{icon-image: remains-m.svg;icon-min-distance: 5;} -node|z16[historic=fort], -area|z16[historic=fort] -node|z16[historic=castle], -area|z16[historic=castle] -{icon-image: remains-m.svg;text-offset: 12;} -node|z17-[historic=ruins], -area|z17-[historic=ruins] -node|z17-[historic=fort], -area|z17-[historic=fort] -node|z17-[historic=castle], -area|z17-[historic=castle], -node|z17-[historic=archaeological_site], -area|z17-[historic=archaeological_site] -{icon-image: remains-l.svg;} -node|z13-14[historic=monument], -area|z13-14[historic=monument] -{icon-image: monument-s.svg;text-offset: 6;icon-min-distance: 12;} -node|z15[historic=monument], -area|z15[historic=monument] -node|z15[historic=memorial], -area|z15[historic=memorial] -{icon-image: monument-m.svg;icon-min-distance: 24;} -node|z16[historic=monument], -area|z16[historic=monument] -node|z16[historic=memorial], -area|z16[historic=memorial] -{icon-image: monument-m.svg;icon-min-distance: 12;} -node|z17-[historic=memorial], -area|z17-[historic=memorial] -node|z17-[historic=monument], -area|z17-[historic=monument] -{icon-image: monument-l.svg;} -node|z13-14[tourism=museum], -area|z13-14[tourism=museum] -{icon-image: museum-s.svg;icon-min-distance: 16;} -node|z15[tourism=museum], -area|z15[tourism=museum] -{icon-image: museum-m.svg;icon-min-distance: 24;} -node|z16[tourism=museum], -area|z16[tourism=museum] -node|z16[historic=museum], -area|z16[historic=museum] -{icon-image: museum-m.svg;text-offset: 12;icon-min-distance: 12;} -node|z17-[tourism=museum], -area|z17-[tourism=museum] -node|z17-[historic=museum], -area|z17-[historic=museum] -{icon-image: museum-l.svg;} - -node|z15[tourism=gallery] -{icon-image: gallery-m.svg;icon-min-distance: 8;} /* <-- <-- не показывается, непонятно почему, позже разобраться */ -/*node|z16[tourism=gallery], -area|z16[tourism=gallery] -{icon-image: gallery-m.svg;text-offset: 12;icon-min-distance: 12;} -node|z17-[tourism=gallery], -area|z17-[tourism=gallery] -{icon-image: gallery-l.svg;} - -node|z14[amenity=theatre], -area|z14[amenity=theatre] -{icon-image: theatre-s.svg;text-offset: 6;icon-min-distance: 8;} -node|z16[amenity=theatre], -area|z16[amenity=theatre] -{icon-image: theatre-m.svg;icon-min-distance: 10;} -node|z17[amenity=theatre], -area|z17[amenity=theatre] -{icon-image: theatre-l.svg;} -node|z18-[amenity=theatre], -area|z18-[amenity=theatre] -{icon-image: theatre-l.svg;font-size: 11;} - -node|z13-14[tourism=zoo], -area|z13-14[tourism=zoo] -{icon-image: zoo-s.svg;text-offset: 6;icon-min-distance: 12;} -node|z15[tourism=zoo], -area|z15[tourism=zoo] -{icon-image: zoo-m.svg;icon-min-distance: 8;} -node|z16[tourism=zoo], -area|z16[tourism=zoo] -{icon-image: zoo-m.svg;text-offset: 12;icon-min-distance: 8;} -node|z17-[tourism=zoo], -area|z17-[tourism=zoo] -{icon-image: zoo-l.svg;} - -node|z14[tourism=viewpoint] -{icon-image: viewpoint-s.svg;text-offset: 6;icon-min-distance: 8;} -node|z15-16[tourism=viewpoint] -{icon-image: viewpoint-m.svg;icon-min-distance: 8;} -node|z17-[tourism=viewpoint] -{icon-image: viewpoint-l.svg;} - -node|z16[tourism=information] -{icon-image: information-m.svg;text-offset: 6;icon-min-distance: 10;} -node|z17-[tourism=information] -{icon-image: information-l.svg;text-offset: 6;} - -node|z16[historic=boundary_stone], -area|z16[historic=boundary_stone] -node|z16[historic=wayside_cross], -area|z16[historic=wayside_cross] -{icon-image: monument-m.svg;font-size: 11;;icon-min-distance: 8;} -node|z16[historic=ship], -area|z16[historic=ship] -{icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;} -node|z16[historic=tomb], -area|z16[historic=tomb] -{icon-image: tomb-m.svg;font-size: 11;icon-min-distance: 8;} -node|z16[historic=wayside_shrine], -area|z16[historic=wayside_shrine] -{icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;} - -node|z17-[historic=boundary_stone], -area|z17-[historic=boundary_stone], -node|z17-[historic=wayside_cross], -area|z17-[historic=wayside_cross] -{icon-image: monument-l.svg;font-size: 11;icon-min-distance: 8;} -node|z17-[historic=ship], -area|z17-[historic=ship] -{icon-image: historic-ship-l.svg;font-size: 11;icon-min-distance: 8;} -node|z17-[historic=tomb], -area|z17-[historic=tomb] -{icon-image: tomb-l.svg;font-size: 11;icon-min-distance: 8;} -node|z17-[historic=wayside_shrine], -area|z17-[historic=wayside_shrine] -{icon-image: wayside_shrine-l.svg;font-size: 11;icon-min-distance: 8;} - -node|z15[tourism=artwork] -{icon-image: tourism-m.svg;icon-min-distance: 8;} -node|z16[tourism=artwork] -{icon-image: tourism-m.svg;icon-min-distance: 28;} -node|z14[tourism=attraction], -area|z14[tourism=attraction] -{icon-image: tourism-s.svg;icon-min-distance: 12;} -node|z15[tourism=attraction], -area|z15[tourism=attraction ] -{icon-image: tourism-m.svg;icon-min-distance: 36;} -node|z16[tourism=attraction], -area|z16[tourism=attraction] -{icon-image: tourism-m.svg;icon-min-distance: 36} -node|z17-[tourism=artwork] -node|z17-[tourism=attraction], -area|z17-[tourism=attraction] -{icon-image: tourism-l.svg;icon-min-distance: 24;} - -node|z14[amenity=community_centre], -area|z14[amenity=community_centre] -{icon-image: tourism-s.svg;icon-min-distance: 8;} -node|z15[amenity=community_centre], -area|z15[amenity=community_centre] -{icon-image: tourism-m.svg;icon-min-distance: 24;} -node|z16[amenity=community_centre], -area|z16[amenity=community_centre] -{icon-image: tourism-m.svg;icon-min-distance: 16} */ - -/* 4.2 Apartament */ - -/*node|z14-[tourism=hotel], -node|z14-[tourism=hostel], -node|z14-[tourism=guest_house], -area|z14-[tourism=guest_house], -node|z14-[tourism=alpine_hut], -area|z14-[tourism=alpine_hut], -node|z14-[tourism=chalet], -area|z14-[tourism=chalet], -node|z14-[tourism=resort], -area|z14-[tourism=resort], -node|z14-[tourism=motel], -area|z14-[tourism=motel], -node|z14-[tourism=apartment], -area|z14-[tourism=apartment], -{text: name;text-offset: 10;font-size: 10; text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;} -node|z15-[tourism=camp_site], -area|z15-[tourism=camp_site], -node|z16-[tourism=picnic_site], -area|z16-[tourism=picnic_site], -node|z16-[amenity=shelter], -area|z16-[amenity=shelter], -node|z16-[tourism=caravan_site], -area|z16-[tourism=caravan_site], -{text: name;text-color: @poi_label;text-offset: 10;font-size: 10;} - -node|z14[tourism=hotel] -{icon-image: hotel-s.svg;text-offset: 6;icon-min-distance: 24;} -node|z14[tourism=hostel] -{icon-image: hotel-s.svg;text-offset: 6;icon-min-distance: 24;} -node|z14[tourism=guest_house], -area|z14[tourism=guest_house] -{icon-image: motel-s.svg;text-offset: 6;icon-min-distance: 24;} -node|z14[tourism=alpine_hut], -area|z14[tourism=alpine_hut], -node|z14[tourism=chalet], -area|z14[tourism=chalet], -node|z14[tourism=resort], -area|z14[tourism=resort] -{icon-image: alpine_hut-s.svg;text-offset: 6;icon-min-distance: 24;} -node|z14[tourism=motel], -area|z14[tourism=motel], -node|z14[tourism=apartment], -area|z14[tourism=apartment] -{icon-image: motel-s.svg;text-offset: 6;icon-min-distance: 24;} - -node|z15[tourism=hotel] -{icon-image: hotel-m.svg;icon-min-distance: 32;} -node|z15[tourism=hostel] -{icon-image: hotel-m.svg;icon-min-distance: 32;} -node|z15[tourism=guest_house], -area|z15[tourism=guest_house] -{icon-image: motel-m.svg;icon-min-distance: 32;} -node|z15[tourism=alpine_hut], -area|z15[tourism=alpine_hut], -node|z15[tourism=chalet], -area|z15[tourism=chalet], -node|z15[tourism=resort], -area|z15[tourism=resort] -{icon-image: alpine_hut-m.svg;icon-min-distance: 32;} -node|z15[tourism=motel], -area|z15[tourism=motel], -node|z15[tourism=apartment], -area|z15[tourism=apartment] -{icon-image: motel-m.svg;icon-min-distance: 32;} - -node|z16[tourism=hotel] -{icon-image: hotel-m.svg;icon-min-distance: 24;} -node|z16[tourism=hostel] -{icon-image: hotel-m.svg;icon-min-distance: 24;} -node|z16[tourism=guest_house], -area|z16[tourism=guest_house] -{icon-image: motel-m.svg;icon-min-distance: 24;} -node|z16[tourism=alpine_hut], -area|z16[tourism=alpine_hut], -node|z16[tourism=chalet], -area|z16[tourism=chalet], -node|z16[tourism=resort], -area|z16[tourism=resort] -{icon-image: alpine_hut-m.svg;icon-min-distance: 24;} -node|z16[tourism=motel], -area|z16[tourism=motel], -node|z16[tourism=apartment], -area|z16[tourism=apartment] -{icon-image: motel-m.svg;icon-min-distance: 24;} - -node|z17[tourism=hotel] -{icon-image: hotel-l.svg;icon-min-distance: 16;} -node|z17[tourism=hostel] -{icon-image: hotel-l.svg;icon-min-distance: 16;} -node|z17[tourism=guest_house], -area|z17[tourism=guest_house] -{icon-image: motel-l.svg;icon-min-distance: 16;} -node|z17[tourism=alpine_hut], -area|z17[tourism=alpine_hut], -node|z17[tourism=chalet], -area|z17[tourism=chalet], -node|z17[tourism=resort], -area|z17[tourism=resort] -{icon-image: alpine_hut-l.svg;icon-min-distance: 16;} -node|z17[tourism=motel], -area|z17[tourism=motel], -node|z17[tourism=apartment], -area|z17[tourism=apartment] -{icon-image: motel-l.svg;icon-min-distance: 16;} - -node|z18-[tourism=hotel] -{icon-image: hotel-l.svg;} -node|z18-[tourism=hostel] -{icon-image: hotel-l.svg;} -node|z18-[tourism=guest_house], -area|z18-[tourism=guest_house] -{icon-image: motel-l.svg;} -node|z18-[tourism=alpine_hut], -area|z18-[tourism=alpine_hut], -node|z18-[tourism=chalet], -area|z18-[tourism=chalet], -node|z18-[tourism=resort], -area|z18-[tourism=resort] -{icon-image: alpine_hut-l.svg;} -node|z18-[tourism=motel], -area|z18-[tourism=motel], -node|z18-[tourism=apartment], -area|z18-[tourism=apartment] -{icon-image: motel-l.svg;} - -node|z15-16[tourism=camp_site], -area|z15-16[tourism=camp_site] -{icon-image: campsite-m.svg;icon-min-distance: 12;} -node|z17-[tourism=camp_site], -area|z17-[tourism=camp_site] -{icon-image: campsite-l.svg;} -node|z16-[tourism=picnic_site], -area|z16-[tourism=picnic_site] -{icon-image: picnic-m.svg;icon-min-distance: 10;} -node|z17-[tourism=picnic_site], -area|z17-[tourism=picnic_site] -{icon-image: picnic-l.svg;} -node|z16-[amenity=shelter], -area|z16-[amenity=shelter] -{icon-image: picnic-m.svg;icon-min-distance: 10;} -node|z17-[amenity=shelter], -area|z17-[amenity=shelter] -{icon-image: picnic-l.svg;} - -node|z16[tourism=caravan_site], -area|z16[tourism=caravan_site] -{icon-image: caravan_site-m.svg;font-size: 11;icon-min-distance: 30;} -node|z17[tourism=caravan_site], -area|z17[tourism=caravan_site] -{icon-image: caravan_site-l.svg;font-size: 11;icon-min-distance: 20;} -node|z18-[tourism=caravan_site], -area|z18-[tourism=caravan_site] -{icon-image: caravan_site-l.svg;font-size: 11;}*/ /* 4.3 Food */ node|z15-[amenity=cafe], @@ -1499,92 +584,49 @@ node|z17-[amenity=fast_food], area|z17-[amenity=fast_food], {text: name;text-color: @poi_label;text-offset: 10;font-size: 13;} -/*node|z17-[amenity=bar], -area|z17-[amenity=bar], -node|z17-[amenity=pub], -area|z17-[amenity=pub], -{text: name;text-color: @poi_label;text-offset: 10;font-size: 10;}*/ -/*node|z15[amenity=cafe], -area|z15[amenity=cafe] -{icon-image: cafe-m.svg;icon-min-distance: 12;} -node|z15[amenity=restaurant], -area|z15[amenity=restaurant] -{icon-image: restaurant-m.svg;icon-min-distance: 28;} -node|z15[amenity=fast_food], -area|z15[amenity=fast_food] -{icon-image: fastfood-m.svg;icon-min-distance: 28;} -node|z15[amenity=bar], -area|z15[amenity=bar] -{icon-image: beer-m.svg;icon-min-distance: 28;} -node|z15[amenity=pub], -area|z15[amenity=pub] -{icon-image: beer-m.svg;icon-min-distance: 28;}*/ -/*node|z16[amenity=cafe], -area|z16[amenity=cafe] -{icon-image: cafe-m.svg;icon-min-distance: 12;} -node|z16[amenity=restaurant], -area|z16[amenity=restaurant] -{icon-image: restaurant-m.svg;icon-min-distance: 12;} -node|z16[amenity=fast_food], -area|z16[amenity=fast_food] -{icon-image: fastfood-m.svg;icon-min-distance: 12;} -node|z16[amenity=bar], -area|z16[amenity=bar] -{icon-image: beer-m.svg;icon-min-distance: 12;} -node|z16[amenity=pub], -area|z16[amenity=pub] -{icon-image: beer-m.svg;icon-min-distance: 12;}*/ + + node|z15[amenity=cafe], area|z15[amenity=cafe] -{icon-image: cafe-m.svg;icon-min-distance: 3;font-size: 11;} +{icon-image: cafe-m.svg;icon-min-distance: 3;font-size: 12.5;} node|z16[amenity=cafe], area|z16[amenity=cafe] -{icon-image: cafe-m.svg;icon-min-distance: 10;font-size: 12.5;} +{icon-image: cafe-l.svg;icon-min-distance: 10;font-size: 12.75;} node|z16[amenity=restaurant], area|z16[amenity=restaurant] -{icon-image: restaurant-m.svg;icon-min-distance: 22;} +{icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 12.75;} node|z17[amenity=cafe], area|z17[amenity=cafe] -{icon-image: cafe-l.svg;icon-min-distance: 20;} +{icon-image: cafe-l.svg;icon-min-distance: 20;font-size: 12.75;} node|z17[amenity=restaurant], area|z17[amenity=restaurant] -{icon-image: restaurant-l.svg;icon-min-distance: 22;} +{icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 12.75;} node|z17[amenity=fast_food], area|z17[amenity=fast_food] -{icon-image: fastfood-l.svg;icon-min-distance: 25;} -/*node|z17[amenity=bar], -area|z17[amenity=bar] -{icon-image: beer-l.svg;icon-min-distance: 12;}*/ -/*node|z17[amenity=pub], -area|z17[amenity=pub] -{icon-image: beer-l.svg;icon-min-distance: 12;}*/ +{icon-image: fastfood-l.svg;icon-min-distance: 25;font-size: 12.75;} + node|z18[amenity=cafe], area|z18[amenity=cafe] -{icon-image: cafe-l.svg;icon-min-distance: 25;} +{icon-image: cafe-xl.svg;icon-min-distance: 25;font-size: 13.5;} node|z18[amenity=restaurant], area|z18[amenity=restaurant] -{icon-image: restaurant-l.svg;icon-min-distance: 25;} +{icon-image: restaurant-xl.svg;icon-min-distance: 25;font-size: 13.5;} node|z18[amenity=fast_food], area|z18[amenity=fast_food] -{icon-image: fastfood-l.svg;icon-min-distance: 25;} +{icon-image: fastfood-xl.svg;icon-min-distance: 25;font-size: 13.5;} node|z19[amenity=cafe], area|z19[amenity=cafe] -{icon-image: cafe-l.svg;icon-min-distance: 35;} +{icon-image: cafe-xl.svg;icon-min-distance: 35;font-size: 13.5;} node|z19[amenity=restaurant], area|z19[amenity=restaurant] -{icon-image: restaurant-l.svg;icon-min-distance: 40;} +{icon-image: restaurant-xl.svg;icon-min-distance: 40;font-size: 13.5;} node|z19[amenity=fast_food], area|z19[amenity=fast_food] -{icon-image: fastfood-l.svg;icon-min-distance: 45;} -/*node|z18-[amenity=bar], -area|z18-[amenity=bar] -{icon-image: beer-l.svg;}*/ -/*node|z18-[amenity=pub], -area|z18-[amenity=pub] -{icon-image: beer-l.svg;}*/ +{icon-image: fastfood-xl.svg;icon-min-distance: 45;font-size: 13.5;} + /* 5.AMENITY (infrastructure) */ node|z17-[amenity=place_of_worship], @@ -1593,11 +635,11 @@ area|z17-[amenity=place_of_worship], /*node|z13-[leisure=stadium], area|z13-[leisure=stadium],*/ -area|z16-[amenity=university], -node|z16-[amenity=university], -node|z16-[amenity=hospital], -node|z16-[building=hospital], -area|z16-[building=hospital], +area|z15-[amenity=university], +node|z15-[amenity=university], +node|z15-[amenity=hospital], +node|z15-[building=hospital], +area|z15-[building=hospital], node|z14-[barrier=toll_booth], @@ -1611,387 +653,133 @@ node|z17-[vending=parking_tickets], area|z17-[vending=parking_tickets], node|z17-[amenity=vending_machine], area|z17-[amenity=vending_machine], -{text: name;text-color: @poi_label;text-offset: 10;font-size: 10;text-min-distance: 14} +{text: name;text-color: @poi_label;text-offset: 10;font-size: 11;text-min-distance: 14} /* POI */ -/* -node|z18-[tourism], -area|z18-[tourism] -{font-size: 11;text-offset: 12;} -node|z18-[office], -area|z18-[office] -{icon-image: office-l.svg;font-size: 11;} -node|z18-[craft], -area|z18-[craft] -{icon-image: hand-l.svg;font-size: 11;}*/ + /* 5.1 Hospital */ -/*area|z14[amenity=hospital] -{icon-image: hospital-s.svg;icon-min-distance: 8;} -node|z15[amenity=hospital] -{icon-image: hospital-m.svg;icon-min-distance: 6;}*/ +node|z15[amenity=hospital], +node|z15[building=hospital], +area|z15[building=hospital] +{icon-image: hospital-m.svg;icon-min-distance: 10;font-size: 12.5;} node|z16[amenity=hospital], node|z16[building=hospital], area|z16[building=hospital] -{icon-image: hospital-m.svg;icon-min-distance: 8;} +{icon-image: hospital-l.svg;icon-min-distance: 8;font-size: 12.75;} node|z17[amenity=hospital], node|z17[building=hospital], area|z17[building=hospital] -{icon-image: hospital-l.svg;icon-min-distance: 14;} +{icon-image: hospital-l.svg;icon-min-distance: 14;font-size: 12.75;} node|z18-[amenity=hospital], node|z18-[building=hospital], area|z18-[building=hospital], -{icon-image: hospital-l.svg;font-size: 13;} +{icon-image: hospital-xl.svg;font-size: 13.5;} -/*node|z16[amenity=veterinary], -area|z16[amenity=veterinary] -{icon-image: veterinary-m.svg;} -node|z17[amenity=veterinary], -area|z17[amenity=veterinary] -{icon-image: veterinary-l.svg;} -node|z18-[amenity=veterinary], -area|z18-[amenity=veterinary] -{icon-image: veterinary-l.svg;font-size: 11;}*/ -/*node|z16[amenity=pharmacy], -area|z16[amenity=pharmacy] -{icon-image: pharmacy-m.svg;icon-min-distance: 20;} -node|z17[amenity=pharmacy], -area|z17[amenity=pharmacy] -{icon-image: pharmacy-l.svg;text-offset: 8;font-size: 11;icon-min-distance: 20;} -node|z18-[amenity=pharmacy], -area|z18-[amenity=pharmacy] -{icon-image: pharmacy-l.svg;font-size: 11;}*/ /* 5.2 Education */ -/*area|z15[amenity=university][name] -{icon-image: college-s.svg;icon-min-distance: 12;-x-me-text-priority:16000;}*/ +area|z15[amenity=university][name], +node|z15[amenity=university][name] +{icon-image: college-m.svg;icon-min-distance: 15;-x-me-text-priority:16000;font-size: 12.5;} +node|z15[amenity=university][!name] +{} area|z16[amenity=university][name], node|z16[amenity=university][name] -{icon-image: college-m.svg;icon-min-distance: 12;-x-me-text-priority:16000;} +{icon-image: college-l.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 12.75;} node|z16[amenity=university][!name] {} node|z17[amenity=university][name], area|z17[amenity=university][name] -{icon-image: college-m.svg;icon-min-distance: 11;-x-me-text-priority:16000;} +{icon-image: college-l.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 12.75;} node|z17[amenity=university][!name], area|z17[amenity=university][!name] {} node|z18[amenity=university][name], area|z18[amenity=university][name] -{icon-image: college-l.svg;icon-min-distance: 10;-x-me-text-priority:16000;} +{icon-image: college-xl.svg;icon-min-distance: 10;-x-me-text-priority:16000;font-size: 13.5;} node|z18[amenity=university][!name], area|z18[amenity=university][!name] {} node|z19[amenity=university][name], area|z19[amenity=university][name] -{icon-image: college-l.svg;font-size: 113;-x-me-text-priority:16000;} +{icon-image: college-xl.svg;font-size: 14.5;-x-me-text-priority:16000;font-size: 13.5;} node|z19[amenity=university][!name], area|z19[amenity=university][!name] {} -/*node|z17[amenity=kindergarten], -area|z17[amenity=kindergarten] -{icon-image: kindergarten-l.svg;} -node|z18-[amenity=kindergarten], -area|z18-[amenity=kindergarten] -{icon-image: kindergarten-l.svg;font-size: 11;} -node|z17[amenity=childcare], -area|z17[amenity=childcare] -{icon-image: kindergarten-l.svg;} -node|z18-[amenity=childcare], -area|z18-[amenity=childcare] -{icon-image: kindergarten-l.svg;font-size: 11;} -node|z17[amenity=school], -area|z17[amenity=school] -{icon-image: school-l.svg;} -node|z18-[amenity=school], -area|z18-[amenity=school] -{icon-image: school-l.svg;font-size: 11;} -node|z17[amenity=college], -area|z17[amenity=college] -{icon-image: college-l.svg;} -node|z18-[amenity=college], -area|z18-[amenity=college] -{icon-image: college-l.svg;font-size: 11;}*/ + /* 5.3 Sport */ -/*node|z13-14[leisure=stadium] -{icon-image: stadium-s.svg;icon-min-distance: 16;} -node|z15-16[leisure=stadium] -{icon-image: stadium-m.svg;icon-min-distance: 8;} -node|z17-[leisure=stadium] -{icon-image: stadium-l.svg;icon-min-distance: 8;}*/ -/*node|z16-[sport=equestrian], -area|z16-[sport=equestrian] -{icon-image: equestrian-m.svg;font-size: 11;icon-min-distance: 30;} -node|z17-[sport=equestrian], -area|z17-[sport=equestrian] -{icon-image: equestrian-l.svg;font-size: 11;icon-min-distance: 20;} -node|z18-[sport=equestrian], -area|z18-[sport=equestrian] -{icon-image: equestrian-l.svg;font-size: 11;} - -node|z17-[sport=multi] -{icon-image: pitch-l.svg;icon-min-distance: 10;} -node|z17-[leisure=pitch] -{icon-image: pitch-l.svg;;icon-min-distance: 10;-x-me-text-priority: 16000;} -node|z17-[leisure=sports_centre] -{icon-image: pitch-l.svg;-x-me-text-priority: 15500;icon-min-distance: 10;} -node|z17-[leisure=sports_centre][sport=climbing] -{icon-image: climbing-l.svg;-x-me-text-priority: 15500;icon-min-distance: 10;} -node|z17-[leisure=sports_centre][sport=swimming] -{icon-image: swimming-l.svg;-x-me-text-priority: 15500;icon-min-distance: 10;} -node|z17-[leisure=fitness_centre] -{icon-image: gym-l.svg;-x-me-text-priority: 15500;icon-min-distance: 10;} -node|z17-[leisure=sauna] -{icon-image: sauna-l.svg;-x-me-text-priority: 15500;icon-min-distance: 10;} -node|z17-[leisure=playground] -{icon-image: pitch-l.svg;font-size: 11;;icon-min-distance: 10;} -node|z17-[leisure=swimming_pool], -area|z17-[leisure=swimming_pool] -{icon-image: swimming-l.svg;icon-min-distance: 10;} -node|z17-[leisure=golf_course], -area|z17-[leisure=golf_course] -{icon-image: golf-l.svg;icon-min-distance: 10;} -node|z17-[sport=soccer], -area|z17-[sport=soccer] -{icon-image: soccer-l.svg;icon-min-distance: 10;} -node|z17-[sport=football], -area|z17-[sport=football] -{icon-image: soccer-l.svg;icon-min-distance: 10;} -node|z17-[sport=tennis] -{icon-image: tennis-l.svg;icon-min-distance: 10;} -node|z17-[leisure=skiing] -{icon-image: skiing-l.svg;icon-min-distance: 10;} - -node|z17-[sport=archery], -area|z17-[sport=archery]{icon-image: archery-l.svg;font-size: 11;icon-min-distance: 10;} -node|z17-[sport=shooting], -area|z17-[sport=shooting] -{icon-image: archery-l.svg;font-size: 11;icon-min-distance: 10;} -node|z17-[sport=australian_football], -area|z17-[sport=australian_football] -{icon-image: australian-football-l.svg;font-size: 11;icon-min-distance: 10;} -node|z17-[sport=bowls], -area|z17-[sport=bowls] -{icon-image: bowls-l.svg;font-size: 11;icon-min-distance: 10;} -node|z17-[sport=cricket], -area|z17-[sport=cricket] -{icon-image: cricket-l.svg;font-size: 11;icon-min-distance: 10;} -node|z17-[sport=curling], -area|z17-[sport=curling] -{icon-image: curling-l.svg;font-size: 11;icon-min-distance: 10;} -node|z17-[sport=diving], -area|z17-[sport=diving] -{icon-image: diving-l.svg;font-size: 11;icon-min-distance: 10;} -node|z17-[sport=scuba_diving], -area|z17-[sport=scuba_diving] -{icon-image: diving-l.svg;font-size: 11;icon-min-distance: 10;} - -node|z18-[sport=swimming] -{icon-image: swimming-l.svg;font-size: 11;} -node|z18-[sport=baseball] -{icon-image: baseball-l.svg;font-size: 11;} -node|z18-[sport=basketball] -{icon-image: basketball-l.svg;font-size: 11;} -node|z18-[sport=american_football] -{icon-image: america-football-l.svg;font-size: 11;} -node|z18-[sport=athletics] -{icon-image: pitch-l.svg;font-size: 11;} -node|z18-[sport=golf] -{icon-image: golf-l.svg;font-size: 11;} -node|z18-[sport=gymnastics] -{icon-image: pitch-l.svg;font-size: 11;} - -node|z18-[sport=archery], -area|z18-[sport=archery] -{icon-image: archery-l.svg;font-size: 11;} -node|z18-[sport=shooting], -area|z18-[sport=shooting] -{icon-image: archery-l.svg;font-size: 11;} -node|z18-[sport=australian_football], -area|z18-[sport=australian_football] -{icon-image: australian-football-l.svg;font-size: 11;} -node|z18-[sport=bowls], -area|z18-[sport=bowls] -{icon-image: bowls-l.svg;font-size: 11;} -node|z18-[sport=cricket], -area|z18-[sport=cricket] -{icon-image: cricket-l.svg;font-size: 11;} -node|z18-[sport=curling], -area|z18-[sport=curling] -{icon-image: curling-l.svg;font-size: 11;} -node|z18-[sport=diving], -area|z18-[sport=diving] -{icon-image: diving-l.svg;font-size: 11;} -node|z18-[sport=scuba_diving], -area|z18-[sport=scuba_diving] -{icon-image: diving-l.svg;font-size: 11;}*/ /* 5.4 Religion */ -/*node|z14[amenity=place_of_worship], -area|z14[amenity=place_of_worship] -{icon-image: place-of-worship-s.svg;text-offset: 6;icon-min-distance: 12;} -node|z14[amenity=place_of_worship][religion=christian], -area|z14[amenity=place_of_worship][religion=christian] -{icon-image: christian-s.svg;text-offset: 6;icon-min-distance: 12;} -node|z14[amenity=place_of_worship][religion=muslim], -area|z14[amenity=place_of_worship][religion=muslim] -{icon-image: muslim-s.svg;text-offset: 6;icon-min-distance: 12;} -node|z14[amenity=place_of_worship][religion=buddhist], -area|z14[amenity=place_of_worship][religion=buddhist] -{icon-image: buddhist-s.svg;text-offset: 6;icon-min-distance: 12;} -node|z14[amenity=place_of_worship][religion=hindu], -area|z14[amenity=place_of_worship][religion=hindu] -{icon-image: hindu-s.svg;text-offset: 6;icon-min-distance: 12;} -node|z14[amenity=place_of_worship][religion=shinto], -area|z14[amenity=place_of_worship][religion=shinto] -{icon-image: shinto-s.svg;text-offset: 6;icon-min-distance: 12;} -node|z14[amenity=place_of_worship][religion=jewish], -area|z14[amenity=place_of_worship][religion=jewish] -{icon-image: jewish-s.svg;text-offset: 6;icon-min-distance: 12;} -node|z14[amenity=place_of_worship][religion=taoist], -area|z14[amenity=place_of_worship][religion=taoist] -{icon-image: taoist-s.svg;text-offset: 6;icon-min-distance: 12;}*/ -node|z16[amenity=place_of_worship], -area|z16[amenity=place_of_worship] -{icon-image: place-of-worship-m.svg;icon-min-distance: 10;} -node|z16[amenity=place_of_worship][religion=christian], -area|z16[amenity=place_of_worship][religion=christian] -{icon-image: christian-m.svg;} -node|z16[amenity=place_of_worship][religion=muslim], -area|z16[amenity=place_of_worship][religion=muslim] -{icon-image: muslim-m.svg;} -node|z16[amenity=place_of_worship][religion=buddhist], -area|z16[amenity=place_of_worship][religion=buddhist] -{icon-image: buddhist-m.svg;} -node|z16[amenity=place_of_worship][religion=hindu], -area|z16[amenity=place_of_worship][religion=hindu] -{icon-image: hindu-m.svg;} -node|z16[amenity=place_of_worship][religion=shinto], -area|z16[amenity=place_of_worship][religion=shinto] -{icon-image: shinto-m.svg;} -node|z16[amenity=place_of_worship][religion=jewish], -area|z16[amenity=place_of_worship][religion=jewish] -{icon-image: jewish-m.svg;} -node|z16[amenity=place_of_worship][religion=taoist], -area|z16[amenity=place_of_worship][religion=taoist] -{icon-image: taoist-m.svg;} +node|z16-[amenity=place_of_worship], +area|z16-[amenity=place_of_worship] +{icon-image: place-of-worship-l.svg;icon-min-distance: 10;font-size: 12.75;} +node|z16-[amenity=place_of_worship][religion=christian], +area|z16-[amenity=place_of_worship][religion=christian] +{icon-image: christian-l.svg;font-size: 12.75;} +node|z16-[amenity=place_of_worship][religion=muslim], +area|z16-[amenity=place_of_worship][religion=muslim] +{icon-image: muslim-l.svg;font-size: 12.75;} +node|z16-[amenity=place_of_worship][religion=buddhist], +area|z16-[amenity=place_of_worship][religion=buddhist] +{icon-image: buddhist-l.svg;font-size: 12.75;} +node|z16-[amenity=place_of_worship][religion=hindu], +area|z16-[amenity=place_of_worship][religion=hindu] +{icon-image: hindu-l.svg;font-size: 12.75;} + + +node|z18-[amenity=place_of_worship], +area|z18-[amenity=place_of_worship] +{icon-image: place-of-worship-l.svg;font-size: 13.5;} +node|z18-[amenity=place_of_worship][religion=christian], +area|z18-[amenity=place_of_worship][religion=christian] +{icon-image: christian-l.svg;font-size: 13.5;} +node|z18-[amenity=place_of_worship][religion=muslim], +area|z18-[amenity=place_of_worship][religion=muslim] +{icon-image: muslim-l.svg;font-size: 13.5;} +node|z18-[amenity=place_of_worship][religion=buddhist], +area|z18-[amenity=place_of_worship][religion=buddhist] +{icon-image: buddhist-l.svg;font-size: 13.5;} +node|z18-[amenity=place_of_worship][religion=hindu], +area|z18-[amenity=place_of_worship][religion=hindu] +{icon-image: hindu-l.svg;font-size: 13.5;} -node|z17-[amenity=place_of_worship], -area|z17-[amenity=place_of_worship] -{icon-image: place-of-worship-l.svg;} -node|z17-[amenity=place_of_worship][religion=christian], -area|z17-[amenity=place_of_worship][religion=christian] -{icon-image: christian-l.svg;} -node|z17-[amenity=place_of_worship][religion=muslim], -area|z17-[amenity=place_of_worship][religion=muslim] -{icon-image: muslim-l.svg;} -node|z17-[amenity=place_of_worship][religion=buddhist], -area|z17-[amenity=place_of_worship][religion=buddhist] -{icon-image: buddhist-l.svg;} -node|z17-[amenity=place_of_worship][religion=hindu], -area|z17-[amenity=place_of_worship][religion=hindu] -{icon-image: hindu-l.svg;} -node|z17-[amenity=place_of_worship][religion=shinto], -area|z17-[amenity=place_of_worship][religion=shinto] -{icon-image: shinto-l.svg;} -node|z17-[amenity=place_of_worship][religion=jewish], -area|z17-[amenity=place_of_worship][religion=jewish] -{icon-image: jewish-l.svg;} -node|z17-[amenity=place_of_worship][religion=taoist], -area|z17-[amenity=place_of_worship][religion=taoist] -{icon-image: taoist-l.svg;} /* 5.5 Others */ -/*node|z16-[amenity=nightclub], -area|z16-[amenity=nightclub] -{icon-image: bar-l.svg;font-size: 11;}*/ -/*node|z16[amenity=bank], -area|z16[amenity=bank] -{icon-image: bank-m.svg;text-offset: 6;font-size: 11;}*/ node|z17[amenity=bank], area|z17[amenity=bank] -{icon-image: bank-m.svg;font-size: 12.75; icon-min-distance: 15} +{icon-image: bank-l.svg;font-size: 12.75; icon-min-distance: 15} node|z18-[amenity=bank], area|z18-[amenity=bank] -{icon-image: bank-l.svg;font-size: 13; icon-min-distance: 10} +{icon-image: bank-xl.svg;font-size: 13.5; icon-min-distance: 10} -/*node|z15-[landuse=landfill], -area|z15-[landuse=landfill] -{icon-image: recycling-m.svg;text-offset: 8;font-size: 10;} -node|z17-[landuse=landfill], -area|z17-[landuse=landfill] -{icon-image: recycling-l.svg;text-offset: 8;font-size: 10;}*/ - -/*node|z16-[leisure=water_park], -area|z16-[leisure=water_park] -{icon-image: swimming-m.svg;icon-min-distance: 10} -node|z17-[leisure=water_park], -area|z17-[leisure=water_park] -{icon-image: swimming-l.svg;} -node|z18-[leisure=water_park], -area|z18-[leisure=water_park] -{icon-image: swimming-l.svg;font-size: 11;} - -node|z16[amenity=fountain], -area|z16[amenity=fountain] -{icon-image: fountain-m.svg;icon-min-distance: 20;} -node|z17-[amenity=fountain], -area|z17-[amenity=fountain] -{icon-image: fountain-l.svg;icon-min-distance: 24;} - -node|z14[man_made=lighthouse], -area|z14[man_made=lighthouse] -{icon-image: lighthouse-s.svg;text-offset: 6;icon-min-distance: 5;} -node|z15-16[man_made=lighthouse], -area|z15-16[man_made=lighthouse] -{icon-image: lighthouse-m.svg;} -node|z17-[man_made=lighthouse], -area|z17-[man_made=lighthouse] -{icon-image: lighthouse-l.svg;}*/ node|z12-14[barrier=toll_booth], area|z12-14[barrier=toll_booth] {icon-image: toll_booth-s.svg;icon-min-distance: 8;} node|z15-16[barrier=toll_booth], area|z15-16[barrier=toll_booth] -{icon-image: toll_booth-m.svg;icon-min-distance: 8;} +{icon-image: toll_booth-l.svg;icon-min-distance: 8;} node|z17-[barrier=toll_booth], area|z17-[barrier=toll_booth] -{icon-image: toll_booth-m.svg;icon-min-distance: 8;} +{icon-image: toll_booth-xl.svg;icon-min-distance: 8;} node|z15-[barrier=border_control] {icon-image:bcontrol-m.svg;} node|z17-[barrier=border_control] {icon-image:bcontrol-l.svg;} -/*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;font-size: 11;}*/ -/*node|z16[amenity=taxi], -area|z16[amenity=taxi] -{icon-image: taxi-m.svg;icon-min-distance: 30;} -node|z17[amenity=taxi], -area|z17[amenity=taxi] -{icon-image: taxi-l.svg;icon-min-distance: 20;} -node|z18-[amenity=taxi], -area|z18-[amenity=taxi] -{icon-image: taxi-l.svg;}*/ node|z16-[barrier=lift_gate], area|z16-[barrier=lift_gate] @@ -2003,114 +791,6 @@ node|z18-[barrier=lift_gate], area|z18-[barrier=lift_gate] {icon-image: lift_gate-l.svg;} -/*node|z16-[leisure=dog_park], -area|z16-[leisure=dog_park] -{icon-image: dog_park-m.svg;icon-min-distance: 30;} -node|z17-[leisure=dog_park], -area|z17-[leisure=dog_park] -{icon-image: dog_park-l.svg;icon-min-distance: 20;} -node|z18-[leisure=dog_park], -area|z18-[leisure=dog_park] -{icon-image: dog_park-l.svg;} - -node|z16-[leisure=water_park], -area|z16-[leisure=water_park] -{icon-image: swimming-m.svg;icon-min-distance: 30;} -node|z17-[leisure=water_park], -area|z17-[leisure=water_park] -{icon-image: swimming-l.svg;icon-min-distance: 20;} -node|z18-[leisure=water_park], -area|z18-[leisure=water_park] -{icon-image: swimming-l.svg;} - -node|z16-[man_made=windmill], -area|z16-[man_made=windmill] -{icon-image: windmill-m.svg;icon-min-distance: 30;} -node|z17-[man_made=windmill], -area|z17-[man_made=windmill] -{icon-image: windmill-l.svg;icon-min-distance: 20;} -node|z18-[man_made=windmill], -area|z18-[man_made=windmill] -{icon-image: windmill-l.svg;} - -node|z17-[amenity=casino], -area|z17-[amenity=casino] -{icon-image: casino-l.svg;icon-min-distance: 20;} -node|z18-[amenity=casino], -area|z18-[amenity=casino] -{icon-image: casino-l.svg;} - -node|z17[amenity=courthouse], -area|z17[amenity=courthouse] -{icon-image: public-building-l.svg;} -node|z18-[amenity=courthouse], -area|z18-[amenity=courthouse] -{icon-image: public-building-l.svg;} - -node|z17[amenity=cinema], -area|z17[amenity=cinema] -{icon-image: cinema-l.svg;} -node|z18-[amenity=cinema], -area|z18-[amenity=cinema] -{icon-image: cinema-l.svg;font-size: 11;} - -node|z17[amenity=police], -area|z17[amenity=police] -{icon-image: police-l.svg;} -node|z18-[amenity=police], -area|z18-[amenity=police] -{icon-image: police-l.svg;font-size: 11;} - -node|z17[amenity=embassy], -area|z17[amenity=embassy] -{icon-image: embassy-l.svg;} -node|z18-[amenity=embassy], -area|z18-[amenity=embassy] -{icon-image: embassy-l.svg;font-size: 11;} - -node|z17[amenity=bicycle_rental], -area|z17[amenity=bicycle_rental] -{icon-image: bicycle-l.svg;} -node|z18-[amenity=bicycle_rental], -area|z18-[amenity=bicycle_rental] -{icon-image: bicycle-l.svg;font-size: 11;} - -node|z17[amenity=post_office] -{icon-image: mail-l.svg;} -node|z18-[amenity=post_office] -{icon-image: mail-m.svg;font-size: 11;} -node|z18-[amenity=post_box], -area|z18-[amenity=post_box] -{icon-image: postbox-l.svg;font-size: 11;} - -node|z17-[office=lawyer], -area|z17-[office=lawyer] -{icon-image: lawyer-l.svg;icon-min-distance: 10;} - -node|z17-[amenity=telephone] -node|z17-[emergency=phone] -{icon-image: phone-l.svg;icon-min-distance: 30;} -node|z18-[amenity=telephone] -node|z18-[emergency=phone] -{icon-image: phone-l.svg;} - -node|z17-[amenity=recycling], -area|z17-[amenity=recycling], -{icon-image: recycling-l.svg;icon-min-distance: 30;} -node|z18-[amenity=recycling], -area|z19-[amenity=recycling], -{icon-image: recycling-l.svg;} - -node|z17-[power=station], -area|z17-[power=station], -node|z17-[power=substation], -area|z17-[power=substation] -{icon-image: power-l.svg;font-size: 11;icon-min-distance: 20;} -node|z18-[power=station], -area|z18-[power=station], -node|z18-[power=substation], -area|z18-[power=substation] -{icon-image: power-l.svg;font-size: 11;z-index: 2400;}*/ node|z17-[amenity=vending_machine], area|z17-[amenity=vending_machine] @@ -2125,397 +805,88 @@ node|z18-[vending=parking_tickets], area|z18-[vending=parking_tickets] {icon-image: parking-meter-l.svg;} -/*node|z17-[aeroway=gate], -area|z17-[aeroway=gate] -{icon-image: gate-l.svg;font-size: 11;} -node|z18-[aeroway=gate], -area|z18-[aeroway=gate] -{icon-image: gate-l.svg;tfont-size: 11; z-index: 24200;}/*check*/ - -/*node|z17-[amenity=bureau_de_change] -{icon-image: banknote-l.svg;font-size: 11;} - -node|z18-[amenity=fire_station], -area|z18-[amenity=fire_station] -{icon-image: fire_station-l.svg;font-size: 11;} -node|z18-[amenity=toilets], -area|z18-[amenity=toilets] -{icon-image: toilets-l.svg;font-size: 11;} -node|z18-[amenity=atm], -area|z18-[amenity=atm] -{z-index: 4200;icon-image: atm-l.svg;font-size: 11;} - -node|z18-[amenity=bench] -{icon-image: bench.svg;} -node|z18-[amenity=waste_basket] -{icon-image: waste-basket-s.svg;} - -node|z18-[amenity=library] -{icon-image: library-l.svg;font-size: 11;} -node|z18-[amenity=waste_disposal], -area|z18-[amenity=waste_disposal] -{icon-image: recycling-l.svg;font-size: 11;} - -node|z18-[amenity=hunting_stand], -area|z18-[amenity=hunting_stand] -{icon-image: hunting-tower-l.svg;font-size: 11;} - -node|z18-[man_made=chimney], -area|z18-[man_made=chimney] -{icon-image: chimney-l.svg;font-size: 11;} - -node|z18-[amenity=bbq], -area|z18-[amenity=bbq] -{icon-image: bbq-l.svg;font-size: 11;-x-me-text-priority:16000;} - -node|z19-[man_made=survey_point] -{icon-image: survey_point-l.svg;}*/ /* 6. SHOP */ -node|z16-[shop], -area|z16-[shop] -{icon-image: shop-m.svg;text-offset: 10;font-size: 10;icon-min-distance: 20} -node|z17-[shop], -area|z17-[shop] -{icon-image: shop-l.svg;text-offset: 10;font-size: 10;icon-min-distance: 27} -node|z12-[shop=mall], -area|z12-[shop=mall], + +node|z14-[shop=mall], +area|z14-[shop=mall], node|z14-[shop=supermarket], area|z14-[shop=supermarket], node|z15-[shop=car_repair][service=tyres], area|z15-[shop=car_repair][service=tyres], {text: name;text-color: @poi_label;text-offset: 8;font-size: 11.5;text-min-distance: 3;} -node|z12[shop=mall], -area|z12[shop=mall] -{icon-image: shop-s.svg;icon-min-distance: 4;-x-me-icon-priority:15000; -x-me-text-priority:15500;} -node|z13[shop=mall], -area|z13[shop=mall] -{icon-image: shop-s.svg;icon-min-distance: 4;-x-me-icon-priority:15000; -x-me-text-priority:15500;} + node|z14[shop=mall], area|z14[shop=mall] -{icon-image: shop-s.svg;icon-min-distance: 5;-x-me-icon-priority:15500;-x-me-text-priority:15500;} -node|z15-16[shop=mall], -area|z15-16[shop=mall] -{icon-image: shop-m.svg;font-size:12;icon-min-distance: 6;-x-me-icon-priority:15500; -x-me-text-priority:15500;} -node|z17-[shop=mall], -area|z17-[shop=mall] +{icon-image: shop-m.svg;font-size:12.25;icon-min-distance: 5;-x-me-icon-priority:15500;-x-me-text-priority:15500;} +node|z15[shop=mall], +area|z15[shop=mall] +{icon-image: shop-m.svg;font-size:12.5;icon-min-distance: 6;-x-me-icon-priority:15500; -x-me-text-priority:15500;} +node|z16-17[shop=mall], +area|z16-17[shop=mall] {icon-image: shop-l.svg;font-size: 12.75;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;} +node|z18-[shop=mall], +area|z18-[shop=mall] +{icon-image: shop-xl.svg;font-size: 13.5;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;} node|z14[shop=supermarket], area|z14[shop=supermarket] -{icon-image: grocery-s.svg;icon-min-distance: 4;} +{icon-image: grocery-m.svg;font-size:12.25;icon-min-distance: 4;} node|z15[shop=supermarket], area|z15[shop=supermarket] -{icon-image: grocery-m.svg;font-size:12;icon-min-distance: 3;} -node|z16[shop=supermarket], -area|z16[shop=supermarket] -{icon-image: grocery-m.svg;font-size: 12;icon-min-distance: 16;text-min-distance:6;} -/*node|z16[amenity=marketplace], -area|z16[amenity=marketplace] -{icon-image: marketplace-s.svg;text-offset: 11;font-size: 11;icon-min-distance: 24;}*/ -node|z17-[shop=supermarket], -area|z17-[shop=supermarket] -{icon-image: grocery-l.svg;font-size: 12.75;icon-min-distance: 15;} -/*node|z17[amenity=marketplace], -area|z17[amenity=marketplace] -{icon-image: marketplace-m.svg;font-size: 11;icon-min-distance: 8;} -node|z18-[amenity=marketplace], -area|z18-[amenity=marketplace] -{icon-image: marketplace-m.svg;font-size: 11;}*/ +{icon-image: grocery-m.svg;font-size:12.5;icon-min-distance: 3;} +node|z16-17[shop=supermarket], +area|z16-17[shop=supermarket] +{icon-image: grocery-l.svg;font-size: 12.75;icon-min-distance: 16;text-min-distance:6;} + + +node|z18-[shop=supermarket], +area|z18-[shop=supermarket] +{icon-image: grocery-xl.svg;font-size: 13.5;icon-min-distance: 15;} + node|z15[shop=car_repair][service=tyres], area|z15[shop=car_repair][service=tyres] -{icon-image: car-repair-m.svg;text-offset: 6;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: car-repair-m.svg;text-offset: 6;-x-me-text-priority:15500;icon-min-distance: 20;font-size:12.5;} node|z16[shop=car_repair][service=tyres], area|z16[shop=car_repair][service=tyres] -{icon-image: car-repair-m.svg;;-x-me-text-priority:15500;} +{icon-image: car-repair-l.svg;;-x-me-text-priority:15500;font-size: 12.75;} node|z17[shop=car_repair][service=tyres], area|z17[shop=car_repair][service=tyres] -{icon-image: car-repair-l.svg;} +{icon-image: car-repair-l.svg;font-size: 12.75;} node|z18-[shop=car_repair][service=tyres], area|z18-[shop=car_repair][service=tyres] -{icon-image: car-repair-l.svg;font-size: 13;} +{icon-image: car-repair-l.svg;font-size: 13.5;} -/*node|z16-[shop], -area|z16-[shop] -{icon-image: shop-m.svg;text-offset: 10;font-size: 10;icon-min-distance: 10} -node|z17-[shop], -area|z17-[shop] -{icon-image: shop-l.svg;text-offset: 10;font-size: 10;icon-min-distance: 10}*/ -/*node|z17[shop=alcohol], -area|z17[shop=alcohol] -{icon-image: alcohol-l.svg;icon-min-distance: 24;} -node|z17[shop=wine], -area|z17[shop=wine] -{icon-image: alcohol-l.svg;icon-min-distance: 24;} -node|z17[shop=books], -area|z17[shop=books] -{icon-image: book-shop-l.svg;icon-min-distance: 24;} -node|z17[shop=bookmaker], -area|z17[shop=bookmaker] -{icon-image: bookmaker-l.svg;icon-min-distance: 24;} -node|z17[shop=bakery], -area|z17[shop=bakery] -{icon-image: bakery-l.svg;icon-min-distance: 24;} -node|z17[shop=beauty], -area|z17[shop=beauty] -{icon-image: beauty-l.svg;icon-min-distance: 24;} -node|z17[shop=cosmetics], -area|z17[shop=cosmetics] -{icon-image: beauty-l.svg;icon-min-distance: 24;} -node|z17[shop=beverages], -area|z17[shop=beverages] -{icon-image: alcohol-l.svg;icon-min-distance: 24;} -node|z17[shop=bicycle], -area|z17[shop=bicycle] -{icon-image: shop-bicycle-l.svg;icon-min-distance: 24;} -node|z17[shop=butcher], -area|z17[shop=butcher] -{icon-image: butcher-l.svg;icon-min-distance: 24;}*/ node|z17[shop=car], area|z17[shop=car] -{icon-image: car_shop-l.svg;icon-min-distance: 24;} +{icon-image: car_shop-l.svg;icon-min-distance: 24;font-size: 12.75;} node|z17[shop=motorcycle], area|z17[shop=motorcycle] -{icon-image: motorcycle_shop-l.svg;icon-min-distance: 24;} +{icon-image: motorcycle_shop-l.svg;icon-min-distance: 24;font-size: 12.75;} node|z17[shop=car_parts], area|z17[shop=car_parts] -{icon-image: car-part-l.svg;icon-min-distance: 24;} +{icon-image: car-part-l.svg;icon-min-distance: 24;font-size: 12.75;} node|z17[shop=car_repair], area|z17[shop=car_repair] -{icon-image: car-repair-l.svg;icon-min-distance: 24;} -/*node|z17[shop=tyres], -area|z17[shop=tyres] -{icon-image: car-repair-l.svg;icon-min-distance: 24;} -node|z17[shop=chemist], -area|z17[shop=chemist] -{icon-image: chemist-l.svg;icon-min-distance: 24;} -node|z17[shop=clothes], -area|z17[shop=clothes] -{icon-image: clothes-l.svg;icon-min-distance: 24;} -node|z17[shop=computer], -area|z17[shop=computer] -{icon-image: computer-l.svg;icon-min-distance: 24;} -node|z17[shop=confectionery], -area|z17[shop=confectionery] -{icon-image: sweets-l.svg;icon-min-distance: 24;} -node|z17[shop=convenience], -area|z17[shop=convenience] -{icon-image: grocery-l.svg;icon-min-distance: 24;} -node|z17[shop=copyshop], -area|z17[shop=copyshop] -{icon-image: copyshop-l.svg;icon-min-distance: 24;} -node|z17[shop=photo], -area|z17[shop=photo] -{icon-image: photo-shop-l.svg;icon-min-distance: 24;} -node|z17[shop=pet], -area|z17[shop=pet] -{icon-image: petshop-l.svg;icon-min-distance: 24;} -node|z17[shop=department_store], -area|z17[shop=department_store] -{icon-image: department_store-l.svg;icon-min-distance: 24;} -node|z17[shop=doityourself], -area|z17[shop=doityourself] -{icon-image: doityourself-l.svg;icon-min-distance: 24;} -node|z17[shop=electronics], -area|z17[shop=electronics] -{icon-image: electronics-l.svg;icon-min-distance: 24;} -node|z17[shop=florist], -area|z17[shop=florist] -{icon-image: florist-l.svg;icon-min-distance: 24;} -node|z17[shop=furniture], -area|z17[shop=furniture] -{icon-image: furniture-l.svg;icon-min-distance: 24;} -node|z17[shop=garden_centre], -area|z17[shop=garden_centre] -{icon-image: garden_center-l.svg;icon-min-distance: 24;} -node|z17[shop=gift], -area|z17[shop=gift] -{icon-image: gift-l.svg;icon-min-distance: 24;} -node|z17[shop=greengrocer], -area|z17[shop=greengrocer] -{icon-image: greengrocer-l.svg;icon-min-distance: 24;} -node|z17[shop=hairdresser], -area|z17[shop=hairdresser] -{icon-image: hairdresser-l.svg;icon-min-distance: 24;} -node|z17[shop=hardware], -area|z17[shop=hardware] -{icon-image: doityourself-l.svg;icon-min-distance: 24;} -node|z17[shop=jewelry], -area|z17[shop=jewelry] -{icon-image: jewelry-l.svg;icon-min-distance: 24;} -node|z17[shop=kiosk], -area|z17[shop=kiosk] -{icon-image: kiosk-l.svg;icon-min-distance: 24;} -node|z17[shop=laundry], -area|z17[shop=laundry] -{icon-image:laundry-l.svg;icon-min-distance: 24;} -node|z17[shop=dry_cleaning], -area|z17[shop=dry_cleaning] -{icon-image:laundry-l.svg;icon-min-distance: 24;} -node|z17[shop=mobile_phone], -area|z17[shop=mobile_phone] -{icon-image: mobile_phone-l.svg;icon-min-distance: 24;} -node|z17[shop=optician], -area|z17[shop=optician] -{icon-image: optician-l.svg;icon-min-distance: 24;} -node|z17[shop=outdoor], -area|z17[shop=outdoor] -{icon-image: outdoor-shop-l.svg;icon-min-distance: 24;} -node|z17[shop=seafood], -area|z17[shop=seafood] -{icon-image: seafood-shop-l.svg;icon-min-distance: 24;} -node|z17[shop=shoes], -area|z17[shop=shoes] -{icon-image: shoes-l.svg;icon-min-distance: 24;} -node|z17[shop=sports], -area|z17[shop=sports] -{icon-image: sports-l.svg;icon-min-distance: 24;} -node|z17[shop=ticket], -area|z17[shop=ticket] -{icon-image: ticket-shop-l.svg;icon-min-distance: 24;} -node|z17[shop=toys], -area|z17[shop=toys] -{icon-image: toys-l.svg;icon-min-distance: 24;}*/ +{icon-image: car-repair-l.svg;icon-min-distance: 24;font-size: 12.75;} -/*node|z18-[shop=alcohol], -area|z18-[shop=alcohol] -{icon-image: alcohol-l.svg;} -node|z18-[shop=wine], -area|z18-[shop=wine] -{icon-image: alcohol-l.svg;} -node|z18-[shop=books], -area|z18-[shop=books] -{icon-image: book-shop-l.svg;} -node|z18-[shop=bookmaker], -area|z18-[shop=bookmaker] -{icon-image: bookmaker-l.svg;} -node|z18-[shop=bakery], -area|z18-[shop=bakery] -{icon-image: bakery-l.svg;} -node|z18-[shop=beauty], -area|z18-[shop=beauty] -{icon-image: beauty-l.svg;} -node|z18-[shop=cosmetics], -area|z18-[shop=cosmetics] -{icon-image: beauty-l.svg;} -node|z18-[shop=beverages], -area|z18-[shop=beverages] -{icon-image: alcohol-l.svg;} -node|z18-[shop=bicycle], -area|z18-[shop=bicycle] -{icon-image: shop-bicycle-l.svg;} -node|z18-[shop=butcher], -area|z18-[shop=butcher] -{icon-image: butcher-l.svg;}*/ node|z18-[shop=car], area|z18-[shop=car] -{icon-image: car_shop-l.svg;} +{icon-image: car_shop-xl.svg;font-size: 13.5;} node|z18-[shop=motorcycle], area|z18-[shop=motorcycle] -{icon-image: motorcycle_shop-l.svg;} +{icon-image: motorcycle_shop-l.svg;font-size: 13.5;} node|z18-[shop=car_parts], area|z18-[shop=car_parts] -{icon-image: car-part-l.svg;} +{icon-image: car-part-xl.svg;font-size: 13.5;} node|z18-[shop=car_repair], area|z18-[shop=car_repair] -{icon-image: car-repair-l.svg;} -/*node|z18-[shop=tyres], -area|z18-[shop=tyres] -{icon-image: car-repair-l.svg;} -node|z18-[shop=chemist], -area|z18-[shop=chemist] -{icon-image: chemist-l.svg;} -node|z18-[shop=clothes], -area|z18-[shop=clothes] -{icon-image: clothes-l.svg;} -node|z18-[shop=computer], -area|z18-[shop=computer] -{icon-image: computer-l.svg;} -node|z18-[shop=confectionery], -area|z18-[shop=confectionery] -{icon-image: sweets-l.svg;} -node|z18-[shop=convenience], -area|z18-[shop=convenience] -{icon-image: grocery-l.svg;} -node|z18-[shop=copyshop], -area|z18-[shop=copyshop] -{icon-image: copyshop-l.svg;} -node|z18-[shop=photo], -area|z18-[shop=photo] -{icon-image: photo-shop-l.svg;} -node|z18-[shop=pet], -area|z18-[shop=pet] -{icon-image: petshop-l.svg;} -node|z18-[shop=department_store], -area|z18-[shop=department_store] -{icon-image: department_store-l.svg;} -node|z18-[shop=doityourself], -area|z18-[shop=doityourself] -{icon-image: doityourself-l.svg;} -node|z18-[shop=electronics], -area|z18-[shop=electronics] -{icon-image: electronics-l.svg;} -node|z18-[shop=florist], -area|z18-[shop=florist] -{icon-image: florist-l.svg;} -node|z18-[shop=furniture], -area|z18-[shop=furniture] -{icon-image: furniture-l.svg;} -node|z18-[shop=garden_centre], -area|z18-[shop=garden_centre] -{icon-image: garden_center-l.svg;} -node|z18-[shop=gift], -area|z18-[shop=gift] -{icon-image: gift-l.svg;} -node|z18-[shop=greengrocer], -area|z18-[shop=greengrocer] -{icon-image: greengrocer-l.svg;} -node|z18-[shop=hairdresser], -area|z18-[shop=hairdresser] -{icon-image: hairdresser-l.svg;} -node|z18-[shop=hardware], -area|z18-[shop=hardware] -{icon-image: doityourself-l.svg;} -node|z18-[shop=jewelry], -area|z18-[shop=jewelry] -{icon-image: jewelry-l.svg;} -node|z18-[shop=kiosk], -area|z18-[shop=kiosk] -{icon-image: kiosk-l.svg;} -node|z18-[shop=laundry], -area|z18-[shop=laundry] -{icon-image:laundry-l.svg;} -node|z18-[shop=dry_cleaning], -area|z18-[shop=dry_cleaning] -{icon-image:laundry-l.svg;} -node|z18-[shop=mobile_phone], -area|z18-[shop=mobile_phone] -{icon-image: mobile_phone-l.svg;} -node|z18-[shop=optician], -area|z18-[shop=optician] -{icon-image: optician-l.svg;} -node|z18-[shop=outdoor], -area|z18-[shop=outdoor] -{icon-image: outdoor-shop-l.svg;} -node|z18-[shop=seafood], -area|z18-[shop=seafood] -{icon-image: seafood-shop-l.svg;} -node|z18-[shop=shoes], -area|z18-[shop=shoes] -{icon-image: shoes-l.svg;} -node|z18-[shop=sports], -area|z18-[shop=sports] -{icon-image: sports-l.svg;} -node|z18-[shop=ticket], -area|z18-[shop=ticket] -{icon-image: ticket-shop-l.svg;} -node|z18-[shop=toys], -area|z18-[shop=toys] -{icon-image: toys-l.svg;}*/ +{icon-image: car-repair-xl.svg;font-size: 13.5;} + /* 7. CAR */ @@ -2525,8 +896,8 @@ node|z14-[amenity=charging_station], area|z14-[amenity=charging_station], node|z17-[amenity=car_wash], area|z17-[amenity=car_wash], -node|z18-[amenity=parking], -area|z18-[amenity=parking], +node|z16-[amenity=parking], +area|z16-[amenity=parking], node|z18-[amenity=car_rental], area|z18-[amenity=car_rental], node|z18-[amenity=car_sharing], @@ -2538,79 +909,92 @@ area|z12[amenity=fuel] {icon-image: fuel-s.svg;text-offset: 6;-x-me-text-priority:15500;icon-min-distance: 20;} node|z13[amenity=fuel], area|z13[amenity=fuel] -{icon-image: fuel-s.svg;text-offset: 6;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: fuel-m.svg;text-offset: 6;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 11.75;} node|z14[amenity=fuel], area|z14[amenity=fuel] -{icon-image: fuel-s.svg;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.25;} node|z15[amenity=fuel], area|z15[amenity=fuel] -{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.5;} node|z16[amenity=fuel], area|z16[amenity=fuel] -{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;} +{icon-image: fuel-l.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;} node|z17[amenity=fuel], area|z17[amenity=fuel] -{icon-image: fuel-l.svg;} +{icon-image: fuel-l.svg;font-size: 12.75;} node|z18-[amenity=fuel], area|z18-[amenity=fuel] -{icon-image: fuel-l.svg;font-size: 13;text:} +{icon-image: fuel-xl.svg;font-size: 13.5;text:} node|z14[amenity=charging_station], area|z14[amenity=charging_station] -{icon-image: charging-station-s.svg;text-offset: 6;font-size: 11;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: charging-station-m.svg;text-offset: 6;font-size: 12.25;-x-me-text-priority:15500;icon-min-distance: 20;} node|z15[amenity=charging_station], area|z15[amenity=charging_station] -{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.5;} node|z16[amenity=charging_station], area|z16[amenity=charging_station] -{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;} +{icon-image: charging-station-l.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;} node|z17[amenity=charging_station], area|z17[amenity=charging_station] -{icon-image: charging-station-l.svg;} +{icon-image: charging-station-l.svg; font-size: 12.75;} node|z18-[amenity=charging_station], area|z18-[amenity=charging_station] -{icon-image: charging-station-l.svg;font-size: 12.75;} +{icon-image: charging-station-xl.svg;font-size: 12.75;} node|z13[highway=speed_camera] -{icon-image: speedcam-m.svg;} -node|z14-[highway=speed_camera] -{icon-image: speedcam-m.svg;} +{icon-image: speedcam-l.svg; z-index: 75000;} +node|z14[highway=speed_camera] +{icon-image: speedcam-l.svg; z-index: 75000;} +node|z15[highway=speed_camera] +{icon-image: speedcam-l.svg; z-index: 75000;} node|z16-[highway=speed_camera] -{icon-image: speedcam1-l.svg;} +{icon-image: speedcam-xl.svg; z-index: 75000;} +node|z18-[highway=speed_camera] +{icon-image: speedcam-xl.svg; z-index: 75000;} + node|z17[amenity=car_wash], area|z17[amenity=car_wash] -{icon-image: car-wash-l.svg;font-size: 11;icon-min-distance: 24;} +{icon-image: car-wash-l.svg;font-size: 12.75;icon-min-distance: 24;} node|z18-[amenity=car_wash], area|z18-[amenity=car_wash ] -{icon-image: car-wash-l.svg;text-offset: 10;font-size: 12.75;} +{icon-image: car-wash-xl.svg;text-offset: 10;font-size: 13.5;} node|z18-[amenity=car_rental], area|z18-[amenity=car_rental] -{icon-image: car_sharing-l.svg;text-offset: 10;font-size: 11;} +{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 13.5;} node|z18-[amenity=car_sharing], area|z18-[amenity=car_sharing] -{icon-image: car_sharing-l.svg;text-offset: 10;font-size: 11;} +{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 13.5;} /* 7.1 Parking */ +node|z15-16[amenity=parking], +area|z15-16[amenity=parking] +{icon-image: parking-m.svg;icon-min-distance: 3;z-index: 20000;} +node|z15-16[amenity=parking][access=permissive], +node|z15-16[amenity=parking][access=private] +{icon-image: zero-icon.svg; icon-min-distance: 3;z-index: 20000;} + + node|z17[amenity=parking], area|z17[amenity=parking] -{icon-image: parking-m.svg;icon-min-distance: 15;} +{icon-image: parking-l.svg;icon-min-distance: 15;} node|z17[amenity=parking][access=permissive], node|z17[amenity=parking][access=private] {icon-image: zero-icon.svg;z-index: 6;icon-min-distance: 7;} node|z18[amenity=parking] area|z18[amenity=parking] -{icon-image: parking-m.svg;icon-min-distance: 10;} +{icon-image: parking-xl.svg;icon-min-distance: 10;} node|z18[amenity=parking][access=permissive], node|z18[amenity=parking][access=private] {icon-image: zero-icon.svg;} node|z19-[amenity=parking], area|z19-[amenity=parking] -{icon-image: parking-m.svg;font-size: 13;icon-min-distance: 6;} +{icon-image: parking-xl.svg;icon-min-distance: 6;} /*node|z17-[amenity=bicycle_parking], area|z17-[amenity=bicycle_parking] diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss old mode 100644 new mode 100755 index 5844bfe19d..c1aa28645b --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -124,8 +124,7 @@ line[highway=footway][bridge?]::bridgeblack, line[highway=steps][bridge?]::bridgeblack, line[highway=road][bridge?]::bridgeblack, line[highway=service][bridge?]::bridgeblack, -line[railway=rail][bridge?]::bridgeblack, -line[railway=tram][bridge?]::bridgeblack, +line[railway=rail][bridge?]::bridgeblack {z-index: 390;} line[highway=motorway][bridge?]::bridgewhite, @@ -145,8 +144,7 @@ line[highway=footway][bridge?]::bridgewhite, line[highway=steps][bridge?]::bridgewhite, line[highway=road][bridge?]::bridgewhite, line[highway=service][bridge?]::bridgewhite, -line[railway=rail][bridge?]::bridgewhite, -line[railway=tram][bridge?]::bridgewhite, +line[railway=rail][bridge?]::bridgewhite {z-index: 400;} line[highway=construction], @@ -204,30 +202,27 @@ line[highway=secondary_link] line[highway=secondary] {z-index: 800;} -/*line[highway=primary_link] -{z-index: 840;}*/ +line[highway=primary_link] +{z-index: 840;} -line[highway=motorway_link], -line[highway=trunk_link], +line[highway=primary], line|z8-9[highway=world_towns_level], line|z8-9[highway=world_level], {z-index: 850;} - -line[highway=primary_link], -line[highway=primary], -{z-index: 910;} +line[highway=motorway_link], +line[highway=trunk_link] +{z-index: 890;} line|z4-7[highway=world_towns_level], line|z4-7[highway=world_level], line[highway=trunk], line[highway=motorway] -{z-index: 940;} +{z-index: 900;} line[railway=monorail], line[railway=narrow_gauge], -line[railway=tram], -line[railway=tram]::centerline +line[railway=tram] {z-index: 950;} line[highway=cycleway], @@ -267,7 +262,7 @@ line[piste:lift=j-bar], line[piste:lift=magic_carpet], line[piste:lift=platter], line[piste:lift=rope_tow], -line[piste:lift=t-bar], +line[piste:lift=t-bar] {z-index: 6888;} line[highway] @@ -301,19 +296,19 @@ line|z7-[highway=trunk], line|z7-[highway=motorway], line|z13-[highway=motorway_link], line|z13-[highway=trunk_link] -{color: @trunk_orange_light;opacity: 1; casing-linecap: butt; casing-color:@casing_road;} +{color: @trunk_orange_light;opacity: 1;casing-color:@casing_road;} line|z12-[highway=motorway][tunnel?], line|z12-[highway=trunk][tunnel?], line|z12-[highway=motorway_link][tunnel?], line|z12-[highway=trunk_link][tunnel?], {casing-width: 1;casing-linecap: butt;casing-color:@trunk_tunnel_casing;} -line|z14-[highway=motorway][bridge?]::bridgewhite, -line|z14-[highway=trunk][bridge?]::bridgewhite, +line|z13-[highway=motorway][bridge?]::bridgewhite, +line|z13-[highway=trunk][bridge?]::bridgewhite, line|z14-[highway=motorway_link][bridge?]::bridgewhite, line|z14-[highway=trunk_link][bridge?]::bridgewhite, {casing-linecap: butt;casing-color:@bridge_background;} -line|z14-[highway=motorway][bridge?]::bridgeblack, -line|z14-[highway=trunk][bridge?]::bridgeblack, +line|z13-[highway=motorway][bridge?]::bridgeblack, +line|z13-[highway=trunk][bridge?]::bridgeblack, line|z14-[highway=motorway_link][bridge?]::bridgeblack, line|z14-[highway=trunk_link][bridge?]::bridgeblack, {casing-linecap: butt;casing-color:@bridge_casing;} @@ -334,7 +329,7 @@ line|z10[highway=motorway] {color: @trunk_orange_medium; width: 2.5;} line|z11[highway=trunk], line|z11[highway=motorway] -{color: @trunk_orange_medium; width: 3.5;} +{width: 3.5;} line|z12[highway=trunk], line|z12[highway=motorway] {color: @trunk_orange_medium; width: 4;} @@ -399,52 +394,54 @@ line|z15-[highway=trunk_link][tunnel?] /* 3.3 Trunk & Motorway bridge 13-22 ZOOM */ - +line|z13[highway=motorway][bridge?]::bridgewhite, +line|z13[highway=trunk][bridge?]::bridgewhite +{casing-width: eval(prop("width")+0.2);} line|z14-16[highway=motorway][bridge?]::bridgewhite, line|z14-16[highway=trunk][bridge?]::bridgewhite, line|z14-16[highway=motorway_link][bridge?]::bridgewhite, line|z14-16[highway=trunk_link][bridge?]::bridgewhite, -{casing-width: eval(prop("width")+0.025);} +{casing-width: eval(prop("width"));} line|z17[highway=motorway][bridge?]::bridgewhite, line|z17[highway=trunk][bridge?]::bridgewhite, line|z17[highway=motorway_link][bridge?]::bridgewhite, line|z17[highway=trunk_link][bridge?]::bridgewhite, -{casing-width: eval(prop("width")+0.05);} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=motorway][bridge?]::bridgewhite, line|z18-[highway=trunk][bridge?]::bridgewhite, line|z18-[highway=motorway_link][bridge?]::bridgewhite, line|z18-[highway=trunk_link][bridge?]::bridgewhite, -{casing-width: eval(prop("width")+0.25);} +{casing-width: eval(prop("width")+1);} -line|z14-16[highway=motorway][bridge?]::bridgeblack, -line|z14-16[highway=trunk][bridge?]::bridgeblack +line|z13-16[highway=motorway][bridge?]::bridgeblack, +line|z13-16[highway=trunk][bridge?]::bridgeblack line|z14-16[highway=motorway_link][bridge?]::bridgeblack, line|z14-16[highway=trunk_link][bridge?]::bridgeblack, -{casing-width: eval(prop("width")+0.05);} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=motorway][bridge?]::bridgeblack, line|z17[highway=trunk][bridge?]::bridgeblack, line|z17[highway=motorway_link][bridge?]::bridgeblack, line|z17[highway=trunk_link][bridge?]::bridgeblack, -{casing-width: eval(prop("width")+0.1);} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=motorway][bridge?]::bridgeblack, line|z18-[highway=trunk][bridge?]::bridgeblack, line|z18-[highway=motorway_link][bridge?]::bridgeblack, line|z18-[highway=trunk_link][bridge?]::bridgeblack, -{casing-width: eval(prop("width")+0.5);} +{casing-width: eval(prop("width")+2);} /* 4.PRIMARY 8-22 ZOOM */ line|z8-10[highway=primary], -{color: @primary_orange;opacity: 1;} +{color: @primary_orange;opacity: 1;casing-linecap: butt;} line|z11-14[highway=primary], line|z11-14[highway=primary_link] {color: @primary_orange_medium;opacity: 1;casing-linecap: butt; casing-color:@casing_road;} line|z15-17[highway=primary], line|z15-17[highway=primary_link] -{color: @primary_orange_light;;opacity: 1;casing-linecap: butt; casing-color:@casing_road;} +{color: @primary_orange_light;opacity: 1;casing-linecap: butt; casing-color:@casing_road;} line|z18-[highway=primary], line|z18-[highway=primary_link] -{color: @primary_orange_light;;opacity: 1;casing-linecap: butt; casing-color:@casing_road;} +{color: @primary_orange_light;opacity: 1;casing-linecap: butt; casing-color:@casing_road;} line|z14-[highway=primary][tunnel?], line|z14-[highway=primary_link][tunnel?] {casing-width: 1;casing-linecap: butt;casing-color: @primary_tunnel_casing;} @@ -504,20 +501,20 @@ line|z14-16[highway=primary_link][bridge?]::bridgewhite, {casing-width: eval(prop("width"));} line|z17[highway=primary][bridge?]::bridgewhite, line|z17[highway=primary_link][bridge?]::bridgewhite, -{casing-width: eval(prop("width")+0.35);} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=primary][bridge?]::bridgewhite, line|z18-[highway=primary_link][bridge?]::bridgewhite, -{casing-width: eval(prop("width")+0.7);} +{casing-width: eval(prop("width")+1);} line|z14-16[highway=primary][bridge?]::bridgeblack, line|z14-16[highway=primary_link][bridge?]::bridgeblack, -{casing-width: eval(prop("width")+0.19);} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=primary][bridge?]::bridgeblack, line|z17[highway=primary_link][bridge?]::bridgeblack, -{casing-width: eval(prop("width")+0.9);} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=primary][bridge?]::bridgeblack, line|z18-[highway=primary_link][bridge?]::bridgeblack, -{casing-width: eval(prop("width")+1.15);} +{casing-width: eval(prop("width")+2);} /* 5.SECONDARY 10-22 ZOOM */ @@ -534,7 +531,6 @@ line|z14-[highway=secondary][bridge?]::bridgeblack, line|z14-[highway=secondary_link][bridge?]::bridgeblack, {casing-linecap: butt;casing-color:@bridge_casing;} - /* 5.1 Secondary 10-22 ZOOM */ line|z10[highway=secondary] @@ -580,52 +576,49 @@ line|z14-16[highway=secondary_link][bridge?]::bridgewhite, {casing-width: eval(prop("width"));} line|z17[highway=secondary][bridge?]::bridgewhite, line|z17[highway=secondary_link][bridge?]::bridgewhite, -{casing-width: eval(prop("width")+0.35);} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=secondary][bridge?]::bridgewhite, line|z18-[highway=secondary_link][bridge?]::bridgewhite, -{casing-width: eval(prop("width")+0.6);} +{casing-width: eval(prop("width")+1);} line|z14-16[highway=secondary][bridge?]::bridgeblack, line|z14-16[highway=secondary_link][bridge?]::bridgeblack, -{casing-width: eval(prop("width")+0.19);} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=secondary][bridge?]::bridgeblack, line|z17[highway=secondary_link][bridge?]::bridgeblack, -{casing-width: eval(prop("width")+0.9);} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=secondary][bridge?]::bridgeblack, line|z18-[highway=secondary_link][bridge?]::bridgeblack -{casing-width: eval(prop("width")+1.15);} +{casing-width: eval(prop("width")+2);} /* 6.RESIDENTAL & TERTIARY 11-22 ZOOM */ +line|z11-[highway=residential], line|z11-[highway=tertiary], +line|z15-[highway=residential_link], line|z15-[highway=tertiary_link], {color: @residential; opacity: 1;casing-linecap: butt; casing-color:@casing_road;} line|z16-[highway=tertiary][tunnel?], -line|z16-[highway=tertiary_link][tunnel?] +line|z16-[highway=residential][tunnel?] +line|z16-[highway=tertiary_link][tunnel?], +line|z16-[highway=residential_link][tunnel?], {color: @tertiary_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @tertiary_tunnel_casing;} line|z14-[highway=tertiary][bridge?]::bridgewhite, +line|z14-[highway=residential][bridge?]::bridgewhite, line|z14-[highway=tertiary_link][bridge?]::bridgewhite {casing-linecap: butt;casing-color:@bridge_background;} line|z14-[highway=tertiary][bridge?]::bridgeblack, -line|z14-[highway=tertiary_link][bridge?]::bridgeblack -{casing-linecap: butt;casing-color:@bridge_casing;} - -line|z11-[highway=residential], -line|z15-[highway=residential_link], -{color: @residential; opacity: 1;casing-linecap: butt; casing-color:@casing_road;} -line|z16-[highway=residential][tunnel?] -line|z16-[highway=residential_link][tunnel?], -{color: @tertiary_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @tertiary_tunnel_casing;} -line|z14-[highway=residential][bridge?]::bridgewhite, -{casing-linecap: butt;casing-color:@bridge_background;} line|z14-[highway=residential][bridge?]::bridgeblack, +line|z14-[highway=tertiary_link][bridge?]::bridgeblack {casing-linecap: butt;casing-color:@bridge_casing;} /* 6.1 Residential & Tertiary 11-22 ZOOM */ line|z11[highway=tertiary] {width: 0.9;} -line|z12-13[highway=tertiary] +line|z12[highway=tertiary] +{width: 1.22;} +line|z13[highway=tertiary] {width: 1.85;} line|z14[highway=tertiary] {width: 3.3;} @@ -649,8 +642,10 @@ line|z19-[highway=tertiary_link] line|z11[highway=residential], {width: 0.3; opacity: 0;} -line|z12-13[highway=residential], -{width: 2;} +line|z12[highway=residential], +{width: 0.8;} +line|z13[highway=residential], +{width: 1.6;} line|z14[highway=residential], {width: 2.2;} line|z15[highway=residential], @@ -686,24 +681,24 @@ line|z14-16[highway=residential][bridge?]::bridgewhite, line|z17[highway=tertiary][bridge?]::bridgewhite, line|z17[highway=tertiary_link][bridge?]::bridgewhite, line|z17[highway=residential][bridge?]::bridgewhite, -{casing-width: eval(prop("width")+0.35);} +{casing-width: eval(prop("width")+0.8);} line|z18-[highway=tertiary][bridge?]::bridgewhite, line|z18-[highway=tertiary_link][bridge?]::bridgewhite, line|z18-[highway=residential][bridge?]::bridgewhite, -{casing-width: eval(prop("width")+0.7);} +{casing-width: eval(prop("width")+1);} line|z14-16[highway=tertiary][bridge?]::bridgeblack, line|z14-16[highway=tertiary_link][bridge?]::bridgeblack, line|z14-16[highway=residential][bridge?]::bridgeblack, -{casing-width: eval(prop("width")+0.19);} +{casing-width: eval(prop("width")+0.4);} line|z17[highway=tertiary][bridge?]::bridgeblack, line|z17[highway=tertiary_link][bridge?]::bridgeblack, line|z17[highway=residential][bridge?]::bridgeblack, -{casing-width: eval(prop("width")+0.6);} +{casing-width: eval(prop("width")+1.6);} line|z18-[highway=tertiary][bridge?]::bridgeblack, line|z18-[highway=tertiary_link][bridge?]::bridgeblack, line|z18-[highway=residential][bridge?]::bridgeblack, -{casing-width: eval(prop("width")+1.1);} +{casing-width: eval(prop("width")+2);} /* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 12-22 ZOOM */ @@ -711,14 +706,14 @@ line|z12-13[highway=unclassified], line|z12-13[highway=road], line|z12-13[highway=living_street], line|z12-13[aeroway=runway], -{color: @unclassified;opacity: 1;} +{color: @unclassified;opacity: 1;casing-linecap: butt;} line|z14-[aeroway=taxiway], line|z14-[highway=unclassified], line|z14-[highway=road], line|z14-[highway=living_street], line|z14-[aeroway=runway], line|z14-[highway=service], -{color: @unclassified; opacity: 1;} +{color: @unclassified; opacity: 1;casing-linecap: butt;} line|z16-[highway=unclassified][tunnel?], line|z16-[highway=living_street][tunnel?], {color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;} @@ -728,9 +723,6 @@ line|z14-[highway=unclassified][bridge?]::bridgeblack, {casing-linecap: butt;casing-color:@bridge_casing;} /* 7.1 Road, Street, Unclassified 12-22 ZOOM */ -/*line|z12-[highway=unpaved] -{color: #B020A4; opacity: 1;width: 3.85;}*/ - line|z12[highway=unclassified], line|z12[highway=road], line|z12[highway=living_street] @@ -805,7 +797,7 @@ line|z19-[highway=service] /* 8.OTHERS ROADS 13-22 ZOOM */ -line|z14-[highway=pedestrian], +line|z13-[highway=pedestrian], line|z13-[highway=ford] {color: @pedestrian;opacity: 1;} line|z13-[highway=cycleway] @@ -813,54 +805,43 @@ line|z13-[highway=cycleway] line|z13-[highway=construction], line|z13-[highway=proposed] {color: @construction;opacity: 1;} -line|z14-[highway=pedestrian][bridge?]::bridgewhite, +line|z13-[highway=pedestrian][bridge?]::bridgewhite, line|z13-[highway=footway][bridge?]::bridgewhite line|z16-[highway=steps][bridge?]::bridgewhite, line|z16-[highway=road][bridge?]::bridgewhite, line|z16-[highway=service][bridge?]::bridgewhite {casing-linecap: butt;casing-color:@bridge_background;} -line|z14-[highway=pedestrian][bridge?]::bridgeblack, +line|z13-[highway=pedestrian][bridge?]::bridgeblack, line|z13-[highway=footway][bridge?]::bridgeblack, line|z16-[highway=steps][bridge?]::bridgeblack, line|z16-[highway=road][bridge?]::bridgeblack, line|z16-[highway=service][bridge?]::bridgeblack {casing-linecap: butt;casing-color:@bridge_casing;} -/*line|z14-[highway=track] -line|z14-[highway=raceway], -line|z14-[leisure=track], -line|z14-[route=hiking], -{color: @track;opacity: 1;} -line|z14-[highway=bridleway] -{color: @bridleway;opacity: 1;}*/ -/*line|z16-[highway=footway], -line|z16-[highway=steps] -{color: @footway;opacity: 1;} -line|z16-[highway=pedestrian][tunnel?] -{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;}*/ + /* 8.1 Pedestrian & ford 13-22 ZOOM */ /*line|z13[highway=pedestrian], line|z13[highway=ford] -{width: 0.8;dashes: 2,1;opacity: 0;} +{width: 1;dashes: 2,1;} line|z14[highway=pedestrian], line|z14[highway=ford] -{width: 0.75;dashes: 2.6,1.3;opacity: 0;} +{width: 1.6;dashes: 3.6,1.6;} line|z15[highway=pedestrian], line|z15[highway=ford] -{width: 1.1;dashes: 3.1,1.7;opacity: 0;}*/ -/*line|z16[highway=pedestrian], +{width: 2;dashes: 5,2.2;} +line|z16[highway=pedestrian], line|z16[highway=ford] -{width: 0.5;dashes: 4,2.2;opacity: 1;} +{width: 2.4;dashes: 5.4,2.7;} line|z17[highway=pedestrian], line|z17[highway=ford] -{width: 0.9;dashes: 5,2;opacity: 1;} +{width: 3;dashes: 5,2;} line|z18[highway=pedestrian], line|z18[highway=ford] -{width: 1;dashes: 7,3;opacity: 1;} +{width: 4;dashes: 7,3;} line|z19-[highway=pedestrian], line|z19-[highway=ford] -{width:1.5;dashes: 16.2,8.1;opacity: 1;}*/ +{width: 5;dashes: 16.2,8.1;}*/ /* 8.2 Pedestrian & ford tunnel 16-22 ZOOM */ @@ -871,7 +852,7 @@ line|z19-[highway=ford] /*line|z13[highway=pedestrian][bridge?]::bridgewhite, line|z13[highway=footway][bridge?]::bridgewhite, -{casing-width: eval(prop("width")-0.2);opacity: 0;} +{casing-width: eval(prop("width")-0.2);} line|z14-[highway=pedestrian][bridge?]::bridgewhite, line|z14-[highway=footway][bridge?]::bridgewhite, line|z16-[highway=steps][bridge?]::bridgewhite, @@ -954,9 +935,9 @@ line|z17-18[leisure=track] line|z19-[highway=track][tracktype=grade1], line|z19-[highway=raceway], line|z19-[leisure=track] -{width:4;}*/ +{width:4;} -/*line|z14[highway=track], +line|z14[highway=track], line|z14[highway=path], line|z14[route=hiking] {width:0.9;dashes: 2.52,1.35;} @@ -986,15 +967,15 @@ line|z19-[route=hiking] /*line|z14[highway=footway] {width: 1;dashes: 2.7,1.26;} line|z15[highway=footway] -{width: 1.3;dashes: 2.7,1.26;}*/ -/*line|z16[highway=footway] -{width: 0.5;dashes: 3.6,1.8;} +{width: 1.7;dashes: 2.7,1.26;} +line|z16[highway=footway] +{width: 2;dashes: 3.6,1.8;} line|z17[highway=footway] -{width: 0.9;dashes: 4.5,1.8;} +{width: 2.4;dashes: 4.5,1.8;} line|z18[highway=footway] -{width: 1.7;dashes: 7.2,2.7;} +{width: 3.4;dashes: 7.2,2.7;} line|z19-[highway=footway], -{width: 2.5;dashes: 9,3.6;}*/ +{width: 4;dashes: 9,3.6;}*/ /* 8.8 Footway & Path tunnel 17-22 ZOOM */ @@ -1031,13 +1012,13 @@ line|z19-[highway=bridleway] /* 8.10 Steps 16-22 ZOOM */ /*line|z16[highway=steps] -{width: 0.5;dashes: 1.5,1.5;} +{width: 5;dashes: 1.5,1.5;} line|z17[highway=steps] -{width: 1;dashes: 2.3,2.3;} +{width: 7;dashes: 2.3,2.3;} line|z18[highway=steps] -{width: 1.5;dashes: 3.2,3.2;} +{width: 9;dashes: 3.2,3.2;} line|z19-[highway=steps] -{width: 2.5;dashes: 4,4;}*/ +{width: 11;dashes: 4,4;}*/ /* 8.11 Runway 12-22 ZOOM */ @@ -1084,7 +1065,7 @@ line|z16-[railway=tram][bridge?]::bridgewhite, line|z14-[railway=rail][bridge?]::bridgeblack, line|z14-[railway=light_rail][bridge?]::bridgeblack, line|z14-[railway=yard][bridge?]::bridgeblack, -line|z16-[railway=tram][bridge?]::bridgeblack, +line|z16-[railway=tram][bridge?]::bridgeblack {casing-linecap: butt;casing-color:@bridge_casing;} /* 9.1 RAIL 11-22 ZOOM */ @@ -1197,8 +1178,7 @@ line|z17-[railway=narrow_gauge] {width: 2;} /* 9.5 Tram line 13-22 ZOOM */ -/*line|z15-[railway=tram]::centerline -{width: 0.75;}*/ + line|z16-[railway=tram]::centerline {width: 0.85;} line|z17-[railway=tram]::centerline @@ -1208,8 +1188,6 @@ line|z18-[railway=tram]::centerline line|z19-[railway=tram]::centerline {width: 2;} -/*line|z15-[railway=tram] -{width: 2;opacity:1; dashes:0.6,9; linecap:butt;}*/ line|z16-[railway=tram] {width: 1.5;opacity:1;dashes:0.8,12; linecap:butt;} line|z17-[railway=tram] @@ -1219,7 +1197,6 @@ line|z18-[railway=tram] line|z19-[railway=tram] {width: 7; opacity:1; dashes:1.5,19; linecap:butt;} - /* 9.6 Funicular 12-22 ZOOM */ /*line|z12[railway=funicular], diff --git a/data/styles/vehicle/include/Roads_label.mapcss b/data/styles/vehicle/include/Roads_label.mapcss old mode 100644 new mode 100755 index e090099312..4ed05e61c0 --- a/data/styles/vehicle/include/Roads_label.mapcss +++ b/data/styles/vehicle/include/Roads_label.mapcss @@ -128,7 +128,10 @@ line[railway=tram] line[highway=cycleway], line[highway=steps], -node[highway=motorway_junction], +node[highway=motorway_junction] +{z-index: 1000;} + +line|z15-[hwtag=oneway]::arrows {z-index: 1000;} line[aerialway=cable_car]::dash, @@ -166,13 +169,119 @@ line[piste:lift=rope_tow], line[piste:lift=t-bar], {z-index: 6888;} -line[hwtag=oneway]::arrows -{z-index: 10000;} - - /* 2.SHIELD 10-22 ZOOM */ +line|z10-[highway=motorway], +line|z10-[highway=trunk], +line|z10-[highway=motorway_link], +line|z10-[highway=trunk_link], +line|z10-[highway=primary], +line|z10-[highway=primary_link], +line|z12-[highway=secondary], +line|z12-[highway=residential], +line|z12-[highway=tertiary] +{shield-font-size: 9;shield-text-color: @shield_text;shield-text-halo-radius: 0;shield-text-halo-color: @shield_text_halo;shield-color: @shield;shield-outline-radius: 1;shield-outline-color: @shield_outline;-x-me-icon-priority: 100000;} +line|z10[highway=motorway], +line|z10[highway=trunk], +line|z10[highway=motorway_link], +line|z10[highway=trunk_link], +line|z10[highway=primary], +line|z10[highway=primary_link], +line|z10[highway=secondary], +line|z10[highway=residential], +line|z10[highway=tertiary] +{shield-min-distance: 30;} +line|z11[highway=motorway], +line|z11[highway=trunk], +line|z11[highway=motorway_link], +line|z11[highway=trunk_link], +line|z11[highway=primary], +line|z11[highway=primary_link], +line|z11[highway=secondary], +line|z11[highway=residential], +line|z11[highway=tertiary] +{shield-min-distance: 60;} +line|z12[highway=motorway], +line|z12[highway=trunk], +line|z12[highway=motorway_link], +line|z12[highway=trunk_link], +line|z12[highway=primary], +line|z12[highway=primary_link], +line|z12[highway=secondary], +line|z12[highway=residential], +line|z12[highway=tertiary] +{shield-min-distance: 100;} +line|z13[highway=motorway], +line|z13[highway=trunk], +line|z13[highway=motorway_link], +line|z13[highway=trunk_link], +line|z13[highway=primary], +line|z13[highway=primary_link], +line|z13[highway=secondary], +line|z13[highway=residential], +line|z13[highway=tertiary] +{shield-min-distance: 120;} +line|z14[highway=motorway], +line|z14[highway=trunk], +line|z14[highway=motorway_link], +line|z14[highway=trunk_link], +line|z14[highway=primary], +line|z14[highway=primary_link], +line|z14[highway=secondary], +line|z14[highway=residential], +line|z14[highway=tertiary] +{shield-min-distance: 175;} +line|z15[highway=motorway], +line|z15[highway=trunk], +line|z15[highway=motorway_link], +line|z15[highway=trunk_link], +line|z15[highway=primary], +line|z15[highway=primary_link], +line|z15[highway=secondary], +line|z15[highway=residential], +line|z15[highway=tertiary] +{shield-min-distance: 250;} +line|z16[highway=motorway], +line|z16[highway=trunk], +line|z16[highway=motorway_link], +line|z16[highway=trunk_link], +line|z16[highway=primary], +line|z16[highway=primary_link], +line|z16[highway=secondary], +line|z16[highway=residential], +line|z16[highway=tertiary] +{shield-min-distance: 300;-x-me-icon-priority: 75000;} +line|z17[highway=motorway], +line|z17[highway=trunk], +line|z17[highway=motorway_link], +line|z17[highway=trunk_link], +line|z17[highway=primary], +line|z17[highway=primary_link], +line|z17[highway=secondary], +line|z17[highway=residential], +line|z17[highway=tertiary] +{shield-font-size: 10;shield-min-distance: 350;} +line|z18[highway=motorway], +line|z18[highway=trunk], +line|z18[highway=motorway_link], +line|z18[highway=trunk_link], +line|z18[highway=primary], +line|z18[highway=primary_link], +line|z18[highway=secondary], +line|z18[highway=residential], +line|z18[highway=tertiary] +{shield-font-size: 10;shield-min-distance: 350;} +line|z19[highway=motorway], +line|z19[highway=trunk], +line|z19[highway=motorway_link], +line|z19[highway=trunk_link], +line|z19[highway=primary], +line|z19[highway=primary_link], +line|z19[highway=secondary], +line|z19[highway=residential], +line|z19[highway=tertiary] +{shield-font-size: 11;shield-min-distance: 350;} /* 3.TRUNK & MOTORWAY 10-22 ZOOM */ @@ -186,30 +295,39 @@ line|z10-11[highway=motorway], line|z10-11[highway=trunk], line|z10-11[highway=motorway_link], line|z10-11[highway=trunk_link] -{font-size: 11.5;text-color: @label_dark;text-halo-opacity: 0.8;text-halo-color: @label_halo_medium;} +{font-size: 12;text-color: @label_medium;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;} line|z12-13[highway=motorway], line|z12-13[highway=trunk], line|z12-13[highway=motorway_link], line|z12-13[highway=trunk_link] -{font-size: 13.5;text-halo-color: @label_halo_medium;} +{font-size: 13;text-halo-color: @label_halo_light;} line|z14-15[highway=motorway], line|z14-15[highway=trunk], -{font-size: 14.5;text-color: @label_dark;text-halo-opacity: 0.8;} +{font-size: 14;text-color: @label_dark;text-halo-opacity: 0.9;} line|z14[highway=motorway_link], line|z14[highway=trunk_link] -{font-size: 12;text-halo-color: @label_halo_medium;} +{font-size: 11.5;text-halo-color: @label_halo_medium;} line|z15[highway=motorway_link], line|z15[highway=trunk_link] -{font-size: 12.5;text-halo-color: @label_halo_medium;} -line|z16-17[highway=trunk], -line|z16-17[highway=motorway], -{font-size: 15.5;text-color: @label_dark;text-halo-opacity: 0.8;} -line|z16-[highway=motorway_link], -line|z16-[highway=trunk_link] -{font-size: 14.5;text-halo-opacity: 1;} +{font-size: 12;text-halo-color: @label_halo_medium;} +line|z16[highway=trunk], +line|z16[highway=motorway], +{font-size: 16.5;text-color: @label_dark;text-halo-opacity: 0.9;} +line|z16[highway=motorway_link], +line|z16[highway=trunk_link] +{font-size: 13.75;text-halo-opacity: 0.9;} +line|z17[highway=trunk], +line|z17[highway=motorway], +{font-size: 17.5;text-color: @label_dark;text-halo-opacity: 0.99;} +line|z17[highway=motorway_link], +line|z17[highway=trunk_link] +{font-size: 14;text-halo-opacity: 0.99;} line|z18-[highway=trunk], line|z18-[highway=motorway], -{font-size: 16;text-color: @label_dark;text-halo-opacity: 1;} +{font-size: 18.5;text-color: @label_dark;text-halo-opacity: 1;} +line|z18-[highway=motorway_link], +line|z18-[highway=trunk_link] +{font-size: 14.75;text-halo-opacity: 1;} /* 4.PRIMARY 10-22 ZOOM */ @@ -217,22 +335,31 @@ line|z10-[highway=primary], line|z10-[highway=primary_link], {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;} -line|z10-11[highway=primary], -line|z10-11[highway=primary_link] -{font-size: 11;text-halo-color: @label_halo_medium;} +line|z10[highway=primary], +line|z10[highway=primary_link] +{font-size: 11.5;text-halo-color: @label_halo_medium;} +line|z11[highway=primary], +line|z11[highway=primary_link] +{font-size: 11.5;text-halo-color: @label_halo_medium;} line|z12-13[highway=primary], line|z12-13[highway=primary_link] {font-size: 12.75;text-halo-opacity: 0.9;text-halo-color: @label_halo_medium;} line|z14-15[highway=primary], {font-size: 13.5;text-color: @label_dark;} line|z14[highway=primary_link] -{font-size: 12;text-halo-color: @label_halo_medium;} +{font-size: 11;text-halo-color: @label_halo_medium;} line|z15[highway=primary_link] -{font-size: 14;text-halo-color: @label_halo_medium;} -line|z16-[highway=primary], +{font-size: 11.5;text-halo-color: @label_halo_medium;} +line|z16[highway=primary], {font-size: 15.5;text-color: @label_dark;} -line|z16-17[highway=primary_link], -{font-size: 13.25;} +line|z16[highway=primary_link], +{font-size: 13;} +line|z17[highway=primary], +{font-size: 16.75;text-color: @label_dark;} +line|z17[highway=primary_link], +{font-size: 13.5;} +line|z18-[highway=primary], +{font-size: 17;text-color: @label_dark;} line|z18-[highway=primary_link], {font-size: 14.5;text-halo-opacity: 1;} @@ -247,15 +374,18 @@ line|z10-11[highway=secondary] line|z12-13[highway=secondary] {font-size: 12;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;} line|z14[highway=secondary], -{font-size: 12.5;} +{font-size: 12.75;} line|z15[highway=secondary], -{font-size: 13;} -line|z16-17[highway=secondary], -line|z16-17[highway=secondary_link] -{font-size: 14;text-color: @label_dark;text-halo-color: @label_halo_light;} +{font-size: 13.75;} +line|z16[highway=secondary], +line|z16[highway=secondary_link] +{font-size: 15;text-color: @label_dark;text-halo-color: @label_halo_light;} +line|z17[highway=secondary], +line|z17[highway=secondary_link] +{font-size: 15.75;text-color: @label_dark;text-halo-color: @label_halo_light;} line|z18-[highway=secondary], line|z18-[highway=secondary_link] -{font-size: 14;text-color: @label_dark;text-halo-opacity: 1;text-halo-color: @label_halo_light;} +{font-size: 16;text-color: @label_dark;text-halo-opacity: 1;text-halo-color: @label_halo_light;} /* 6.RESIDENTAL & TERTIARY 12-22 ZOOM */ @@ -270,46 +400,54 @@ line|z12-13[highway=tertiary] {font-size: 10;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;} line|z14[highway=residential], line|z14[highway=tertiary], -{font-size: 11.5;} +{font-size: 11;} line|z15[highway=residential], line|z15[highway=tertiary], {font-size: 12.5;} -line|z16-17[highway=residential], -line|z16-17[highway=tertiary], -{font-size: 13;text-halo-color: @label_halo_light;} +line|z16[highway=residential], +line|z16[highway=tertiary], +{font-size: 13.5;text-halo-color: @label_halo_light;} +line|z17[highway=residential], +line|z17[highway=tertiary], +{font-size: 14.25;text-halo-color: @label_halo_light;} line|z18-[highway=residential], line|z18-[highway=residential_link], line|z18-[highway=tertiary], line|z18-[highway=tertiary_link] -{font-size: 13.5;text-halo-opacity: 1;text-halo-color: @label_halo_light;} +{font-size: 15;text-halo-opacity: 1;text-halo-color: @label_halo_light;} /* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 14-22 ZOOM */ line|z14-[highway=unclassified], line|z14-[highway=road], line|z14-[highway=living_street], +line|z14-[highway=pedestrian], line|z16-[highway=service], {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;} line|z14[highway=unclassified], line|z14[highway=living_street], +line|z14[highway=pedestrian], line|z14[highway=road], -{font-size: 11;} +{font-size: 10.5;} line|z15[highway=unclassified], line|z15[highway=living_street], +line|z15[highway=pedestrian], line|z15[highway=road], {font-size: 11.5;} line|z16-17[highway=unclassified], line|z16-17[highway=living_street], -{font-size: 12;text-halo-color: @label_halo_light;} +{font-size: 12.5;text-halo-color: @label_halo_light;} +line|z16-17[highway=pedestrian], line|z16-17[highway=service], line|z16-17[highway=road], -{font-size: 12;text-halo-color: @label_halo_light;} +{font-size: 12.5;text-halo-color: @label_halo_light;} line|z18-[highway=unclassified], line|z18-[highway=living_street], +line|z18-[highway=pedestrian], line|z18-[highway=service], line|z18-[highway=road], -{font-size: 12.5;text-halo-opacity: 1;text-halo-color: @label_halo_light;} +{font-size: 13.75;text-halo-opacity: 1;text-halo-color: @label_halo_light;} /* 8.OTHERS ROADS 15-22 ZOOM */ @@ -421,7 +559,7 @@ line|z17-[route=ferry_motorcar] /* line|z15-[highway=primary][hwtag=oneway]::arrows <-- не работает по типам магистралей */ line|z15[hwtag=oneway]::arrows -{pattern-offset: 80; pattern-image: arrow-xs.svg;pattern-spacing: 160;} +{pattern-offset: 80;pattern-image: arrow-xs.svg;pattern-spacing: 160;} line|z16[hwtag=oneway]::arrows {pattern-offset: 120;pattern-image: arrow-s.svg;pattern-spacing: 160;} line|z17[hwtag=oneway]::arrows @@ -432,112 +570,9 @@ line|z18-[hwtag=oneway]::arrows /* 13.JUNCTION */ node|z15-[highway=motorway_junction] -{text: name;text-color: #3A302B;text-position: center;} +{text: name;text-color: @subway_label;text-position: center;} node|z15[highway=motorway_junction] {font-size: 9;} node|z16-[highway=motorway_junction] {font-size: 10;} - - -line|z10-[highway=motorway], -line|z10-[highway=trunk], -line|z10-[highway=motorway_link], -line|z10-[highway=trunk_link], -line|z10-[highway=primary], -line|z10-[highway=primary_link], -line|z12-[highway=secondary], -line|z12-[highway=residential], -line|z12-[highway=tertiary] -{shield-font-size: 9;shield-text-color: @shield_text;shield-text-halo-radius: 0;shield-text-halo-color: @shield_text_halo;shield-color: @shield;shield-outline-radius: 1;shield-outline-color: @shield_outline;-x-me-icon-priority: 20000;z-index:60000;} - -line|z10[highway=motorway], -line|z10[highway=trunk], -line|z10[highway=motorway_link], -line|z10[highway=trunk_link], -line|z10[highway=primary], -line|z10[highway=primary_link], -line|z10[highway=secondary], -line|z10[highway=residential], -line|z10[highway=tertiary] -{shield-min-distance: 85;-x-me-icon-priority: 75000;z-index:60000;} -line|z11-12[highway=motorway], -line|z11-12[highway=trunk], -line|z11-12[highway=motorway_link], -line|z11-12[highway=trunk_link], -line|z11-12[highway=primary], -line|z11-12[highway=primary_link], -line|z11-12[highway=secondary], -line|z11-12[highway=residential], -line|z11-12[highway=tertiary] -{shield-min-distance: 90;-x-me-icon-priority: 75000;z-index:60000;} -line|z13[highway=motorway], -line|z13[highway=trunk], -line|z13[highway=motorway_link], -line|z13[highway=trunk_link], -line|z13[highway=primary], -line|z13[highway=primary_link], -line|z13[highway=secondary], -line|z13[highway=residential], -line|z13[highway=tertiary] -{shield-min-distance: 120;-x-me-icon-priority: 75000;z-index:60000;} -line|z14[highway=motorway], -line|z14[highway=trunk], -line|z14[highway=motorway_link], -line|z14[highway=trunk_link], -line|z14[highway=primary], -line|z14[highway=primary_link], -line|z14[highway=secondary], -line|z14[highway=residential], -line|z14[highway=tertiary] -{shield-min-distance: 175;-x-me-icon-priority: 75000;z-index:60000;} -line|z15[highway=motorway], -line|z15[highway=trunk], -line|z15[highway=motorway_link], -line|z15[highway=trunk_link], -line|z15[highway=primary], -line|z15[highway=primary_link], -line|z15[highway=secondary], -line|z15[highway=residential], -line|z15[highway=tertiary] -{shield-min-distance: 250;-x-me-icon-priority: 75000;z-index:60000;} -line|z16[highway=motorway], -line|z16[highway=trunk], -line|z16[highway=motorway_link], -line|z16[highway=trunk_link], -line|z16[highway=primary], -line|z16[highway=primary_link], -line|z16[highway=secondary], -line|z16[highway=residential], -line|z16[highway=tertiary] -{shield-min-distance: 300;-x-me-icon-priority: 75000;z-index:60000;} -line|z17[highway=motorway], -line|z17[highway=trunk], -line|z17[highway=motorway_link], -line|z17[highway=trunk_link], -line|z17[highway=primary], -line|z17[highway=primary_link], -line|z17[highway=secondary], -line|z17[highway=residential], -line|z17[highway=tertiary] -{shield-font-size: 10;shield-min-distance: 300;-x-me-icon-priority: 75000;z-index:60000;} -line|z18[highway=motorway], -line|z18[highway=trunk], -line|z18[highway=motorway_link], -line|z18[highway=trunk_link], -line|z18[highway=primary], -line|z18[highway=primary_link], -line|z18[highway=secondary], -line|z18[highway=residential], -line|z18[highway=tertiary] -{shield-font-size: 10;shield-min-distance: 300;-x-me-icon-priority: 75000;z-index:60000;} -line|z19[highway=motorway], -line|z19[highway=trunk], -line|z19[highway=motorway_link], -line|z19[highway=trunk_link], -line|z19[highway=primary], -line|z19[highway=primary_link], -line|z19[highway=secondary], -line|z19[highway=residential], -line|z19[highway=tertiary] -{shield-font-size: 11;shield-min-distance: 350;-x-me-icon-priority: 75000;z-index:60000;} diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss index eab4bdf164..7356464a99 100644 --- a/data/styles/vehicle/style-clear/colors.mapcss +++ b/data/styles/vehicle/style-clear/colors.mapcss @@ -121,7 +121,7 @@ @unversity: #F8E4BA; @hospital: #F8D9D9;/*FADCDB*/ -@industrial: #DED8E0;/*#D5D5DE; #E4E2EB;*/ +@industrial: #E1DCE3;/*#D5D5DE; #E4E2EB;*/ @sport: #C8DBAD; @parking: #F2F2CE; @parking_l: #FCFCC2;/*#F0EBC5;DCDCB9; #F2F2CE;*/ diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/style-night/colors.mapcss index 7f99fb8486..3c55ac6c4a 100644 --- a/data/styles/vehicle/style-night/colors.mapcss +++ b/data/styles/vehicle/style-night/colors.mapcss @@ -61,11 +61,11 @@ @pedestrian_area_light: #262222; @university: #261F13; @hospital: #261916; -@industrial: #141014; +@industrial: #0D0A0D; @sport: #070F0A; -@parking: #332D14; -@parking_l: #403819; @military: #B71C1C; +@parking: #191509; +@parking_l: #1F190A; /*4.2 Aerodrome*/ diff --git a/data/styles/vehicle/style-night/style.mapcss b/data/styles/vehicle/style-night/style.mapcss index d729a0d3c6..da5762a1c3 100755 --- a/data/styles/vehicle/style-night/style.mapcss +++ b/data/styles/vehicle/style-night/style.mapcss @@ -26,10 +26,10 @@ colors Selection-opacity: 0.64; Route-color: #0087FF; RouteOutline-color: #055FCD; - RouteTrafficG0-color: #9B2300; - RouteTrafficG1-color: #F03C0A; - RouteTrafficG2-color: #F03C0A; - RouteTrafficG3-color: #F5D728; + RouteTrafficG0-color: #5E0F0D; + RouteTrafficG1-color: #7F1311; + RouteTrafficG2-color: #7F1311; + RouteTrafficG3-color: #9E8216; RouteTrafficG3-opacity: @traffic_arrow_dark; RoutePedestrian-color: #FFB94B; RoutePedestrian-opacity: 0.7; @@ -45,25 +45,25 @@ colors TrackCarSpeed-color: #FFCA28; TrackPlaneSpeed-color: #FFF5A0; TrackUnknownDistance-color: #969696; - TrafficG0-color: #410F00; - TrafficG1-color: #781919; - TrafficG2-color: #781919; - TrafficG3-color: #8C5A00; + TrafficG0-color: #4C120F; + TrafficG1-color: #731816; + TrafficG2-color: #731816; + TrafficG3-color: #8C7012; TrafficG3-opacity: @traffic_arrow_dark; - TrafficG4-color: #555519; - TrafficG5-color: #285032; + TrafficG4-color: #376222; + TrafficG5-color: #376222; TrafficTempBlock-color: #232323; TrafficUnknown-color: #000000; TrafficArrowLight-color: #AAAAAA; TrafficArrowDark-color: #1E1E1E; - TrafficOutline-color: #000000; - RoadShieldBlackText-color: #000000; - RoadShieldWhiteText-color: #FFFFFF; - RoadShieldUKYellowText-color: #FFCC66; - RoadShieldBlueBackground-color: #2E6FC9; - RoadShieldGreenBackground-color: #22723B; - RoadShieldRedBackground-color: #CD2828; - RoadShieldOrangeBackground-color: #FFBE00; + TrafficOutline-color: #383838; + RoadShieldBlackText-color: #212121; + RoadShieldWhiteText-color: #B7B6B6; + RoadShieldUKYellowText-color: #B49E0E; + RoadShieldBlueBackground-color: #294C88; + RoadShieldGreenBackground-color: #136C30; + RoadShieldRedBackground-color: #9F1A17; + RoadShieldOrangeBackground-color: #136C30; PoiHotelTextOutline-color: #000000; PoiHotelTextOutline-opacity: 0.6; PoiDeletedMask-color: #FFFFFF;