diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss index 27e54edc34..92b79e758c 100644 --- a/data/styles/clear/include/POI.mapcss +++ b/data/styles/clear/include/POI.mapcss @@ -105,6 +105,10 @@ node|z18-[natural=cave_entrance],area|z16-[natural=cave] { icon-image: cave-l.sv node|z12-14[natural=waterfall],area|z12-14[natural=waterfall] { icon-image: waterfall-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } node|z15-16[natural=waterfall],area|z15-17[natural=waterfall] { icon-image: waterfall-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} node|z17-[natural=waterfall],area|z18-[natural=waterfall] { icon-image: waterfall-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } +node|z12-14[waterway=waterfall],area|z12-14[waterway=waterfall] { icon-image: waterfall-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } +node|z15-16[waterway=waterfall],area|z15-17[waterway=waterfall] { icon-image: waterfall-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} +node|z17-[waterway=waterfall],area|z18-[waterway=waterfall] { icon-image: waterfall-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } + node|z10-14[natural=volcano],{ icon-image: volcano-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } node|z15-16[natural=volcano],{ icon-image: volcano-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} @@ -157,19 +161,25 @@ area|z15[natural=peak],area|z15-16[natural=bare_rock],area|z15-16[natural=rock] node|z16-[natural=peak],node|z17-[natural=bare_rock],node|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2700; } area|z16-[natural=peak],area|z17-[natural=bare_rock],area|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2700;} -node|z12-14[landuse=forest][boundary=national_park],area|z12-14[landuse=forest][boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 1; text-halo-color: @label_halo_light; +node|z12-13[landuse=forest][boundary=national_park],area|z12-14[landuse=forest][boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; text-halo-radius:0.5; z-index: 2700;} -node|z15-16[landuse=forest][boundary=national_park],area|z15-16[landuse=forest][boundary=national_park] { icon-image: nparkf-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label;text-halo-opacity: 1; text-halo-color: @label_halo_light; +node|z14[landuse=forest][boundary=national_park],area|z14-[landuse=forest][boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; text-halo-radius:0.5; z-index: 2700;} -node|z17-[landuse=forest][boundary=national_park],area|z17-[landuse=forest][boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 12; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 1; text-halo-color: @label_halo_light; +node|z15-16[landuse=forest][boundary=national_park],area|z15-16[landuse=forest][boundary=national_park] { icon-image: nparkf-m.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label;text-halo-opacity: 0.8; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 2700;} +node|z17-[landuse=forest][boundary=national_park],area|z17-[landuse=forest][boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; text-halo-radius:0.5; z-index: 2700;} -node|z12-14[leisure=nature_reserve],area|z12-14[leisure=nature_reserve] { icon-image: nparkf-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 1; text-halo-color: @label_halo_light; -text-halo-radius:0.5; z-index: 2700;} -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: 1; text-halo-color: @label_halo_light; -text-halo-radius:0.5; z-index: 2700; } -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: 1; text-halo-color: @label_halo_light; -text-halo-radius:0.5; z-index: 2700; } +node|z12-13[leisure=nature_reserve],area|z12-14[leisure=nature_reserve] { icon-image: npark-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 30;} +node|z14[leisure=nature_reserve],area|z14-[leisure=nature_reserve]{ icon-image: nparkf-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 30;} +node|z15-16[leisure=nature_reserve],area|z15-16[leisure=nature_reserve] { icon-image: npark-m.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 30; } +node|z17-[leisure=nature_reserve],area|z17-[leisure=nature_reserve] { icon-image: npark-l.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; +text-halo-radius:0.5; z-index: 30; } + +node|z15-[natural=beach], area|z15-[natural=beach]{ icon-image: beach-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } /* AMENITY */ @@ -182,6 +192,7 @@ node|z19-[amenity], area|z19-[amenity] { icon-image: none.svg; text-offset: 10; node|z15-[natural=spring],area|z17-[natural=spring]{ icon-image: drinking-water-m.svg; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } node|z15-[amenity=hunting_stand], area|z18-[amenity=hunting_stand] { icon-image: hunting-tower-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } +node|z15-[tourism=attraction], area|z15-[tourism=attraction ] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } node|z16[amenity=place_of_worship], area|z16[amenity=place_of_worship] { icon-image: place-of-worship-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;} @@ -198,11 +209,12 @@ node|z16-[natural=spring],area|z16-[natural=spring]{ icon-image: drinking-water- node|z16[amenity=cafe], area|z16[amenity=cafe] { icon-image: cafe-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;} node|z16[amenity=restaurant], area|z16[amenity=restaurant] { icon-image: restaurant-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;icon-min-distance: 10;} node|z16[amenity=theatre], area|z16[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;} - +node|z16-[tourism=attraction], area|z16-[tourism=attraction] { icon-image: tourism-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } +node|z16-[leisure=water_park], area|z16-[leisure=water_park] { icon-image: swimming-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } node|z17[amenity=place_of_worship], area|z17[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;} node|z17[amenity=theatre], area|z17[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; } -node|z17[amenity=kindergarten], area|z17[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 21000; } +node|z17[amenity=kindergarten], area|z17[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2100; } node|z17[amenity=school], area|z17[amenity=school] { icon-image: school-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;} node|z17[amenity=college], area|z17[amenity=college] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;} node|z17[amenity=hospital], area|z17[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } @@ -227,6 +239,8 @@ node|z17-[historic=archaeological_site],area|z17-[historic=archaeological_site] node|z17-[historic=ruins],area|z17-[historic=ruins] { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} node|z17-[historic=fort],area|z17-[historic=fort] { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } node|z17-[historic=castle],area|z17-[historic=castle] { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} +node|z17-[tourism=attraction],area|z17-[tourism=attraction] { icon-image: tourism-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } +node|z17-[leisure=water_park], area|z17-[leisure=water_park] { icon-image: swimming-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } node|z18-[amenity=place_of_worship], area|z18-[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;} @@ -256,6 +270,9 @@ node|z18-[amenity=pub], area|z18-[amenity=pub] { icon-image: beer-l.svg; text-of node|z18-[amenity=nightclub], area|z18-[amenity=nightclub] { icon-image: bar-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;} node|z18-[amenity=bureau_de_change] { icon-image: banknote-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } node|z18-[amenity=bench] { icon-image: bench.svg;z-index: 2400; } +node|z18-[natural=tree] { icon-image: tree-m.svg; z-index: 2400;} +node|z19-[man_made=survey_point] { icon-image: survey_point-l.svg; z-index: 2400;} + node|z18-[amenity=fountain],area|z18-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } node|z18-[amenity=drinking_water],area|z18-[amenity=drinking_water],node|z18-[amenity=water_point],area|z18-[amenity=water_point] { icon-image: drinking-water-l.svg; z-index: 2400;} node|z18-[natural=spring],area|z18-[natural=spring]{ icon-image: drinking-water-l.svg; z-index: 1000; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;} @@ -289,18 +306,22 @@ node|z19-[shop], area|z19-[shop] { icon-image: shop-m.svg; text-offset: 10; font /* SPORT */ /* LEISURE */ -node|z16-[leisure=stadium] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; } -node|z17-[leisure=stadium] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; } +node|z16-[sport=soccer], area|z17-[sport=soccer] { icon-image: soccer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; } +node|z16-[leisure=stadium] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; } +node|z17-[leisure=stadium] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; } -node|z17-[leisure=pitch] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; } -node|z17-[leisure=sports_centre] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; } -node|z17-[leisure=playground] { icon-image: pitch-l.svg; z-index: 2500; } +node|z17-[leisure=pitch] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; } +node|z17-[sport=multi] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; } + +node|z17-[leisure=sports_centre] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; } +node|z18-[leisure=playground] { icon-image: pitch-l.svg; z-index: 2500; } node|z17-[leisure=swimming_pool],area|z18-[leisure=swimming_pool] { icon-image: swimming-l.svg;z-index: 2600; } node|z17-[leisure=golf_course], area|z18-[leisure=golf_course] { icon-image: golf-l.svg;z-index: 50; } /* нельзя другой z-inex^иначе пропадают все объекты на поле */ -node|z17-[sport=soccer], area|z17[sport=soccer] { icon-image: soccer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } +node|z17-[sport=soccer], area|z17-[sport=soccer] { icon-image: soccer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; } +node|z17-[sport=football], area|z17-[sport=football] { icon-image: soccer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; } node|z17-[sport=tennis] { icon-image: tennis-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;} -node|z17-[leisure=pitch][sport=tennis] { icon-image: tennis-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; } +node|z17-[leisure=skiing] { icon-image: skiing-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; } node|z18-[sport=swimming] { icon-image: swimming-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;} node|z18-[sport=baseball] { icon-image: baseball-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;} @@ -312,7 +333,7 @@ node|z18-[sport=gymnastics] { icon-image: pitch-l.svg; text-offset: 10; font-siz node|z16-[highway=speed_camera] { icon-image: speedcam-m.svg; z-index: 2400; } -node|z16[building=hospital], area|z16[building=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } +node|z16[building=hospital], area|z16-[building=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } node|z17-[building=hospital], area|z17-[building=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } @@ -336,14 +357,35 @@ node|z17-[aeroway=helipad] /* MAN MADE */ +node|z15-[landuse=landfill],area|z15-[landuse=landfill] +{ icon-image: recycling-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } + node|z15-16[man_made=lighthouse], area|z15-16[man_made=lighthouse] { icon-image: lighthouse-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;} node|z17-[man_made=lighthouse], area|z17-[man_made=lighthouse] { icon-image: lighthouse-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; } -/* BORDER CONTROL*/ -node|z15-[barrier=border_control]{ icon-image:bcontrol-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } -node|z17-[barrier=border_control]{ icon-image:bcontrol-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } +/* BORDER */ +node|z15-[barrier=toll_booth],area|z15-[barrier=toll_booth] { icon-image: toll_booth-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } +node|z17-[barrier=toll_booth],area|z15-[barrier=toll_booth] { icon-image: toll_booth-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } + +node|z15-[barrier=border_control] +{ icon-image:bcontrol-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } +node|z17-[barrier=border_control] +{ icon-image:bcontrol-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; } + +line|z17-[barrier=block], +line|z17-[barrier=bollard], +line|z17-[barrier=entrance], +line|z17-[barrier=gate], +line|z17-[barrier=stile], +line|z17-[power=tower], +{ icon-image: dot-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; } + + + /* NEW POI */ +node|z18-[craft], area|z18-[craft]{ icon-image: hand-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} + node|z18-[amenity=car_sharing], area|z18-[amenity=car_sharing]{ icon-image: car_sharing-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[amenity=post_box], area|z18-[amenity=post_box]{ icon-image: postbox-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} @@ -354,9 +396,7 @@ node|z18-[amenity=car_rental], area|z18-[amenity=car_rental]{ icon-image: car_sh /*node|z18-[], area|z18-[] { icon-image: none.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }*/ node|z18-[amenity=vending_machine], area|z18-[amenity=vending_machine] { icon-image: vending-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } -node|z18-[amenity=vending_machine][vending=parking_tickets], -area|z18-[amenity=vending_machine][vending=parking_tickets] -{ icon-image: parking-meter-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } +/*node|z18-[vending=parking_tickets], area|z18-[vending=parking_tickets] { icon-image: parking-meter-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }*/ node|z18-[amenity=casino], area|z18-[amenity=casino]{ icon-image: casino-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } @@ -365,13 +405,15 @@ node|z18-[amenity=taxi], area|z18-[amenity=taxi]{ icon-image: taxi-l.svg; text-o node|z18-[barrier=lift_gate], area|z18-[barrier=lift_gate] { icon-image: lift_gate-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[barrier=toll_booth], area|z18-[barrier=toll_booth] { icon-image: toll_booth-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } node|z18-[historic=boundary_stone], area|z18-[historic=boundary_stone]{ icon-image: boundary_stone-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} -node|z18-[historic=ship], area|z18-[historic=ship]{ icon-image: ship-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } +node|z18-[historic=ship], area|z18-[historic=ship]{ icon-image: historic-ship-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } node|z18-[historic=tomb], area|z18-[historic=tomb] { icon-image: tomb-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[historic=wayside_cross], area|z18-[historic=wayside_cross]{ icon-image: wayside_cross-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[historic=wayside_shrine], area|z18-[historic=wayside_shrine] { icon-image: wayside_shrine-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[leisure=dog_park], area|z18-[leisure=dog_park] { icon-image: dog_park-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } -node|z18-[leisure=water_park], area|z18-[leisure=water_park]{ icon-image: diving-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } +node|z18-[leisure=water_park], area|z18-[leisure=water_park]{ icon-image: swimming-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } node|z18-[man_made=windmill], area|z18-[man_made=windmill]{ icon-image: windmill-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} +node|z18-[sport=equestrian], area|z18-[sport=equestrian]{ icon-image: equestrian-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} + node|z18-[shop=books], area|z18-[shop=books]{ icon-image: book-shop-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[shop=bakery], area|z18-[shop=bakery] { icon-image: bakery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} @@ -405,6 +447,7 @@ node|z18-[shop=sports], area|z18-[shop=sports]{ icon-image: sports-l.svg; text-o node|z18-[shop=toys], area|z18-[shop=toys]{ icon-image: toys-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[sport=archery], area|z18-[sport=archery]{ icon-image: archery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} +node|z18-[sport=shooting], area|z18-[sport=shooting]{ icon-image: archery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[sport=australian_football], area|z18-[sport=australian_football]{ icon-image: australian-football-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } node|z18-[sport=bowls], area|z18-[sport=bowls] { icon-image: bowls-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[sport=cricket], area|z18-[sport=cricket]{ icon-image: cricket-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} @@ -419,4 +462,5 @@ node|z18-[tourism=guest_house], area|z18-[tourism=guest_house]{ icon-image: mote node|z18-[tourism=motel], area|z18-[tourism=motel]{ icon-image: motel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} node|z18-[tourism=picnic_site], area|z18-[tourism=picnic_site]{ icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} -node|z18-[natural=beach], area|z18-[natural=beach]{ icon-image: beach-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } +node|z18-[power=station], area|z18-[power=station]{ icon-image: power-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} +node|z18-[power=substation], area|z18-[power=substation]{ icon-image: power-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;} diff --git a/data/styles/clear/include/Z-INDEXES b/data/styles/clear/include/Z-INDEXES index 33dd094064..d51a5fa6e3 100644 --- a/data/styles/clear/include/Z-INDEXES +++ b/data/styles/clear/include/Z-INDEXES @@ -1,6 +1,7 @@ Z-INDEXES -/*NATURE -1000 - 1 */ + +/*NATURE -10 - 1 background */ area|z0-[natural=coastline] {z-index: -10;} @@ -10,7 +11,7 @@ area|z0-[natural=glacier] {z-index: 1;} area|z10-[leisure=beach_resort], area|z10-[natural=beach], -{z-index: 1;} +{z-index: 46;} /*LANDUSE 1- */ @@ -218,3 +219,24 @@ line|z17-[aerialway=mixed_lift] {z-index: 1050;} /*POI 2400-2900*/ + +/* LABELS 2400 - 3100 */ +node|z1-[place=city][capital=2] +{z-index: 1450;} +node|z1-[place=city][capital=3], +node|z1-[place=city][capital=4] +{z-index: 1300;} +node|z1-[place=city] +{z-index: 1200;} +node|z1-[place=town] +{z-index: 1100;} +node|z12[place=village] +{z-index: 1010;} +node|z13-[place=hamlet] +{z-index: 1002;} +node|z7[place=state] +{z-index: 1001;} +node|z3-[place=country] +{z-index: 1000;} +node|z1-[place=continent] +{z-index: 999;} diff --git a/data/styles/clear/include/boundaries.mapcss b/data/styles/clear/include/boundaries.mapcss index a7d04a435f..8267eaafe6 100644 --- a/data/styles/clear/include/boundaries.mapcss +++ b/data/styles/clear/include/boundaries.mapcss @@ -50,6 +50,14 @@ line|z8[boundary=administrative][admin_level=2] z-index: 130; } +line|z9-[boundary=administrative][admin_level=2] +{ + color: @border_country; + width: 1.4; + opacity: 1; + z-index: 130; +} + line|z4[boundary=administrative][admin_level=3] { color: @border_region; @@ -108,6 +116,8 @@ line|z10-[boundary=administrative][admin_level=4] z-index: 130; dashes: 1.8,0.9; } + + /* line|z12-[boundary=administrative][admin_level=4] { diff --git a/data/styles/clear/include/buildings.mapcss b/data/styles/clear/include/buildings.mapcss index fc6603c9bc..45b981bcf9 100644 --- a/data/styles/clear/include/buildings.mapcss +++ b/data/styles/clear/include/buildings.mapcss @@ -1,31 +1,36 @@ -area|z14[building] +area|z14[building], +area|z14[landuse=garages] { fill-color: @building; fill-opacity: 0.5; z-index: 150; } -area|z15[building] +area|z15[building], +area|z15[landuse=garages] { fill-color: @building; fill-opacity: 0.6; z-index: 150; } -area|z16[building] +area|z16[building], +area|z16[landuse=garages] { fill-color: @building; fill-opacity: 0.8; z-index: 150; } -area|z17[building] +area|z17[building], +area|z17[landuse=garages] { fill-color: @building_dark; opacity: 0.9; z-index: 150; } -area|z18-[building] +area|z18-[building], +area|z18-[landuse=garages] { fill-color: @building_dark; opacity: 1; diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss index cbce72c85b..98fd84fc24 100644 --- a/data/styles/clear/include/labels.mapcss +++ b/data/styles/clear/include/labels.mapcss @@ -14,7 +14,7 @@ node|z1[place=continent] font-size: 12; text-color: @country_label; max-width: 5; - z-index: 1100; + z-index: 999; } node|z2[place=continent] @@ -23,7 +23,7 @@ node|z2[place=continent] font-size: 14; text-color: @country_label; max-width: 5; - z-index: 1100; + z-index: 999; } /* COUNTRIES */ @@ -46,7 +46,7 @@ node|z3[place=country]::int_name node|z4[place=country] { text: name; - font-size: 14; + font-size: 12; text-color: @country_label; z-index: 1000; } @@ -54,7 +54,7 @@ node|z4[place=country] node|z4[place=country]::int_name { text: int_name; - font-size: 12; + font-size: 10; text-color: @country_label; z-index: 1000; } @@ -62,49 +62,53 @@ node|z4[place=country]::int_name node|z5[place=country] { text: name; - font-size: 16; + font-size: 14; text-color: @country_label; z-index: 1000; } node|z5[place=country]::int_name { text: int_name; - font-size: 14; + font-size: 12; text-color: @country_label; z-index: 1000; } node|z6-[place=country] { text: name; - font-size: 18; + font-size: 15; text-color: @country_label; z-index: 1000; } node|z6[place=country]::int_name { text: int_name; - font-size: 16; + font-size: 13; text-color: @country_label; z-index: 1000; } /* Z-INDEXES */ -node|z1-[place=city][capital=2] { - z-index: 4000; +node|z1-[place=city][capital=2] +{ + z-index: 1400; } node|z1-[place=city][capital=3], -node|z1-[place=city][capital=4] { - z-index: 3900; +node|z1-[place=city][capital=4] + { + z-index: 1300; } -node|z1-[place=city] { - z-index: 3800; +node|z1-[place=city] +{ + z-index: 1200; } -node|z1-[place=town] { - z-index: 3500; +node|z1-[place=town] +{ + z-index: 1100; } /* STATES */ @@ -132,9 +136,9 @@ node|z4[place=city][capital!=2][population>=1000000], text: name; text-color: @label_dark; text-halo-radius: 1; - text-halo-opacity: 1; + text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 1000; + z-index: 1400; } node|z4[place=city][capital!=2][population>=1000000]::int_name { @@ -144,31 +148,31 @@ node|z4[place=city][capital!=2][population>=1000000]::int_name text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 1000; + z-index: 1400; } node|z4[place=city][capital=2], { icon-image: star-s.svg; - text-offset: 5; + text-offset: 3; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; - text-halo-opacity: 1; + text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 4000; + z-index: 1450; } node|z4[place=city][capital=2]::int_name { - text-offset: 20; + text-offset: 9; font-size: 9; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 4000; + z-index: 1450; } /* CITIES ZOOM 5*/ @@ -178,9 +182,9 @@ node|z4[place=city][capital=2]::int_name text: name; text-color: @label_dark; text-halo-radius: 1; - text-halo-opacity: 1; + text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 1000; + z-index: 1400; } /* @@ -195,26 +199,30 @@ node|z4[place=city][capital=2]::int_name text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 1000; + z-index: 1400; } -node|z5[place=city][capital=2]{ +node|z5[place=city][capital=2] +{ icon-image: star-m.svg; - text-offset: 6; + text-offset: 3; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_medium; + z-index: 1450; } -node|z5[place=city][capital=2]::int_name { - text-offset: 21; +node|z5[place=city][capital=2]::int_name +{ + text-offset: 9; font-size: 9; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; + z-index: 1450; } /* CITIES ZOOM 6*/ @@ -225,9 +233,9 @@ node|z6[place=city][capital!=2][population>=50000], text: name; text-color: @label_dark; text-halo-radius: 1; - text-halo-opacity: 1; + text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 1000; + z-index: 1400; } /* @@ -242,29 +250,31 @@ node|z6[place=city][capital!=2][population>=50000], text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 1000; + z-index: 1400; } -node|z6[place=city][capital=2] { +node|z6[place=city][capital=2] + { icon-image: star-l.svg; - text-offset: 6; + text-offset: 4; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; - text-halo-opacity: 1; + text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 9000; + z-index: 1450; } -node|z6[place=city][capital=2]::int_name { - text-offset: 21; +node|z6[place=city][capital=2]::int_name +{ + text-offset: 10; font-size: 9; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 9000; + z-index: 1450; } /* CITIES ZOOM 7*/ @@ -280,9 +290,9 @@ node|z7[place=city][capital!=2][population>=40000], text: name; text-color: @label_dark; text-halo-radius: 1; - text-halo-opacity: 1; + text-halo-opacity: 0.6; text-halo-color: @label_halo_medium; - z-index: 5000; + z-index: 1400; } node|z7[place=city][capital!=2][population>=40000]::int_name { @@ -292,54 +302,56 @@ node|z7[place=city][capital!=2][population>=40000]::int_name text-halo-radius: 1; text-halo-opacity: 0.6; text-halo-color: @label_halo_medium; - z-index: 5000; + z-index: 1400; } node|z7[place=city][capital=2]{ icon-image: star-l.svg; - text-offset: 6; + text-offset: 5; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; - text-halo-opacity: 1; + text-halo-opacity: 0.6; text-halo-color: @label_halo_medium; - z-index: 9000; + z-index: 1450; } -node|z7[place=city][capital=2]::int_name { - text-offset: 21; +node|z7[place=city][capital=2]::int_name +{ + text-offset: 11; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.6; text-halo-color: @label_halo_medium; - z-index: 9000; + z-index: 1450; } node|z7[place=state] { text: name; font-size: 11; text-color: @state_name; - z-index: -10; + z-index: 1001; } node|z7[place=state]::int_name { text: int_name; font-size: 10; text-color: @state_name; - z-index: -10; + z-index: 1001; } /* CITIES ZOOM 8*/ + node|z8[place=city][capital!=2][population>=40000], { font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; - text-halo-opacity: 1; + text-halo-opacity: 0.6; text-halo-color: @label_halo_medium; - z-index: 3000; + z-index: 1400; } /* icon-image: dot-m.svg; @@ -353,122 +365,124 @@ node|z8[place=city][capital!=2][population>=40000], text-halo-radius: 1; text-halo-opacity: 0.6; text-halo-color: @label_halo_medium; - z-index: 3000; + z-index: 1400; } -node|z8[place=city][capital=2] { +node|z8[place=city][capital=2] + { icon-image: star-l.svg; - text-offset: 6; + text-offset: 5; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; - text-halo-opacity: 1; + text-halo-opacity: 0.6; text-halo-color: @label_halo_medium; - z-index: 9000; + z-index: 1450; } -node|z8[place=city][capital=2]::int_name { - text-offset: 21; +node|z8[place=city][capital=2]::int_name +{ + text-offset: 11; font-size: 11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.6; text-halo-color: @label_halo_medium; - z-index: 9000; + z-index: 1450; } -node|z8[place=town][population>=40000] { +node|z8[place=town][population>=40000] +{ font-size: 10; text: name; text-color: @city_label; - z-index: 2000; + z-index: 1100; } -node|z8[place=town][population>=40000]::int_name { +node|z8[place=town][population>=40000]::int_name +{ font-size: 9; text: int_name; text-color: @city_label; - z-index: 2000; + z-index: 1100; } node|z8[place=state] { text: name; font-size: 12; text-color: @state_name; - z-index: -10; + z-index: 1001; } node|z8[place=state]::int_name { text: int_name; font-size: 11; text-color: @state_name; - z-index: -10; + z-index: 1001; } /* ZOOM 9 */ -node|z9[place=city] { +node|z9[place=city] +{ font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 0.5; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - /* - icon-image: dot-s.svg; - text-offset: 4; - */ + z-index: 1200; + } -node|z9[place=city]::int_name { +node|z9[place=city]::int_name +{ font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 0.5; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - /* - icon-image: dot-s.svg; - text-offset: 4; - */ + z-index: 1200; + } -node|z9[place=city][capital=2] { +node|z9[place=city][capital=2] +{ icon-image: star-l.svg; - text-offset: 6; - font-size: 12; + text-offset: 5; + font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 0.5; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 3900; + z-index: 1450; } -node|z9[place=city][capital=2]::int_name { - text-offset: 21; - font-size: 11; +node|z9[place=city][capital=2]::int_name +{ + text-offset: 11; + font-size: 12; text: int_name; text-color: @label_dark; text-halo-radius: 0.5; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; - z-index: 3900; + z-index: 1450; } -node|z9[place=town][population>=20000] { +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; + z-index: 1100; } -node|z9[place=town][population>=20000]::int_name { - font-size: 8; +node|z9[place=town][population>=20000]::int_name +{ + font-size: 9; text: int_name; text-color: @city_label; - text-halo-radius: 1; - text-halo-opacity: 0.5; - text-halo-color: @label_halo_bg; + z-index: 1100; } node|z9[place=state] @@ -476,68 +490,73 @@ node|z9[place=state] text: name; font-size: 12; text-color: @state_name; - z-index: -10; + z-index: 1001; } node|z9[place=state]::int_name { text: int_name; - font-size: 12; + font-size: 11; text-color: @state_name; - z-index: -10; +z-index: 1001; } /* ZOOM 10 */ -node|z10[place=city] { - font-size: 12; +node|z10[place=city] +{ + font-size: 11; text: name; text-color: @label_medium; text-halo-radius:1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; - z-index: 2000; + z-index: 1200; } -node|z10[place=city]::int_name { - font-size: 11; +node|z10[place=city]::int_name + { + font-size: 10; text: int_name; text-color: @label_medium; text-halo-radius:1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; - z-index: 2000; + z-index: 1200; } -node|z10[place=city][capital=2]{ +node|z10[place=city][capital=2] +{ icon-image: star-l.svg; - text-offset: 6; - font-size: 12; + text-offset: 3; + font-size: 13; text: name; text-color: @label_dark; text-halo-radius:1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; - z-index: 9000; + z-index: 1450; } -node|z10[place=city][capital=2]::int_name { - text-offset: 21; - font-size: 11; +node|z10[place=city][capital=2]::int_name +{ + text-offset: 9; + font-size: 12; text: int_name; text-color: @label_dark; text-halo-radius:1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; - z-index: 9000; + z-index: 1450; } -node|z10[place=town] { +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: 9000; + z-index: 1100; } node|z10[place=town]::int_name { font-size: 9; @@ -546,256 +565,293 @@ node|z10[place=town]::int_name { text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_bg; - z-index: 2000; + z-index: 1100; } -node|z9[place=state] +node|z10[place=state] { text: name; font-size: 12; text-color: @state_name; - z-index: -10; + z-index: 1001; } node|z10[place=state]::int_name { text: int_name; font-size: 11; text-color: @state_name; - z-index: -10; + z-index: 1001; } /* 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]::int_name { - font-size: 13; - text: int_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=city][capital=2]::int_name { - icon-image: star-l.svg; - text-offset: 4; - font-size: 13; - text: int_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] { +node|z11[place=city] + { font-size: 12; text: name; + text-color: @label_dark; + text-halo-radius:1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 1200; +} +node|z11[place=city]::int_name +{ + font-size: 11; + text: int_name; + text-color: @label_dark; + text-halo-radius:1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 1200; +} +node|z11[place=city][capital=2] +{ + icon-image: star-l.svg; + text-offset: 4; + font-size: 12; + text: name; + text-color: @label_dark; + text-halo-radius:1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 1450; +} +node|z11[place=city][capital=2]::int_name +{ + icon-image: star-l.svg; + text-offset: 10; + font-size: 11; + text: int_name; + text-color: @label_dark; + text-halo-radius:1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 1450; +} +node|z11[place=town] +{ + font-size: 11; + text: name; text-color: @label_medium; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; + z-index: 1100; } -node|z11[place=town]::int_name { +node|z11[place=town]::int_name +{ font-size: 10; text: int_name; text-color: @label_medium; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_medium; + z-index: 1100; } -node|z11[place=village] { +node|z11[place=village] +{ font-size: 10; text: name; text-color: @city_label; text-halo-radius: 1; text-halo-color: @city_halo; - z-index: 2000; + z-index: 1050; } -node|z11[place=village]::int_name { +node|z11[place=village]::int_name +{ font-size: 9; text: name; text-color: @city_label; text-halo-radius: 1; text-halo-color: @city_halo; - z-index: 2000; + z-index: 1050; } /* ZOOM 12 */ -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]::int_name { +node|z12[place=city] +{ font-size: 13; - text: int_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; -} -node|z12[place=city][capital=2]::int_name { - icon-image: star-l.svg; - text-offset: 4; - font-size: 15; - text: int_name; - text-color: @label_dark; - text-halo-radius: 1; - text-halo-opacity: 0.5; - text-halo-color: @label_halo_light; - z-index: 3900; -} -node|z12[place=town] { - font-size: 14; text: name; text-color: @label_medium; text-halo-radius: 1; text-halo-opacity: 0.5; - text-halo-color: @label_halo_medium; + text-halo-color: @label_halo_light; + z-index: 1200; } -node|z12[place=town]::int_name { - font-size: 13; - text: int_name; - text-color: @label_medium; - text-halo-radius: 1; - text-halo-opacity: 0.5; - text-halo-color: @label_halo_medium; -} -node|z12[place=village] { - font-size: 12; - text: name; - text-color: @city_label; - text-halo-radius: 1; - text-halo-color: @city_halo; -} -node|z12[place=village]::int_name { +node|z12[place=city]::int_name + { font-size: 11; text: int_name; + text-color: @label_medium; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 1200; + +} +node|z12[place=city][capital=2] +{ + icon-image: star-l.svg; + text-offset: 4; + font-size: 13; + text: name; + text-color: @label_dark; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 1450; +} +node|z12[place=city][capital=2]::int_name +{ + icon-image: star-l.svg; + text-offset: 10; + font-size: 11; + text: int_name; + text-color: @label_dark; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 1450; +} +node|z12[place=town] +{ + font-size: 12; + text: name; + text-color: @label_medium; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_medium; + z-index: 1100; +} +node|z12[place=town]::int_name +{ + font-size: 10; + text: int_name; + text-color: @label_medium; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_medium; + z-index: 1100; +} +node|z12[place=village] +{ + font-size: 11; + text: name; text-color: @city_label; text-halo-radius: 1; text-halo-color: @city_halo; + z-index: 1010; +} +node|z12[place=village]::int_name +{ + font-size: 9; + text: int_name; + text-color: @city_label; + text-halo-radius: 1; + text-halo-color: @city_halo; + z-index: 1010; } /* ZOOM 13 */ -node|z13-17[place=town] { +node|z13-[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; + z-index: 1200; } -node|z13-17[place=town]::int_name { +node|z13-[place=city]::int_name +{ font-size: 12; text: int_name; text-color: @label_medium; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; + z-index: 1200; } - -node|z13-17[place=village] { - font-size: 14; - text: name; - text-color: @label_medium; - text-halo-radius: 1; - text-halo-opacity: 0.5; - text-halo-color: @label_halo_light; - z-index: 1; -} -node|z13-17[place=village]::int_name { - font-size: 12; - text: int_name; - text-color: @label_medium; - text-halo-radius: 1; - text-halo-opacity: 0.5; - text-halo-color: @label_halo_light; - z-index: 1; -} - -node|z13-14[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; - z-index: 1; -} -node|z13-14[place=city]::int_name { - font-size: 13; - text: int_name; - text-color: @label_medium; - text-halo-radius: 1; - text-halo-opacity: 0.5; - text-halo-color: @label_halo_light; - z-index: 1; -} -node|z13-14[place=city][capital=2] { +node|z13-[place=city][capital=2] +{ icon-image: star-l.svg; text-offset: 4; - font-size: 16; + font-size: 14; text: name; text-color: @label_medium; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; - z-index: 1; + z-index: 1450; } -node|z13-14[place=city][capital=2]::int_name { - text-offset: 4; - font-size: 15; +node|z13-[place=city][capital=2]::int_name + { + text-offset: 10; + font-size: 12; text: int_name; text-color: @label_medium; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; - z-index: 1; + z-index: 1450; } -node|z13-[place=hamlet] { +node|z13-[place=town] +{ + font-size: 14; + text: name; + text-color: @label_medium; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 1100; +} +node|z13-[place=town]::int_name +{ + font-size: 12; + text: int_name; + text-color: @label_medium; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 1100; +} + +node|z13-[place=village] +{ + font-size: 13; + text: name; + text-color: @label_medium; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 1010; +} +node|z13-[place=village]::int_name + { + font-size: 12; + text: int_name; + text-color: @label_medium; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + z-index: 1010; +} + + +node|z13-[place=hamlet] +{ font-size: 12; text: name; text-color: @label_light; text-halo-radius: 1; text-halo-opacity: 0.3; text-halo-color: @label_halo_light; - z-index: 1; + z-index: 1002; } /* ROADS */ @@ -815,7 +871,7 @@ line|z10-11[highway=primary], line|z10-11[highway=primary_link] { shield-font-size: 9; shield-text-color: @shield; - shield-text-halo-radius: 2; + shield-text-halo-radius: 0.5; shield-text-halo-color: @shield_halo; shield-text-halo-opacity: 1; shield-min-distance: 18; @@ -826,17 +882,17 @@ line|z10-11[highway=motorway], line|z10-11[highway=trunk], line|z10-11[highway=motorway_link], line|z10-11[highway=trunk_link] { - font-size: 9; + font-size: 10; text: name; text-color: @label_dark; - text-halo-opacity: 0.5; + text-halo-opacity: 0.3; text-halo-radius: 1; text-halo-color: @label_halo_medium; } line|z10-11[highway=primary], line|z10-11[highway=primary_link] { - font-size: 9; + font-size: 10; text: name; text-color: @label_medium; text-halo-opacity: 0.3; @@ -846,7 +902,7 @@ line|z10-11[highway=primary_link] { } line|z10-11[highway=secondary] { - font-size: 9; + font-size: 10; text: name; text-color: @label_light; text-halo-opacity: 0.3; @@ -895,7 +951,7 @@ line|z12-13[highway=primary_link] { } line|z12-13[highway=secondary] { - font-size: 9; + font-size: 10; text: name; text-color: @label_light; text-halo-opacity: 0.3; @@ -905,7 +961,7 @@ line|z12-13[highway=secondary] { line|z12-13[highway=residential], line|z12-13[highway=tertiary] { - font-size: 8; + font-size: 10; text: name; text-color: @label_light; text-halo-opacity: 0; @@ -969,8 +1025,9 @@ line|z14[highway=residential], line|z14[highway=tertiary], line|z14[highway=unclassified], line|z14[highway=living_street], -line|z14[highway=pedestrian] { - font-size: 9; +line|z14[highway=pedestrian], + { + font-size: 10; text: name; text-color: @label_medium; text-halo-opacity: 0.5; @@ -988,7 +1045,7 @@ line|z15[highway=tertiary], line|z15[highway=unclassified], line|z15[highway=living_street], line|z15[highway=pedestrian] { - font-size: 10; + font-size: 11; text: name; text-color: @label_medium; text-halo-opacity: 0.5; @@ -1035,7 +1092,19 @@ line|z16-17[highway=secondary] { /* SECONDARY LABELS */ line|z15-[highway=bridleway], line|z15-[highway=path], -line|z15-[highway=footway] { +line|z15-[highway=footway], +line|z15-[highway=cycleway] { + font-size: 8; + text: name; + text-color: @label_medium; + text-halo-opacity: 0.5; + text-halo-radius: 1; + text-halo-color: @label_halo_light; +} +line|z16-17[highway=bridleway], +line|z16-17[highway=path], +line|z16-17[highway=footway], +line|z16-17[highway=cycleway] { font-size: 9; text: name; text-color: @label_medium; @@ -1043,7 +1112,17 @@ line|z15-[highway=footway] { text-halo-radius: 1; text-halo-color: @label_halo_light; } - +line|z18-[highway=bridleway], +line|z18-[highway=path], +line|z18-[highway=footway], +line|z18-[highway=cycleway] { + font-size: 10; + text: name; + text-color: @label_medium; + text-halo-opacity: 0.5; + text-halo-radius: 1; + text-halo-color: @label_halo_light; +} line|z16-17[highway=primary_link], line|z16-17[highway=motorway_link], line|z16-17[highway=trunk_link], @@ -1051,10 +1130,9 @@ line|z16-17[highway=residential], line|z16-17[highway=tertiary], line|z16-17[highway=unclassified], line|z16-17[highway=living_street], -line|z16-17[highway=pedestrian], -line|z16-17[highway=bridleway], -line|z16-17[highway=path] { - font-size: 11; + + { + font-size: 12; text: name; text-color: @label_medium; text-halo-opacity: 0.5; @@ -1062,6 +1140,17 @@ line|z16-17[highway=path] { text-halo-color: @label_halo_light; } +line|z16-17[highway=pedestrian], +line|z16-17[highway=service] +{ + font-size: 10; + text: name; + text-color: @label_medium; + text-halo-opacity: 0.5; + text-halo-radius: 1; + text-halo-color: @label_halo_light; +} + /* ZOOM 18+ */ /*SHIELDS FOR TRUNKS */ @@ -1098,9 +1187,8 @@ line|z18-[highway=tertiary], line|z18-[highway=unclassified], line|z18-[highway=living_street], line|z18-[highway=pedestrian], -line|z18-[highway=path], -line|z18-[highway=bridleway], -line|z18-[highway=service] { +line|z18-[highway=service], + { font-size: 12; text: name; text-color: @label_medium; @@ -1266,13 +1354,20 @@ area|z15-[area:highway=footway], /* INDUSTRIAL */ area|z15-[landuse=industrial], +node|z15-[landuse=industrial], area|z15-[landuse=construction], -node|z15-[landuse=industrial]{ +area|z15-[landuse=railway], +area|z15-[landuse=quarry], +node|z15-[landuse=construction], +node|z15-[landuse=landfill], +node|z15-[landuse=railway], +node|z15-[landuse=quarry], + +{ text: name; font-size: 10; text-color: @city_label; text-position: center; - z-index: 5000; } /* COMMERCIAL */ @@ -1339,10 +1434,12 @@ area|z12-[place=island] } node|z14-15[natural=water], -node|z14-15[natural=bay] +node|z14-15[natural=bay], +area|z14-15[natural=water], +area|z14-15[natural=bay] { text: name; - font-size: 8; + font-size: 10; text-color: @water_label; text-halo-opacity: 0.1; text-halo-color: @halo_water_lable; @@ -1350,7 +1447,13 @@ node|z14-15[natural=bay] } node|z16-[natural=water], -node|z16-[natural=bay] +node|z16-[natural=bay], +area|z16-[natural=water], +area|z16-[natural=bay], +node|z16-[natural=wetland], +node|z16-[natural=marsh] +area|z16-[natural=wetland], +area|z16-[natural=marsh] { text: name; font-size: 11; @@ -1574,11 +1677,11 @@ area|z14-[landuse=forest][name] { icon-image: park-s.svg; text-offset: 8; text: name; - font-size: 10; + font-size: 11; text-color: @park_label; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; - text-halo-opacity: 1; + text-halo-radius: 0.5; + text-halo-opacity: 0.8; } area|z14-[leisure=park][!name], area|z14-[landuse=forest][!name] { @@ -1590,28 +1693,29 @@ area|z14-[landuse=forest][name]::int_name { font-size: 10; text-color: @park_label; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; - text-halo-opacity: 1; + text-halo-radius: 0.5; + text-halo-opacity: 0.8; } area|z15-[leisure=park][name], area|z15-[landuse=forest][name] { icon-image: park-m.svg; text-offset: 8; text: name; - font-size: 10; + font-size: 11; text-color: @park_label; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; - text-halo-opacity: 1; + text-halo-radius: 0.5; + text-halo-opacity: 0.8; } area|z15-[leisure=park][name]::int_name, area|z15-[landuse=forest][name]::int_name { text-offset: 18; + font-size: 10; text: int_name; text-color: @park_label; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; - text-halo-opacity: 1; + text-halo-radius: 0.5; + text-halo-opacity: 0.8; } /* area|z15[leisure=garden][name] { @@ -1636,21 +1740,21 @@ area|z16[landuse=forest][name]{ icon-image: park-m.svg; text-offset: 10; text: name; - font-size: 11; + font-size: 12; text-color: @park_label; - text-halo-opacity: 1; + text-halo-opacity: 0.8; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; + text-halo-radius: 0.5; } area|z16[leisure=garden][name] { icon-image: garden-m.svg; text-offset: 10; text: name; - font-size: 11; + font-size: 12; text-color: @park_label; - text-halo-opacity: 0.4; + text-halo-opacity: 0.8; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; + text-halo-radius: 0.5; icon-min-distance: 10; } area|z16[leisure=park][!name], @@ -1662,11 +1766,11 @@ area|z16[leisure=garden][name]::int_name, area|z16[landuse=forest][name]::int_name { text-offset: 18; text: int_name; - font-size: 11; + font-size: 10; text-color: @park_label; - text-halo-opacity: 1; + text-halo-opacity: 0.8; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; + text-halo-radius: 0.5; } area|z16[leisure=park][!name]::int_name, area|z16[leisure=garden][!name]::int_name, @@ -1681,9 +1785,9 @@ area|z17[landuse=forest][name] { text: name; font-size: 12; text-color: @park_label; - text-halo-opacity: 1; + text-halo-opacity: 0.8; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; + text-halo-radius: 0.5; } area|z17[leisure=garden][name] { @@ -1692,9 +1796,9 @@ area|z17[leisure=garden][name] { text: name; font-size: 11; text-color: @park_label; - text-halo-opacity: 0.4; + text-halo-opacity: 0.8; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; + text-halo-radius: 0.5; icon-min-distance: 10; } area|z17[leisure=park][!name], @@ -1709,11 +1813,11 @@ area|z17[leisure=forest][name]::int_name { text-offset: 10; text: int_name; - font-size: 13; + font-size: 10; text-color: @park_label; - text-halo-opacity: 1; + text-halo-opacity: 0.8; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; + text-halo-radius: 0.5; } area|z17[leisure=park][!name]::int_name, area|z17[leisure=garden][!name]::int_name, @@ -1728,30 +1832,30 @@ area|z18-[landuse=forest]{ text: name; font-size: 13; text-color: @park_label; - text-halo-opacity: 1; + text-halo-opacity: 0.8; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; + text-halo-radius: 0.5; } area|z18-[leisure=garden]{ icon-image: garden-l.svg; text-offset: 10; text: name; - font-size: 11; + font-size: 13; text-color: @park_label; - text-halo-opacity: 0.4; + text-halo-opacity: 0.8; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; + text-halo-radius: 0.5; } area|z18-[leisure=park]::int_name, area|z18-[leisure=garden]::int_name, area|z18-[leisure=forest]::int_name { text-offset: 18; text: int_name; - font-size: 13; + font-size: 11; text-color: @park_label; - text-halo-opacity: 1; + text-halo-opacity: 0.8; text-halo-color: @halo_park_lable; - text-halo-radius: 0.1; + text-halo-radius: 0.5; } /* BEACH LABELS */ diff --git a/data/styles/clear/include/landuse.mapcss b/data/styles/clear/include/landuse.mapcss index 009346f122..df0a709fd5 100644 --- a/data/styles/clear/include/landuse.mapcss +++ b/data/styles/clear/include/landuse.mapcss @@ -12,6 +12,7 @@ fill-color: @background; area|z12-[man_made=pier], area|z12-[man_made=breakwater], + { fill-color: @background; fill-opacity: 1; @@ -20,7 +21,9 @@ area|z12-[man_made=breakwater], } line|z14-[man_made=pier], -line|z14-[man_made=breakwater] +line|z14-[man_made=breakwater], +line|z14-[man_made=cutline] + { casing-width: 2; casing-color: @background; fill-color: @background; @@ -29,7 +32,8 @@ line|z14-[man_made=breakwater] fill-position: background; } line|z17-[man_made=pier], -line|z17-[man_made=breakwater] +line|z17-[man_made=breakwater], +line|z17-[man_made=cutline] { casing-width: 2; casing-color: @background; fill-color: @background; @@ -45,12 +49,15 @@ 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] + { fill-color: @pedestrian_area; fill-position: background; fill-opacity: 1; z-index: 44; - + } area|z16-[highway=pedestrian][area?], @@ -71,7 +78,12 @@ area|z16-[area:highway=living_street], area|z15-[landuse=industrial], -area|z15-[landuse=construction]{ +area|z15-[landuse=construction], +area|z15-[landuse=landfill], +area|z15-[landuse=railway], +area|z15-[landuse=quarry] + +{ fill-color: @industrial; fill-position: background; fill-opacity: 1; @@ -137,10 +149,23 @@ area|z18-[amenity=university] { z-index: 1; } -area|z16-[leisure=pitch], +area|z15-[leisure=stadium], +area|z17-[leisure=playground], +area|z17-[sport=multi] + { + fill-color: @sport; + fill-position: background; + fill-opacity: 1; + z-index: 5; +} + + +area|z15-[leisure=pitch], area|z16-[sport=soccer], area|z15-[leisure=stadium], -area|z17-[leisure=playground] { +area|z17-[leisure=playground], +area|z17-[sport=multi] + { fill-color: @sport; fill-position: background; fill-opacity: 1; diff --git a/data/styles/clear/include/natural.mapcss b/data/styles/clear/include/natural.mapcss index 26a7745f0e..5994a6d721 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] @@ -8,7 +9,9 @@ area|z0-9[natural=land] z-index: 0; } -area|z10-[natural=land] +area|z10-[natural=land], +area|z10-[place=islet], +area|z10-[place=islet] { fill-opacity: 1; fill-color: @background; @@ -55,6 +58,8 @@ area|z13-[leisure=swimming_pool], area|z0-[natural=lake], area|z0-[natural=pond], area|z0-[natural=water], +area|z0-[natural=salt_pond], +area|z0-[landuse=salt_pond], area|z0-[waterway=dock], area|z0-[waterway=riverbank], area|z10-[waterway=river], @@ -66,10 +71,11 @@ area|z10-[natural=bay], } -area|z11-[natural=wetland] { +area|z11-19[natural=wetland], +area|z11-19[natural=marsh] { z-index: 49; - fill-opacity: 0.3; - fill-color: @water; + fill-opacity: 1; + fill-color: @wetland; fill-position: background; } @@ -84,6 +90,10 @@ line|z10[waterway=riverbank] { z-index: 50; } +line|z10-19[waterway=river][tunnel?], + { +} + line|z11-12[waterway=river], line|z11-12[waterway=riverbank] { width: 0.8; @@ -92,6 +102,7 @@ line|z11-12[waterway=riverbank] { z-index: 50; } + line|z13-14[waterway=stream], line|z13-14[waterway=canal]{ width: 0.2; @@ -100,6 +111,7 @@ line|z13-14[waterway=canal]{ z-index: 50; } + line|z13-14[waterway=stream][intermittent=yes] { dashes: 2.7,2.7; z-index: 49; @@ -149,20 +161,29 @@ line|z15-[waterway=riverbank] { area|z15-[waterway=dam], line|z15-[waterway=dam], -line|z15-[waterway=wair], +line|z15-[waterway=weir], { width: 1; opacity: 1; color: @bridge_casing; z-index: 110; } -line|z16-[waterway=canal] +line|z16-[waterway=canal], +node|z16-[waterway=lock] { width: 1.5; color: @river; z-index: 50; } -line|z17-[waterway=ditch] { + +node|z16-[waterway=lock_gate], + { + icon-image: dot-m.svg; + z-index: 110; +} + +line|z17-[waterway=ditch], +line|z17-[waterway=drain] { width: 1.8; opacity: 1; color: @river; @@ -288,7 +309,8 @@ area|z16-[leisure=park], area|z16-[leisure=garden] { area|z13-[landuse=grass], area|z13-[natural=grassland], -area|z13-[leisure=golf_course] +area|z13-[leisure=golf_course], +area|z13-[natural=heath], { fill-color: @green0; @@ -305,6 +327,7 @@ area|z13-[landuse=vineyard], area|z13-[landuse=meadow], area|z13-[landuse=recreation_ground], area|z13-[landuse=village_green], +area|z13-[landuse=field], { fill-color: @green0; @@ -315,7 +338,8 @@ area|z13-[landuse=village_green], area|z14-[landuse=grass], area|z14-[natural=grassland], -area|z14-[leisure=golf_course] +area|z14-[leisure=golf_course], +area|z14-[natural=heath], { fill-color: @green1; @@ -332,7 +356,7 @@ area|z14-[landuse=vineyard], area|z14-[landuse=meadow], area|z14-[landuse=recreation_ground], area|z14-[landuse=village_green], - +area|z14-[landuse=field] { fill-color: @green1; @@ -349,7 +373,7 @@ area|z10-14[natural=beach], fill-color: @beach; fill-position: background; fill-opacity: 1; - z-index: 1; + z-index: 46; } area|z15-[leisure=beach_resort], area|z15-[natural=beach], @@ -357,7 +381,7 @@ area|z15-[natural=beach], fill-color: @beach; fill-position: background; fill-opacity: 1; - z-index: 1; + z-index: 46; } area|z17-[leisure=beach_resort], area|z17-[natural=beach], diff --git a/data/styles/clear/include/newPOI b/data/styles/clear/include/newPOI index df47197b43..d51d43e5a0 100644 --- a/data/styles/clear/include/newPOI +++ b/data/styles/clear/include/newPOI @@ -7,9 +7,7 @@ node|z18-[amenity=car_rental], area|z18-[amenity=car_rental]{ icon-image: car_sh node|z18-[], area|z18-[] { icon-image: none.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } node|z18-[amenity=vending_machine], area|z18-[amenity=vending_machine] { icon-image: vending-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } -node|z18-[amenity=vending_machine][vending=parking_tickets], -area|z18-[amenity=vending_machine][vending=parking_tickets] -{ icon-image: parking-meter-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } +node|z18-[vending=parking_tickets], area|z18-[vending=parking_tickets] { icon-image: parking-meter-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } node|z18-[amenity=casino], area|z18-[amenity=casino]{ icon-image: casino-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; } diff --git a/data/styles/clear/include/other.mapcss b/data/styles/clear/include/other.mapcss index 0c26d0ef2a..7e6cf6f9c0 100644 --- a/data/styles/clear/include/other.mapcss +++ b/data/styles/clear/include/other.mapcss @@ -8,7 +8,7 @@ line|z16[barrier=hedge], line|z16[historic=citywalls], { color: @fence; - width: 0.5; + width: 0.7; opacity: 1; z-index: 950; dashes: 0.09,0.09; @@ -22,7 +22,7 @@ line|z17-[barrier=hedge], line|z17-[historic=citywalls], { color: @fence; - width: 1; + width: 1.2; opacity: 1; z-index: 950; dashes: 0.18,0.18; @@ -35,11 +35,14 @@ line|z18-[barrier=hedge], line|z18-[historic=citywalls], { color: @fence; - width: 1; + width: 1.4; z-index: 950; dashes: 0.18,0.18; } + + + /* PISTE */ /* node|z13[aerialway=station] { symbol-shape: circle; symbol-fill-color: grey; symbol-size: 2; } */ @@ -66,13 +69,25 @@ line|z15-[piste:lift=t-bar] { z-index: 6888; } -line|z14[piste:type=downhill], line|z14[piste:type=nordic], line|z14[piste:type=sled] { +line|z19-[power=line] { + color: @aerialway; + width: 1; + opacity: 1; + z-index: 2000; +} + + +line|z14[piste:type=downhill], +line|z14[piste:type=nordic], +line|z14[piste:type=sled], +{ color: @piste; width: 0.8; opacity: 1; z-index: 10; } -line|z14[route=ski] { +line|z14[route=ski], +line|z14[leisure=skiing] { color: @piste; width: 0.8; opacity: 1; @@ -91,7 +106,8 @@ line|z15-[piste:type=nordic]{ z-index: 199; } -line|z15-[route=ski] { +line|z15-[route=ski], +line|z15-[leisure=skiing] { color: @piste; width: 1.1; opacity: 1; @@ -107,7 +123,8 @@ line|z17-[piste:type=sled] { opacity: 1; z-index: 199; } -line|z17-[route=ski] { +line|z17-[route=ski], +line|z17-[leisure=skiing] { color: @piste; width: 1.5; opacity: 1; diff --git a/data/styles/clear/include/roads.mapcss b/data/styles/clear/include/roads.mapcss index 5f2b2f9890..424a396418 100644 --- a/data/styles/clear/include/roads.mapcss +++ b/data/styles/clear/include/roads.mapcss @@ -194,7 +194,7 @@ line|z11[highway=primary]::case line|z11[highway=secondary] { color: @secondary; - width: 1.1; + width: 1.2; opacity: 1; z-index: 800; } @@ -203,7 +203,7 @@ line|z11[highway=residential], line|z11[highway=tertiary] { color: @residential; - width: 0.4; + width: 0.8; opacity: 1; z-index: 750; } @@ -272,7 +272,7 @@ line|z12[highway=road], line|z12[highway=living_street] { color: @residential; - width: 0.8; + width: 1.2; opacity: 1; z-index: 750; } @@ -362,7 +362,8 @@ line|z13[highway=living_street] z-index: 700; } -line|z13[highway=pedestrian] +line|z13[highway=pedestrian], +line|z13[highway=ford] { color: @pedestrian; width: 1; @@ -381,7 +382,8 @@ line|z13[highway=cycleway] opacity: 0.8;*/ } -line|z13[highway=construction] +line|z13[highway=construction], +line|z13[highway=proposed] { color: @construction; opacity: 1; @@ -498,11 +500,12 @@ line|z14[highway=road] z-index: 700; } -line|z14[highway=pedestrian] +line|z14[highway=pedestrian], +line|z14[highway=ford] { color: @pedestrian; width: 1.6; - dashes: 3.6,1.44;/*dashes: 3.6,1.8;*/ + dashes: 3.6,1.6;/*dashes: 3.6,1.8;*/ opacity: 1; z-index: 660; } @@ -516,6 +519,8 @@ line|z14[highway=service] } line|z14[highway=track][tracktype=grade1], +line|z14[highway=raceway], +line|z14[leisure=track] { color: @track; opacity: 1; @@ -526,6 +531,7 @@ line|z14[highway=track], line|z14[highway=path], line|z14[route=hiking] { + color: @track; opacity: 1; dashes: 2.52,1.35; @@ -552,7 +558,8 @@ line|z14[highway=footway] z-index: 600; } -line|z14[highway=construction] +line|z14[highway=construction], +line|z14[highway=proposed] { color: @construction; opacity: 1; @@ -683,11 +690,12 @@ line|z15[highway=road] opacity: 1; z-index: 700; } -line|z15[highway=pedestrian] +line|z15[highway=pedestrian], +line|z15[highway=ford] { color: @pedestrian; width: 2; - dashes: 5,2;/*dashes: 3.6,1.8;*/ + dashes: 5,2.2;/*dashes: 3.6,1.8;*/ opacity: 1; z-index: 660; } @@ -706,6 +714,8 @@ line|z15[highway=service][service=driveway] } line|z15[highway=track][tracktype=grade1], +line|z15[highway=raceway], +line|z15[leisure=track] { color: @track; opacity: 1; @@ -719,7 +729,7 @@ line|z15[route=hiking] color: @track; opacity: 1; dashes: 2.7,1.26; - width: 1.3; + width: 1.1; z-index: 600; } @@ -750,7 +760,8 @@ line|z15[highway=cycleway] z-index: 1000; } -line|z15[highway=construction] +line|z15[highway=construction], +line|z15[highway=proposed] { color: @construction; opacity: 1; @@ -898,7 +909,8 @@ line|z16[highway=service] z-index: 650; } -line|z16[highway=pedestrian] +line|z16[highway=pedestrian], +line|z16[highway=ford] { color: @pedestrian; width: 2.4; @@ -933,6 +945,8 @@ line|z16[highway=service][service=driveway] } line|z16[highway=track][tracktype=grade1], +line|z16[highway=raceway], +line|z16[leisure=track] { color: @track; opacity: 1; @@ -968,7 +982,8 @@ line|z16[highway=steps] z-index: 1000; } -line|z16[highway=construction] +line|z16[highway=construction], +line|z16[highway=proposed] { color: @construction; opacity: 1; @@ -1119,7 +1134,8 @@ line|z17[highway=road] z-index: 700; } -line|z17[highway=pedestrian] +line|z17[highway=pedestrian], +line|z17[highway=ford] { color: @pedestrian; width: 3; @@ -1171,6 +1187,8 @@ line|z17[highway=service] } line|z17[highway=track][tracktype=grade1], +line|z17[highway=raceway], +line|z17[leisure=track] { color: @track; opacity: 1; @@ -1205,7 +1223,8 @@ line|z17[highway=steps] z-index: 1000; } -line|z17[highway=construction] +line|z17[highway=construction], +line|z17[highway=proposed] { color: @construction; opacity: 1; @@ -1354,7 +1373,8 @@ line|z18[highway=road] z-index: 700; } -line|z18[highway=pedestrian] +line|z18[highway=pedestrian], +line|z18[highway=ford] { color: @pedestrian; width: 4; @@ -1406,6 +1426,8 @@ line|z18[highway=service] } line|z18[highway=track][tracktype=grade1], +line|z18[highway=raceway], +line|z18[leisure=track] { color: @track; opacity: 1; @@ -1441,7 +1463,8 @@ line|z18[highway=steps] z-index: 1000; } -line|z18[highway=construction] +line|z18[highway=construction], +line|z18[highway=proposed] { color: @construction; opacity: 1; @@ -1590,7 +1613,8 @@ line|z19-[highway=road] z-index: 700; } -line|z19-[highway=pedestrian] +line|z19-[highway=pedestrian], +line|z19-[highway=ford] { color: @pedestrian; width: 5; @@ -1643,6 +1667,8 @@ line|z19-[highway=service] } line|z19-[highway=track][tracktype=grade1], +line|z19-[highway=raceway], +line|z19-[leisure=track] { color: @track; opacity: 1; @@ -1677,7 +1703,8 @@ line|z19-[highway=steps] z-index: 1000; } -line|z19-[highway=construction] +line|z19-[highway=construction], +line|z19-[highway=proposed] { color: @construction; opacity: 1; @@ -2015,14 +2042,32 @@ line|z16-[highway=footway][bridge?]::bridgeblack, casing-linecap: butt; casing-color: @bridge_casing; } -line|z18-[highway=pedestrian][bridge?]::bridgewhite, -line|z18-[highway=footway][bridge?]::bridgewhite +line|z16-[highway=pedestrian][bridge?]::bridgewhite, +line|z16-[highway=footway][bridge?]::bridgewhite +{ + z-index: 400; + casing-width: eval(prop("width")+0.2); + casing-linecap: butt; + casing-color: @bridge_background; +} + +line|z17-[highway=pedestrian][bridge?]::bridgeblack, +line|z17-[highway=footway][bridge?]::bridgeblack, +{ + z-index:390; + casing-width: eval(prop("width")+0.6); + casing-linecap: butt; + casing-color: @bridge_casing; +} +line|z17-[highway=pedestrian][bridge?]::bridgewhite, +line|z17-[highway=footway][bridge?]::bridgewhite { z-index:400; 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, { diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss index 20d89d014d..85f2799171 100644 --- a/data/styles/clear/include/transport.mapcss +++ b/data/styles/clear/include/transport.mapcss @@ -2,7 +2,9 @@ /* RAILWAY LINES */ -line|z11-12[railway=rail] +line|z11-12[railway=rail], +line|z11-12[railway=yard] + { color: @railway_light; width: 0.6; @@ -11,7 +13,8 @@ line|z11-12[railway=rail] } line|z13-[railway=rail], -line|z13-[railway=light_rail] +line|z13-[railway=light_rail], +line|z13-[railway=yard] { color: @railway_light; opacity: 1; @@ -19,7 +22,8 @@ line|z13-[railway=light_rail] z-index: 680; } line|z14[railway=rail], -line|z14[railway=light_rail] +line|z14[railway=light_rail], +line|z14[railway=yard] { color: @railway; opacity: 1; @@ -27,7 +31,8 @@ line|z14[railway=light_rail] z-index: 680; } line|z15[railway=rail], -line|z15[railway=light_rail] +line|z15[railway=light_rail], +line|z15[railway=yard] { color: @railway; opacity: 1; @@ -36,7 +41,9 @@ line|z15[railway=light_rail] } line|z16[railway=rail]::dash, -line|z16[railway=light_rail]::dash +line|z16[railway=light_rail]::dash, +line|z16[railway=yard]::dash, + { color: @railway_dash; opacity: 1; @@ -45,7 +52,8 @@ line|z16[railway=light_rail]::dash dashes: 4.5,4.5; } line|z16[railway=rail], -line|z16[railway=light_rail] +line|z16[railway=light_rail], +line|z16[railway=yard] { color: @railway; opacity: 1; @@ -54,7 +62,8 @@ line|z16[railway=light_rail] } line|z17[railway=rail], -line|z17[railway=light_rail] +line|z17[railway=light_rail], +line|z17[railway=yard] { color: @railway; opacity: 1; @@ -63,7 +72,8 @@ line|z17[railway=light_rail] } line|z17[railway=rail]::dash, -line|z17[railway=light_rail]::dash +line|z17[railway=light_rail]::dash, +line|z17[railway=yard]::dash { color: @railway_dash; opacity: 1; @@ -73,7 +83,8 @@ line|z17[railway=light_rail]::dash } line|z18-[railway=rail], -line|z18-[railway=light_rail] +line|z18-[railway=light_rail], +line|z18-[railway=yard] { color: @railway; opacity: 1; @@ -83,6 +94,7 @@ line|z18-[railway=light_rail] line|z18-[railway=rail]::dash, line|z18-[railway=light_rail]::dash, +line|z18-[railway=yard]::dash { color: @railway_dash; opacity: 1; @@ -92,15 +104,18 @@ line|z18-[railway=light_rail]::dash, } line|z14-[railway=rail][tunnel?], -line|z14-[railway=light_rail][tunnel?] { +line|z14-[railway=light_rail][tunnel?], +line|z14-[railway=yard][tunnel?], { casing-width: 1; casing-linecap: butt; casing-color: @railway_tunnel; casing-dashes: 5,5; } -line|z14-17[railway][bridge?]::bridgewhite, -line|z14-17[railway=light_rail][bridge?]::bridgewhite { +line|z14-16[railway][bridge?]::bridgewhite, +line|z14-16[railway=light_rail][bridge?]::bridgewhite, +line|z14-16[railway=yard][bridge?]::bridgewhite, +{ z-index: 30; casing-width: eval(prop("width")+0.2); casing-linecap: butt; @@ -108,7 +123,9 @@ line|z14-17[railway=light_rail][bridge?]::bridgewhite { } line|z14-16[railway=rail][bridge?]::bridgeblack, -line|z14-16[railway=light_rail][bridge?]::bridgeblack { +line|z14-16[railway=light_rail][bridge?]::bridgeblack , +line|z14-16[railway=yard][bridge?]::bridgeblack , +{ z-index: 25; casing-width: eval(prop("width")+0.5); casing-linecap: butt; @@ -116,7 +133,8 @@ line|z14-16[railway=light_rail][bridge?]::bridgeblack { } line|z17-[railway][bridge?]::bridgewhite, -line|z17-[railway=light_rail][bridge?]::bridgewhite { +line|z17-[railway=light_rail][bridge?]::bridgewhite, +line|z17-[railway=yard][bridge?]::bridgewhite { z-index: 30; casing-width: eval(prop("width")+1.2); casing-linecap: butt; @@ -124,7 +142,8 @@ line|z17-[railway=light_rail][bridge?]::bridgewhite { } line|z17-[railway=rail][bridge?]::bridgeblack, -line|z17-[railway=light_rail][bridge?]::bridgeblack { +line|z17-[railway=light_rail][bridge?]::bridgeblack, +line|z17-[railway=yard][bridge?]::bridgeblack { z-index: 25; casing-width: eval(prop("width")+2); casing-linecap: butt; @@ -140,7 +159,9 @@ line|z18-[railway=disused] { } -line|z14[railway=monorail] +line|z14[railway=monorail], + +/*line|z14-[railway=subway][tunnel=no]*/ { color: @railway_light; width: 1; @@ -149,7 +170,8 @@ line|z14[railway=monorail] } -line|z15-16[railway=monorail] +line|z15-16[railway=monorail], + { color: @railway; width: 1.2; @@ -157,7 +179,8 @@ line|z15-16[railway=monorail] z-index: 950; } -line|z17-[railway=monorail] +line|z17-[railway=monorail], + { color: @railway; opacity: 1; @@ -303,7 +326,7 @@ node|z14[railway=halt] { icon-image: train-s.svg; text-offset: 6; z-index: 2800; - font-size: 10; + font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; @@ -326,7 +349,7 @@ node|z15[railway=halt] { icon-image: train-m.svg; text-offset: 8; z-index: 2800; - font-size: 11; + font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; @@ -360,7 +383,7 @@ node|z16[railway=halt] { node|z16[railway=station]::int_name, node|z16[railway=halt]::int_name { text-offset: 8; - font-size: 12; + font-size: 11; z-index: 2800; text: int_name; text-color: @label_dark; @@ -406,7 +429,7 @@ node|z14[railway=station][transport=subway] { icon-image: subway-s.svg; text-offset: 6; z-index: 2900; - font-size: 10; + font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; @@ -428,7 +451,7 @@ node|z15[railway=station][transport=subway] { icon-image: subway-m.svg; text-offset: 7; z-index: 2900; - font-size: 11; + font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; @@ -459,7 +482,7 @@ node|z16[railway=station][transport=subway] { } node|z16[railway=station][transport=subway]::int_name { text-offset: 7; - font-size: 12; + font-size: 11; z-index: 2900; text: int_name; text-color: @label_dark; @@ -478,7 +501,7 @@ node|z17-[railway=station][transport=subway] { text-halo-color: @label_halo_light; } node|z17-[railway=station][transport=subway]::int_name { - font-size: 12; + font-size: 11; z-index: 2900; text: int_name; text-color: @label_dark; @@ -487,28 +510,34 @@ node|z17-[railway=station][transport=subway]::int_name { text-halo-color: @label_halo_light; } node|z17[railway=subway_entrance] { icon-image: subway-entrance-s.svg; text-offset: 8; font-size: 13; z-index: 2800; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z17[railway=subway_entrance]::int_name { text-offset: 8; font-size: 11; z-index: 2800; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } + node|z18-[railway=subway_entrance] { icon-image: subway-entrance-s.svg; text-offset: 8; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; z-index: 2800; } +node|z18-[railway=subway_entrance]::int_name { text-offset: 8; font-size: 11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; z-index: 2800; } /* MOSCOW SUBWAY */ -node|z11[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-s.svg; z-index: 2900; } -node|z12-13[railway=station][transport=subway][city=moscow] { +node|z11[railway=station][transport=subway][city=moscow] +{ icon-image: subway-moscow-s.svg; z-index: 2900; } + +node|z12-13[railway=station][transport=subway][city=moscow] +{ icon-image: subway-moscow-s.svg; - text-offset: 7; + text-offset: 5; z-index: 2900; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; - text-halo-opacity: 1; + text-halo-opacity:0.5; text-halo-color: @label_halo_light; } node|z12-13[railway=station][transport=subway][city=moscow]::int_name { - text-offset: 22; + text-offset: 20; z-index: 2900; font-size: 9; text: int_name; @@ -519,61 +548,133 @@ node|z12-13[railway=station][transport=subway][city=moscow]::int_name { } -node|z14[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text-offset: 9; z-index: 2900; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;} -node|z14[railway=station][transport=subway][city=moscow]::int_name { z-index: 2900; font-size: 10; text-offset: 24;text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;} -node|z15[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text-offset: 9; z-index: 2900; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } -node|z15[railway=station][transport=subway][city=moscow]::int_name { font-size: 10; text: int_name; text-offset: 24; z-index: 2900; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;} +node|z14[railway=station][transport=subway][city=moscow] +{ icon-image: subway-moscow-m.svg; text-offset: 8; z-index: 2900; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;} +node|z14[railway=station][transport=subway][city=moscow]::int_name +{ z-index: 2900; font-size: 10; text-offset: 24;text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;} +node|z15[railway=station][transport=subway][city=moscow] +{ icon-image: subway-moscow-m.svg; text-offset: 9; z-index: 2900; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } +node|z15[railway=station][transport=subway][city=moscow]::int_name +{ font-size: 10; text: int_name; text-offset: 24; z-index: 2900; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;} -node|z16[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text: name; font-size: 12; text-color: @district_label; text-halo-radius: 0; z-index: 2900} -node|z16[railway=station][transport=subway][city=moscow]::int_name { icon-image: none.svg; text: int_name; font-size: 11; text-color: @district_label; text-halo-radius: 0;z-index: 2900 } +node|z16[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text: name; font-size: 10; text-color: @district_label; text-halo-radius: 0; z-index: 2900} +node|z16[railway=station][transport=subway][city=moscow]::int_name { icon-image: none.svg; text: int_name; font-size: 9; text-color: @district_label; text-halo-radius: 0;z-index: 2900 } -node|z17-[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text: name; font-size: 12; text-color: @district_label; text-halo-radius: 0; z-index: 2900} -node|z17-[railway=station][transport=subway][city=moscow]::int_name { text: int_name; font-size: 11; text-color: @district_label; text-halo-radius: 0; z-index: 2900} +node|z17-[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text: name; font-size: 10; text-color: @district_label; text-halo-radius: 0; z-index: 2900} +node|z17-[railway=station][transport=subway][city=moscow]::int_name { text: int_name; font-size: 9; text-color: @district_label; text-halo-radius: 0; z-index: 2900} /* MOSCOW SUBWAY ENTRANCES */ -node|z16[railway=subway_entrance][city=moscow] { icon-image: subway-moscow-m.svg; text-offset: 10; z-index: 2800; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } -node|z16[railway=subway_entrance][city=moscow]::int_name { font-size: 11; text: int_name; text-offset: 25; z-index: 2800; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } +node|z16[railway=subway_entrance][city=moscow] + { icon-image: subway-moscow-m.svg; text-offset: 10; z-index: 2800; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } +node|z16[railway=subway_entrance][city=moscow]::int_name +{ font-size: 10; text: int_name; text-offset: 25; z-index: 2800; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } -node|z17[railway=subway_entrance][city=moscow] { icon-image: subway-moscow-m.svg; text-offset: 10; z-index: 2800; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } -node|z17[railway=subway_entrance][city=moscow]::int_name { font-size: 11; text: int_name; text-offset: 25; z-index: 2800; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } +node|z17[railway=subway_entrance][city=moscow] + { icon-image: subway-moscow-m.svg; text-offset: 10; z-index: 2800; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } +node|z17[railway=subway_entrance][city=moscow]::int_name +{ font-size: 11; text: int_name; text-offset: 25; z-index: 2800; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } -node|z18-[railway=subway_entrance][city=moscow] { icon-image: subway-moscow-m.svg; text-offset: 10; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } -node|z18-[railway=subway_entrance][city=moscow]::int_name { font-size: 12; text: int_name; text-offset: 25; z-index: 2800; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } +node|z18-[railway=subway_entrance][city=moscow] + { icon-image: subway-moscow-m.svg; text-offset: 10; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } +node|z18-[railway=subway_entrance][city=moscow]::int_name +{ font-size: 11; text: int_name; text-offset: 25; z-index: 2800; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; } /* SAINT PETERSBURG SUBWAY */ -node|z11[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; z-index: 2900; } -node|z12[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z12[railway=station][transport=subway][city=spb]::int_name { icon-image: subway-spb-s.svg; text-offset: 5; z-index: 2900; font-size: 9; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z11[railway=station][transport=subway][city=spb] + { + icon-image: subway-spb-s.svg; + z-index: 2900; + } +node|z12[railway=station][transport=subway][city=spb] +{ + icon-image: subway-spb-s.svg; + text-offset: 8; + z-index: 2900; + font-size: 10; + text: name; + text-color: @label_dark; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + } +node|z12[railway=station][transport=subway][city=spb]::int_name + { + icon-image: subway-spb-s.svg; + text-offset: 5; + z-index: 2900; + font-size: 9; + text: int_name; + text-color: @label_dark; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + } -node|z13[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z13[railway=station][transport=subway][city=spb]::int_name { icon-image: subway-spb-s.svg; text-offset: 5; z-index: 2900; font-size: 9; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z13[railway=station][transport=subway][city=spb] +{ + icon-image: subway-spb-s.svg; + text-offset: 8; + z-index: 2900; + font-size: 11; + text: name; + text-color: @label_dark; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; +} +node|z13[railway=station][transport=subway][city=spb]::int_name +{ + icon-image: subway-spb-s.svg; + text-offset: 5; + z-index: 2900; + font-size: 10; + text: int_name; + text-color: @label_dark; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; +} -node|z14[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z14[railway=station][transport=subway][city=spb]::int_name { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z14[railway=station][transport=subway][city=spb] +{ icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z14[railway=station][transport=subway][city=spb]::int_name +{ icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z15[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z15[railway=station][transport=subway][city=spb]::int_name { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z15[railway=station][transport=subway][city=spb] +{ icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z15[railway=station][transport=subway][city=spb]::int_name + { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z16[railway=station][transport=subway][city=spb] { icon-image: subway-spb-m.svg; font-size: 12; text: name; text-color: @district_label; text-halo-radius: 0;z-index: 2900 } -node|z16[railway=station][transport=subway][city=spb]::int_name { font-size: 11; text: int_name; text-color: @district_label; text-halo-radius: 0;z-index: 2900 } +node|z16[railway=station][transport=subway][city=spb] + { icon-image: subway-spb-m.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0;z-index: 2900 } +node|z16[railway=station][transport=subway][city=spb]::int_name +{ font-size: 9; text: int_name; text-color: @district_label; text-halo-radius: 0;z-index: 2900 } -node|z17-[railway=station][transport=subway][city=spb] { icon-image: subway-spb-m.svg; font-size: 12; text: name; text-color: @district_label; text-halo-radius: 0; z-index: 2900} -node|z17-[railway=station][transport=subway][city=spb]::int_name { font-size: 11; text: int_name; text-color: @district_label; text-halo-radius: 0;z-index: 2900 } +node|z17-[railway=station][transport=subway][city=spb] +{ icon-image: subway-spb-m.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; z-index: 2900} +node|z17-[railway=station][transport=subway][city=spb]::int_name +{ font-size: 9; text: int_name; text-color: @district_label; text-halo-radius: 0;z-index: 2900 } -node|z16-[railway=subway_entrance][city=spb] { icon-image: subway-spb-m.svg; text-offset: 8; z-index: 2800; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z16-[railway=subway_entrance][city=spb]::int_name { z-index: 2800; font-size: 11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z16-[railway=subway_entrance][city=spb] + { icon-image: subway-spb-m.svg; text-offset: 8; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z16-[railway=subway_entrance][city=spb]::int_name +{ z-index: 2800; font-size:11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z17-[railway=subway_entrance][city=spb] { icon-image: subway-spb-m.svg; text-offset: 8; z-index: 2800; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z17-[railway=subway_entrance][city=spb]::int_name { z-index: 2800; font-size: 11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z17-[railway=subway_entrance][city=spb] +{ icon-image: subway-spb-m.svg; text-offset: 8; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z17-[railway=subway_entrance][city=spb]::int_name +{ z-index: 2800; font-size: 11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z18-[railway=subway_entrance][city=spb] { icon-image: subway-spb-m.svg; text-offset: 8; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } -node|z18-[railway=subway_entrance][city=spb]::int_name { z-index: 2800; font-size: 12; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z18-[railway=subway_entrance][city=spb] + { icon-image: subway-spb-m.svg; text-offset: 8; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z18-[railway=subway_entrance][city=spb]::int_name +{ z-index: 2800; font-size: 12; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } /* LONDON ICONS */ node|z14[railway=station][transport=subway][city=london] { icon-image: subway-london-s.svg; } @@ -618,12 +719,12 @@ node|z17-[railway=station][transport=subway][city=roma] { icon-image: none.svg; node|z17-[railway=subway_entrance][city=roma] { icon-image: subway-rome-m.svg; } /* MINSK ICONS */ -node|z13[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-s.svg; text-offset: 4; z-index: 2800; font-size: 9; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z13[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-s.svg; text-offset: 4; z-index: 2800; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } 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-l.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; } 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; } -node|z16-[railway=subway_entrance][city=minsk] { icon-image: subway-minsk-m.svg; text-offset: 6; z-index: 2800; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z16-[railway=subway_entrance][city=minsk] { icon-image: subway-minsk-m.svg; text-offset: 6; z-index: 2800; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; 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; } @@ -633,7 +734,7 @@ node|z13[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev node|z14[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-s.svg; } node|z15[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-m.svg; } node|z16-[railway=station][transport=subway][city=kiev] { icon-image: none.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; } -node|z16-[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; text-offset: 6; z-index: 2; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } +node|z16-[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; text-offset: 6; z-index: 2; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; } node|z17[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; font-size: 13; } node|z18-[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; font-size: 13; } @@ -659,7 +760,7 @@ area|z17[railway=tram_stop] { icon-image: tram-l.svg; text-offset: 8; - font-size: 10; + font-size: 11; z-index: 2800; text: name; text-color: @label_dark; @@ -672,7 +773,7 @@ node|z17[railway=tram_stop]::int_name, area|z17[railway=tram_stop]::int_name { text-offset: 8; - font-size: 9; + font-size: 10; z-index: 2800; text: int_name; text-color: @label_dark; @@ -687,7 +788,7 @@ area|z18-[railway=tram_stop] icon-image: tram-l.svg; z-index: 4000; text-offset: 8; - font-size: 10; + font-size: 12; z-index: 2800; text: name; text-color: @label_dark; @@ -700,7 +801,7 @@ node|z18-[railway=tram_stop]::int_name, area|z18-[railway=tram_stop]::int_name { text-offset: 8; - font-size: 9; + font-size: 10; z-index: 2800; text: int_name; text-color: @label_dark; @@ -711,11 +812,25 @@ area|z18-[railway=tram_stop]::int_name /* BUS STOPS */ -node|z17[highway=bus_stop], -area|z17[highway=bus_stop] +node|z16[highway=bus_stop], +area|z16[highway=bus_stop] { icon-image: bus-m.svg; - z-index: 27000; + z-index: 2700; +} +node|z17[highway=bus_stop], +area|z17[highway=bus_stop], +{ + icon-image: bus-l.svg; + z-index: 2700; + text-offset: 10; + font-size: 11; + text: name; + text-color: @label_dark; + text-halo-radius: 1; + text-halo-opacity: 0.5; + text-halo-color: @label_halo_light; + text-position: center; } node|z18-19[highway=bus_stop], @@ -724,24 +839,25 @@ node|z16-17[public_transport=station], area|z16-17[public_transport=station] { icon-image: bus-l.svg; - z-index: 27000; + z-index: 2700; text-offset: 10; - font-size: 10; + font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; + text-position: center; } node|z18-19[highway=bus_stop]::int_name, area|z18-19[highway=bus_stop]::int_name, -node|z16-17[public_transport=station]::int_name, -area|z16-17[public_transport=station]::int_name +node|z18-19[public_transport=station]::int_name, +area|z18-19[public_transport=station]::int_name { text-offset: 10; font-size: 9; - z-index: 27000; + z-index: 2700; text: int_name; text-color: @label_dark; text-halo-radius: 1; @@ -755,8 +871,8 @@ node|z15[amenity=bus_station], area|z16-[amenity=bus_station] { node|z16-17[amenity=bus_station], area|z16-[amenity=bus_station] { icon-image: bus-l.svg; text-offset: 8; - font-size: 10; - z-index: 27000; + font-size: 11; + z-index: 2700; text: name; text-color: @label_dark; text-halo-radius: 1; @@ -767,7 +883,7 @@ node|z16-17[amenity=bus_station], area|z16-[amenity=bus_station] { node|z16-17[amenity=bus_station]::int_name, area|z16-[amenity=bus_station]::int_name { text-offset: 8; font-size: 9; - z-index: 27000; + z-index: 2700; text: int_name; text-color: @label_dark; text-halo-radius: 1; @@ -777,9 +893,9 @@ node|z16-17[amenity=bus_station]::int_name, area|z16-[amenity=bus_station]::int_ node|z18[amenity=bus_station], area|z18[amenity=bus_station] { icon-image: bus-l.svg; - z-index: 27000; + z-index: 2700; text-offset: 8; - font-size: 10; + font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; @@ -789,8 +905,8 @@ node|z18[amenity=bus_station], area|z18[amenity=bus_station] { node|z18[amenity=bus_station]::int_name, area|z18[amenity=bus_station]::int_name { text-offset: 8; - font-size: 9; - z-index: 27000; + font-size: 10; + z-index: 2700; text: int_name; text-color: @label_dark; text-halo-radius: 1; @@ -800,9 +916,9 @@ node|z18[amenity=bus_station]::int_name, area|z18[amenity=bus_station]::int_name node|z19-[amenity=bus_station], area|z19-[amenity=bus_station] { icon-image: bus-l.svg; - z-index: 27000; + z-index: 2700; text-offset: 10; - font-size: 10; + font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; @@ -811,8 +927,8 @@ node|z19-[amenity=bus_station], area|z19-[amenity=bus_station] { } node|z19-[amenity=bus_station]::int_name, area|z19-[amenity=bus_station]::int_name { text-offset: 10; - font-size: 9; - z-index: 27000; + font-size: 10; + z-index: 2700; text: int_name; text-color: @label_dark; text-halo-radius: 1; @@ -823,15 +939,15 @@ node|z19-[amenity=bus_station]::int_name, area|z19-[amenity=bus_station]::int_na node|z14-15[amenity=ferry_terminal] { icon-image: ship-s.svg; - z-index: 27000; + z-index: 2700; } node|z16-[amenity=ferry_terminal] { icon-image: ship-m.svg; - z-index: 27000; + z-index: 2700; text-offset: 8; - font-size: 10; + font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; @@ -841,7 +957,7 @@ node|z16-[amenity=ferry_terminal] { node|z17[amenity=ferry_terminal] { icon-image: ship-l.svg; - z-index: 27000; + z-index: 2700; text-offset: 10; font-size: 12; text: name; @@ -853,7 +969,7 @@ node|z17[amenity=ferry_terminal] { node|z18-[amenity=ferry_terminal] { icon-image: ship-l.svg; - z-index: 27000; + z-index: 2700; text-offset: 10; font-size: 12; text: name; @@ -878,71 +994,71 @@ node|z10[aeroway=aerodrome][aerodrome=international] text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; - z-index: 2900; + z-index: 3100; fill-opacity: 1; } -area|z11-14[aeroway=airport][aerodrome=international], -area|z11-14[aeroway=aerodrome][aerodrome=international], -node|z11-14[aeroway=airport][aerodrome=international], -node|z11-14[aeroway=aerodrome][aerodrome=international] +area|z11-12[aeroway=airport][aerodrome=international], +area|z11-12[aeroway=aerodrome][aerodrome=international], +node|z11-12[aeroway=airport][aerodrome=international], +node|z11-12[aeroway=aerodrome][aerodrome=international] { icon-image: airport-m.svg; text-offset: 7; - font-size: 10; + font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; - z-index: 2900; + z-index: 3100; } -area|z11-14[aeroway=airport][aerodrome=international]::int_name, -area|z11-14[aeroway=aerodrome][aerodrome=international]::int_name, -node|z11-14[aeroway=airport][aerodrome=international]::int_name, -node|z11-14[aeroway=aerodrome][aerodrome=international]::int_name +area|z11-12[aeroway=airport][aerodrome=international]::int_name, +area|z11-12[aeroway=aerodrome][aerodrome=international]::int_name, +node|z11-12[aeroway=airport][aerodrome=international]::int_name, +node|z11-12[aeroway=aerodrome][aerodrome=international]::int_name { - font-size: 9; + font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; - z-index: 2900; + z-index: 3100; } -area|z14-[aeroway=airport], -area|z14-[aeroway=aerodrome], -node|z14-[aeroway=airport], -node|z14-[aeroway=aerodrome] +area|z13-[aeroway=airport], +area|z13-[aeroway=aerodrome], +node|z13-[aeroway=airport], +node|z13-[aeroway=aerodrome] { icon-image: airport-l.svg; text-offset: 8; - font-size: 10; + 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: 2900; + z-index: 3100; } -area|z15-[aeroway=airport]::int_name, -area|z15-[aeroway=aerodrome]::int_name, -node|z15-[aeroway=airport]::int_name, -node|z15-[aeroway=aerodrome]::int_name +area|z13-[aeroway=airport]::int_name, +area|z13-[aeroway=aerodrome]::int_name, +node|z13-[aeroway=airport]::int_name, +node|z13-[aeroway=aerodrome]::int_name { text-offset: 8; - font-size: 14; + font-size: 12; text: int_name; text-color: @label_dark; text-halo-radius: 1; - text-halo-opacity: 0.5; + text-halo-opacity: 1; text-halo-color: @label_halo_light; - z-index: 2900; + z-index: 3100; } area|z10[aeroway=airport][aerodrome=international], @@ -1011,7 +1127,9 @@ line|z15-[aeroway=taxiway] { width: 1.2; opacity: 0.6; color: @unclassified;z-in line|z14-15[aerialway=cable_car], line|z14-15[aerialway=chair_lift], line|z14-15[aerialway=gondola], -line|z14-15[aerialway=mixed_lift] { +line|z14-15[aerialway=mixed_lift], +line|z14-15[aerialway=drag_lift] + { color: @aerialway; width: 0.5; opacity: 1; @@ -1021,7 +1139,9 @@ line|z14-15[aerialway=mixed_lift] { line|z16[aerialway=cable_car], line|z16[aerialway=chair_lift], line|z16[aerialway=gondola], -line|z16[aerialway=mixed_lift] { +line|z16[aerialway=mixed_lift], +line|z16[aerialway=drag_lift] + { color: @aerialway; width: 1; opacity: 1; @@ -1031,7 +1151,9 @@ line|z16[aerialway=mixed_lift] { line|z17-[aerialway=cable_car], line|z17-[aerialway=chair_lift], line|z17-[aerialway=gondola], -line|z17-[aerialway=mixed_lift] { +line|z17-[aerialway=mixed_lift], +line|z17-[aerialway=drag_lift] + { color: @aerialway; width: 1; z-index: 1050; @@ -1041,6 +1163,7 @@ line|z14[aerialway=cable_car]::dash, line|z14[aerialway=chair_lift]::dash, line|z14[aerialway=gondola]::dash, line|z14[aerialway=mixed_lift]::dash +line|z14[aerialway=drag_lift] ::dash { color: @aerialway; width: 2.5; @@ -1052,7 +1175,9 @@ line|z14[aerialway=mixed_lift]::dash line|z15-[aerialway=cable_car]::dash, line|z15-[aerialway=chair_lift]::dash, line|z15-[aerialway=gondola]::dash, -line|z15-[aerialway=mixed_lift]::dash { +line|z15-[aerialway=mixed_lift]::dash, +line|z15-[aerialway=drag_lift] ::dash +{ color: @aerialway; width: 2.5; z-index: 1049; @@ -1065,7 +1190,7 @@ node|z14[aerialway=chair_lift], node|z14[aerialway=gondola], node|z14[aerialway=mixed_lift] { icon-image: cable-car-s.svg; - z-index: 26000;} + z-index: 2600;} node|z15[aerialway=station], node|z15[aerialway=cable_car], @@ -1073,7 +1198,7 @@ node|z15[aerialway=chair_lift], node|z15[aerialway=gondola], node|z15[aerialway=mixed_lift] { icon-image: cable-car-s.svg; - z-index: 26000; + z-index: 2600; text-offset: 6; font-size: 10; text: name; @@ -1096,7 +1221,7 @@ node|z16-17[aerialway=mixed_lift]{ text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; - z-index: 26000; + z-index: 2600; } node|z18-[aerialway=station], @@ -1112,5 +1237,8 @@ node|z18[aerialway=mixed_lift] { text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; - z-index: 26000; + z-index: 2600; } + + +node|z17-[railway=crossing] { icon-image: railway-crossing.svg; z-index: 2600;} diff --git a/data/styles/clear/style-clear/6plus/route_from.png b/data/styles/clear/style-clear/6plus/route_from.png index f073e4df01..130060ea78 100644 Binary files a/data/styles/clear/style-clear/6plus/route_from.png and b/data/styles/clear/style-clear/6plus/route_from.png differ diff --git a/data/styles/clear/style-clear/6plus/route_to.png b/data/styles/clear/style-clear/6plus/route_to.png index 41d23aafad..4c3f8b727b 100644 Binary files a/data/styles/clear/style-clear/6plus/route_to.png and b/data/styles/clear/style-clear/6plus/route_to.png differ diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index 9677c18fa7..62231f564a 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -80,7 +80,7 @@ @railway: #969586; @railway_dash: #EEEEEE; @railway_tunnel: #555555; -@aerialway: #777777; +@aerialway: #444444; @tram: #555555; @ferry: #4499Bb; @@ -96,8 +96,10 @@ @glacier: #FFFFFF; @water: #8BD3E0; @river: #36B0BF; +@wetland: #c9ddd6; @forest: #AABF65; @park: #AABF65; /* A5BF60 #A4B275 #BCCC74*/ +@natpark: #3A7921; @beach: #FCEC7E; /*forest-park*/ @green0: #CFD5A8; @@ -116,8 +118,8 @@ @pedestrian_area: #E3E1D2; @pedestrian_area_light: #EDEBDB; -@unversity: #EBD8B0; -@hospital: #EBCECE;/*FADCDB*/ +@unversity: #F8E4BA; +@hospital: #F8D9D9;/*FADCDB*/ @industrial: #E4E2EB; @sport: #D1CDA7; @parking: #F2F2CE; diff --git a/data/styles/clear/style-clear/hdpi/route_from.png b/data/styles/clear/style-clear/hdpi/route_from.png index 793fa6b817..b457b0f2a5 100644 Binary files a/data/styles/clear/style-clear/hdpi/route_from.png and b/data/styles/clear/style-clear/hdpi/route_from.png differ diff --git a/data/styles/clear/style-clear/hdpi/route_to.png b/data/styles/clear/style-clear/hdpi/route_to.png index 718f6d1b0e..4b0ecaab94 100644 Binary files a/data/styles/clear/style-clear/hdpi/route_to.png and b/data/styles/clear/style-clear/hdpi/route_to.png differ diff --git a/data/styles/clear/style-clear/ldpi/route_from.png b/data/styles/clear/style-clear/ldpi/route_from.png index 541626a1d5..e305504f3b 100644 Binary files a/data/styles/clear/style-clear/ldpi/route_from.png and b/data/styles/clear/style-clear/ldpi/route_from.png differ diff --git a/data/styles/clear/style-clear/ldpi/route_to.png b/data/styles/clear/style-clear/ldpi/route_to.png index da6017cf44..4c87d967b2 100644 Binary files a/data/styles/clear/style-clear/ldpi/route_to.png and b/data/styles/clear/style-clear/ldpi/route_to.png differ diff --git a/data/styles/clear/style-clear/mdpi/route_from.png b/data/styles/clear/style-clear/mdpi/route_from.png index 8d22b8243d..c3d31ff777 100644 Binary files a/data/styles/clear/style-clear/mdpi/route_from.png and b/data/styles/clear/style-clear/mdpi/route_from.png differ diff --git a/data/styles/clear/style-clear/mdpi/route_to.png b/data/styles/clear/style-clear/mdpi/route_to.png index 581bb0e408..47d548989f 100644 Binary files a/data/styles/clear/style-clear/mdpi/route_to.png and b/data/styles/clear/style-clear/mdpi/route_to.png differ diff --git a/data/styles/clear/style-night/symbols/casino-s.svg b/data/styles/clear/style-clear/symbols/-s.svg similarity index 94% rename from data/styles/clear/style-night/symbols/casino-s.svg rename to data/styles/clear/style-clear/symbols/-s.svg index 738c72be33..44378d543a 100644 --- a/data/styles/clear/style-night/symbols/casino-s.svg +++ b/data/styles/clear/style-clear/symbols/-s.svg @@ -1,7 +1,7 @@ - casino-s + -s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/alcohol-l.svg b/data/styles/clear/style-clear/symbols/alcohol-l.svg index f02811ee18..4a499444e4 100644 --- a/data/styles/clear/style-clear/symbols/alcohol-l.svg +++ b/data/styles/clear/style-clear/symbols/alcohol-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/alcohol-m.svg b/data/styles/clear/style-clear/symbols/alcohol-m.svg index 1ddfa3d8fd..db2ff1f46a 100644 --- a/data/styles/clear/style-clear/symbols/alcohol-m.svg +++ b/data/styles/clear/style-clear/symbols/alcohol-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/alcohol-s.svg b/data/styles/clear/style-clear/symbols/alcohol-s.svg index 9f872239fa..02762399ae 100644 --- a/data/styles/clear/style-clear/symbols/alcohol-s.svg +++ b/data/styles/clear/style-clear/symbols/alcohol-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/alpine_hut-l.svg b/data/styles/clear/style-clear/symbols/alpine_hut-l.svg index 71fbcdca72..fb5ac15934 100644 --- a/data/styles/clear/style-clear/symbols/alpine_hut-l.svg +++ b/data/styles/clear/style-clear/symbols/alpine_hut-l.svg @@ -8,7 +8,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/alpine_hut-m.svg b/data/styles/clear/style-clear/symbols/alpine_hut-m.svg index 1045f8b932..823a38d151 100644 --- a/data/styles/clear/style-clear/symbols/alpine_hut-m.svg +++ b/data/styles/clear/style-clear/symbols/alpine_hut-m.svg @@ -8,7 +8,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/america-football-l.svg b/data/styles/clear/style-clear/symbols/america-football-l.svg index af06d96be2..9bf7de715d 100644 --- a/data/styles/clear/style-clear/symbols/america-football-l.svg +++ b/data/styles/clear/style-clear/symbols/america-football-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/america-football-m.svg b/data/styles/clear/style-clear/symbols/america-football-m.svg index 6608d6f374..09037a7235 100644 --- a/data/styles/clear/style-clear/symbols/america-football-m.svg +++ b/data/styles/clear/style-clear/symbols/america-football-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/america-football-s.svg b/data/styles/clear/style-clear/symbols/america-football-s.svg index c4d9d88d74..e96b6b7687 100644 --- a/data/styles/clear/style-clear/symbols/america-football-s.svg +++ b/data/styles/clear/style-clear/symbols/america-football-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/archery-l.svg b/data/styles/clear/style-clear/symbols/archery-l.svg index 76a05a7fb0..bff0a4d7e9 100644 --- a/data/styles/clear/style-clear/symbols/archery-l.svg +++ b/data/styles/clear/style-clear/symbols/archery-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/archery-m.svg b/data/styles/clear/style-clear/symbols/archery-m.svg index cd8927fd32..9ffdce9057 100644 --- a/data/styles/clear/style-clear/symbols/archery-m.svg +++ b/data/styles/clear/style-clear/symbols/archery-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/atm-l.svg b/data/styles/clear/style-clear/symbols/atm-l.svg index dcf2e24d76..b8b8f86885 100644 --- a/data/styles/clear/style-clear/symbols/atm-l.svg +++ b/data/styles/clear/style-clear/symbols/atm-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/atm-m.svg b/data/styles/clear/style-clear/symbols/atm-m.svg index 18d8a15580..5d26ac637e 100644 --- a/data/styles/clear/style-clear/symbols/atm-m.svg +++ b/data/styles/clear/style-clear/symbols/atm-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/atm-s.svg b/data/styles/clear/style-clear/symbols/atm-s.svg index 688af7c172..41f83dc128 100644 --- a/data/styles/clear/style-clear/symbols/atm-s.svg +++ b/data/styles/clear/style-clear/symbols/atm-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/australian-football-l.svg b/data/styles/clear/style-clear/symbols/australian-football-l.svg index 544de5e84b..a5616e1ea9 100644 --- a/data/styles/clear/style-clear/symbols/australian-football-l.svg +++ b/data/styles/clear/style-clear/symbols/australian-football-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/australian-football-m.svg b/data/styles/clear/style-clear/symbols/australian-football-m.svg index 7f4517b1b7..693e1f45e2 100644 --- a/data/styles/clear/style-clear/symbols/australian-football-m.svg +++ b/data/styles/clear/style-clear/symbols/australian-football-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bakery-l.svg b/data/styles/clear/style-clear/symbols/bakery-l.svg index 9ae107b564..89f1b620d2 100644 --- a/data/styles/clear/style-clear/symbols/bakery-l.svg +++ b/data/styles/clear/style-clear/symbols/bakery-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bakery-m.svg b/data/styles/clear/style-clear/symbols/bakery-m.svg index 5c6a2bfdb1..3c7d481bbb 100644 --- a/data/styles/clear/style-clear/symbols/bakery-m.svg +++ b/data/styles/clear/style-clear/symbols/bakery-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bank-2-m.svg b/data/styles/clear/style-clear/symbols/bank-2-m.svg deleted file mode 100644 index 9b78f0a350..0000000000 --- a/data/styles/clear/style-clear/symbols/bank-2-m.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - bank-2-m - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/bank-l.svg b/data/styles/clear/style-clear/symbols/bank-l.svg index 3b984ff746..a645206658 100644 --- a/data/styles/clear/style-clear/symbols/bank-l.svg +++ b/data/styles/clear/style-clear/symbols/bank-l.svg @@ -7,9 +7,9 @@ - + - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/bank-m.svg b/data/styles/clear/style-clear/symbols/bank-m.svg index 151c4847cc..5cd7c2f405 100644 --- a/data/styles/clear/style-clear/symbols/bank-m.svg +++ b/data/styles/clear/style-clear/symbols/bank-m.svg @@ -7,9 +7,9 @@ - + - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/banknote-l.svg b/data/styles/clear/style-clear/symbols/banknote-l.svg index e1b9050db1..5749fdf00d 100644 --- a/data/styles/clear/style-clear/symbols/banknote-l.svg +++ b/data/styles/clear/style-clear/symbols/banknote-l.svg @@ -7,12 +7,12 @@ - + - + - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/banknote-m.svg b/data/styles/clear/style-clear/symbols/banknote-m.svg index 6f696b0073..d5f41c2a98 100644 --- a/data/styles/clear/style-clear/symbols/banknote-m.svg +++ b/data/styles/clear/style-clear/symbols/banknote-m.svg @@ -7,12 +7,12 @@ - + - + - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/bar-l.svg b/data/styles/clear/style-clear/symbols/bar-l.svg index 94bb9b29a4..bd06ed696b 100644 --- a/data/styles/clear/style-clear/symbols/bar-l.svg +++ b/data/styles/clear/style-clear/symbols/bar-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bar-m.svg b/data/styles/clear/style-clear/symbols/bar-m.svg index 858a43cbd1..69a15aebb2 100644 --- a/data/styles/clear/style-clear/symbols/bar-m.svg +++ b/data/styles/clear/style-clear/symbols/bar-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bar-s.svg b/data/styles/clear/style-clear/symbols/bar-s.svg index 7221c0f977..bda5446328 100644 --- a/data/styles/clear/style-clear/symbols/bar-s.svg +++ b/data/styles/clear/style-clear/symbols/bar-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/baseball-l.svg b/data/styles/clear/style-clear/symbols/baseball-l.svg index 5fa812d4c7..569e3e542c 100644 --- a/data/styles/clear/style-clear/symbols/baseball-l.svg +++ b/data/styles/clear/style-clear/symbols/baseball-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/baseball-m.svg b/data/styles/clear/style-clear/symbols/baseball-m.svg index 687dfd3632..4fe4c3dd9f 100644 --- a/data/styles/clear/style-clear/symbols/baseball-m.svg +++ b/data/styles/clear/style-clear/symbols/baseball-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/baseball-s.svg b/data/styles/clear/style-clear/symbols/baseball-s.svg index 12c51b73ce..ea6330b10d 100644 --- a/data/styles/clear/style-clear/symbols/baseball-s.svg +++ b/data/styles/clear/style-clear/symbols/baseball-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/basketball-l.svg b/data/styles/clear/style-clear/symbols/basketball-l.svg index 12195efb4c..74b56e283a 100644 --- a/data/styles/clear/style-clear/symbols/basketball-l.svg +++ b/data/styles/clear/style-clear/symbols/basketball-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/basketball-m.svg b/data/styles/clear/style-clear/symbols/basketball-m.svg index 9ef1a6e5cf..48712cae30 100644 --- a/data/styles/clear/style-clear/symbols/basketball-m.svg +++ b/data/styles/clear/style-clear/symbols/basketball-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/basketball-s.svg b/data/styles/clear/style-clear/symbols/basketball-s.svg index a15cfe6deb..fd633e514a 100644 --- a/data/styles/clear/style-clear/symbols/basketball-s.svg +++ b/data/styles/clear/style-clear/symbols/basketball-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bbq-l.svg b/data/styles/clear/style-clear/symbols/bbq-l.svg index abdf106e1a..52f46d2c8f 100644 --- a/data/styles/clear/style-clear/symbols/bbq-l.svg +++ b/data/styles/clear/style-clear/symbols/bbq-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bbq-m.svg b/data/styles/clear/style-clear/symbols/bbq-m.svg index ffc219702e..01b8ac267a 100644 --- a/data/styles/clear/style-clear/symbols/bbq-m.svg +++ b/data/styles/clear/style-clear/symbols/bbq-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bcontrol-l.svg b/data/styles/clear/style-clear/symbols/bcontrol-l.svg index 1ea69f1c75..694ae0b0f3 100644 --- a/data/styles/clear/style-clear/symbols/bcontrol-l.svg +++ b/data/styles/clear/style-clear/symbols/bcontrol-l.svg @@ -1,20 +1,18 @@ - + bcontrol-l Created with Sketch. - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/bcontrol-m.svg b/data/styles/clear/style-clear/symbols/bcontrol-m.svg index b870122ad9..1a5b2f9f8e 100644 --- a/data/styles/clear/style-clear/symbols/bcontrol-m.svg +++ b/data/styles/clear/style-clear/symbols/bcontrol-m.svg @@ -1,13 +1,13 @@ - + bcontrol-m Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/bcontrol-s.svg b/data/styles/clear/style-clear/symbols/bcontrol-s.svg index 08055d4269..1d4d68dc43 100644 --- a/data/styles/clear/style-clear/symbols/bcontrol-s.svg +++ b/data/styles/clear/style-clear/symbols/bcontrol-s.svg @@ -1,13 +1,13 @@ - + bcontrol-s Created with Sketch. - - - + + + diff --git a/data/styles/clear/style-clear/symbols/beach-l.svg b/data/styles/clear/style-clear/symbols/beach-l.svg index 1942534218..1bb1dd9810 100644 --- a/data/styles/clear/style-clear/symbols/beach-l.svg +++ b/data/styles/clear/style-clear/symbols/beach-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/beach-m.svg b/data/styles/clear/style-clear/symbols/beach-m.svg index 326c4d579f..79c11e2a7a 100644 --- a/data/styles/clear/style-clear/symbols/beach-m.svg +++ b/data/styles/clear/style-clear/symbols/beach-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/beauty-l.svg b/data/styles/clear/style-clear/symbols/beauty-l.svg index edeff2bfda..226153df36 100644 --- a/data/styles/clear/style-clear/symbols/beauty-l.svg +++ b/data/styles/clear/style-clear/symbols/beauty-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/beauty-m.svg b/data/styles/clear/style-clear/symbols/beauty-m.svg index b152dd3f26..58a97ed5b3 100644 --- a/data/styles/clear/style-clear/symbols/beauty-m.svg +++ b/data/styles/clear/style-clear/symbols/beauty-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/beer-l.svg b/data/styles/clear/style-clear/symbols/beer-l.svg index 21266c561f..ff34a150bf 100755 --- a/data/styles/clear/style-clear/symbols/beer-l.svg +++ b/data/styles/clear/style-clear/symbols/beer-l.svg @@ -1,14 +1,14 @@ - + beer-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/beer-m.svg b/data/styles/clear/style-clear/symbols/beer-m.svg index 8906e3e4b9..15b6b2e546 100755 --- a/data/styles/clear/style-clear/symbols/beer-m.svg +++ b/data/styles/clear/style-clear/symbols/beer-m.svg @@ -1,14 +1,14 @@ - + beer-m Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/beer-s.svg b/data/styles/clear/style-clear/symbols/beer-s.svg index 15c4dc4ffa..48eab4a9bd 100644 --- a/data/styles/clear/style-clear/symbols/beer-s.svg +++ b/data/styles/clear/style-clear/symbols/beer-s.svg @@ -1,5 +1,5 @@ - + beer-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/bicycle-l.svg b/data/styles/clear/style-clear/symbols/bicycle-l.svg index 560d4e2a4e..96c97860ab 100644 --- a/data/styles/clear/style-clear/symbols/bicycle-l.svg +++ b/data/styles/clear/style-clear/symbols/bicycle-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bicycle-m.svg b/data/styles/clear/style-clear/symbols/bicycle-m.svg index ce16686b8c..270e503c58 100644 --- a/data/styles/clear/style-clear/symbols/bicycle-m.svg +++ b/data/styles/clear/style-clear/symbols/bicycle-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bicycle-s.svg b/data/styles/clear/style-clear/symbols/bicycle-s.svg index 6f11f61440..3793bf78eb 100644 --- a/data/styles/clear/style-clear/symbols/bicycle-s.svg +++ b/data/styles/clear/style-clear/symbols/bicycle-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/book-shop-l.svg b/data/styles/clear/style-clear/symbols/book-shop-l.svg index dbe04c7d9c..aa7cd22421 100644 --- a/data/styles/clear/style-clear/symbols/book-shop-l.svg +++ b/data/styles/clear/style-clear/symbols/book-shop-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/book-shop-m.svg b/data/styles/clear/style-clear/symbols/book-shop-m.svg index c886131ca3..711273a286 100644 --- a/data/styles/clear/style-clear/symbols/book-shop-m.svg +++ b/data/styles/clear/style-clear/symbols/book-shop-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/boundary_stone-l.svg b/data/styles/clear/style-clear/symbols/boundary_stone-l.svg index 88a50136d1..6349beae23 100644 --- a/data/styles/clear/style-clear/symbols/boundary_stone-l.svg +++ b/data/styles/clear/style-clear/symbols/boundary_stone-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/boundary_stone-m.svg b/data/styles/clear/style-clear/symbols/boundary_stone-m.svg index 36d6623975..9f9b3c0bda 100644 --- a/data/styles/clear/style-clear/symbols/boundary_stone-m.svg +++ b/data/styles/clear/style-clear/symbols/boundary_stone-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bowls-l.svg b/data/styles/clear/style-clear/symbols/bowls-l.svg index 80032c9804..6035dc4d95 100644 --- a/data/styles/clear/style-clear/symbols/bowls-l.svg +++ b/data/styles/clear/style-clear/symbols/bowls-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/bowls-m.svg b/data/styles/clear/style-clear/symbols/bowls-m.svg index 4b9ded13bb..7389fd42ae 100644 --- a/data/styles/clear/style-clear/symbols/bowls-m.svg +++ b/data/styles/clear/style-clear/symbols/bowls-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/butcher-l.svg b/data/styles/clear/style-clear/symbols/butcher-l.svg index f475a176ed..f9f3b2342b 100644 --- a/data/styles/clear/style-clear/symbols/butcher-l.svg +++ b/data/styles/clear/style-clear/symbols/butcher-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/butcher-m.svg b/data/styles/clear/style-clear/symbols/butcher-m.svg index a31eef173b..a5bfb1685f 100644 --- a/data/styles/clear/style-clear/symbols/butcher-m.svg +++ b/data/styles/clear/style-clear/symbols/butcher-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cafe-l.svg b/data/styles/clear/style-clear/symbols/cafe-l.svg index 6a2bbbd3ac..5c05892c6c 100644 --- a/data/styles/clear/style-clear/symbols/cafe-l.svg +++ b/data/styles/clear/style-clear/symbols/cafe-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cafe-m.svg b/data/styles/clear/style-clear/symbols/cafe-m.svg index 4fa8bee328..f608a27b6f 100644 --- a/data/styles/clear/style-clear/symbols/cafe-m.svg +++ b/data/styles/clear/style-clear/symbols/cafe-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cafe-s.svg b/data/styles/clear/style-clear/symbols/cafe-s.svg index f60d5e08cf..601fcb3b7a 100644 --- a/data/styles/clear/style-clear/symbols/cafe-s.svg +++ b/data/styles/clear/style-clear/symbols/cafe-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/campsite-l.svg b/data/styles/clear/style-clear/symbols/campsite-l.svg index dce5f81f7e..a2a20a0dd6 100644 --- a/data/styles/clear/style-clear/symbols/campsite-l.svg +++ b/data/styles/clear/style-clear/symbols/campsite-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/campsite-m.svg b/data/styles/clear/style-clear/symbols/campsite-m.svg index 0520a7023b..6284dbb564 100644 --- a/data/styles/clear/style-clear/symbols/campsite-m.svg +++ b/data/styles/clear/style-clear/symbols/campsite-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/campsite-s.svg b/data/styles/clear/style-clear/symbols/campsite-s.svg index f92e20054f..b80b62a82e 100644 --- a/data/styles/clear/style-clear/symbols/campsite-s.svg +++ b/data/styles/clear/style-clear/symbols/campsite-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/car-repair-l.svg b/data/styles/clear/style-clear/symbols/car-repair-l.svg index 0c7892005d..76850530ef 100755 --- a/data/styles/clear/style-clear/symbols/car-repair-l.svg +++ b/data/styles/clear/style-clear/symbols/car-repair-l.svg @@ -1,14 +1,14 @@ - + car-repair-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/car-repair-m.svg b/data/styles/clear/style-clear/symbols/car-repair-m.svg index 2558608e19..44dac48534 100755 --- a/data/styles/clear/style-clear/symbols/car-repair-m.svg +++ b/data/styles/clear/style-clear/symbols/car-repair-m.svg @@ -1,14 +1,14 @@ - + car-repair-m Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/car_sharing-l.svg b/data/styles/clear/style-clear/symbols/car_sharing-l.svg index a9c5a86d21..35aa4a313e 100644 --- a/data/styles/clear/style-clear/symbols/car_sharing-l.svg +++ b/data/styles/clear/style-clear/symbols/car_sharing-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/car_sharing-m.svg b/data/styles/clear/style-clear/symbols/car_sharing-m.svg index 0b4db09d2a..580040a2cf 100644 --- a/data/styles/clear/style-clear/symbols/car_sharing-m.svg +++ b/data/styles/clear/style-clear/symbols/car_sharing-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/caravan_site-l.svg b/data/styles/clear/style-clear/symbols/caravan_site-l.svg index de1bbddc7f..5115066fa1 100644 --- a/data/styles/clear/style-clear/symbols/caravan_site-l.svg +++ b/data/styles/clear/style-clear/symbols/caravan_site-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/caravan_site-m.svg b/data/styles/clear/style-clear/symbols/caravan_site-m.svg index 4bcd1d52d0..987591a974 100644 --- a/data/styles/clear/style-clear/symbols/caravan_site-m.svg +++ b/data/styles/clear/style-clear/symbols/caravan_site-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/casino-l.svg b/data/styles/clear/style-clear/symbols/casino-l.svg index 9d0c776912..4888ad4cd3 100644 --- a/data/styles/clear/style-clear/symbols/casino-l.svg +++ b/data/styles/clear/style-clear/symbols/casino-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/casino-m.svg b/data/styles/clear/style-clear/symbols/casino-m.svg index 733b4b86ec..4d43661673 100644 --- a/data/styles/clear/style-clear/symbols/casino-m.svg +++ b/data/styles/clear/style-clear/symbols/casino-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cave-l.svg b/data/styles/clear/style-clear/symbols/cave-l.svg index 97d5eab61f..34d27ce888 100644 --- a/data/styles/clear/style-clear/symbols/cave-l.svg +++ b/data/styles/clear/style-clear/symbols/cave-l.svg @@ -8,7 +8,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cave-m.svg b/data/styles/clear/style-clear/symbols/cave-m.svg index 4b288e0996..e307eb67df 100644 --- a/data/styles/clear/style-clear/symbols/cave-m.svg +++ b/data/styles/clear/style-clear/symbols/cave-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cave-s.svg b/data/styles/clear/style-clear/symbols/cave-s.svg index 61ac63a03e..f8f58c46e3 100644 --- a/data/styles/clear/style-clear/symbols/cave-s.svg +++ b/data/styles/clear/style-clear/symbols/cave-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cemetery-l.svg b/data/styles/clear/style-clear/symbols/cemetery-l.svg index c747b6df30..5794bfe35d 100644 --- a/data/styles/clear/style-clear/symbols/cemetery-l.svg +++ b/data/styles/clear/style-clear/symbols/cemetery-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cemetery-m.svg b/data/styles/clear/style-clear/symbols/cemetery-m.svg index 4e00f91536..3ed0e11cfe 100644 --- a/data/styles/clear/style-clear/symbols/cemetery-m.svg +++ b/data/styles/clear/style-clear/symbols/cemetery-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cemetery-s.svg b/data/styles/clear/style-clear/symbols/cemetery-s.svg index e25fe59678..aebf4a336e 100644 --- a/data/styles/clear/style-clear/symbols/cemetery-s.svg +++ b/data/styles/clear/style-clear/symbols/cemetery-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/chemist-l.svg b/data/styles/clear/style-clear/symbols/chemist-l.svg index 1b80c63c82..f1354b958f 100644 --- a/data/styles/clear/style-clear/symbols/chemist-l.svg +++ b/data/styles/clear/style-clear/symbols/chemist-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/chemist-m.svg b/data/styles/clear/style-clear/symbols/chemist-m.svg index 6b5a563e60..b6e3e72fed 100644 --- a/data/styles/clear/style-clear/symbols/chemist-m.svg +++ b/data/styles/clear/style-clear/symbols/chemist-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cinema-l.svg b/data/styles/clear/style-clear/symbols/cinema-l.svg index 66bf235454..21d8d2a775 100644 --- a/data/styles/clear/style-clear/symbols/cinema-l.svg +++ b/data/styles/clear/style-clear/symbols/cinema-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cinema-m.svg b/data/styles/clear/style-clear/symbols/cinema-m.svg index cd777a494a..83be671fc1 100644 --- a/data/styles/clear/style-clear/symbols/cinema-m.svg +++ b/data/styles/clear/style-clear/symbols/cinema-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cinema-s.svg b/data/styles/clear/style-clear/symbols/cinema-s.svg index 084226cdad..3f38bbffe2 100644 --- a/data/styles/clear/style-clear/symbols/cinema-s.svg +++ b/data/styles/clear/style-clear/symbols/cinema-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/clothes-l.svg b/data/styles/clear/style-clear/symbols/clothes-l.svg index 7aa86c7dc3..4d43d41f74 100644 --- a/data/styles/clear/style-clear/symbols/clothes-l.svg +++ b/data/styles/clear/style-clear/symbols/clothes-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/clothes-m.svg b/data/styles/clear/style-clear/symbols/clothes-m.svg index e845b9aef2..e4ea89d1c1 100644 --- a/data/styles/clear/style-clear/symbols/clothes-m.svg +++ b/data/styles/clear/style-clear/symbols/clothes-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/college-l.svg b/data/styles/clear/style-clear/symbols/college-l.svg index 7bf7e9ad09..d5e7ee37df 100644 --- a/data/styles/clear/style-clear/symbols/college-l.svg +++ b/data/styles/clear/style-clear/symbols/college-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/college-m.svg b/data/styles/clear/style-clear/symbols/college-m.svg index 3eb510b27d..61707a3782 100644 --- a/data/styles/clear/style-clear/symbols/college-m.svg +++ b/data/styles/clear/style-clear/symbols/college-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/college-s.svg b/data/styles/clear/style-clear/symbols/college-s.svg index a317ce71c1..920492bfd2 100644 --- a/data/styles/clear/style-clear/symbols/college-s.svg +++ b/data/styles/clear/style-clear/symbols/college-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/computer-l.svg b/data/styles/clear/style-clear/symbols/computer-l.svg index c324e6a292..4157bc7006 100644 --- a/data/styles/clear/style-clear/symbols/computer-l.svg +++ b/data/styles/clear/style-clear/symbols/computer-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/computer-m.svg b/data/styles/clear/style-clear/symbols/computer-m.svg index 8b539535f0..7f98c78094 100644 --- a/data/styles/clear/style-clear/symbols/computer-m.svg +++ b/data/styles/clear/style-clear/symbols/computer-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/convenience-l.svg b/data/styles/clear/style-clear/symbols/convenience-l.svg index dd9865e906..210058f7ad 100644 --- a/data/styles/clear/style-clear/symbols/convenience-l.svg +++ b/data/styles/clear/style-clear/symbols/convenience-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/convenience-m.svg b/data/styles/clear/style-clear/symbols/convenience-m.svg index d6c4e0c3d6..e46a98d0d2 100644 --- a/data/styles/clear/style-clear/symbols/convenience-m.svg +++ b/data/styles/clear/style-clear/symbols/convenience-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cricket-l.svg b/data/styles/clear/style-clear/symbols/cricket-l.svg index 945b6d0e56..ff04db7d64 100644 --- a/data/styles/clear/style-clear/symbols/cricket-l.svg +++ b/data/styles/clear/style-clear/symbols/cricket-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/cricket-m.svg b/data/styles/clear/style-clear/symbols/cricket-m.svg index 0bee681985..fad18d2ed4 100644 --- a/data/styles/clear/style-clear/symbols/cricket-m.svg +++ b/data/styles/clear/style-clear/symbols/cricket-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/crossing-l.svg b/data/styles/clear/style-clear/symbols/crossing-l.svg new file mode 100644 index 0000000000..10a11b2062 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/crossing-l.svg @@ -0,0 +1,10 @@ + + + + crossing-l + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/crossing-m.svg b/data/styles/clear/style-clear/symbols/crossing-m.svg new file mode 100644 index 0000000000..e1a0bc017d --- /dev/null +++ b/data/styles/clear/style-clear/symbols/crossing-m.svg @@ -0,0 +1,10 @@ + + + + crossing-m + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/crossing-s.svg b/data/styles/clear/style-clear/symbols/crossing-s.svg new file mode 100644 index 0000000000..20a44daa44 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/crossing-s.svg @@ -0,0 +1,10 @@ + + + + crossing-s + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/curling-l.svg b/data/styles/clear/style-clear/symbols/curling-l.svg index 09b7713976..b2b4a5690c 100644 --- a/data/styles/clear/style-clear/symbols/curling-l.svg +++ b/data/styles/clear/style-clear/symbols/curling-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/curling-m.svg b/data/styles/clear/style-clear/symbols/curling-m.svg index 608ff01610..c2d9163931 100644 --- a/data/styles/clear/style-clear/symbols/curling-m.svg +++ b/data/styles/clear/style-clear/symbols/curling-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/department_store-l.svg b/data/styles/clear/style-clear/symbols/department_store-l.svg index 09d679a7d5..c2e21f563c 100644 --- a/data/styles/clear/style-clear/symbols/department_store-l.svg +++ b/data/styles/clear/style-clear/symbols/department_store-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/department_store-m.svg b/data/styles/clear/style-clear/symbols/department_store-m.svg index 88073533d4..c0960da2f7 100644 --- a/data/styles/clear/style-clear/symbols/department_store-m.svg +++ b/data/styles/clear/style-clear/symbols/department_store-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/diving-l.svg b/data/styles/clear/style-clear/symbols/diving-l.svg index 744dc79e62..32e99df906 100644 --- a/data/styles/clear/style-clear/symbols/diving-l.svg +++ b/data/styles/clear/style-clear/symbols/diving-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/diving-m.svg b/data/styles/clear/style-clear/symbols/diving-m.svg index d56006f9fe..1a67a90a50 100644 --- a/data/styles/clear/style-clear/symbols/diving-m.svg +++ b/data/styles/clear/style-clear/symbols/diving-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/dog_park-l.svg b/data/styles/clear/style-clear/symbols/dog_park-l.svg index fd8caae411..8bdeadffc3 100644 --- a/data/styles/clear/style-clear/symbols/dog_park-l.svg +++ b/data/styles/clear/style-clear/symbols/dog_park-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/dog_park-m.svg b/data/styles/clear/style-clear/symbols/dog_park-m.svg index d638c78f5e..746651d080 100644 --- a/data/styles/clear/style-clear/symbols/dog_park-m.svg +++ b/data/styles/clear/style-clear/symbols/dog_park-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/doityourself-l.svg b/data/styles/clear/style-clear/symbols/doityourself-l.svg index 03f64e99db..d056ce7931 100644 --- a/data/styles/clear/style-clear/symbols/doityourself-l.svg +++ b/data/styles/clear/style-clear/symbols/doityourself-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/doityourself-m.svg b/data/styles/clear/style-clear/symbols/doityourself-m.svg index eda8c3dd03..a8035dea76 100644 --- a/data/styles/clear/style-clear/symbols/doityourself-m.svg +++ b/data/styles/clear/style-clear/symbols/doityourself-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/dot-m.svg b/data/styles/clear/style-clear/symbols/dot-m.svg index 81836212b5..1241f22b05 100644 --- a/data/styles/clear/style-clear/symbols/dot-m.svg +++ b/data/styles/clear/style-clear/symbols/dot-m.svg @@ -1,17 +1,19 @@ - + dot-m Created with Sketch. - - - - - - - + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dot-s-light.svg b/data/styles/clear/style-clear/symbols/dot-s-light.svg index 2609f295a6..9ef33b7f9c 100644 --- a/data/styles/clear/style-clear/symbols/dot-s-light.svg +++ b/data/styles/clear/style-clear/symbols/dot-s-light.svg @@ -1,18 +1,20 @@ - + dot-s-light Created with Sketch. - - - - - - - - + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dot-s.svg b/data/styles/clear/style-clear/symbols/dot-s.svg index 305b66e454..f4dde34347 100644 --- a/data/styles/clear/style-clear/symbols/dot-s.svg +++ b/data/styles/clear/style-clear/symbols/dot-s.svg @@ -1,18 +1,20 @@ - + dot-s Created with Sketch. - - - - - - - - + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/electronics-l.svg b/data/styles/clear/style-clear/symbols/electronics-l.svg index 87caae73af..703d303812 100644 --- a/data/styles/clear/style-clear/symbols/electronics-l.svg +++ b/data/styles/clear/style-clear/symbols/electronics-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/electronics-m.svg b/data/styles/clear/style-clear/symbols/electronics-m.svg index 1f6b6b29ef..3712220e11 100644 --- a/data/styles/clear/style-clear/symbols/electronics-m.svg +++ b/data/styles/clear/style-clear/symbols/electronics-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/embassy-l.svg b/data/styles/clear/style-clear/symbols/embassy-l.svg index bd0dc633fa..3b30228aa9 100644 --- a/data/styles/clear/style-clear/symbols/embassy-l.svg +++ b/data/styles/clear/style-clear/symbols/embassy-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/embassy-m.svg b/data/styles/clear/style-clear/symbols/embassy-m.svg index 67f099df91..c62f94558a 100644 --- a/data/styles/clear/style-clear/symbols/embassy-m.svg +++ b/data/styles/clear/style-clear/symbols/embassy-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/embassy-s.svg b/data/styles/clear/style-clear/symbols/embassy-s.svg index c196e97af4..1c6dcaac3f 100644 --- a/data/styles/clear/style-clear/symbols/embassy-s.svg +++ b/data/styles/clear/style-clear/symbols/embassy-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/equestrian-l.svg b/data/styles/clear/style-clear/symbols/equestrian-l.svg new file mode 100644 index 0000000000..d17b72191a --- /dev/null +++ b/data/styles/clear/style-clear/symbols/equestrian-l.svg @@ -0,0 +1,16 @@ + + + + equestrian-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/equestrian-m.svg b/data/styles/clear/style-clear/symbols/equestrian-m.svg new file mode 100644 index 0000000000..60f6f18dce --- /dev/null +++ b/data/styles/clear/style-clear/symbols/equestrian-m.svg @@ -0,0 +1,14 @@ + + + + equestrian-m + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/car-repair-s.svg b/data/styles/clear/style-clear/symbols/equestrian-s.svg similarity index 94% rename from data/styles/clear/style-night/symbols/car-repair-s.svg rename to data/styles/clear/style-clear/symbols/equestrian-s.svg index 0b886153ae..0450ccdb88 100644 --- a/data/styles/clear/style-night/symbols/car-repair-s.svg +++ b/data/styles/clear/style-clear/symbols/equestrian-s.svg @@ -1,7 +1,7 @@ - car-repair-s + equestrian-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/fastfood-l.svg b/data/styles/clear/style-clear/symbols/fastfood-l.svg index 813c5598d5..c07e31d63d 100644 --- a/data/styles/clear/style-clear/symbols/fastfood-l.svg +++ b/data/styles/clear/style-clear/symbols/fastfood-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/fastfood-m.svg b/data/styles/clear/style-clear/symbols/fastfood-m.svg index dc03c99ebe..0c4101ce24 100644 --- a/data/styles/clear/style-clear/symbols/fastfood-m.svg +++ b/data/styles/clear/style-clear/symbols/fastfood-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/fastfood-s.svg b/data/styles/clear/style-clear/symbols/fastfood-s.svg index 512744fd0b..1dab488d7a 100644 --- a/data/styles/clear/style-clear/symbols/fastfood-s.svg +++ b/data/styles/clear/style-clear/symbols/fastfood-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/fire_station-l.svg b/data/styles/clear/style-clear/symbols/fire_station-l.svg index 06b5140b5c..e11e04a103 100644 --- a/data/styles/clear/style-clear/symbols/fire_station-l.svg +++ b/data/styles/clear/style-clear/symbols/fire_station-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/fire_station-m.svg b/data/styles/clear/style-clear/symbols/fire_station-m.svg index 40a1af5a69..80796960e9 100644 --- a/data/styles/clear/style-clear/symbols/fire_station-m.svg +++ b/data/styles/clear/style-clear/symbols/fire_station-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/florist-l.svg b/data/styles/clear/style-clear/symbols/florist-l.svg index a2f9f5da8b..ba3f93f910 100644 --- a/data/styles/clear/style-clear/symbols/florist-l.svg +++ b/data/styles/clear/style-clear/symbols/florist-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/florist-m.svg b/data/styles/clear/style-clear/symbols/florist-m.svg index 4e3fefadf5..5208279883 100644 --- a/data/styles/clear/style-clear/symbols/florist-m.svg +++ b/data/styles/clear/style-clear/symbols/florist-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/fuel-l.svg b/data/styles/clear/style-clear/symbols/fuel-l.svg index 027288d765..0ba830aaaa 100644 --- a/data/styles/clear/style-clear/symbols/fuel-l.svg +++ b/data/styles/clear/style-clear/symbols/fuel-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/fuel-m.svg b/data/styles/clear/style-clear/symbols/fuel-m.svg index b6beceb60d..ac5da8af15 100644 --- a/data/styles/clear/style-clear/symbols/fuel-m.svg +++ b/data/styles/clear/style-clear/symbols/fuel-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/fuel-s.svg b/data/styles/clear/style-clear/symbols/fuel-s.svg index 9ee7e9c156..ba744bb2e4 100644 --- a/data/styles/clear/style-clear/symbols/fuel-s.svg +++ b/data/styles/clear/style-clear/symbols/fuel-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/furniture-l.svg b/data/styles/clear/style-clear/symbols/furniture-l.svg index 37ddaa5b1c..cd28e730a6 100644 --- a/data/styles/clear/style-clear/symbols/furniture-l.svg +++ b/data/styles/clear/style-clear/symbols/furniture-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/furniture-m.svg b/data/styles/clear/style-clear/symbols/furniture-m.svg index 32d51ff7c3..167c02a9b4 100644 --- a/data/styles/clear/style-clear/symbols/furniture-m.svg +++ b/data/styles/clear/style-clear/symbols/furniture-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/gallery-l.svg b/data/styles/clear/style-clear/symbols/gallery-l.svg index 5b7fd1eb17..3beb82ac53 100644 --- a/data/styles/clear/style-clear/symbols/gallery-l.svg +++ b/data/styles/clear/style-clear/symbols/gallery-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/gallery-m.svg b/data/styles/clear/style-clear/symbols/gallery-m.svg index ae735174e9..46007cf897 100644 --- a/data/styles/clear/style-clear/symbols/gallery-m.svg +++ b/data/styles/clear/style-clear/symbols/gallery-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/gallery-s.svg b/data/styles/clear/style-clear/symbols/gallery-s.svg index f9a6a91c67..c66f511ccc 100644 --- a/data/styles/clear/style-clear/symbols/gallery-s.svg +++ b/data/styles/clear/style-clear/symbols/gallery-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/garden_center-l.svg b/data/styles/clear/style-clear/symbols/garden_center-l.svg index 235d748f7d..4ecf166dc0 100644 --- a/data/styles/clear/style-clear/symbols/garden_center-l.svg +++ b/data/styles/clear/style-clear/symbols/garden_center-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/garden_center-m.svg b/data/styles/clear/style-clear/symbols/garden_center-m.svg index 08d571bd07..fd2933ca5c 100644 --- a/data/styles/clear/style-clear/symbols/garden_center-m.svg +++ b/data/styles/clear/style-clear/symbols/garden_center-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/gate-l.svg b/data/styles/clear/style-clear/symbols/gate-l.svg index a4865180d1..441a785cda 100644 --- a/data/styles/clear/style-clear/symbols/gate-l.svg +++ b/data/styles/clear/style-clear/symbols/gate-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/gate-m.svg b/data/styles/clear/style-clear/symbols/gate-m.svg index 1d9ef8bd87..6fc2355a14 100644 --- a/data/styles/clear/style-clear/symbols/gate-m.svg +++ b/data/styles/clear/style-clear/symbols/gate-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/gift-l.svg b/data/styles/clear/style-clear/symbols/gift-l.svg index 4cab46d5a5..0688e3252f 100644 --- a/data/styles/clear/style-clear/symbols/gift-l.svg +++ b/data/styles/clear/style-clear/symbols/gift-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/gift-m.svg b/data/styles/clear/style-clear/symbols/gift-m.svg index 647a5450b8..f101698570 100644 --- a/data/styles/clear/style-clear/symbols/gift-m.svg +++ b/data/styles/clear/style-clear/symbols/gift-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/golf-l.svg b/data/styles/clear/style-clear/symbols/golf-l.svg index 5f8034cbf9..e2910a77f0 100644 --- a/data/styles/clear/style-clear/symbols/golf-l.svg +++ b/data/styles/clear/style-clear/symbols/golf-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/golf-m.svg b/data/styles/clear/style-clear/symbols/golf-m.svg index 3fe997525c..1e39b8972f 100644 --- a/data/styles/clear/style-clear/symbols/golf-m.svg +++ b/data/styles/clear/style-clear/symbols/golf-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/golf-s.svg b/data/styles/clear/style-clear/symbols/golf-s.svg index 06dc6f0c6f..a76b6d8a1a 100644 --- a/data/styles/clear/style-clear/symbols/golf-s.svg +++ b/data/styles/clear/style-clear/symbols/golf-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/greengrocer-l.svg b/data/styles/clear/style-clear/symbols/greengrocer-l.svg index c1114fceff..bf2bf4fd3c 100644 --- a/data/styles/clear/style-clear/symbols/greengrocer-l.svg +++ b/data/styles/clear/style-clear/symbols/greengrocer-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/greengrocer-m.svg b/data/styles/clear/style-clear/symbols/greengrocer-m.svg index b784be4841..45652a5dab 100644 --- a/data/styles/clear/style-clear/symbols/greengrocer-m.svg +++ b/data/styles/clear/style-clear/symbols/greengrocer-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/grocery-l.svg b/data/styles/clear/style-clear/symbols/grocery-l.svg index 0a8d73ea4a..25af0d2c78 100644 --- a/data/styles/clear/style-clear/symbols/grocery-l.svg +++ b/data/styles/clear/style-clear/symbols/grocery-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/grocery-m.svg b/data/styles/clear/style-clear/symbols/grocery-m.svg index ab4d2f6674..075b287d0e 100644 --- a/data/styles/clear/style-clear/symbols/grocery-m.svg +++ b/data/styles/clear/style-clear/symbols/grocery-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/grocery-s.svg b/data/styles/clear/style-clear/symbols/grocery-s.svg index 0d37f91bd5..0ce5c56d06 100644 --- a/data/styles/clear/style-clear/symbols/grocery-s.svg +++ b/data/styles/clear/style-clear/symbols/grocery-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/hairdresser-l.svg b/data/styles/clear/style-clear/symbols/hairdresser-l.svg index dc3bda1582..a556f92a4d 100644 --- a/data/styles/clear/style-clear/symbols/hairdresser-l.svg +++ b/data/styles/clear/style-clear/symbols/hairdresser-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/hairdresser-m.svg b/data/styles/clear/style-clear/symbols/hairdresser-m.svg index ae87a9246d..f7ed8b18b8 100644 --- a/data/styles/clear/style-clear/symbols/hairdresser-m.svg +++ b/data/styles/clear/style-clear/symbols/hairdresser-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/hand-l.svg b/data/styles/clear/style-clear/symbols/hand-l.svg new file mode 100644 index 0000000000..80d5d0522d --- /dev/null +++ b/data/styles/clear/style-clear/symbols/hand-l.svg @@ -0,0 +1,14 @@ + + + + hand-l + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/hand-m.svg b/data/styles/clear/style-clear/symbols/hand-m.svg new file mode 100644 index 0000000000..c3092157fc --- /dev/null +++ b/data/styles/clear/style-clear/symbols/hand-m.svg @@ -0,0 +1,14 @@ + + + + hand-m + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/windmill-s.svg b/data/styles/clear/style-clear/symbols/hand-s.svg similarity index 94% rename from data/styles/clear/style-night/symbols/windmill-s.svg rename to data/styles/clear/style-clear/symbols/hand-s.svg index 129bf5fa3d..f26e77ea29 100644 --- a/data/styles/clear/style-night/symbols/windmill-s.svg +++ b/data/styles/clear/style-clear/symbols/hand-s.svg @@ -1,7 +1,7 @@ - windmill-s + hand-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/hardware-l.svg b/data/styles/clear/style-clear/symbols/hardware-l.svg index 26c215eece..be8dbdca80 100644 --- a/data/styles/clear/style-clear/symbols/hardware-l.svg +++ b/data/styles/clear/style-clear/symbols/hardware-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/hardware-m.svg b/data/styles/clear/style-clear/symbols/hardware-m.svg index 0b54c5a2ca..9e18edf339 100644 --- a/data/styles/clear/style-clear/symbols/hardware-m.svg +++ b/data/styles/clear/style-clear/symbols/hardware-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/heliport-l.svg b/data/styles/clear/style-clear/symbols/heliport-l.svg index e51ec898fc..33239a63bb 100644 --- a/data/styles/clear/style-clear/symbols/heliport-l.svg +++ b/data/styles/clear/style-clear/symbols/heliport-l.svg @@ -1,12 +1,12 @@ - + heliport-l Created with Sketch. - - - + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/heliport-m.svg b/data/styles/clear/style-clear/symbols/heliport-m.svg index 89173cb40e..9304831e08 100644 --- a/data/styles/clear/style-clear/symbols/heliport-m.svg +++ b/data/styles/clear/style-clear/symbols/heliport-m.svg @@ -1,13 +1,13 @@ - + heliport-m Created with Sketch. - - - - + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/heliport-s.svg b/data/styles/clear/style-clear/symbols/heliport-s.svg index 09993548fb..bc60524043 100644 --- a/data/styles/clear/style-clear/symbols/heliport-s.svg +++ b/data/styles/clear/style-clear/symbols/heliport-s.svg @@ -1,12 +1,12 @@ - + heliport-s Created with Sketch. - - - + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/historic-ship-l.svg b/data/styles/clear/style-clear/symbols/historic-ship-l.svg index e98c223fd2..620a58c7cc 100644 --- a/data/styles/clear/style-clear/symbols/historic-ship-l.svg +++ b/data/styles/clear/style-clear/symbols/historic-ship-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/historic-ship-m.svg b/data/styles/clear/style-clear/symbols/historic-ship-m.svg index 7e2f06d907..57a64b4dbf 100644 --- a/data/styles/clear/style-clear/symbols/historic-ship-m.svg +++ b/data/styles/clear/style-clear/symbols/historic-ship-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/hotel-l.svg b/data/styles/clear/style-clear/symbols/hotel-l.svg index aa6efb586c..e1e90d8e31 100644 --- a/data/styles/clear/style-clear/symbols/hotel-l.svg +++ b/data/styles/clear/style-clear/symbols/hotel-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/hotel-m.svg b/data/styles/clear/style-clear/symbols/hotel-m.svg index 177cbce4fe..c3b94ec0b6 100644 --- a/data/styles/clear/style-clear/symbols/hotel-m.svg +++ b/data/styles/clear/style-clear/symbols/hotel-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/hotel-s.svg b/data/styles/clear/style-clear/symbols/hotel-s.svg index 727db6388b..f219903614 100644 --- a/data/styles/clear/style-clear/symbols/hotel-s.svg +++ b/data/styles/clear/style-clear/symbols/hotel-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-l.svg b/data/styles/clear/style-clear/symbols/hunting-tower-l.svg index a2d83ef315..cbf1b8defb 100755 --- a/data/styles/clear/style-clear/symbols/hunting-tower-l.svg +++ b/data/styles/clear/style-clear/symbols/hunting-tower-l.svg @@ -1,14 +1,14 @@ - + hunting-tower-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-m.svg b/data/styles/clear/style-clear/symbols/hunting-tower-m.svg index 81deec076a..5c6babb90a 100755 --- a/data/styles/clear/style-clear/symbols/hunting-tower-m.svg +++ b/data/styles/clear/style-clear/symbols/hunting-tower-m.svg @@ -1,14 +1,14 @@ - + hunting-tower-m Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-s.svg b/data/styles/clear/style-clear/symbols/hunting-tower-s.svg index 2653eddbac..8fa684d8a0 100644 --- a/data/styles/clear/style-clear/symbols/hunting-tower-s.svg +++ b/data/styles/clear/style-clear/symbols/hunting-tower-s.svg @@ -1,5 +1,5 @@ - + hunting-tower-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/information-l.svg b/data/styles/clear/style-clear/symbols/information-l.svg index 552865d8ec..351d4b1ef3 100644 --- a/data/styles/clear/style-clear/symbols/information-l.svg +++ b/data/styles/clear/style-clear/symbols/information-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/information-m.svg b/data/styles/clear/style-clear/symbols/information-m.svg index 92d3ea840e..12daa0c5ac 100644 --- a/data/styles/clear/style-clear/symbols/information-m.svg +++ b/data/styles/clear/style-clear/symbols/information-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/information-s.svg b/data/styles/clear/style-clear/symbols/information-s.svg index bcfd4f26bf..6dedab4e1f 100644 --- a/data/styles/clear/style-clear/symbols/information-s.svg +++ b/data/styles/clear/style-clear/symbols/information-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/jewelry-l.svg b/data/styles/clear/style-clear/symbols/jewelry-l.svg index 1cf195b902..e2cf3ea912 100644 --- a/data/styles/clear/style-clear/symbols/jewelry-l.svg +++ b/data/styles/clear/style-clear/symbols/jewelry-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/jewelry-m.svg b/data/styles/clear/style-clear/symbols/jewelry-m.svg index d08f967c74..528eb7a85f 100644 --- a/data/styles/clear/style-clear/symbols/jewelry-m.svg +++ b/data/styles/clear/style-clear/symbols/jewelry-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/kindergarten-l.svg b/data/styles/clear/style-clear/symbols/kindergarten-l.svg index 25fe546cd9..766118bdcd 100644 --- a/data/styles/clear/style-clear/symbols/kindergarten-l.svg +++ b/data/styles/clear/style-clear/symbols/kindergarten-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/kindergarten-m.svg b/data/styles/clear/style-clear/symbols/kindergarten-m.svg index 946ce2dc67..b739bdc880 100644 --- a/data/styles/clear/style-clear/symbols/kindergarten-m.svg +++ b/data/styles/clear/style-clear/symbols/kindergarten-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/kindergarten-s.svg b/data/styles/clear/style-clear/symbols/kindergarten-s.svg index b7ffa902d9..3acf278b3b 100644 --- a/data/styles/clear/style-clear/symbols/kindergarten-s.svg +++ b/data/styles/clear/style-clear/symbols/kindergarten-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/kiosk-l.svg b/data/styles/clear/style-clear/symbols/kiosk-l.svg index e8e262a2aa..8e454b0d1c 100644 --- a/data/styles/clear/style-clear/symbols/kiosk-l.svg +++ b/data/styles/clear/style-clear/symbols/kiosk-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/kiosk-m.svg b/data/styles/clear/style-clear/symbols/kiosk-m.svg index 31a1397cf8..9a1cf4b9bd 100644 --- a/data/styles/clear/style-clear/symbols/kiosk-m.svg +++ b/data/styles/clear/style-clear/symbols/kiosk-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/laundry-l.svg b/data/styles/clear/style-clear/symbols/laundry-l.svg index 94dae25fea..e52c510adb 100755 --- a/data/styles/clear/style-clear/symbols/laundry-l.svg +++ b/data/styles/clear/style-clear/symbols/laundry-l.svg @@ -1,15 +1,15 @@ - + laundry-l Created with Sketch. - + - + - + diff --git a/data/styles/clear/style-clear/symbols/laundry-m.svg b/data/styles/clear/style-clear/symbols/laundry-m.svg index 8a191d5751..11413c4d31 100755 --- a/data/styles/clear/style-clear/symbols/laundry-m.svg +++ b/data/styles/clear/style-clear/symbols/laundry-m.svg @@ -1,15 +1,15 @@ - + laundry-m Created with Sketch. - + - + - + diff --git a/data/styles/clear/style-clear/symbols/library-l.svg b/data/styles/clear/style-clear/symbols/library-l.svg index a548d17932..271459cc28 100644 --- a/data/styles/clear/style-clear/symbols/library-l.svg +++ b/data/styles/clear/style-clear/symbols/library-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/library-m.svg b/data/styles/clear/style-clear/symbols/library-m.svg index 01d5d78da0..6d25fd0974 100644 --- a/data/styles/clear/style-clear/symbols/library-m.svg +++ b/data/styles/clear/style-clear/symbols/library-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/library-s.svg b/data/styles/clear/style-clear/symbols/library-s.svg index 2a039f33f3..86613a39cc 100644 --- a/data/styles/clear/style-clear/symbols/library-s.svg +++ b/data/styles/clear/style-clear/symbols/library-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/lift_gate-l.svg b/data/styles/clear/style-clear/symbols/lift_gate-l.svg index 389d268abd..4024b57242 100644 --- a/data/styles/clear/style-clear/symbols/lift_gate-l.svg +++ b/data/styles/clear/style-clear/symbols/lift_gate-l.svg @@ -5,10 +5,8 @@ Created with Sketch. - - - - + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/lift_gate-m.svg b/data/styles/clear/style-clear/symbols/lift_gate-m.svg index 4b8c7759b1..51e8dd38fd 100644 --- a/data/styles/clear/style-clear/symbols/lift_gate-m.svg +++ b/data/styles/clear/style-clear/symbols/lift_gate-m.svg @@ -5,10 +5,8 @@ Created with Sketch. - - - - + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/lighthouse-l.svg b/data/styles/clear/style-clear/symbols/lighthouse-l.svg index 5a1d2313cd..e9851e9584 100644 --- a/data/styles/clear/style-clear/symbols/lighthouse-l.svg +++ b/data/styles/clear/style-clear/symbols/lighthouse-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/lighthouse-m.svg b/data/styles/clear/style-clear/symbols/lighthouse-m.svg index c37cc8f7c6..6d35e02034 100644 --- a/data/styles/clear/style-clear/symbols/lighthouse-m.svg +++ b/data/styles/clear/style-clear/symbols/lighthouse-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/lighthouse-s.svg b/data/styles/clear/style-clear/symbols/lighthouse-s.svg index 3ba3648ffd..240bb3a4f4 100644 --- a/data/styles/clear/style-clear/symbols/lighthouse-s.svg +++ b/data/styles/clear/style-clear/symbols/lighthouse-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/mail-l.svg b/data/styles/clear/style-clear/symbols/mail-l.svg index fd76776160..4536c25d83 100644 --- a/data/styles/clear/style-clear/symbols/mail-l.svg +++ b/data/styles/clear/style-clear/symbols/mail-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/mail-m.svg b/data/styles/clear/style-clear/symbols/mail-m.svg index 4c7f7b1456..084cf7ecf5 100644 --- a/data/styles/clear/style-clear/symbols/mail-m.svg +++ b/data/styles/clear/style-clear/symbols/mail-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/mail-s.svg b/data/styles/clear/style-clear/symbols/mail-s.svg index 005a33f779..e546330ab4 100644 --- a/data/styles/clear/style-clear/symbols/mail-s.svg +++ b/data/styles/clear/style-clear/symbols/mail-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/marketplace-l.svg b/data/styles/clear/style-clear/symbols/marketplace-l.svg index 7a27774177..3ea5ed4cb8 100644 --- a/data/styles/clear/style-clear/symbols/marketplace-l.svg +++ b/data/styles/clear/style-clear/symbols/marketplace-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/marketplace-m.svg b/data/styles/clear/style-clear/symbols/marketplace-m.svg index 84d6d1bfd1..a38c14171f 100644 --- a/data/styles/clear/style-clear/symbols/marketplace-m.svg +++ b/data/styles/clear/style-clear/symbols/marketplace-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/military-l.svg b/data/styles/clear/style-clear/symbols/military-l.svg index e02806758d..7e0285376b 100644 --- a/data/styles/clear/style-clear/symbols/military-l.svg +++ b/data/styles/clear/style-clear/symbols/military-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/military-m.svg b/data/styles/clear/style-clear/symbols/military-m.svg index 2acc091383..513cbea82b 100644 --- a/data/styles/clear/style-clear/symbols/military-m.svg +++ b/data/styles/clear/style-clear/symbols/military-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/military-s.svg b/data/styles/clear/style-clear/symbols/military-s.svg index 602973073f..6bdbf95110 100644 --- a/data/styles/clear/style-clear/symbols/military-s.svg +++ b/data/styles/clear/style-clear/symbols/military-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/mobile_phone-l.svg b/data/styles/clear/style-clear/symbols/mobile_phone-l.svg index e5ec653bbb..595160239f 100644 --- a/data/styles/clear/style-clear/symbols/mobile_phone-l.svg +++ b/data/styles/clear/style-clear/symbols/mobile_phone-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/mobile_phone-m.svg b/data/styles/clear/style-clear/symbols/mobile_phone-m.svg index 37d40cfb32..3a4b3f100b 100644 --- a/data/styles/clear/style-clear/symbols/mobile_phone-m.svg +++ b/data/styles/clear/style-clear/symbols/mobile_phone-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/monument-l.svg b/data/styles/clear/style-clear/symbols/monument-l.svg index 7e44dd8ffc..75560306cc 100644 --- a/data/styles/clear/style-clear/symbols/monument-l.svg +++ b/data/styles/clear/style-clear/symbols/monument-l.svg @@ -7,12 +7,12 @@ - + - + diff --git a/data/styles/clear/style-clear/symbols/monument-m.svg b/data/styles/clear/style-clear/symbols/monument-m.svg index ecf6de53fa..3e90ab06d8 100644 --- a/data/styles/clear/style-clear/symbols/monument-m.svg +++ b/data/styles/clear/style-clear/symbols/monument-m.svg @@ -7,12 +7,12 @@ - + - + diff --git a/data/styles/clear/style-clear/symbols/monument-s.svg b/data/styles/clear/style-clear/symbols/monument-s.svg index 9e54000f49..aaf44d9a8f 100644 --- a/data/styles/clear/style-clear/symbols/monument-s.svg +++ b/data/styles/clear/style-clear/symbols/monument-s.svg @@ -7,12 +7,12 @@ - + - + diff --git a/data/styles/clear/style-clear/symbols/motel-l.svg b/data/styles/clear/style-clear/symbols/motel-l.svg index ef3a37d094..d91c2dc4ac 100644 --- a/data/styles/clear/style-clear/symbols/motel-l.svg +++ b/data/styles/clear/style-clear/symbols/motel-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/motel-m.svg b/data/styles/clear/style-clear/symbols/motel-m.svg index 3bc4e3ce13..a02ead39fd 100644 --- a/data/styles/clear/style-clear/symbols/motel-m.svg +++ b/data/styles/clear/style-clear/symbols/motel-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/museum-l.svg b/data/styles/clear/style-clear/symbols/museum-l.svg index abe0ee61cc..6f06532684 100644 --- a/data/styles/clear/style-clear/symbols/museum-l.svg +++ b/data/styles/clear/style-clear/symbols/museum-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/museum-m.svg b/data/styles/clear/style-clear/symbols/museum-m.svg index d3ae23e85c..adef35408e 100644 --- a/data/styles/clear/style-clear/symbols/museum-m.svg +++ b/data/styles/clear/style-clear/symbols/museum-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/museum-s.svg b/data/styles/clear/style-clear/symbols/museum-s.svg index 8c04b519dd..37b0691ff0 100644 --- a/data/styles/clear/style-clear/symbols/museum-s.svg +++ b/data/styles/clear/style-clear/symbols/museum-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/nparkF-m.svg b/data/styles/clear/style-clear/symbols/nparkF-m.svg deleted file mode 100644 index a1d146778a..0000000000 --- a/data/styles/clear/style-clear/symbols/nparkF-m.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - nparkF-m - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/office-l.svg b/data/styles/clear/style-clear/symbols/office-l.svg index 13d2ffcfc1..5e3448008a 100644 --- a/data/styles/clear/style-clear/symbols/office-l.svg +++ b/data/styles/clear/style-clear/symbols/office-l.svg @@ -1,12 +1,12 @@ - + office-l Created with Sketch. - - - + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/office-m.svg b/data/styles/clear/style-clear/symbols/office-m.svg index cd44c60e07..95dcc9bdbc 100644 --- a/data/styles/clear/style-clear/symbols/office-m.svg +++ b/data/styles/clear/style-clear/symbols/office-m.svg @@ -1,12 +1,12 @@ - + office-m Created with Sketch. - - - + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/office-s.svg b/data/styles/clear/style-clear/symbols/office-s.svg index f7d4f088e1..ea19b11daf 100644 --- a/data/styles/clear/style-clear/symbols/office-s.svg +++ b/data/styles/clear/style-clear/symbols/office-s.svg @@ -1,12 +1,12 @@ - + office-s Created with Sketch. - - - + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/optician-l.svg b/data/styles/clear/style-clear/symbols/optician-l.svg index 4ab9fd687d..43984e7bb0 100644 --- a/data/styles/clear/style-clear/symbols/optician-l.svg +++ b/data/styles/clear/style-clear/symbols/optician-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/optician-m.svg b/data/styles/clear/style-clear/symbols/optician-m.svg index 5a90a153b1..4fbae737d8 100644 --- a/data/styles/clear/style-clear/symbols/optician-m.svg +++ b/data/styles/clear/style-clear/symbols/optician-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/parking-meter-l.svg b/data/styles/clear/style-clear/symbols/parking-meter-l.svg index 728c73be13..e77667e79b 100644 --- a/data/styles/clear/style-clear/symbols/parking-meter-l.svg +++ b/data/styles/clear/style-clear/symbols/parking-meter-l.svg @@ -5,14 +5,9 @@ Created with Sketch. - - - - - - + diff --git a/data/styles/clear/style-clear/symbols/parking-meter-m.svg b/data/styles/clear/style-clear/symbols/parking-meter-m.svg index 29a4f7f014..bc45161e88 100644 --- a/data/styles/clear/style-clear/symbols/parking-meter-m.svg +++ b/data/styles/clear/style-clear/symbols/parking-meter-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/peak-l.svg b/data/styles/clear/style-clear/symbols/peak-l.svg index e034cb4507..a39190e851 100644 --- a/data/styles/clear/style-clear/symbols/peak-l.svg +++ b/data/styles/clear/style-clear/symbols/peak-l.svg @@ -1,14 +1,10 @@ - + peak-l Created with Sketch. - - - - - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/peak-m.svg b/data/styles/clear/style-clear/symbols/peak-m.svg index 49476090cd..49ce1a927e 100644 --- a/data/styles/clear/style-clear/symbols/peak-m.svg +++ b/data/styles/clear/style-clear/symbols/peak-m.svg @@ -1,14 +1,10 @@ - + peak-m Created with Sketch. - - - - - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/peak-s.svg b/data/styles/clear/style-clear/symbols/peak-s.svg index 787f109822..0684e71ffc 100644 --- a/data/styles/clear/style-clear/symbols/peak-s.svg +++ b/data/styles/clear/style-clear/symbols/peak-s.svg @@ -1,14 +1,10 @@ - + peak-s Created with Sketch. - - - - - + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/pharmacy-l.svg b/data/styles/clear/style-clear/symbols/pharmacy-l.svg index d6be362bdb..591e1daf50 100644 --- a/data/styles/clear/style-clear/symbols/pharmacy-l.svg +++ b/data/styles/clear/style-clear/symbols/pharmacy-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/pharmacy-m.svg b/data/styles/clear/style-clear/symbols/pharmacy-m.svg index 7bb17776bd..c3f8f75092 100644 --- a/data/styles/clear/style-clear/symbols/pharmacy-m.svg +++ b/data/styles/clear/style-clear/symbols/pharmacy-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/phone-l.svg b/data/styles/clear/style-clear/symbols/phone-l.svg index ac2c99865d..a805c8a40d 100644 --- a/data/styles/clear/style-clear/symbols/phone-l.svg +++ b/data/styles/clear/style-clear/symbols/phone-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/phone-m.svg b/data/styles/clear/style-clear/symbols/phone-m.svg index 49471edd25..8c1e1ff62f 100644 --- a/data/styles/clear/style-clear/symbols/phone-m.svg +++ b/data/styles/clear/style-clear/symbols/phone-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/phone-s.svg b/data/styles/clear/style-clear/symbols/phone-s.svg index e5e917ddbe..bc08a4348d 100644 --- a/data/styles/clear/style-clear/symbols/phone-s.svg +++ b/data/styles/clear/style-clear/symbols/phone-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/picnic-l.svg b/data/styles/clear/style-clear/symbols/picnic-l.svg index 21b23e8bcc..83a5d36151 100644 --- a/data/styles/clear/style-clear/symbols/picnic-l.svg +++ b/data/styles/clear/style-clear/symbols/picnic-l.svg @@ -1,13 +1,13 @@ - + picnic-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/picnic-m.svg b/data/styles/clear/style-clear/symbols/picnic-m.svg index d8609fff63..9ef7630231 100644 --- a/data/styles/clear/style-clear/symbols/picnic-m.svg +++ b/data/styles/clear/style-clear/symbols/picnic-m.svg @@ -1,13 +1,13 @@ - + picnic-m Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/picnic-s.svg b/data/styles/clear/style-clear/symbols/picnic-s.svg index 6cfd9671dc..e4d73479c9 100644 --- a/data/styles/clear/style-clear/symbols/picnic-s.svg +++ b/data/styles/clear/style-clear/symbols/picnic-s.svg @@ -1,13 +1,13 @@ - + picnic-s Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/pitch-l.svg b/data/styles/clear/style-clear/symbols/pitch-l.svg index 07931f7537..90a0e3140e 100644 --- a/data/styles/clear/style-clear/symbols/pitch-l.svg +++ b/data/styles/clear/style-clear/symbols/pitch-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/pitch-m.svg b/data/styles/clear/style-clear/symbols/pitch-m.svg index 9ae3290094..5e389544e9 100644 --- a/data/styles/clear/style-clear/symbols/pitch-m.svg +++ b/data/styles/clear/style-clear/symbols/pitch-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/pitch-s.svg b/data/styles/clear/style-clear/symbols/pitch-s.svg index f87f42ba21..3245d19c23 100644 --- a/data/styles/clear/style-clear/symbols/pitch-s.svg +++ b/data/styles/clear/style-clear/symbols/pitch-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-l.svg b/data/styles/clear/style-clear/symbols/place-of-worship-l.svg index 24b4b9c5a9..e75b9ebbf8 100644 --- a/data/styles/clear/style-clear/symbols/place-of-worship-l.svg +++ b/data/styles/clear/style-clear/symbols/place-of-worship-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-m.svg b/data/styles/clear/style-clear/symbols/place-of-worship-m.svg index 311f5f48eb..59ee665983 100644 --- a/data/styles/clear/style-clear/symbols/place-of-worship-m.svg +++ b/data/styles/clear/style-clear/symbols/place-of-worship-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-s.svg b/data/styles/clear/style-clear/symbols/place-of-worship-s.svg index 8a573373d0..3c94189751 100644 --- a/data/styles/clear/style-clear/symbols/place-of-worship-s.svg +++ b/data/styles/clear/style-clear/symbols/place-of-worship-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/police-l.svg b/data/styles/clear/style-clear/symbols/police-l.svg index ecae1eb9a7..9c02a80bc6 100644 --- a/data/styles/clear/style-clear/symbols/police-l.svg +++ b/data/styles/clear/style-clear/symbols/police-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/police-m.svg b/data/styles/clear/style-clear/symbols/police-m.svg index 1c71083197..b94746b236 100644 --- a/data/styles/clear/style-clear/symbols/police-m.svg +++ b/data/styles/clear/style-clear/symbols/police-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/police-s.svg b/data/styles/clear/style-clear/symbols/police-s.svg index 5416197136..f32d34eaf2 100644 --- a/data/styles/clear/style-clear/symbols/police-s.svg +++ b/data/styles/clear/style-clear/symbols/police-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/postbox-l.svg b/data/styles/clear/style-clear/symbols/postbox-l.svg index a2245b219f..aabb780528 100644 --- a/data/styles/clear/style-clear/symbols/postbox-l.svg +++ b/data/styles/clear/style-clear/symbols/postbox-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/postbox-m.svg b/data/styles/clear/style-clear/symbols/postbox-m.svg index 5a5128dea3..1639d7ccda 100644 --- a/data/styles/clear/style-clear/symbols/postbox-m.svg +++ b/data/styles/clear/style-clear/symbols/postbox-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/power-l.svg b/data/styles/clear/style-clear/symbols/power-l.svg new file mode 100644 index 0000000000..75f9a0f527 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/power-l.svg @@ -0,0 +1,14 @@ + + + + power-l + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/power-m.svg b/data/styles/clear/style-clear/symbols/power-m.svg new file mode 100644 index 0000000000..0f5b6ea35a --- /dev/null +++ b/data/styles/clear/style-clear/symbols/power-m.svg @@ -0,0 +1,14 @@ + + + + power-m + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/book-shop-s.svg b/data/styles/clear/style-clear/symbols/power-s.svg similarity index 94% rename from data/styles/clear/style-night/symbols/book-shop-s.svg rename to data/styles/clear/style-clear/symbols/power-s.svg index 2f97a3b11c..33c631b970 100644 --- a/data/styles/clear/style-night/symbols/book-shop-s.svg +++ b/data/styles/clear/style-clear/symbols/power-s.svg @@ -1,7 +1,7 @@ - book-shop-s + power-s Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/pub-l.svg b/data/styles/clear/style-clear/symbols/pub-l.svg index c4562e047f..38f35aafc6 100644 --- a/data/styles/clear/style-clear/symbols/pub-l.svg +++ b/data/styles/clear/style-clear/symbols/pub-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/pub-m.svg b/data/styles/clear/style-clear/symbols/pub-m.svg index f369f2d1e9..02f0f69661 100644 --- a/data/styles/clear/style-clear/symbols/pub-m.svg +++ b/data/styles/clear/style-clear/symbols/pub-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/pub-s.svg b/data/styles/clear/style-clear/symbols/pub-s.svg index bd6a2fba78..bc2c4d6e6f 100644 --- a/data/styles/clear/style-clear/symbols/pub-s.svg +++ b/data/styles/clear/style-clear/symbols/pub-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/railway-crossing.svg b/data/styles/clear/style-clear/symbols/railway-crossing.svg index ba1ae7eea8..0f37d9aa97 100644 --- a/data/styles/clear/style-clear/symbols/railway-crossing.svg +++ b/data/styles/clear/style-clear/symbols/railway-crossing.svg @@ -1,6 +1,6 @@ - + railway-crossing Created with Sketch. diff --git a/data/styles/clear/style-clear/symbols/recycling-l.svg b/data/styles/clear/style-clear/symbols/recycling-l.svg index 6ee6cf1d77..c1487ec6f0 100644 --- a/data/styles/clear/style-clear/symbols/recycling-l.svg +++ b/data/styles/clear/style-clear/symbols/recycling-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/recycling-m.svg b/data/styles/clear/style-clear/symbols/recycling-m.svg index f3059f9e5b..ae6d81a231 100644 --- a/data/styles/clear/style-clear/symbols/recycling-m.svg +++ b/data/styles/clear/style-clear/symbols/recycling-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/recycling-s.svg b/data/styles/clear/style-clear/symbols/recycling-s.svg index a8b13ac6bc..3deb84be10 100644 --- a/data/styles/clear/style-clear/symbols/recycling-s.svg +++ b/data/styles/clear/style-clear/symbols/recycling-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/remains-l.svg b/data/styles/clear/style-clear/symbols/remains-l.svg index c6c51a1b72..59b4cd7524 100644 --- a/data/styles/clear/style-clear/symbols/remains-l.svg +++ b/data/styles/clear/style-clear/symbols/remains-l.svg @@ -1,13 +1,13 @@ - + remains-l Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/remains-m.svg b/data/styles/clear/style-clear/symbols/remains-m.svg index 164a552141..66ecf96aa9 100644 --- a/data/styles/clear/style-clear/symbols/remains-m.svg +++ b/data/styles/clear/style-clear/symbols/remains-m.svg @@ -1,13 +1,13 @@ - + remains-m Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/remains-s.svg b/data/styles/clear/style-clear/symbols/remains-s.svg index c1794c510e..3dc4e23e72 100644 --- a/data/styles/clear/style-clear/symbols/remains-s.svg +++ b/data/styles/clear/style-clear/symbols/remains-s.svg @@ -1,13 +1,13 @@ - + remains-s Created with Sketch. - + - + diff --git a/data/styles/clear/style-clear/symbols/restaurant-l.svg b/data/styles/clear/style-clear/symbols/restaurant-l.svg index 2db3abf92a..b8f7aaa543 100644 --- a/data/styles/clear/style-clear/symbols/restaurant-l.svg +++ b/data/styles/clear/style-clear/symbols/restaurant-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/restaurant-m.svg b/data/styles/clear/style-clear/symbols/restaurant-m.svg index 2d7b34f63a..3cb455e5a6 100644 --- a/data/styles/clear/style-clear/symbols/restaurant-m.svg +++ b/data/styles/clear/style-clear/symbols/restaurant-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/restaurant-s.svg b/data/styles/clear/style-clear/symbols/restaurant-s.svg index 2dfe91a59d..c91edba15e 100644 --- a/data/styles/clear/style-clear/symbols/restaurant-s.svg +++ b/data/styles/clear/style-clear/symbols/restaurant-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/school-l.svg b/data/styles/clear/style-clear/symbols/school-l.svg index af0870b514..44ef7a0292 100644 --- a/data/styles/clear/style-clear/symbols/school-l.svg +++ b/data/styles/clear/style-clear/symbols/school-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/school-m.svg b/data/styles/clear/style-clear/symbols/school-m.svg index aebcad165f..1a3eef8fcf 100644 --- a/data/styles/clear/style-clear/symbols/school-m.svg +++ b/data/styles/clear/style-clear/symbols/school-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/school-s.svg b/data/styles/clear/style-clear/symbols/school-s.svg index 71c7d7e9a6..c5e082eaef 100644 --- a/data/styles/clear/style-clear/symbols/school-s.svg +++ b/data/styles/clear/style-clear/symbols/school-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/shoes-l.svg b/data/styles/clear/style-clear/symbols/shoes-l.svg index 8583cd3ec8..b7bb7d1de8 100644 --- a/data/styles/clear/style-clear/symbols/shoes-l.svg +++ b/data/styles/clear/style-clear/symbols/shoes-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/shoes-m.svg b/data/styles/clear/style-clear/symbols/shoes-m.svg index ec211b59bb..f59464d949 100644 --- a/data/styles/clear/style-clear/symbols/shoes-m.svg +++ b/data/styles/clear/style-clear/symbols/shoes-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg b/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg index 0638879f1f..2a58309d3a 100644 --- a/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg +++ b/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg b/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg index 13cd39c075..bb59459b72 100644 --- a/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg +++ b/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/shop-l.svg b/data/styles/clear/style-clear/symbols/shop-l.svg index 6e854dbb98..296813151d 100644 --- a/data/styles/clear/style-clear/symbols/shop-l.svg +++ b/data/styles/clear/style-clear/symbols/shop-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/shop-m.svg b/data/styles/clear/style-clear/symbols/shop-m.svg index 9ee99c4035..9833f75f04 100644 --- a/data/styles/clear/style-clear/symbols/shop-m.svg +++ b/data/styles/clear/style-clear/symbols/shop-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/shop-s.svg b/data/styles/clear/style-clear/symbols/shop-s.svg index dda14266b8..a0e2c860c8 100644 --- a/data/styles/clear/style-clear/symbols/shop-s.svg +++ b/data/styles/clear/style-clear/symbols/shop-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/skiing-l.svg b/data/styles/clear/style-clear/symbols/skiing-l.svg index 524108988e..2b78871722 100644 --- a/data/styles/clear/style-clear/symbols/skiing-l.svg +++ b/data/styles/clear/style-clear/symbols/skiing-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/skiing-m.svg b/data/styles/clear/style-clear/symbols/skiing-m.svg index 7385c3b9c7..c50125bb6a 100644 --- a/data/styles/clear/style-clear/symbols/skiing-m.svg +++ b/data/styles/clear/style-clear/symbols/skiing-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/skiing-s.svg b/data/styles/clear/style-clear/symbols/skiing-s.svg index 3d193da508..8a7d49f615 100644 --- a/data/styles/clear/style-clear/symbols/skiing-s.svg +++ b/data/styles/clear/style-clear/symbols/skiing-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/soccer-l.svg b/data/styles/clear/style-clear/symbols/soccer-l.svg index 2a255d649b..dd1ee0b293 100644 --- a/data/styles/clear/style-clear/symbols/soccer-l.svg +++ b/data/styles/clear/style-clear/symbols/soccer-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/soccer-m.svg b/data/styles/clear/style-clear/symbols/soccer-m.svg index 5a3b52d109..ccd131e1b5 100644 --- a/data/styles/clear/style-clear/symbols/soccer-m.svg +++ b/data/styles/clear/style-clear/symbols/soccer-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/soccer-s.svg b/data/styles/clear/style-clear/symbols/soccer-s.svg index 1b19ed6f35..d83a150535 100644 --- a/data/styles/clear/style-clear/symbols/soccer-s.svg +++ b/data/styles/clear/style-clear/symbols/soccer-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/sports-l.svg b/data/styles/clear/style-clear/symbols/sports-l.svg index de824ca65a..69b91204a2 100644 --- a/data/styles/clear/style-clear/symbols/sports-l.svg +++ b/data/styles/clear/style-clear/symbols/sports-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/sports-m.svg b/data/styles/clear/style-clear/symbols/sports-m.svg index e1a91a8cc9..47c95859d9 100644 --- a/data/styles/clear/style-clear/symbols/sports-m.svg +++ b/data/styles/clear/style-clear/symbols/sports-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/star-l.svg b/data/styles/clear/style-clear/symbols/star-l.svg index 5ff4cc3f8b..fa31334e8a 100644 --- a/data/styles/clear/style-clear/symbols/star-l.svg +++ b/data/styles/clear/style-clear/symbols/star-l.svg @@ -1,19 +1,21 @@ - + star-l Created with Sketch. - - - - - - - - - + + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/star-m.svg b/data/styles/clear/style-clear/symbols/star-m.svg index 9fb4c8f04b..9dc2e31364 100644 --- a/data/styles/clear/style-clear/symbols/star-m.svg +++ b/data/styles/clear/style-clear/symbols/star-m.svg @@ -1,16 +1,18 @@ - + star-m Created with Sketch. - - - - - - + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/star-s.svg b/data/styles/clear/style-clear/symbols/star-s.svg index 26a35e9ee8..b543101514 100644 --- a/data/styles/clear/style-clear/symbols/star-s.svg +++ b/data/styles/clear/style-clear/symbols/star-s.svg @@ -1,16 +1,18 @@ - + star-s Created with Sketch. - - - - - - + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/survey_point-l.svg b/data/styles/clear/style-clear/symbols/survey_point-l.svg new file mode 100644 index 0000000000..a0f208a43f --- /dev/null +++ b/data/styles/clear/style-clear/symbols/survey_point-l.svg @@ -0,0 +1,10 @@ + + + + survey_point-l + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/survey_point-m.svg b/data/styles/clear/style-clear/symbols/survey_point-m.svg new file mode 100644 index 0000000000..82bb1d27d6 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/survey_point-m.svg @@ -0,0 +1,10 @@ + + + + survey_point-m + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/survey_point-s.svg b/data/styles/clear/style-clear/symbols/survey_point-s.svg new file mode 100644 index 0000000000..8319b05c17 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/survey_point-s.svg @@ -0,0 +1,10 @@ + + + + survey_point-s + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/sweets-l.svg b/data/styles/clear/style-clear/symbols/sweets-l.svg index fda7de9d98..5d11399b97 100644 --- a/data/styles/clear/style-clear/symbols/sweets-l.svg +++ b/data/styles/clear/style-clear/symbols/sweets-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/sweets-m.svg b/data/styles/clear/style-clear/symbols/sweets-m.svg index b2ace25d9a..706854e026 100644 --- a/data/styles/clear/style-clear/symbols/sweets-m.svg +++ b/data/styles/clear/style-clear/symbols/sweets-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/swimming-l.svg b/data/styles/clear/style-clear/symbols/swimming-l.svg index 4d9146f909..b7c1236020 100644 --- a/data/styles/clear/style-clear/symbols/swimming-l.svg +++ b/data/styles/clear/style-clear/symbols/swimming-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/swimming-m.svg b/data/styles/clear/style-clear/symbols/swimming-m.svg index bd947eb836..990cf4a3bd 100644 --- a/data/styles/clear/style-clear/symbols/swimming-m.svg +++ b/data/styles/clear/style-clear/symbols/swimming-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/swimming-s.svg b/data/styles/clear/style-clear/symbols/swimming-s.svg index 711165e4a2..b9d4c8a347 100644 --- a/data/styles/clear/style-clear/symbols/swimming-s.svg +++ b/data/styles/clear/style-clear/symbols/swimming-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/taxi-l.svg b/data/styles/clear/style-clear/symbols/taxi-l.svg index c130620c29..1382493759 100644 --- a/data/styles/clear/style-clear/symbols/taxi-l.svg +++ b/data/styles/clear/style-clear/symbols/taxi-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/taxi-m.svg b/data/styles/clear/style-clear/symbols/taxi-m.svg index 0f5d7bc52e..cfa7cef1ca 100644 --- a/data/styles/clear/style-clear/symbols/taxi-m.svg +++ b/data/styles/clear/style-clear/symbols/taxi-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/tennis-l.svg b/data/styles/clear/style-clear/symbols/tennis-l.svg index 1c7897aa73..a85684ee50 100644 --- a/data/styles/clear/style-clear/symbols/tennis-l.svg +++ b/data/styles/clear/style-clear/symbols/tennis-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/tennis-m.svg b/data/styles/clear/style-clear/symbols/tennis-m.svg index 6aee12f4f0..76d0190bd9 100644 --- a/data/styles/clear/style-clear/symbols/tennis-m.svg +++ b/data/styles/clear/style-clear/symbols/tennis-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/tennis-s.svg b/data/styles/clear/style-clear/symbols/tennis-s.svg index ece6db4f0b..18e2208b9f 100644 --- a/data/styles/clear/style-clear/symbols/tennis-s.svg +++ b/data/styles/clear/style-clear/symbols/tennis-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/theatre-l.svg b/data/styles/clear/style-clear/symbols/theatre-l.svg index 53e952b4f9..c7be077611 100644 --- a/data/styles/clear/style-clear/symbols/theatre-l.svg +++ b/data/styles/clear/style-clear/symbols/theatre-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/theatre-m.svg b/data/styles/clear/style-clear/symbols/theatre-m.svg index cb70517c0f..bc7d008014 100644 --- a/data/styles/clear/style-clear/symbols/theatre-m.svg +++ b/data/styles/clear/style-clear/symbols/theatre-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/theatre-s.svg b/data/styles/clear/style-clear/symbols/theatre-s.svg index f56a79279a..32cadbfd3d 100644 --- a/data/styles/clear/style-clear/symbols/theatre-s.svg +++ b/data/styles/clear/style-clear/symbols/theatre-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/toilets-l.svg b/data/styles/clear/style-clear/symbols/toilets-l.svg index 69e9728815..db6f79e18a 100644 --- a/data/styles/clear/style-clear/symbols/toilets-l.svg +++ b/data/styles/clear/style-clear/symbols/toilets-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/toilets-m.svg b/data/styles/clear/style-clear/symbols/toilets-m.svg index 80120b7cc2..b33de9b886 100644 --- a/data/styles/clear/style-clear/symbols/toilets-m.svg +++ b/data/styles/clear/style-clear/symbols/toilets-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/toilets-s.svg b/data/styles/clear/style-clear/symbols/toilets-s.svg index d962c0d239..48a735be6f 100644 --- a/data/styles/clear/style-clear/symbols/toilets-s.svg +++ b/data/styles/clear/style-clear/symbols/toilets-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/toll_booth-l.svg b/data/styles/clear/style-clear/symbols/toll_booth-l.svg index 4c9b5f2ad1..1d63db7b76 100644 --- a/data/styles/clear/style-clear/symbols/toll_booth-l.svg +++ b/data/styles/clear/style-clear/symbols/toll_booth-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/toll_booth-m.svg b/data/styles/clear/style-clear/symbols/toll_booth-m.svg index d65854a1bf..24b7d8e3d4 100644 --- a/data/styles/clear/style-clear/symbols/toll_booth-m.svg +++ b/data/styles/clear/style-clear/symbols/toll_booth-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/tomb-l.svg b/data/styles/clear/style-clear/symbols/tomb-l.svg index d6f5f0f84f..dc8c824076 100644 --- a/data/styles/clear/style-clear/symbols/tomb-l.svg +++ b/data/styles/clear/style-clear/symbols/tomb-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/tomb-m.svg b/data/styles/clear/style-clear/symbols/tomb-m.svg index 32496aa502..a951c1edbb 100644 --- a/data/styles/clear/style-clear/symbols/tomb-m.svg +++ b/data/styles/clear/style-clear/symbols/tomb-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/tourism-l.svg b/data/styles/clear/style-clear/symbols/tourism-l.svg index 73e78f7af4..be2b776f98 100644 --- a/data/styles/clear/style-clear/symbols/tourism-l.svg +++ b/data/styles/clear/style-clear/symbols/tourism-l.svg @@ -7,9 +7,8 @@ - + - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/tourism-m.svg b/data/styles/clear/style-clear/symbols/tourism-m.svg index 20c7ff4535..1ffad3046f 100644 --- a/data/styles/clear/style-clear/symbols/tourism-m.svg +++ b/data/styles/clear/style-clear/symbols/tourism-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/tourism-s.svg b/data/styles/clear/style-clear/symbols/tourism-s.svg index 7a41894707..4f21d28eb9 100644 --- a/data/styles/clear/style-clear/symbols/tourism-s.svg +++ b/data/styles/clear/style-clear/symbols/tourism-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/townhall-l.svg b/data/styles/clear/style-clear/symbols/townhall-l.svg index e661febd38..65e36211be 100644 --- a/data/styles/clear/style-clear/symbols/townhall-l.svg +++ b/data/styles/clear/style-clear/symbols/townhall-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/townhall-m.svg b/data/styles/clear/style-clear/symbols/townhall-m.svg index 146e8e889d..4d2eefebd8 100644 --- a/data/styles/clear/style-clear/symbols/townhall-m.svg +++ b/data/styles/clear/style-clear/symbols/townhall-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/townhall-s.svg b/data/styles/clear/style-clear/symbols/townhall-s.svg index 9d2dd1e62f..3fcd9c4e5d 100644 --- a/data/styles/clear/style-clear/symbols/townhall-s.svg +++ b/data/styles/clear/style-clear/symbols/townhall-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/toys-l.svg b/data/styles/clear/style-clear/symbols/toys-l.svg index a87524e8c4..3e7ce9107c 100644 --- a/data/styles/clear/style-clear/symbols/toys-l.svg +++ b/data/styles/clear/style-clear/symbols/toys-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/toys-m.svg b/data/styles/clear/style-clear/symbols/toys-m.svg index d925e646f5..38636057aa 100644 --- a/data/styles/clear/style-clear/symbols/toys-m.svg +++ b/data/styles/clear/style-clear/symbols/toys-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/tree-l.svg b/data/styles/clear/style-clear/symbols/tree-l.svg new file mode 100644 index 0000000000..dc230434cf --- /dev/null +++ b/data/styles/clear/style-clear/symbols/tree-l.svg @@ -0,0 +1,10 @@ + + + + tree-l + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/tree-m.svg b/data/styles/clear/style-clear/symbols/tree-m.svg new file mode 100644 index 0000000000..c675e4e53d --- /dev/null +++ b/data/styles/clear/style-clear/symbols/tree-m.svg @@ -0,0 +1,10 @@ + + + + tree-m + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/tree-s.svg b/data/styles/clear/style-clear/symbols/tree-s.svg new file mode 100644 index 0000000000..56d48ab957 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/tree-s.svg @@ -0,0 +1,10 @@ + + + + tree-s + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/vending-l.svg b/data/styles/clear/style-clear/symbols/vending-l.svg index 1fce37f5bc..aca1d4ece8 100644 --- a/data/styles/clear/style-clear/symbols/vending-l.svg +++ b/data/styles/clear/style-clear/symbols/vending-l.svg @@ -5,13 +5,9 @@ Created with Sketch. - - - - - + diff --git a/data/styles/clear/style-clear/symbols/vending-m.svg b/data/styles/clear/style-clear/symbols/vending-m.svg index b4f92349ff..23b3e1b8d6 100644 --- a/data/styles/clear/style-clear/symbols/vending-m.svg +++ b/data/styles/clear/style-clear/symbols/vending-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/volcano-l.svg b/data/styles/clear/style-clear/symbols/volcano-l.svg index adbd2f86a6..8e77cd744f 100644 --- a/data/styles/clear/style-clear/symbols/volcano-l.svg +++ b/data/styles/clear/style-clear/symbols/volcano-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/volcano-m.svg b/data/styles/clear/style-clear/symbols/volcano-m.svg index 1eb0e32fef..541e2531ed 100644 --- a/data/styles/clear/style-clear/symbols/volcano-m.svg +++ b/data/styles/clear/style-clear/symbols/volcano-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/volcano-s.svg b/data/styles/clear/style-clear/symbols/volcano-s.svg index 3a07308a43..411fd3a8dd 100644 --- a/data/styles/clear/style-clear/symbols/volcano-s.svg +++ b/data/styles/clear/style-clear/symbols/volcano-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/waterfall-l.svg b/data/styles/clear/style-clear/symbols/waterfall-l.svg index 031061ba23..73ce94a6a2 100644 --- a/data/styles/clear/style-clear/symbols/waterfall-l.svg +++ b/data/styles/clear/style-clear/symbols/waterfall-l.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/waterfall-m.svg b/data/styles/clear/style-clear/symbols/waterfall-m.svg index d82c11ebd3..2b48ffb7d8 100644 --- a/data/styles/clear/style-clear/symbols/waterfall-m.svg +++ b/data/styles/clear/style-clear/symbols/waterfall-m.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/waterfall-s.svg b/data/styles/clear/style-clear/symbols/waterfall-s.svg index 73e6a7890b..4777875a85 100644 --- a/data/styles/clear/style-clear/symbols/waterfall-s.svg +++ b/data/styles/clear/style-clear/symbols/waterfall-s.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/data/styles/clear/style-clear/symbols/wayside_cross-l.svg b/data/styles/clear/style-clear/symbols/wayside_cross-l.svg index 4db333b26f..3ce0d243a0 100644 --- a/data/styles/clear/style-clear/symbols/wayside_cross-l.svg +++ b/data/styles/clear/style-clear/symbols/wayside_cross-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/wayside_cross-m.svg b/data/styles/clear/style-clear/symbols/wayside_cross-m.svg index cde43f09dc..a9f9373b51 100644 --- a/data/styles/clear/style-clear/symbols/wayside_cross-m.svg +++ b/data/styles/clear/style-clear/symbols/wayside_cross-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg b/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg index e3446c65bf..c7bbebb11d 100644 --- a/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg +++ b/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg b/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg index 4ac9257dcb..3559e4c4ac 100644 --- a/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg +++ b/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/windmill-l.svg b/data/styles/clear/style-clear/symbols/windmill-l.svg index df15776d96..e4f52bf50c 100644 --- a/data/styles/clear/style-clear/symbols/windmill-l.svg +++ b/data/styles/clear/style-clear/symbols/windmill-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/windmill-m.svg b/data/styles/clear/style-clear/symbols/windmill-m.svg index 2f191b24b0..a098d99f39 100644 --- a/data/styles/clear/style-clear/symbols/windmill-m.svg +++ b/data/styles/clear/style-clear/symbols/windmill-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/zoo-l.svg b/data/styles/clear/style-clear/symbols/zoo-l.svg index 6918122e61..7fba902731 100644 --- a/data/styles/clear/style-clear/symbols/zoo-l.svg +++ b/data/styles/clear/style-clear/symbols/zoo-l.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/zoo-m.svg b/data/styles/clear/style-clear/symbols/zoo-m.svg index ace97b8c5c..12946f78a4 100644 --- a/data/styles/clear/style-clear/symbols/zoo-m.svg +++ b/data/styles/clear/style-clear/symbols/zoo-m.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/symbols/zoo-s.svg b/data/styles/clear/style-clear/symbols/zoo-s.svg index f542531f04..bfa613f509 100644 --- a/data/styles/clear/style-clear/symbols/zoo-s.svg +++ b/data/styles/clear/style-clear/symbols/zoo-s.svg @@ -7,7 +7,7 @@ - + diff --git a/data/styles/clear/style-clear/xhdpi/route_from.png b/data/styles/clear/style-clear/xhdpi/route_from.png index be419ee49d..3e2de72ae2 100644 Binary files a/data/styles/clear/style-clear/xhdpi/route_from.png and b/data/styles/clear/style-clear/xhdpi/route_from.png differ diff --git a/data/styles/clear/style-clear/xhdpi/route_to.png b/data/styles/clear/style-clear/xhdpi/route_to.png index 7226f77951..71ac6ff4ec 100644 Binary files a/data/styles/clear/style-clear/xhdpi/route_to.png and b/data/styles/clear/style-clear/xhdpi/route_to.png differ diff --git a/data/styles/clear/style-clear/xxhdpi/route_from.png b/data/styles/clear/style-clear/xxhdpi/route_from.png index 347cf712fb..3464497403 100644 Binary files a/data/styles/clear/style-clear/xxhdpi/route_from.png and b/data/styles/clear/style-clear/xxhdpi/route_from.png differ diff --git a/data/styles/clear/style-clear/xxhdpi/route_to.png b/data/styles/clear/style-clear/xxhdpi/route_to.png index 452f859594..449b7be1b7 100644 Binary files a/data/styles/clear/style-clear/xxhdpi/route_to.png and b/data/styles/clear/style-clear/xxhdpi/route_to.png differ diff --git a/data/styles/clear/style-night/6plus/route_from.png b/data/styles/clear/style-night/6plus/route_from.png index f073e4df01..130060ea78 100644 Binary files a/data/styles/clear/style-night/6plus/route_from.png and b/data/styles/clear/style-night/6plus/route_from.png differ diff --git a/data/styles/clear/style-night/6plus/route_to.png b/data/styles/clear/style-night/6plus/route_to.png index 41d23aafad..4c3f8b727b 100644 Binary files a/data/styles/clear/style-night/6plus/route_to.png and b/data/styles/clear/style-night/6plus/route_to.png differ diff --git a/data/styles/clear/style-night/hdpi/route_from.png b/data/styles/clear/style-night/hdpi/route_from.png index 793fa6b817..b457b0f2a5 100644 Binary files a/data/styles/clear/style-night/hdpi/route_from.png and b/data/styles/clear/style-night/hdpi/route_from.png differ diff --git a/data/styles/clear/style-night/hdpi/route_to.png b/data/styles/clear/style-night/hdpi/route_to.png index 718f6d1b0e..4b0ecaab94 100644 Binary files a/data/styles/clear/style-night/hdpi/route_to.png and b/data/styles/clear/style-night/hdpi/route_to.png differ diff --git a/data/styles/clear/style-night/ldpi/route_from.png b/data/styles/clear/style-night/ldpi/route_from.png index 541626a1d5..e305504f3b 100644 Binary files a/data/styles/clear/style-night/ldpi/route_from.png and b/data/styles/clear/style-night/ldpi/route_from.png differ diff --git a/data/styles/clear/style-night/ldpi/route_to.png b/data/styles/clear/style-night/ldpi/route_to.png index da6017cf44..4c87d967b2 100644 Binary files a/data/styles/clear/style-night/ldpi/route_to.png and b/data/styles/clear/style-night/ldpi/route_to.png differ diff --git a/data/styles/clear/style-night/mdpi/route_from.png b/data/styles/clear/style-night/mdpi/route_from.png index 8d22b8243d..c3d31ff777 100644 Binary files a/data/styles/clear/style-night/mdpi/route_from.png and b/data/styles/clear/style-night/mdpi/route_from.png differ diff --git a/data/styles/clear/style-night/mdpi/route_to.png b/data/styles/clear/style-night/mdpi/route_to.png index 581bb0e408..47d548989f 100644 Binary files a/data/styles/clear/style-night/mdpi/route_to.png and b/data/styles/clear/style-night/mdpi/route_to.png differ diff --git a/data/styles/clear/style-clear/symbols/bank-s.svg b/data/styles/clear/style-night/symbols/america-football-s.svg similarity index 97% rename from data/styles/clear/style-clear/symbols/bank-s.svg rename to data/styles/clear/style-night/symbols/america-football-s.svg index 037534abae..b30644d7b3 100644 --- a/data/styles/clear/style-clear/symbols/bank-s.svg +++ b/data/styles/clear/style-night/symbols/america-football-s.svg @@ -1,7 +1,7 @@ - bank-s + america-football-s Created with Sketch. diff --git a/data/styles/clear/style-night/symbols/atm-s copy 2.svg b/data/styles/clear/style-night/symbols/atm-s copy 2.svg new file mode 100644 index 0000000000..a7eda11b21 --- /dev/null +++ b/data/styles/clear/style-night/symbols/atm-s copy 2.svg @@ -0,0 +1,14 @@ + + + + atm-s copy 2 + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/bank-s.svg b/data/styles/clear/style-night/symbols/bank-s.svg deleted file mode 100644 index 037534abae..0000000000 --- a/data/styles/clear/style-night/symbols/bank-s.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - bank-s - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/equestrian-l.svg b/data/styles/clear/style-night/symbols/equestrian-l.svg new file mode 100644 index 0000000000..2072e2debb --- /dev/null +++ b/data/styles/clear/style-night/symbols/equestrian-l.svg @@ -0,0 +1,16 @@ + + + + equestrian-l + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/equestrian-m.svg b/data/styles/clear/style-night/symbols/equestrian-m.svg new file mode 100644 index 0000000000..5fc8699136 --- /dev/null +++ b/data/styles/clear/style-night/symbols/equestrian-m.svg @@ -0,0 +1,14 @@ + + + + equestrian-m + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/fire_station-s.svg b/data/styles/clear/style-night/symbols/fire_station-s.svg deleted file mode 100644 index 91393e2a23..0000000000 --- a/data/styles/clear/style-night/symbols/fire_station-s.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - fire_station-s - Created with Sketch. - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/fuel-l copy.svg b/data/styles/clear/style-night/symbols/fuel-l copy.svg new file mode 100644 index 0000000000..d014711684 --- /dev/null +++ b/data/styles/clear/style-night/symbols/fuel-l copy.svg @@ -0,0 +1,14 @@ + + + + fuel-l copy + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/hand-l.svg b/data/styles/clear/style-night/symbols/hand-l.svg new file mode 100644 index 0000000000..09a55ca683 --- /dev/null +++ b/data/styles/clear/style-night/symbols/hand-l.svg @@ -0,0 +1,14 @@ + + + + hand-l + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/hand-m.svg b/data/styles/clear/style-night/symbols/hand-m.svg new file mode 100644 index 0000000000..e1e9a75db6 --- /dev/null +++ b/data/styles/clear/style-night/symbols/hand-m.svg @@ -0,0 +1,14 @@ + + + + hand-m + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/lift_gate-l.svg b/data/styles/clear/style-night/symbols/lift_gate-l.svg index e4d093c141..3af68da257 100644 --- a/data/styles/clear/style-night/symbols/lift_gate-l.svg +++ b/data/styles/clear/style-night/symbols/lift_gate-l.svg @@ -5,10 +5,8 @@ Created with Sketch. - - - - + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/lift_gate-m.svg b/data/styles/clear/style-night/symbols/lift_gate-m.svg index 4cd4d64faa..26624e2f1e 100644 --- a/data/styles/clear/style-night/symbols/lift_gate-m.svg +++ b/data/styles/clear/style-night/symbols/lift_gate-m.svg @@ -5,10 +5,8 @@ Created with Sketch. - - - - + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/pharmacy-2-m.svg b/data/styles/clear/style-night/symbols/pharmacy-2-m.svg deleted file mode 100644 index efdb19cd1c..0000000000 --- a/data/styles/clear/style-night/symbols/pharmacy-2-m.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - pharmacy-2-m - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/power-l.svg b/data/styles/clear/style-night/symbols/power-l.svg new file mode 100644 index 0000000000..b1e8ba0fc2 --- /dev/null +++ b/data/styles/clear/style-night/symbols/power-l.svg @@ -0,0 +1,14 @@ + + + + power-l + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/power-m.svg b/data/styles/clear/style-night/symbols/power-m.svg new file mode 100644 index 0000000000..ecc8de9c38 --- /dev/null +++ b/data/styles/clear/style-night/symbols/power-m.svg @@ -0,0 +1,14 @@ + + + + power-m + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/shop-l copy.svg b/data/styles/clear/style-night/symbols/shop-l copy.svg new file mode 100644 index 0000000000..edcb1fb60c --- /dev/null +++ b/data/styles/clear/style-night/symbols/shop-l copy.svg @@ -0,0 +1,14 @@ + + + + shop-l copy + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/shop-m copy.svg b/data/styles/clear/style-night/symbols/shop-m copy.svg new file mode 100644 index 0000000000..f8d9bbf85a --- /dev/null +++ b/data/styles/clear/style-night/symbols/shop-m copy.svg @@ -0,0 +1,14 @@ + + + + shop-m copy + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/shop-s copy.svg b/data/styles/clear/style-night/symbols/shop-s copy.svg new file mode 100644 index 0000000000..fe4aae72fe --- /dev/null +++ b/data/styles/clear/style-night/symbols/shop-s copy.svg @@ -0,0 +1,14 @@ + + + + shop-s copy + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/subway-xs copy.svg b/data/styles/clear/style-night/symbols/subway-xs copy.svg new file mode 100644 index 0000000000..8261622717 --- /dev/null +++ b/data/styles/clear/style-night/symbols/subway-xs copy.svg @@ -0,0 +1,14 @@ + + + + subway-xs copy + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/survey_point-l.svg b/data/styles/clear/style-night/symbols/survey_point-l.svg new file mode 100644 index 0000000000..693274bcf9 --- /dev/null +++ b/data/styles/clear/style-night/symbols/survey_point-l.svg @@ -0,0 +1,10 @@ + + + + survey_point-l + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/survey_point-m.svg b/data/styles/clear/style-night/symbols/survey_point-m.svg new file mode 100644 index 0000000000..3987cbcd24 --- /dev/null +++ b/data/styles/clear/style-night/symbols/survey_point-m.svg @@ -0,0 +1,10 @@ + + + + survey_point-m + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/survey_point-s.svg b/data/styles/clear/style-night/symbols/survey_point-s.svg new file mode 100644 index 0000000000..cf554e50ec --- /dev/null +++ b/data/styles/clear/style-night/symbols/survey_point-s.svg @@ -0,0 +1,10 @@ + + + + survey_point-s + Created with Sketch. + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/tree-l.svg b/data/styles/clear/style-night/symbols/tree-l.svg new file mode 100644 index 0000000000..457d912669 --- /dev/null +++ b/data/styles/clear/style-night/symbols/tree-l.svg @@ -0,0 +1,12 @@ + + + + tree-l + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/tree-m.svg b/data/styles/clear/style-night/symbols/tree-m.svg new file mode 100644 index 0000000000..e898b5a150 --- /dev/null +++ b/data/styles/clear/style-night/symbols/tree-m.svg @@ -0,0 +1,12 @@ + + + + tree-m + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/tree-s.svg b/data/styles/clear/style-night/symbols/tree-s.svg new file mode 100644 index 0000000000..10fb0ff5e5 --- /dev/null +++ b/data/styles/clear/style-night/symbols/tree-s.svg @@ -0,0 +1,12 @@ + + + + tree-s + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/data/styles/clear/style-night/xhdpi/route_from.png b/data/styles/clear/style-night/xhdpi/route_from.png index be419ee49d..3e2de72ae2 100644 Binary files a/data/styles/clear/style-night/xhdpi/route_from.png and b/data/styles/clear/style-night/xhdpi/route_from.png differ diff --git a/data/styles/clear/style-night/xhdpi/route_to.png b/data/styles/clear/style-night/xhdpi/route_to.png index 7226f77951..71ac6ff4ec 100644 Binary files a/data/styles/clear/style-night/xhdpi/route_to.png and b/data/styles/clear/style-night/xhdpi/route_to.png differ diff --git a/data/styles/clear/style-night/xxhdpi/route_from.png b/data/styles/clear/style-night/xxhdpi/route_from.png index 347cf712fb..3464497403 100644 Binary files a/data/styles/clear/style-night/xxhdpi/route_from.png and b/data/styles/clear/style-night/xxhdpi/route_from.png differ diff --git a/data/styles/clear/style-night/xxhdpi/route_to.png b/data/styles/clear/style-night/xxhdpi/route_to.png index 452f859594..449b7be1b7 100644 Binary files a/data/styles/clear/style-night/xxhdpi/route_to.png and b/data/styles/clear/style-night/xxhdpi/route_to.png differ