diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss index 04efa7450a..a9149a8d74 100644 --- a/data/styles/clear/include/POI.mapcss +++ b/data/styles/clear/include/POI.mapcss @@ -20,16 +20,16 @@ node|z18-[tourism], area|z18-[tourism] { font-size: 10; text: name; text-color: node|z16[tourism=museum],area|z16[tourism=museum] { icon-image: museum-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z16[historic=museum],area|z16[historic=museum] { icon-image: museum-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z16[historic=monument],area|z16[historic=monument] { icon-image: monument-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +/*node|z16[historic=memorial], area|z16[historic=memorial] { icon-image: monument-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }*/ node|z16[tourism=gallery],area|z16[tourism=gallery] { icon-image: gallery-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z16[tourism=zoo], area|z16[tourism=zoo] { icon-image: zoo-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } -node|z15[tourism=camp_site], area|z15[tourism=camp_site] { icon-image: campsite-s.svg; } +node|z15[tourism=camp_site], area|z15[tourism=camp_site] { icon-image: campsite-m.svg; } node|z16[tourism=camp_site], area|z16-17[tourism=camp_site] { icon-image: campsite-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } -/* ZOOM 18+ */ +/* ZOOM 17+ */ node|z17-[tourism=museum],area|z17-[tourism=museum] { icon-image: museum-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z17-[historic=museum],area|z17-[historic=museum] { icon-image: museum-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } -node|z17-[historic=monument],area|z17-[historic=monument] { icon-image: monument-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z17-[tourism=gallery],area|z17-[tourism=gallery] { icon-image: gallery-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z17-[tourism=zoo], area|z17-[tourism=zoo] { icon-image: zoo-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z17-[tourism=hotel] { icon-image: hotel-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } @@ -54,17 +54,67 @@ node|z17-[natural=waterfall],area|z18-[natural=waterfall] { icon-image: waterfal node|z10-14[natural=volcano],{ icon-image: volcano-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z15-16[natural=volcano],{ icon-image: volcano-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z17-[natural=volcano],{ icon-image: volcano-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +area|z10-14[natural=volcano],{ icon-image: volcano-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +area|z15-16[natural=volcano],{ icon-image: volcano-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +area|z17-[natural=volcano],{ icon-image: volcano-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } -node|z15-16[natural=peak] { icon-image: peak-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } -node|z17-[natural=peak] { icon-image: peak-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; } +node|z12[natural=peak][name], +{ icon-image: peakt-s.svg; } +node|z12[natural=peak][!name], +node|z12[natural=bare_rock][!name], +node|z12[natural=rock][!name] +{ } +area|z12[natural=peak][name], +{ icon-image: peakt-s.svg; } +area|z12[natural=peak][!name], +area|z12[natural=bare_rock][!name], +area|z12[natural=rock][!name] +{ } -node|z12-14[boundary=national_park],area|z12-14[boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000;} -node|z15-16[boundary=national_park],area|z15-16[boundary=national_park] { icon-image: nparkf-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000;} -node|z17-[boundary=national_park],area|z17-[boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1000;} +node|z13[natural=peak][name], +{ icon-image: peakt-s.svg;text-offset: 6; font-size: 9; text: name; text-color: @poi_label; } +node|z13[natural=peak][!name], +node|z13[natural=bare_rock][!name], +node|z13[natural=rock][!name] +{ } +area|z13[natural=peak][name], +{ icon-image: peakt-s.svg; text-offset: 6; font-size: 9; text: name; text-color: @poi_label; } +area|z13[natural=peak][!name], +area|z13[natural=bare_rock][!name], +area|z13[natural=rock][!name] +{ } -node|z12-14[leisure=nature_reserve],area|z12-14[leisure=nature_reserve] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000; } -node|z15-16[leisure=nature_reserve],area|z15-16[leisure=nature_reserve] { icon-image: nparkf-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000; } -node|z17-[leisure=nature_reserve],area|z17-[leisure=nature_reserve] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1000; } +node|z14[natural=peak][name], +{ icon-image: peakt-m.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; } +node|z14[natural=peak][!name], +node|z14[natural=bare_rock][!name], +node|z14[natural=rock][!name] +{ } +area|z14[natural=peak][name], +{ icon-image: peakt-m.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; } +area|z14[natural=peak][!name], +area|z14[natural=bare_rock][!name], +area|z14[natural=rock][!name] +{ } + +node|z15[natural=peak],node|z15-16[natural=bare_rock],node|z15-16[natural=rock] { icon-image: peakt-m.svg; text-offset: 8; font-size: 11; text: name; text-color: @poi_label; } +area|z15[natural=peak],area|z15-16[natural=bare_rock],area|z15-16[natural=rock] { icon-image: peakt-m.svg; text-offset: 8; font-size: 11; text: name; text-color: @poi_label; } +node|z16-[natural=peak],node|z17-[natural=bare_rock],node|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 8; font-size: 11; text: name; text-color: @poi_label; } +area|z16-[natural=peak],area|z17-[natural=bare_rock],area|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 8; font-size: 11; text: name; text-color: @poi_label; } + +node|z12-14[boundary=national_park],area|z12-14[boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.4; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 1000;} +node|z15-16[boundary=national_park],area|z15-16[boundary=national_park] { icon-image: nparkf-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label;text-halo-opacity: 0.4; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 1000;} +node|z17-[boundary=national_park],area|z17-[boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 12; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.4; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 1000;} + +node|z12-14[leisure=nature_reserve],area|z12-14[leisure=nature_reserve] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.4; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 1000;} +node|z15-16[leisure=nature_reserve],area|z15-16[leisure=nature_reserve] { icon-image: nparkf-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label; text-halo-opacity: 0.4; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 1000; } +node|z17-[leisure=nature_reserve],area|z17-[leisure=nature_reserve] { icon-image: nparkf-l.svg; text-offset: 12; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.4; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 1000; } /* AMENITY */ @@ -74,6 +124,7 @@ node|z19-[amenity], area|z19-[amenity] { icon-image: none.svg; text-offset: 8; /* AMENITY */ + node|z15-[natural=spring],area|z17-[natural=spring]{ icon-image: drinking-water-m.svg; z-index: 1000; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 100; } node|z16[amenity=place_of_worship], area|z16[amenity=place_of_worship] { icon-image: place-of-worship-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } @@ -81,15 +132,8 @@ node|z16[amenity=theatre], area|z16[amenity=theatre] { icon-image: theatre-m.svg node|z16[amenity=kindergarten], area|z16[amenity=kindergarten] { icon-image: kindergarten-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z16[amenity=school], area|z16[amenity=school] { icon-image: school-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z16[amenity=college], area|z16[amenity=college] { icon-image: college-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } - -node|z16[amenity=hospital], area|z16[amenity=hospital], -node|z16[amenity=doctors], area|z16[amenity=doctors], -node|z16[amenity=dentist], area|z16[amenity=dentist], -node|z16[amenity=clinic], area|z16[amenity=clinic], -{ - icon-image: hospital-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; -} - +node|z16[amenity=hospital], area|z16[amenity=hospital] { icon-image: hospital-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +node|z16[amenity=clinic], area|z16[amenity=clinic] { icon-image: hospital-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z16[amenity=university], area|z16[amenity=university] { icon-image: college-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 4; } node|z16[amenity=fuel], area|z16[amenity=fuel] { icon-image: fuel-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z16-[natural=spring],area|z16-[natural=spring]{ icon-image: drinking-water-m.svg; z-index: 1000; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 100; } @@ -100,15 +144,8 @@ node|z17[amenity=theatre], area|z17[amenity=theatre] { icon-image: theatre-l.svg node|z17[amenity=kindergarten], area|z17[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z17[amenity=school], area|z17[amenity=school] { icon-image: school-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z17[amenity=college], area|z17[amenity=college] { icon-image: college-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } - -node|z17[amenity=hospital], area|z17[amenity=hospital], -node|z17[amenity=doctors], area|z17[amenity=doctors], -node|z17[amenity=dentist], area|z17[amenity=dentist], -node|z17[amenity=clinic], area|z17[amenity=clinic], -{ - icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; -} - +node|z17[amenity=hospital], area|z17[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +node|z17[amenity=clinic], area|z17[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z17[amenity=university], area|z17[amenity=university] { icon-image: college-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 4; } node|z17[amenity=cinema], area|z17[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } @@ -123,6 +160,8 @@ node|z17[amenity=restaurant], area|z17[amenity=restaurant] { icon-image: restaur node|z17-[amenity=fountain],area|z17-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } 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; } node|z17-[natural=spring],area|z17-[natural=spring]{ icon-image: drinking-water-l.svg; z-index: 1000; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 100; } +node|z17-[historic=memorial], area|z17-[historic=memorial] { icon-image: monument-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +node|z17-[historic=monument],area|z17-[historic=monument] { icon-image: monument-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z18-[amenity=place_of_worship], area|z18-[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } @@ -130,15 +169,8 @@ node|z18-[amenity=theatre], area|z18-[amenity=theatre] { icon-image: theatre-l.s node|z18-[amenity=kindergarten], area|z18-[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z18-[amenity=school], area|z18-[amenity=school] { icon-image: school-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z18-[amenity=college], area|z18-[amenity=college] { icon-image: college-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } - -node|z18-[amenity=hospital], area|z18-[amenity=hospital], -node|z18-[amenity=doctors], area|z18-[amenity=doctors], -node|z18-[amenity=dentist], area|z18-[amenity=dentist], -node|z18-[amenity=clinic], area|z18-[amenity=clinic], -{ - icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; -} - +node|z18-[amenity=hospital], area|z18-[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +node|z18-[amenity=clinic], area|z18-[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z18-[amenity=university], area|z18-[amenity=university] { icon-image: college-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 5; } node|z18-[amenity=cinema], area|z18-[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z18-[amenity=bank], area|z18-[amenity=bank] { z-index: 4500; icon-image: bank-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } @@ -162,6 +194,9 @@ node|z18-[amenity=drinking_water],area|z18-[amenity=drinking_water],node|z18-[am node|z18-[natural=spring],area|z18-[natural=spring]{ icon-image: drinking-water-l.svg; z-index: 1000; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z18-[amenity=library] { icon-image: library-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z18-[amenity=waste_disposal], area|z18-[amenity=waste_disposal] { icon-image: recycling-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +node|z18-[historic=memorial], area|z18-[historic=memorial] { icon-image: monument-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +node|z18-[historic=monument],area|z18-[historic=monument] { icon-image: monument-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } + node|z19-[amenity=telephone] { icon-image: phone-l.svg; } node|z19-[amenity=recycling], area|z19-[amenity=recycling], { icon-image: recycling-l.svg; } @@ -182,11 +217,11 @@ node|z18-[leisure=golf_course], area|z18-[leisure=golf_course] { icon-image: gol /* SHOPS */ -node|z19-[shop], area|z19-[shop] { icon-image: shop-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +node|z19-[shop], area|z19-[shop] { icon-image: shop-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6000; } node|z16[shop=mall] { icon-image: shop-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z17-[shop=mall] { icon-image: shop-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } -node|z17-[shop=supermarket] { icon-image: grocery-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } -node|z18-[shop=alcohol] { icon-image: alcohol-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +node|z17-[shop=supermarket] { icon-image: grocery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; } +node|z18-[shop=alcohol] { icon-image: alcohol-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; } /* SPORT */ node|z17-[sport=soccer], area|z17[sport=soccer] { icon-image: soccer-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } @@ -203,9 +238,12 @@ node|z18-[sport=gymnastics] { icon-image: pitch-l.svg; text-offset: 8; font-size node|z16-[highway=speed_camera] { icon-image: speedcam-m.svg; z-index: 7000; } +node|z16[building=hospital], area|z16[building=hospital] { icon-image: hospital-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } +node|z17-[building=hospital], area|z17-[building=hospital] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } + /* PARKINGS */ -area|z16-[amenity=parking] {fill-color: @parking;fill-oppacity:1;z-index: 0;} +area|z16-[amenity=parking] {fill-color: @parking;fill-oppacity:1;z-index: 10000;} node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 4; } node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 4; } @@ -213,7 +251,6 @@ node|z17[amenity=parking][access=permissive], node|z17[amenity=parking][access=private] { icon-image: zero-icon.svg; z-index: 4; } - node|z18-[amenity=parking], area|z18-[amenity=parking] { icon-image: parking-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 4; } @@ -221,3 +258,6 @@ node|z18-[amenity=parking], area|z18-[amenity=parking] { icon-image: parking-m.s node|z15-16[man_made=lighthouse], area|z15-16[man_made=lighthouse] { icon-image: lighthouse-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } node|z17-[man_made=lighthouse], area|z17-[man_made=lighthouse] { icon-image: lighthouse-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } + +/* BORDER CONTROL*/ +node|z15-[barrier=border_control]{ icon-image:bcontrol-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 10000;} diff --git a/data/styles/clear/include/boundaries.mapcss b/data/styles/clear/include/boundaries.mapcss index b8ebcc791e..10341282db 100644 --- a/data/styles/clear/include/boundaries.mapcss +++ b/data/styles/clear/include/boundaries.mapcss @@ -81,7 +81,22 @@ line|z8-[boundary=administrative][admin_level=4] z-index: 400; dashes: 1.5,1; } - +line|z8-[boundary=administrative][admin_level=4] +{ + color: @border_region; + width: 0.9; + opacity: 1; + z-index: 400; + dashes: 1.5,1; +} +line|z11-[boundary=administrative][admin_level=4] +{ + color: @border_region; + width: 1.2; + opacity: 1; + z-index: 400; + dashes: 2,1; +} /* DEBUG */ /* line|z2-[boundary=administrative][admin_level=2] { diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss index 9170e4f98e..6d115ca5cb 100644 --- a/data/styles/clear/include/labels.mapcss +++ b/data/styles/clear/include/labels.mapcss @@ -98,8 +98,18 @@ node|z6[place=state] /* CITIES ZOOM 4*/ - -node|z4[place=city][capital=2] { +node|z4[place=city][capital!=2][population>=1000000], +{ + font-size: 9; + text: name; + text-color: @label_dark; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_medium; + z-index: 1000; +} +node|z4[place=city][capital=2], + { icon-image: star-s.svg; text-offset: 2.8; font-size: 10; @@ -108,27 +118,27 @@ node|z4[place=city][capital=2] { text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; + z-index: 4000; } - /* CITIES ZOOM 5*/ -node|z5[place=city] { - text: name; - font-size: 10; - text-color: @label_medium; - text-halo-radius: 1; - text-halo-opacity: 0.5; - text-halo-color: @label_halo_medium; - + node|z5[place=city][capital!=2][population>=150000], + { + font-size: 10; + text: name; + text-color: @label_dark; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_medium; + z-index: 1000; + } /* icon-image: dot-s.svg; text-offset: 3; */ -} - -node|z5[place=city][capital=2] { +node|z5[place=city][capital=2]{ icon-image: star-m.svg; text-offset: 3; font-size: 10; @@ -157,23 +167,22 @@ node|z5[place=city][capital=4] { /* CITIES ZOOM 6*/ - -node|z6[place=city] { - text: name; +node|z6[place=city][capital!=2][population>=50000], +{ font-size: 10; + text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 2000; + z-index: 1000; +} + /* icon-image: dot-s.svg; text-offset: 2.5; */ -} - - node|z6[place=city][capital=2] { icon-image: star-l.svg; text-offset: 4; @@ -202,21 +211,23 @@ node|z6[place=city][capital=4] { /* CITIES ZOOM 7*/ -node|z7[place=city] { /* icon-image: dot-s.svg; text-offset: 3; */ - font-size: 11; + +node|z7[place=city][capital!=2][population>=40000], +{ + font-size: 10; text: name; - text-color: @label_medium; + text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.6; text-halo-color: @label_halo_medium; - z-index: 8000; + z-index: 5000; } -node|z7[place=city][capital=2] { +node|z7[place=city][capital=2]{ icon-image: star-l.svg; text-offset: 5; font-size: 11; @@ -227,29 +238,30 @@ node|z7[place=city][capital=2] { text-halo-color: @label_halo_medium; z-index: 9000; } - node|z7[place=state] { text: name; - font-size: 13; + font-size: 11; text-color: @state_name; z-index: -10; } /* CITIES ZOOM 8*/ -node|z8[place=city] { - font-size: 12; +node|z8[place=city][capital!=2][population>=40000], +{ + font-size: 11; text: name; - text-color: @label_medium; + text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.6; text-halo-color: @label_halo_medium; - z-index: 8000; + z-index: 3000; +} /* icon-image: dot-m.svg; text-offset: 3; */ -} + node|z8[place=city][capital=2] { icon-image: star-l.svg; @@ -263,35 +275,25 @@ node|z8[place=city][capital=2] { z-index: 9000; } -node|z8[place=town] { - font-size: 9; +node|z8[place=town][population>=40000] { + font-size: 10; text: name; - text-color: @label_light; - z-index: 20; + text-color: @city_label; + z-index: 2000; } - node|z8[place=state] { text: name; - font-size: 13; + font-size: 12; text-color: @state_name; - z-index: 7000; + z-index: -10; } /* ZOOM 9 */ -node|z9[place=town] { - font-size: 10; - text: name; - text-color: @city_label_light; - text-halo-radius: 1; - text-halo-opacity: 0.5; - text-halo-color: @label_halo_bg; -} - node|z9[place=city] { - font-size: 12; + font-size: 11; text: name; - text-color: @label_medium; + text-color: @label_dark; text-halo-radius: 0.5; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; @@ -312,6 +314,16 @@ node|z9[place=city][capital=2] { text-halo-color: @label_halo_medium; z-index: 3900; } + +node|z9[place=town][population>=20000] { + font-size: 10; + text: name; + text-color: @city_label; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_bg; +} + node|z9[place=state] { text: name; @@ -320,18 +332,8 @@ node|z9[place=state] z-index: -10; } - /* ZOOM 10 */ -node|z10[place=town] { - font-size: 9; - text: name; - text-color: @label_light; - text-halo-radius: 1; - text-halo-opacity: 1; - text-halo-color: @label_halo_bg; - z-index: 2000; -} node|z10[place=city] { font-size: 12; @@ -343,7 +345,7 @@ node|z10[place=city] { z-index: 2000; } -node|z10[place=city][capital=2] { +node|z10[place=city][capital=2]{ icon-image: star-l.svg; text-offset: 3; font-size: 12; @@ -355,10 +357,49 @@ node|z10[place=city][capital=2] { z-index: 9000; } +node|z10[place=town] { + font-size: 10; + text: name; + text-color: @city_label; + text-halo-radius: 1; + text-halo-opacity: 1; + text-halo-color: @label_halo_bg; + z-index: 2000; +} +node|z9[place=state] +{ + text: name; + font-size: 12; + text-color: @state_name; + z-index: -10; +} + + /* ZOOM 11 */ +node|z11[place=city] { + font-size: 14; + text: name; + text-color: @label_dark; + text-halo-radius:1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 4000; +} + +node|z11[place=city][capital=2]{ + icon-image: star-l.svg; + text-offset: 4; + font-size: 14; + text: name; + text-color: @label_dark; + text-halo-radius:1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 3900; +} node|z11[place=town] { - font-size: 10; + font-size: 12; text: name; text-color: @label_medium; text-halo-radius: 1; @@ -372,31 +413,33 @@ node|z11[place=village] { text-color: @city_label; text-halo-radius: 1; text-halo-color: @city_halo; + z-index: 2000; } -node|z11[place=city] { + +/* ZOOM 12 */ + +node|z12[place=city] { font-size: 14; text: name; - text-color: @label_dark; - text-halo-radius:1; + text-color: @label_medium; + text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z11[place=city][capital=2] { +node|z12[place=city][capital=2]{ icon-image: star-l.svg; text-offset: 4; - font-size: 14; + font-size: 16; text: name; text-color: @label_dark; - text-halo-radius:1; + text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; z-index: 3900; } -/* ZOOM 12 */ - node|z12[place=town] { font-size: 14; text: name; @@ -414,27 +457,6 @@ node|z12[place=village] { text-halo-color: @city_halo; } -node|z12[place=city] { - font-size: 14; - text: name; - text-color: @label_medium; - text-halo-radius: 1; - text-halo-opacity: 0.5; - text-halo-color: @label_halo_light; -} - -node|z12[place=city][capital=2] { - icon-image: star-l.svg; - text-offset: 4; - font-size: 16; - text: name; - text-color: @label_dark; - text-halo-radius: 1; - text-halo-opacity: 0.5; - text-halo-color: @label_halo_light; - z-index: 3900; -} - /* ZOOM 13 */ node|z13-17[place=town] { @@ -480,7 +502,7 @@ node|z13-14[place=city][capital=2] { } node|z13-[place=hamlet] { - font-size: 10; + font-size: 12; text: name; text-color: @label_light; text-halo-radius: 1; @@ -744,27 +766,27 @@ line|z18-[highway=path] { node|z10[place=suburb] { text: name; - font-size: 10; + font-size: 8; text-color: @district_label; } node|z11[place=suburb] { text: name; - font-size: 10; + font-size: 9; text-color: @district_label; } node|z12[place=suburb] { text: name; - font-size: 11; + font-size: 10; text-color: @district_label; } node|z13-14[place=suburb] { text: name; - font-size: 14; + font-size: 11; text-color: @district_label; } /* SMALL LOCALITIES */ @@ -785,13 +807,14 @@ node|z8-9[place=region], area|z16[building], node|z16[building], area|z16[addr:housenumber][addr:street], -node|z16[addr:housenumber][addr:street] +node|z16[addr:housenumber][addr:street], + { - text: "addr:housenumber"; + text: "addr:housename"; font-size: 8; text-color: @housename; text-position: center; - z-index: 100; + z-index: 1000; } area|z17[building], @@ -799,7 +822,7 @@ node|z17[building], area|z17[addr:housenumber][addr:street], node|z17[addr:housenumber][addr:street] { - text: "addr:housenumber"; + text: name; font-size: 9; text-color: @building_label; text-position: center; @@ -812,7 +835,7 @@ node|z18-[building], area|z18-[addr:housenumber][addr:street], node|z18-[addr:housenumber][addr:street] { - text: "addr:housenumber"; + text: name; font-size: 10; text-color: @building_label; text-position: center; @@ -850,6 +873,23 @@ area|z15-[area:highway=footway], text-color: @city_label; text-position: center; } +/* INDUSTRIAL */ + +area|z15-[landuse=industrial] { + text: name; + font-size: 10; + text-color: @city_label; + text-position: center; + z-index: 5000; +} +/* COMMERCIAL */ + +area|z17-[landuse=commercial]{ + text: name; + font-size: 10; + text-color: @poi_label; + text-position: center; +} /* @@ -928,7 +968,34 @@ node|z16-[natural=bay] text-halo-radius: 0; } -/* RIVERS LABELS */ +/* water LABELS */ + +area|z10-[natural=lake][bbox_area>=4000000], +area|z10-[landuse=reservoir][bbox_area>=4000000], +area|z10-[natural=water][bbox_area>=4000000] +{text: name; +font-size: 9; +text-color: @water_label; +z-index: 10000;} + +area|z10-[natural=lake][bbox_area<4000000], +area|z10-[landuse=reservoir][bbox_area<4000000], +area|z10-[natural=water][bbox_area<4000000] +{} +/* +area|z12-[natural=lake][bbox_area>=10000000], +area|z12-[landuse=reservoir][bbox_area>=10000000], +area|z12-[natural=water][bbox_area>=10000000] + {text: name; + font-size: 10; + text-color: @water_label; + z-index: 300;} + +area|z12-[natural=lake][bbox_area<10000000], +area|z12-[landuse=reservoir][bbox_area<10000000], +area|z12-[natural=water][bbox_area<10000000] + {} + */ line[waterway] { text-position: line; @@ -961,61 +1028,140 @@ line|z13-[waterway=stream] { text-halo-radius: 0; } +/* +area|z10-[natural=lake][bbox_area>=100000000000], +area|z10-[landuse=reservoir][bbox_area>=100000000000], +area|z10-[natural=water][bbox_area>=100000000000] +{text: name; +font-size: 20; +text-color: #090909; +text-halo-opacity: 0.1; +text-halo-color: @halo_water_lable; +text-halo-radius: 0; +z-index: 100000;} + +area|z10-[natural=lake][bbox_area<100000000000], +area|z10-[landuse=reservoir][bbox_area<100000000000], +area|z10-[natural=water][bbox_area<100000000000] +{} +*/ /* PARKS LABELS */ -area|z14[leisure=park] { +area|z14[leisure=park][name] { + icon-image: park-s.svg; + text-offset: 8; text: name; font-size: 10; text-color: @park_label; -} - -area|z15[leisure=park], area|z17-[leisure=garden] { - text: name; - font-size: 11; - text-color: @park_label; -} - -area|z16[leisure=park], area|z17-[leisure=garden] { - text: name; - font-size: 13; - text-color: @park_label; - text-halo-opacity: 0.3; text-halo-color: @label_halo_light; - text-halo-radius: 0; + text-halo-radius: 0.4; + text-halo-opacity: 0.4; +} +area|z14[leisure=park][!name] { } +area|z15[leisure=park][name], { + icon-image: park-m.svg; + text-offset: 8; + text: name; + font-size: 10; + text-color: @park_label; + text-halo-color: @label_halo_light; + text-halo-radius: 0.4; + text-halo-opacity: 0.4; +} +/* +area|z15[leisure=garden][name] { + icon-image: garden-m.svg; + text-offset: 8; + text: name; + font-size: 10; + text-color: @park_label; + text-halo-color: @label_halo_light; + text-halo-radius: 0.4; + text-halo-opacity: 0.4; +} +*/ +area|z15[leisure=park][!name], +/*area|z15[leisure=garden][!name]*/ { -area|z17-[leisure=park][name] { +} + +area|z16[leisure=park][name]{ icon-image: park-m.svg; text-offset: 10; text: name; - font-size: 14; + font-size: 11; text-color: @park_label; - text-halo-opacity: 0.3; + text-halo-opacity: 0.4; text-halo-color: @label_halo_light; - text-halo-radius: 0; + text-halo-radius: 0.5; } - -area|z17-[leisure=park][!name] {} - -area|z17[leisure=garden] { - text: name; - font-size: 12; - text-color: @park_label; - text-halo-opacity: 0.3; - text-halo-color: @label_halo_light; - text-halo-radius: 0; -} - -area|z18-[leisure=garden] { +area|z16[leisure=garden][name] { icon-image: garden-m.svg; text-offset: 10; text: name; - font-size: 14; + font-size: 11; text-color: @park_label; - text-halo-opacity: 0.3; + text-halo-opacity: 0.4; text-halo-color: @label_halo_light; - text-halo-radius: 0; + text-halo-radius: 0.5; +} +area|z16[leisure=park][!name], +area|z16[leisure=garden][!name] { +} + +area|z17[leisure=park][name] { + icon-image: park-l.svg; + text-offset: 10; + text: name; + font-size: 12; + text-color: @park_label; + text-halo-opacity: 0.4; + text-halo-color: @label_halo_light; + text-halo-radius: 0.5; +} + +area|z17[leisure=garden][name] { + icon-image: garden-l.svg; + text-offset: 10; + text: name; + font-size: 13; + text-color: @park_label; + text-halo-opacity: 0.4; + text-halo-color: @label_halo_light; + text-halo-radius: 0.5; +} +area|z17[leisure=park][!name] { +} + +area|z17[leisure=garden][!name] { +} +area|z18-[leisure=park][name] { + icon-image: park-l.svg; + text-offset: 10; + text: name; + font-size: 13; + text-color: @park_label; + text-halo-opacity: 0.4; + text-halo-color: @label_halo_light; + text-halo-radius: 0.5; +} +area|z18-[leisure=garden][name] { + icon-image: garden-l.svg; + text-offset: 10; + text: name; + font-size: 13; + text-color: @park_label; + text-halo-opacity: 0.4; + text-halo-color: @label_halo_light; + text-halo-radius: 0.5; +} +area|z18-[leisure=park][!name] { + icon-image: park-l.svg; +} +area|z18-[leisure=garden][!name] { + icon-image: garden-l.svg; } /* BEACH LABELS */ @@ -1039,7 +1185,7 @@ node|z17-[landuse=military] { } /* CEMETRY */ -area|z15-[landuse=cemetery] { +area|z15-16[landuse=cemetery] { icon-image: cemetery-m.svg; text-offset: 10; text: name; @@ -1047,7 +1193,8 @@ area|z15-[landuse=cemetery] { text-color: @poi_label; z-index: 1000; } -area|z17-[landuse=cemetery] { +area|z17-[landuse=cemetery] +node|z17-[landuse=cemetery] { icon-image: cemetery-l.svg; text-offset: 10; text: name; @@ -1055,7 +1202,8 @@ area|z17-[landuse=cemetery] { text-color: @poi_label; z-index: 1000; } -area|z17-[amenity=grave_yard] { +area|z17-[amenity=grave_yard] +node|z17-[amenity=grave_yard]{ icon-image: cemetry-l.svg; text-offset: 10; text: name; @@ -1063,3 +1211,36 @@ area|z17-[amenity=grave_yard] { text-color: @poi_label; z-index: 1000; } +/* PIER */ +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; + z-index: 1000; +} + +area|z15-[waterway=dam], +line|z15-[waterway=dam], +line|z15-[waterway=wair], +node|z15-[waterway=wair] +{ + text: name; + font-size: 10; + text-color:@poi_label; + fill-opacity: 1; + z-index: 1000; +} + +node|z14-[natural=cape], +area|z14-[natural=cape] +{font-size: 8; +text: name; +text-color: @poi_label; + } diff --git a/data/styles/clear/include/landuse.mapcss b/data/styles/clear/include/landuse.mapcss index c90ab82eaf..047e46ff0a 100644 --- a/data/styles/clear/include/landuse.mapcss +++ b/data/styles/clear/include/landuse.mapcss @@ -7,15 +7,40 @@ area|z11-[place=hamlet] { fill-color: @background; } */ +/* PIER */ +area|z12-[man_made=pier], +area|z12-[man_made=breakwater], + { + fill-color: @background; + fill-opacity: 1; + z-index: 1000; +} + +line|z14-[man_made=pier], +line|z14-[man_made=breakwater] +{ casing-width: 0.3; + casing-color: @background; + fill-color: @background; + fill-opacity: 1; + z-index: 1000; +} +line|z17-[man_made=pier], +line|z17-[man_made=breakwater] +{ casing-width: 1; + casing-color: @background; + fill-color: @background; + fill-opacity: 1; + z-index: 1000; +} /* PEDESTRIAN AREAS */ -area|z15[highway=pedestrian][area?], -area|z15[area:highway=pedestrian], -area|z15[highway=footway][area?][!sac_scale], -area|z15[area:highway=footway], -area|z15[area:highway=living_street], +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], { fill-color: @pedestrian_area; fill-opacity: 0.3; @@ -38,7 +63,7 @@ area|z16-[area:highway=living_street], area|z15-[landuse=industrial] { fill-color: @industrial; fill-opacity: 1; - z-index: 10; + z-index: -10; } @@ -54,26 +79,33 @@ area|z14[amenity=grave_yard] { fill-opacity: 0.85; z-index: -10; } - -area|z15-[amenity=grave_yard], area|z15-[landuse=cemetery] { +area|z15-[amenity=grave_yard], +area|z15-[landuse=cemetery] { fill-color: @park; fill-opacity: 1; z-index: -1000; } + /* UNIVERSITY */ -area|z14[amenity=university] { +area|z14-15[amenity=university] { fill-color: @unversity; - fill-opacity: 0.5; + fill-opacity: 0.8; z-index: 10; } -area|z15-[amenity=university] { +area|z16-17[amenity=university] { fill-color: @unversity; - fill-opacity: 0.5; + fill-opacity: 1; z-index: 10; } +area|z18-[amenity=university] { + fill-color: @unversity; + fill-opacity: 1; + z-index: 0; +} + area|z16-[leisure=pitch], area|z16-[sport=soccer], area|z15-[leisure=stadium], @@ -82,9 +114,9 @@ area|z17-[leisure=playground] { fill-opacity: 1; z-index: 150; } -/* PARKINGS -area|z16-[amenity=parking] {fill-color: @parking;fill-oppacity:1;z-index: 3;} -*/ +/* PARKINGS*/ + + /* MILITARY */ /* area|z14[landuse=military] { fill-color: ; diff --git a/data/styles/clear/include/natural.mapcss b/data/styles/clear/include/natural.mapcss index 5b4228b234..ae3e6568cd 100644 --- a/data/styles/clear/include/natural.mapcss +++ b/data/styles/clear/include/natural.mapcss @@ -1,3 +1,4 @@ + /* land */ area|z0-9[natural=land] @@ -20,7 +21,7 @@ area|z0-[natural=glacier] fill-color: @glacier; } -/* WATER */ +/*water */ area|z0-10[natural=coastline] { @@ -58,29 +59,52 @@ area|z10-[natural=bay], z-index: 250; } +area|z10-11[natural=lake], +area|z10-11[landuse=reservoir], +area|z10-11[natural=water] +{ + fill-color: @water; + z-index: 1000; +} + area|z12-[natural=wetland] { z-index: 15; fill-opacity: 0.2; fill-color: @water; } + /* rivers */ -line|z10-12[waterway=river], -line|z10-12[waterway=riverbank] { +line|z10[waterway=river], +line|z10[waterway=riverbank] { width: 0.5; - opacity: 0.7; + opacity: 0.5; color: @river; z-index: 50; } +line|z11-12[waterway=river], +line|z11-12[waterway=riverbank] { + width: 0.7; + opacity: 0.8; + color: @river; + z-index: 50; +} + +line|z13-14[waterway=stream] { + width: 0.1; + opacity: 0.6; + color: @river; + z-index: 50; +} + +line|z13-14[waterway=stream][intermittent=yes] { + dashes: 3,3; +} + line|z13-14[waterway=river] { - width: 0.5; - color: @river; - z-index: 50; -} - -line|z15-[waterway=river] { - width: 1.5; + width: 1; + opacity: 1; color: @river; z-index: 50; } @@ -90,24 +114,6 @@ line|z13-14[waterway=riverbank] { color: @river; z-index: 50; } - -line|z15-[waterway=riverbank] { - width: 2; - color: @river; - z-index: 50; -} - -line|z13-14[waterway=stream] { - width: 0.5; - opacity: 1; - color: @river; - z-index: 50; -} - -line|z13-14[waterway=stream][intermittent=yes] { - dashes: 3,3; -} - line|z15-[waterway=stream] { width: 1; opacity: 1; @@ -122,6 +128,18 @@ line|z15-[waterway=stream][intermittent=yes] { color: @river; z-index: 50; } +line|z15-[waterway=river] { + width: 1.8; + color: @river; + z-index: 50; +} + +line|z15-[waterway=riverbank] { + width: 1.8; + color: @river; + z-index: 50; +} + line|z17-[waterway=ditch] { width: 1; @@ -131,7 +149,10 @@ line|z17-[waterway=ditch] { dashes: 1,1; } -line|z15-[waterway=dam] { +area|z15-[waterway=dam], +line|z15-[waterway=dam], +line|z15-[waterway=wair], + { width: 1; opacity: 0.8; color: @bridge_casing; @@ -144,6 +165,7 @@ line|z15-[waterway=dam] { area|z10[natural=wood], area|z10[landuse=forest], +area|z10[leisure=nature_reserve] { fill-color: @forest; fill-opacity: 0.5; @@ -151,13 +173,15 @@ area|z10[landuse=forest], } area|z11[natural=wood], area|z11[landuse=forest], +area|z11[leisure=nature_reserve] { fill-color: @forest; fill-opacity: 0.65; z-index: 30; } area|z12[natural=wood], -area|z12[landuse=forest] +area|z12[landuse=forest], +area|z12[leisure=nature_reserve] { fill-color: @forest; fill-opacity: 0.75; @@ -165,7 +189,8 @@ area|z12[landuse=forest] } area|z13-14[natural=wood], -area|z13-14[landuse=forest] +area|z13-14[landuse=forest], +area|z13-14[leisure=nature_reserve] { fill-color: @forest; fill-opacity: 0.85; @@ -173,7 +198,8 @@ area|z13-14[landuse=forest] } area|z15-[natural=wood], -area|z15-[landuse=forest] +area|z15-[landuse=forest], +area|z15-[leisure=nature_reserve] { fill-color: @forest; fill-opacity: 1; @@ -214,7 +240,6 @@ area|z15-[leisure=park], area|z15-[leisure=garden] { fill-opacity: 1; z-index: 40; } - area|z15-[landuse=grass] { fill-color: @forest; diff --git a/data/styles/clear/include/other.mapcss b/data/styles/clear/include/other.mapcss index 6ad38ada94..5d82a773d1 100644 --- a/data/styles/clear/include/other.mapcss +++ b/data/styles/clear/include/other.mapcss @@ -1,3 +1,5 @@ + + line|z16[barrier=wall], line|z16[barrier=city_wall], line|z16[barrier=retaining_wall], @@ -6,9 +8,10 @@ line|z16[barrier=hedge], line|z16[historic=citywalls], { color: @fence; - width: 1; + width: 0.1; + opacity: 0.6; z-index: 950; - dashes: 1,1; + dashes: 0.1,0.1; } line|z17-[barrier=wall], @@ -19,9 +22,22 @@ line|z17-[barrier=hedge], line|z17-[historic=citywalls], { color: @fence; - width: 1; - dashes: 2,2; + width: 0.3; + opacity: 1; z-index: 950; + dashes: 0.2,0.2; +} +line|z18-[barrier=wall], +line|z18-[barrier=city_wall], +line|z18-[barrier=retaining_wall], +line|z18-[barrier=fence], +line|z18-[barrier=hedge], +line|z18-[historic=citywalls], +{ + color: @fence; + width: 1; + z-index: 950; + dashes: 0.1,0.1; } /* PISTE */ @@ -52,15 +68,26 @@ line|z15-[piste:lift=t-bar] { line|z14[piste:type=downhill], line|z14[piste:type=nordic], line|z14[piste:type=sled] { color: @piste; - width: 0.5; + width: 0.3; + opacity: 0.6; + z-index: 10; +} +line|z14[route=ski] { + color: @piste; + width: 0.3; opacity: 0.6; z-index: 199; } - line|z15[piste:type=downhill], line|z15[piste:type=nordic], line|z15[piste:type=sled] { color: @piste; - width: 1; - opacity: 0.6; + width: 0.5; + opacity: 0.8; + z-index: 199; +} +line|z15[route=ski] { + color: @piste; + width: 0.5; + opacity: 0.8; z-index: 199; } @@ -69,20 +96,38 @@ line|z16-[piste:type=downhill], line|z16-[piste:type=nordic], line|z16-[piste:type=sled] { color: @piste; - width: 1.5; - opacity: 0.9; + width: 1; + opacity: 1; + z-index: 199; +} +line|z16-[route=ski] { + color: @piste; + width: 1; + opacity: 1; z-index: 199; } -line|z14-[piste:type=downhill][piste:difficulty=novice] { color: @piste_novice; } -line|z14-[piste:type=downhill][piste:difficulty=easy] { color: @piste_easy; } -line|z14-[piste:type=downhill][piste:difficulty=intermediate] { color: @piste_intermadiate; } -line|z14-[piste:type=downhill][piste:difficulty=advanced] { color: @piste_advanced; } -line|z14-[piste:type=downhill][piste:difficulty=expert] { color: @piste_expert; } -line|z14-[piste:type=downhill][piste:difficulty=freeride] { color: @piste_expert; } +line|z14-[piste:type=downhill][piste:difficulty=novice] { color: @piste_novice; width: 0.3; opacity: 0.6; z-index: 100;} +line|z14-[piste:type=downhill][piste:difficulty=easy] { color: @piste_easy; width: 0.3; opacity: 0.6; z-index: 100; } +line|z14-[piste:type=downhill][piste:difficulty=intermediate] { color: @piste_intermadiate; width: 0.3; opacity: 0.6; z-index: 100;} +line|z14-[piste:type=downhill][piste:difficulty=advanced] { color: @piste_advanced; width: 0.3; opacity: 0.6; z-index: 100; } +line|z14-[piste:type=downhill][piste:difficulty=expert] { color: @piste_expert; width: 0.3; opacity: 0.6; z-index: 100; } +line|z14-[piste:type=downhill][piste:difficulty=freeride] { color: @piste_expert; width: 0.3; opacity: 0.6; z-index: 100;} +line|z15-[piste:type=downhill][piste:difficulty=novice] { color: @piste_novice; width: 0.5; opacity: 0.8; z-index: 100;} +line|z15-[piste:type=downhill][piste:difficulty=easy] { color: @piste_easy; width: 0.5; opacity: 0.8; z-index: 100; } +line|z15-[piste:type=downhill][piste:difficulty=intermediate] { color: @piste_intermadiate; width: 0.5; opacity: 0.8; z-index: 100;} +line|z15-[piste:type=downhill][piste:difficulty=advanced] { color: @piste_advanced; width: 0.5; opacity: 0.8; z-index: 100; } +line|z15-[piste:type=downhill][piste:difficulty=expert] { color: @piste_expert; width: 0.5; opacity: 0.8; z-index: 100; } +line|z15-[piste:type=downhill][piste:difficulty=freeride] { color: @piste_expert; width: 0.5; opacity: 0.8; z-index: 100;} +line|z16-[piste:type=downhill][piste:difficulty=novice] { color: @piste_novice; width: 1; opacity: 1; z-index: 100;} +line|z16-[piste:type=downhill][piste:difficulty=easy] { color: @piste_easy; width: 1; opacity: 1; z-index: 100; } +line|z16-[piste:type=downhill][piste:difficulty=intermediate] { color: @piste_intermadiate; width: 1; opacity: 1; z-index: 100;} +line|z16-[piste:type=downhill][piste:difficulty=advanced] { color: @piste_advanced; width: 1; opacity: 1; z-index: 100; } +line|z16-[piste:type=downhill][piste:difficulty=expert] { color: @piste_expert; width: 1; opacity: 1; z-index: 100; } +line|z16-[piste:type=downhill][piste:difficulty=freeride] { color: @piste_expert; width: 1; opacity: 1; z-index: 100;} /* [piste:type=downhill] diff --git a/data/styles/clear/include/roads.mapcss b/data/styles/clear/include/roads.mapcss index 6f9fbcdf61..d7e0a92dab 100644 --- a/data/styles/clear/include/roads.mapcss +++ b/data/styles/clear/include/roads.mapcss @@ -439,7 +439,8 @@ line|z14[highway=track][tracktype=grade1], width: 0.8; } line|z14[highway=track], -line|z14[highway=path] +line|z14[highway=path], +line|z14[route=hiking] { color: @track; opacity: 1; @@ -616,7 +617,8 @@ line|z15[highway=track][tracktype=grade1], z-index: 1000; } line|z15[highway=track], -line|z15[highway=path] +line|z15[highway=path], +line|z15[route=hiking] { color: @track; opacity: 1; @@ -659,7 +661,6 @@ line|z15[highway=cycleway] z-index: 1000; } - line|z15[highway=construction] { color: @construction; @@ -668,7 +669,6 @@ line|z15[highway=construction] dashes: 5,5; } - /* ZOOM 16 */ line|z16[highway=trunk], @@ -807,7 +807,8 @@ line|z16[highway=track][tracktype=grade1], width: 3.5; } line|z16[highway=track], -line|z16[highway=path] +line|z16[highway=path], +line|z16[route=hiking] { color: @track; opacity: 1; @@ -1015,7 +1016,7 @@ line|z17[highway=footway] width: 1.2; dashes: 2,2; opacity: 1; - z-index: 600; + z-index: 750; } line|z17[highway=footway][tunnel?]::tunnelBackground, @@ -1047,7 +1048,8 @@ line|z17[highway=track][tracktype=grade1], width: 6; } line|z17[highway=track], -line|z17[highway=path] +line|z17[highway=path], +line|z17[route=hiking] { color: @track; opacity: 1; @@ -1231,7 +1233,7 @@ line|z18[highway=footway] width: 1.8; dashes: 3,1.5; opacity: 1; - z-index: 600; + z-index: 1050; } line|z18[highway=footway][tunnel?]::tunnelBackground, @@ -1265,7 +1267,8 @@ line|z18[highway=track][tracktype=grade1], z-index: 600; } line|z18[highway=track], -line|z18[highway=path] +line|z18[highway=path], +line|z18[route=hiking] { color: @track; opacity: 1; @@ -1452,7 +1455,7 @@ line|z19-[highway=footway] width: 2; dashes: 3,1.5; opacity: 1; - z-index: 600; + z-index: 1050; } line|z19-[highway=footway][tunnel?]::tunnelBackground, @@ -1485,7 +1488,8 @@ line|z19-[highway=track][tracktype=grade1], width: 8.2; } line|z19-[highway=track], -line|z19-[highway=path] +line|z19-[highway=path], +line|z19-[route=hiking] { color: @track; opacity: 1; @@ -1549,7 +1553,7 @@ line|z13[highway=trunk][bridge?]::bridgewhite { line|z13[highway=motorway][bridge?]::bridgeblack, line|z13[highway=trunk][bridge?]::bridgeblack { z-index: 25; - casing-width: eval(prop("width")+0.5); + casing-width: eval(prop("width")+0.4); casing-linecap: butt; casing-color: @bridge_casing; } @@ -1557,63 +1561,219 @@ line|z13[highway=trunk][bridge?]::bridgeblack { line|z14-[highway=motorway][bridge?]::bridgewhite, line|z14-[highway=trunk][bridge?]::bridgewhite, line|z14-[highway=primary][bridge?]::bridgewhite, -line|z15-[highway=secondary][bridge?]::bridgewhite, -line|z16-[highway=tertiary][bridge?]::bridgewhite, -line|z16-[highway=residential][bridge?]::bridgewhite, -line|z16-[highway=unclassified][bridge?]::bridgewhite, -line|z16-[highway=pedestrian][bridge?]::bridgewhite, -line|z16-[highway=footway][bridge?]::bridgewhite, -line|z17-[highway=steps][bridge?]::bridgewhite, -line|z17-[highway=road][bridge?]::bridgewhite, -line|z17-[highway=service][bridge?]::bridgewhite { - z-index: 30; - casing-width: eval(prop("width")+0.5); +line|z14-[highway=secondary][bridge?]::bridgewhite, +line|z14-[highway=tertiary][bridge?]::bridgewhite, +line|z14-[highway=residential][bridge?]::bridgewhite, +line|z14-[highway=unclassified][bridge?]::bridgewhite, +line|z14-[railway=rail][bridge?]::bridgewhite +{ + z-index: 510; + casing-width: eval(prop("width")); casing-linecap: butt; casing-color: @bridge_background; } - line|z14-[highway=motorway][bridge?]::bridgeblack, line|z14-[highway=trunk][bridge?]::bridgeblack, line|z14-[highway=primary][bridge?]::bridgeblack, -line|z15-[highway=secondary][bridge?]::bridgeblack, -line|z16-[highway=tertiary][bridge?]::bridgeblack, -line|z16-[highway=residential][bridge?]::bridgeblack, -line|z16-[highway=unclassified][bridge?]::bridgeblack, -line|z16-[highway=pedestrian][bridge?]::bridgeblack, -line|z16-[highway=footway][bridge?]::bridgeblack, -line|z17-[highway=steps][bridge?]::bridgeblack, -line|z17-[highway=road][bridge?]::bridgeblack, -line|z17-[highway=service][bridge?]::bridgeblack +line|z14-[highway=secondary][bridge?]::bridgeblack, +line|z14-[highway=tertiary][bridge?]::bridgeblack, +line|z14-[highway=residential][bridge?]::bridgeblack, +line|z14-[highway=unclassified][bridge?]::bridgeblack, +line|z14-[railway=rail][bridge?]::bridgeblack { - z-index: 25; - casing-width: eval(prop("width")+1.5); + z-index: 500; + casing-width: eval(prop("width")+0.4); casing-linecap: butt; casing-color: @bridge_casing; } -line|z15-[highway=motorway_link][bridge?]::bridgewhite, -line|z15-[highway=trunk_link][bridge?]::bridgewhite, -line|z15-[highway=primary_link][bridge?]::bridgewhite, -line|z16-[highway=secondary_link][bridge?]::bridgewhite, -line|z16-[highway=tertiary_link][bridge?]::bridgewhite +line|z17-[highway=motorway][bridge?]::bridgewhite, +line|z17-[highway=trunk][bridge?]::bridgewhite, +line|z17-[highway=primary][bridge?]::bridgewhite, +line|z17-[highway=secondary][bridge?]::bridgewhite, +line|z17-[highway=tertiary][bridge?]::bridgewhite, +line|z17-[highway=residential][bridge?]::bridgewhite, +line|z17-[highway=unclassified][bridge?]::bridgewhite, +line|z17-[railway=rail][bridge?]::bridgewhite { - z-index: 30; - casing-width: eval(prop("width")+0.5); + z-index: 510; + casing-width: eval(prop("width")+0.8); + casing-linecap: butt; + casing-color: @bridge_background; +} +line|z17-[highway=motorway][bridge?]::bridgeblack, +line|z17-[highway=trunk][bridge?]::bridgeblack, +line|z17-[highway=primary][bridge?]::bridgeblack, +line|z17-[highway=secondary][bridge?]::bridgeblack, +line|z17-[highway=tertiary][bridge?]::bridgeblack, +line|z17-[highway=residential][bridge?]::bridgeblack, +line|z17-[highway=unclassified][bridge?]::bridgeblack, +line|z17-[railway=rail][bridge?]::bridgeblack +{ + z-index: 500; + casing-width: eval(prop("width")+1.6); + casing-linecap: butt; + casing-color: @bridge_casing; +} +line|z18-[highway=motorway][bridge?]::bridgewhite, +line|z18-[highway=trunk][bridge?]::bridgewhite, +line|z18-[highway=primary][bridge?]::bridgewhite, +line|z18-[highway=secondary][bridge?]::bridgewhite, +line|z18-[highway=tertiary][bridge?]::bridgewhite, +line|z18-[highway=residential][bridge?]::bridgewhite, +line|z18-[highway=unclassified][bridge?]::bridgewhite, +line|z18-[railway=rail][bridge?]::bridgewhite +{ + z-index: 510; + casing-width: eval(prop("width")+1); + casing-linecap: butt; + casing-color: @bridge_background; +} +line|z18-[highway=motorway][bridge?]::bridgeblack, +line|z18-[highway=trunk][bridge?]::bridgeblack, +line|z18-[highway=primary][bridge?]::bridgeblack, +line|z18-[highway=secondary][bridge?]::bridgeblack, +line|z18-[highway=tertiary][bridge?]::bridgeblack, +line|z18-[highway=residential][bridge?]::bridgeblack, +line|z18-[highway=unclassified][bridge?]::bridgeblack, +line|z18-[railway=rail][bridge?]::bridgeblack +{ + z-index: 500; + casing-width: eval(prop("width")+2); + casing-linecap: butt; + casing-color: @bridge_casing; +} +line|z14-[highway=motorway_link][bridge?]::bridgewhite, +line|z14-[highway=trunk_link][bridge?]::bridgewhite, +line|z14-[highway=primary_link][bridge?]::bridgewhite, +line|z14-[highway=secondary_link][bridge?]::bridgewhite, +line|z14-[highway=tertiary_link][bridge?]::bridgewhite +{ + z-index: 510; + casing-width: eval(prop("width")); casing-linecap: butt; casing-color: @bridge_background; } -line|z15-[highway=motorway_link][bridge?]::bridgeblack, -line|z15-[highway=trunk_link][bridge?]::bridgeblack, -line|z15-[highway=primary_link][bridge?]::bridgeblack, -line|z16-[highway=secondary_link][bridge?]::bridgeblack, -line|z16-[highway=tertiary_link][bridge?]::bridgeblack +line|z14-[highway=motorway_link][bridge?]::bridgeblack, +line|z14-[highway=trunk_link][bridge?]::bridgeblack, +line|z14-[highway=primary_link][bridge?]::bridgeblack, +line|z14-[highway=secondary_link][bridge?]::bridgeblack, +line|z14-[highway=tertiary_link][bridge?]::bridgeblack { - z-index: 25; - casing-width: eval(prop("width")+1); + z-index: 500; + casing-width: eval(prop("width")+0.4); casing-linecap: butt; casing-color: @bridge_casing; } +line|z17-[highway=motorway_link][bridge?]::bridgewhite, +line|z17-[highway=trunk_link][bridge?]::bridgewhite, +line|z17-[highway=primary_link][bridge?]::bridgewhite, +line|z17-[highway=secondary_link][bridge?]::bridgewhite, +line|z17-[highway=tertiary_link][bridge?]::bridgewhite +{ + z-index: 510; + casing-width: eval(prop("width")+0.8); + casing-linecap: butt; + casing-color: @bridge_background; +} + +line|z17-[highway=motorway_link][bridge?]::bridgeblack, +line|z17-[highway=trunk_link][bridge?]::bridgeblack, +line|z17-[highway=primary_link][bridge?]::bridgeblack, +line|z17-[highway=secondary_link][bridge?]::bridgeblack, +line|z17-[highway=tertiary_link][bridge?]::bridgeblack +{ + z-index: 500; + casing-width: eval(prop("width")+1.6); + casing-linecap: butt; + casing-color: @bridge_casing; +} +line|z18-[highway=motorway_link][bridge?]::bridgewhite, +line|z18-[highway=trunk_link][bridge?]::bridgewhite, +line|z18-[highway=primary_link][bridge?]::bridgewhite, +line|z18-[highway=secondary_link][bridge?]::bridgewhite, +line|z18-[highway=tertiary_link][bridge?]::bridgewhite +{ + z-index: 510; + casing-width: eval(prop("width")+1); + casing-linecap: butt; + casing-color: @bridge_background; +} + +line|z18-[highway=motorway_link][bridge?]::bridgeblack, +line|z18-[highway=trunk_link][bridge?]::bridgeblack, +line|z18-[highway=primary_link][bridge?]::bridgeblack, +line|z18-[highway=secondary_link][bridge?]::bridgeblack, +line|z18-[highway=tertiary_link][bridge?]::bridgeblack +{ + z-index: 500; + casing-width: eval(prop("width")+2); + casing-linecap: butt; + casing-color: @bridge_casing; +} +line|z13[highway=pedestrian][bridge?]::bridgewhite, +line|z13[highway=footway][bridge?]::bridgewhite +{ + z-index: 610; + casing-width: eval(prop("width")-0.2); + casing-linecap: butt; + casing-color: @bridge_background; +} +line|z14-[highway=pedestrian][bridge?]::bridgewhite, +line|z14-[highway=footway][bridge?]::bridgewhite, +line|z16-[highway=steps][bridge?]::bridgewhite, +line|z16-[highway=road][bridge?]::bridgewhite, +line|z16-[highway=service][bridge?]::bridgewhite { + z-index: 510; + casing-width: eval(prop("width")); + casing-linecap: butt; + casing-color: @bridge_background; +} +line|z14-[highway=pedestrian][bridge?]::bridgeblack, +line|z14-[highway=footway][bridge?]::bridgeblack, +line|z16-[highway=steps][bridge?]::bridgeblack, +line|z16-[highway=road][bridge?]::bridgeblack, +line|z16-[highway=service][bridge?]::bridgeblack +{ + z-index: 500; + casing-width: eval(prop("width")+0.2); + casing-linecap: butt; + casing-color: @bridge_casing; +} +line|z16-[highway=pedestrian][bridge?]::bridgewhite, +line|z16-[highway=footway][bridge?]::bridgewhite +{ + z-index: 710; + casing-width: eval(prop("width")+0.2); + casing-linecap: butt; + casing-color: @bridge_background; +} +line|z16-[highway=pedestrian][bridge?]::bridgeblack, +line|z16-[highway=footway][bridge?]::bridgeblack, +{ + z-index:700; + casing-width: eval(prop("width")+0.6); + casing-linecap: butt; + casing-color: @bridge_casing; +} +line|z18-[highway=pedestrian][bridge?]::bridgewhite, +line|z18-[highway=footway][bridge?]::bridgewhite +{ + z-index:1010; + casing-width: eval(prop("width")+0.2); + casing-linecap: butt; + casing-color: @bridge_background; +} +line|z18-[highway=pedestrian][bridge?]::bridgeblack, +line|z18-[highway=footway][bridge?]::bridgeblack, +{ + z-index:1000; + casing-width: eval(prop("width")+0.6); + casing-linecap: butt; + casing-color: @bridge_casing; +} + /* ONEWAY ARROWS */ @@ -1646,6 +1806,8 @@ line|z18-[hwtag=oneway]::arrows } + + /* Process bridge and tunnel */ /* line|z15-[bridge?]::bridgewhite, diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss index 943bd58291..a3f01b1539 100644 --- a/data/styles/clear/include/transport.mapcss +++ b/data/styles/clear/include/transport.mapcss @@ -521,11 +521,27 @@ area|z17[highway=bus_stop] z-index: 4000; } -node|z18-[highway=bus_stop], -area|z18-[highway=bus_stop], -node|z16-[public_transport=station], -area|z16-[public_transport=station] +node|z18-19[highway=bus_stop], +area|z18-19[highway=bus_stop], +node|z16-17[public_transport=station], +area|z16-17[public_transport=station] { + icon-image: bus-l.svg; + z-index: 9000; + text-offset: 10; + font-size: 10; + z-index: 5000; + text: name; + text-color: @label_dark; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; +} + +node|z15[amenity=bus_station], area|z16-[amenity=bus_station] { + icon-image: bus-l.svg; +} +node|z16-17[amenity=bus_station], area|z16-[amenity=bus_station] { icon-image: bus-l.svg; z-index: 4000; text-offset: 8; @@ -538,11 +554,8 @@ area|z16-[public_transport=station] text-halo-color: @label_halo_light; } -node|z15[amenity=bus_station], area|z16-[amenity=bus_station] { - icon-image: bus-m.svg; -} -node|z16-17[amenity=bus_station], area|z16-[amenity=bus_station] { - icon-image: bus-m.svg; +node|z18[amenity=bus_station], area|z18[amenity=bus_station] { + icon-image: bus-l.svg; z-index: 4000; text-offset: 8; font-size: 10; @@ -554,12 +567,12 @@ node|z16-17[amenity=bus_station], area|z16-[amenity=bus_station] { text-halo-color: @label_halo_light; } -node|z18-[amenity=bus_station], area|z18-[amenity=bus_station] { - icon-image: bus-m.svg; - z-index: 4000; - text-offset: 8; +node|z19-[amenity=bus_station], area|z19-[amenity=bus_station] { + icon-image: bus-l.svg; + z-index: 9000; + text-offset: 10; font-size: 10; - z-index: 5000; + z-index: 9000; text: name; text-color: @label_dark; text-halo-radius: 1; @@ -567,8 +580,6 @@ node|z18-[amenity=bus_station], area|z18-[amenity=bus_station] { text-halo-color: @label_halo_light; } - - /* FERRY */ node|z14-15[amenity=ferry_terminal] { @@ -779,9 +790,19 @@ line|z15-[aerialway=mixed_lift]::dash { dashes: 1, 20; } -node|z14[aerialway=station] { icon-image: cable-car-s.svg; } +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; + z-index: 10000;} -node|z15[aerialway=station] { +node|z15[aerialway=station], +node|z15[aerialway=cable_car], +node|z15[aerialway=chair_lift], +node|z15[aerialway=gondola], +node|z15[aerialway=mixed_lift] { icon-image: cable-car-s.svg; z-index: 10000; text-offset: 6; @@ -794,7 +815,11 @@ node|z15[aerialway=station] { z-index: 10000; } -node|z16-17[aerialway=station] { +node|z16-17[aerialway=station], +node|z16-17[aerialway=cable_car], +node|z16-17[aerialway=chair_lift], +node|z16-17[aerialway=gondola], +node|z16-17[aerialway=mixed_lift]{ icon-image: cable-car-m.svg; text-offset: 8; font-size: 10; @@ -806,7 +831,11 @@ node|z16-17[aerialway=station] { z-index: 10000; } -node|z18-[aerialway=station] { +node|z18-[aerialway=station], +node|z18[aerialway=cable_car], +node|z18[aerialway=chair_lift], +node|z18[aerialway=gondola], +node|z18[aerialway=mixed_lift] { icon-image: cable-car-l.svg; text-offset: 8; font-size: 12; diff --git a/data/styles/clear/style-clear/city_rank.txt b/data/styles/clear/style-clear/city_rank.txt deleted file mode 100644 index cedaa76ea4..0000000000 --- a/data/styles/clear/style-clear/city_rank.txt +++ /dev/null @@ -1,50 +0,0 @@ -z4 -{ --250000:-1; -250000-2000000:0; -2000000-:0.3; -} -z5 -{ --250000:-1; -250000-1000000:0; -1000000-:0.3; -} -z6 -{ --200000:-1; -200000-500000:0; -500000-:0.33; -} -z7 -{ --30000:-1; -30000-500000:0; -500000-2000000:0.2; -2000000-:0.33; -} -z8 -{ --30000:-1; -30000-300000:0; -300000-1000000:0.2; -1000000-:0.33; -} -z9 -{ --10000:-1; -10000-100000:0; -100000-500000:0.2; -500000-:0.4; -} -z10-11 -{ --20000:0; -20000-500000:0.2; -500000-:0.4; -} -z12- -{ --20000:0; -20000-:0; -} diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index a7d17a1cf7..91346150ee 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -160,9 +160,9 @@ @building_label: #7F7F7F; /* PISTE */ -@piste: #c867f6; -@piste_novice: #40A90B; -@piste_easy: #40A90B; -@piste_intermadiate: #DF4741; +@piste: #7766ff; +@piste_novice: #11dd00; +@piste_easy: #11dd00; +@piste_intermadiate: #ff0000; @piste_expert: #333333; @piste_advanced: #333333; diff --git a/data/styles/clear/style-clear/symbols/bcontrol-m.svg b/data/styles/clear/style-clear/symbols/bcontrol-m.svg new file mode 100644 index 0000000000..8244645cf9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/bcontrol-m.svg @@ -0,0 +1,23 @@ + + + + bcontrol-m + Created with Sketch. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/peakt-l.svg b/data/styles/clear/style-clear/symbols/peakt-l.svg new file mode 100644 index 0000000000..d8b6c95fb8 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/peakt-l.svg @@ -0,0 +1,10 @@ + + + + peakt-l + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/peakt-m.svg b/data/styles/clear/style-clear/symbols/peakt-m.svg new file mode 100644 index 0000000000..267f70ed5d --- /dev/null +++ b/data/styles/clear/style-clear/symbols/peakt-m.svg @@ -0,0 +1,10 @@ + + + + peakt-m + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/peakt-s.svg b/data/styles/clear/style-clear/symbols/peakt-s.svg new file mode 100644 index 0000000000..f472e358cd --- /dev/null +++ b/data/styles/clear/style-clear/symbols/peakt-s.svg @@ -0,0 +1,10 @@ + + + + peakt-s + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/city_rank.txt b/data/styles/clear/style-night/city_rank.txt deleted file mode 100644 index cedaa76ea4..0000000000 --- a/data/styles/clear/style-night/city_rank.txt +++ /dev/null @@ -1,50 +0,0 @@ -z4 -{ --250000:-1; -250000-2000000:0; -2000000-:0.3; -} -z5 -{ --250000:-1; -250000-1000000:0; -1000000-:0.3; -} -z6 -{ --200000:-1; -200000-500000:0; -500000-:0.33; -} -z7 -{ --30000:-1; -30000-500000:0; -500000-2000000:0.2; -2000000-:0.33; -} -z8 -{ --30000:-1; -30000-300000:0; -300000-1000000:0.2; -1000000-:0.33; -} -z9 -{ --10000:-1; -10000-100000:0; -100000-500000:0.2; -500000-:0.4; -} -z10-11 -{ --20000:0; -20000-500000:0.2; -500000-:0.4; -} -z12- -{ --20000:0; -20000-:0; -} diff --git a/data/styles/clear/style-night/symbols/peakt-l.svg b/data/styles/clear/style-night/symbols/peakt-l.svg new file mode 100644 index 0000000000..65e2491cc5 --- /dev/null +++ b/data/styles/clear/style-night/symbols/peakt-l.svg @@ -0,0 +1,10 @@ + + + + peakt-l + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/peakt-m.svg b/data/styles/clear/style-night/symbols/peakt-m.svg new file mode 100644 index 0000000000..3bac8f8bd6 --- /dev/null +++ b/data/styles/clear/style-night/symbols/peakt-m.svg @@ -0,0 +1,10 @@ + + + + peakt-m + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/peakt-s.svg b/data/styles/clear/style-night/symbols/peakt-s.svg new file mode 100644 index 0000000000..3f147b47f8 --- /dev/null +++ b/data/styles/clear/style-night/symbols/peakt-s.svg @@ -0,0 +1,10 @@ + + + + peakt-s + Created with Sketch. + + + + + \ No newline at end of file