diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss index 9adfc8bc7c..85bf10935a 100755 --- a/data/styles/clear/include/Roads_label.mapcss +++ b/data/styles/clear/include/Roads_label.mapcss @@ -166,7 +166,7 @@ line[piste:lift=j-bar], line[piste:lift=magic_carpet], line[piste:lift=platter], line[piste:lift=rope_tow], -line[piste:lift=t-bar] +line[piste:lift=t-bar], {z-index: 6888;} /* 2.SHIELD 10-22 ZOOM */ @@ -180,28 +180,48 @@ line|z10-[highway=primary_link], line|z12-[highway=secondary], line|z12-[highway=residential], line|z12-[highway=tertiary] -{shield-font-size: 10;shield-text-color: @shield_text;shield-text-halo-radius: 0;shield-text-halo-color: @shield_text_halo;shield-color: @shield;shield-outline-radius: 1;shield-outline-color: @shield_outline;} +{shield-font-size: 9;shield-text-color: @shield_text;shield-text-halo-radius: 0;shield-text-halo-color: @shield_text_halo;shield-color: @shield;shield-outline-radius: 1;shield-outline-color: @shield_outline;-x-me-icon-priority: 20000;} -line|z10-12[highway=motorway], -line|z10-12[highway=trunk], -line|z10-12[highway=motorway_link], -line|z10-12[highway=trunk_link], -line|z10-12[highway=primary], -line|z10-12[highway=primary_link], -line|z10-12[highway=secondary], -line|z10-12[highway=residential], -line|z10-12[highway=tertiary] -{shield-min-distance: 60;} -line|z13-14[highway=motorway], -line|z13-14[highway=trunk], -line|z13-14[highway=motorway_link], -line|z13-14[highway=trunk_link], -line|z13-14[highway=primary], -line|z13-14[highway=primary_link], -line|z13-14[highway=secondary], -line|z13-14[highway=residential], -line|z13-14[highway=tertiary] -{shield-min-distance: 100;} +line|z10[highway=motorway], +line|z10[highway=trunk], +line|z10[highway=motorway_link], +line|z10[highway=trunk_link], +line|z10[highway=primary], +line|z10[highway=primary_link], +line|z10[highway=secondary], +line|z10[highway=residential], +line|z10[highway=tertiary] +{shield-min-distance: 85;-x-me-icon-priority: 75000;} +line|z11-12[highway=motorway], +line|z11-12[highway=trunk], +line|z11-12[highway=motorway_link], +line|z11-12[highway=trunk_link], +line|z11-12[highway=primary], +line|z11-12[highway=primary_link], +line|z11-12[highway=secondary], +line|z11-12[highway=residential], +line|z11-12[highway=tertiary] +{shield-min-distance: 90;-x-me-icon-priority: 75000;} +line|z13[highway=motorway], +line|z13[highway=trunk], +line|z13[highway=motorway_link], +line|z13[highway=trunk_link], +line|z13[highway=primary], +line|z13[highway=primary_link], +line|z13[highway=secondary], +line|z13[highway=residential], +line|z13[highway=tertiary] +{shield-min-distance: 120;-x-me-icon-priority: 75000;} +line|z14[highway=motorway], +line|z14[highway=trunk], +line|z14[highway=motorway_link], +line|z14[highway=trunk_link], +line|z14[highway=primary], +line|z14[highway=primary_link], +line|z14[highway=secondary], +line|z14[highway=residential], +line|z14[highway=tertiary] +{shield-min-distance: 175;-x-me-icon-priority: 75000;} line|z15[highway=motorway], line|z15[highway=trunk], line|z15[highway=motorway_link], @@ -211,7 +231,7 @@ line|z15[highway=primary_link], line|z15[highway=secondary], line|z15[highway=residential], line|z15[highway=tertiary] -{shield-min-distance: 150;} +{shield-min-distance: 250;-x-me-icon-priority: 75000;} line|z16[highway=motorway], line|z16[highway=trunk], line|z16[highway=motorway_link], @@ -221,7 +241,7 @@ line|z16[highway=primary_link], line|z16[highway=secondary], line|z16[highway=residential], line|z16[highway=tertiary] -{shield-min-distance: 250;} +{shield-min-distance: 300;-x-me-icon-priority: 75000;} line|z17[highway=motorway], line|z17[highway=trunk], line|z17[highway=motorway_link], @@ -231,17 +251,27 @@ line|z17[highway=primary_link], line|z17[highway=secondary], line|z17[highway=residential], line|z17[highway=tertiary] -{shield-font-size: 11;shield-min-distance: 400;} -line|z18-[highway=motorway], -line|z18-[highway=trunk], -line|z18-[highway=motorway_link], -line|z18-[highway=trunk_link], -line|z18-[highway=primary], -line|z18-[highway=primary_link], -line|z18-[highway=secondary], -line|z18-[highway=residential], -line|z18-[highway=tertiary] -{shield-font-size: 11;shield-min-distance: 500;} +{shield-font-size: 10;shield-min-distance: 300;-x-me-icon-priority: 75000;} +line|z18[highway=motorway], +line|z18[highway=trunk], +line|z18[highway=motorway_link], +line|z18[highway=trunk_link], +line|z18[highway=primary], +line|z18[highway=primary_link], +line|z18[highway=secondary], +line|z18[highway=residential], +line|z18[highway=tertiary] +{shield-font-size: 10;shield-min-distance: 300;-x-me-icon-priority: 75000;} +line|z19[highway=motorway], +line|z19[highway=trunk], +line|z19[highway=motorway_link], +line|z19[highway=trunk_link], +line|z19[highway=primary], +line|z19[highway=primary_link], +line|z19[highway=secondary], +line|z19[highway=residential], +line|z19[highway=tertiary] +{shield-font-size: 11;shield-min-distance: 350;-x-me-icon-priority: 75000;} /* 3.TRUNK & MOTORWAY 10-22 ZOOM */ diff --git a/data/styles/clear/include/common_colors.mapcss b/data/styles/clear/include/common_colors.mapcss index 9d2ec0fa89..6c2e8614d1 100755 --- a/data/styles/clear/include/common_colors.mapcss +++ b/data/styles/clear/include/common_colors.mapcss @@ -1,2 +1,2 @@ @traffic_arrow_light: 1.0; -@traffic_arrow_dark: 0.5; +@traffic_arrow_dark: 1.0; diff --git a/data/styles/clear/style-clear/style.mapcss b/data/styles/clear/style-clear/style.mapcss index cbb9d3dad7..1afaaa86fe 100755 --- a/data/styles/clear/style-clear/style.mapcss +++ b/data/styles/clear/style-clear/style.mapcss @@ -25,11 +25,11 @@ colors Selection-color: #1E96F0; Selection-opacity: 0.64; Route-color: #0087FF; - RouteOutline-color: #055FCD; + RouteOutline-color: #871814; RouteTrafficG0-color: #9B2300; - RouteTrafficG1-color: #F03C0A; - RouteTrafficG2-color: #F03C0A; - RouteTrafficG3-color: #F5D728; + RouteTrafficG1-color: #E82705; + RouteTrafficG2-color: #E82705; + RouteTrafficG3-color: #FFE500; RouteTrafficG3-opacity: @traffic_arrow_dark; RoutePedestrian-color: #1D339E; RoutePedestrian-opacity: 0.8; @@ -42,27 +42,27 @@ colors Arrow3DShadow-opacity: 0.24; Arrow3DOutline-color: #FFFFFF; TrackHumanSpeed-color: #1D339E; - TrackCarSpeed-color: #1579F4; - TrackPlaneSpeed-color: #0AC4FF; + TrackCarSpeed-color: #7C8EDE; + TrackPlaneSpeed-color: #A8B7ED; TrackUnknownDistance-color: #616161; - TrafficG0-color: #9B2305; - TrafficG1-color: #E63C37; - TrafficG2-color: #E63C37; - TrafficG3-color: #FAB423; + TrafficG0-color: #7E1712; + TrafficG1-color: #E42300; + TrafficG2-color: #E42300; + TrafficG3-color: #FCDE00; TrafficG3-opacity: @traffic_arrow_dark; - TrafficG4-color: #9BAF37; - TrafficG5-color: #468755; - TrafficTempBlock-color: #464646; + TrafficG4-color: #39962E; + TrafficG5-color: #39962E; + TrafficTempBlock-color: #525252; TrafficUnknown-color: #000000; TrafficArrowLight-color: #FFFFFF; - TrafficArrowDark-color: #6B5114; - TrafficOutline-color: #FFFFFF; + TrafficArrowDark-color: #473635; + TrafficOutline-color: #E8E6DC; RoadShieldBlackText-color: #000000; RoadShieldWhiteText-color: #FFFFFF; - RoadShieldUKYellowText-color: #FFCC66; - RoadShieldBlueBackground-color: #2E6FC9; - RoadShieldGreenBackground-color: #22723B; - RoadShieldRedBackground-color: #CD2828; + RoadShieldUKYellowText-color: #FFD400; + RoadShieldBlueBackground-color: #1A5EC1; + RoadShieldGreenBackground-color: #309302; + RoadShieldRedBackground-color: #E63534; RoadShieldOrangeBackground-color: #FFBE00; PoiHotelTextOutline-color: #FFFFFF; PoiHotelTextOutline-opacity: 0.6; diff --git a/data/styles/clear/style-clear/symbols/speedcam1-l.svg b/data/styles/clear/style-clear/symbols/speedcam1-l.svg new file mode 100644 index 0000000000..a36e0375bb --- /dev/null +++ b/data/styles/clear/style-clear/symbols/speedcam1-l.svg @@ -0,0 +1,29 @@ + + + +speedcam-l +Created with Sketch. + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/speedcam1-l.svg b/data/styles/clear/style-night/symbols/speedcam1-l.svg new file mode 100644 index 0000000000..e5e3ed57cf --- /dev/null +++ b/data/styles/clear/style-night/symbols/speedcam1-l.svg @@ -0,0 +1,28 @@ + + + +speedcam-l +Created with Sketch. + + + + + + + + + diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 225d1f6a5b..b1fee5caf0 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -440,7 +440,7 @@ area|z15-[landuse=landfill], area|z15-[landuse=railway], area|z15-[landuse=quarry], area|z15-[leisure=stadium], -area|z15-[amenity=parking] +area|z15-[amenity=parking], area|z16-[public_transport=platform], area|z16-[amenity=place_of_worship], area|z16-[railway=platform], @@ -510,27 +510,27 @@ area|z10[aeroway=airport][aerodrome=international], area|z10[aeroway=aerodrome][aerodrome=international], area|z10[aeroway=aerodrome], area|z10[aeroway=airport] -{fill-color: @aerodrome0;fill-opacity: 0.75;} +{fill-color: @aerodrome0;fill-opacity: 1;} area|z11[aeroway=airport][aerodrome=international], area|z11[aeroway=aerodrome][aerodrome=international], area|z11[aeroway=aerodrome], area|z11[aeroway=airport], -{fill-color: @aerodrome1;fill-opacity: 0.55;} +{fill-color: @aerodrome1;fill-opacity: 1;} area|z12-[aeroway=airport][aerodrome=international], area|z12-[aeroway=aerodrome][aerodrome=international], area|z12-[aeroway=airport], area|z12-[aeroway=aerodrome] -{fill-color: @aerodrome2;fill-opacity: 0.55;} +{fill-color: @aerodrome2;fill-opacity: 1;} area|z13[aeroway=airport][aerodrome=international], area|z13[aeroway=aerodrome][aerodrome=international], area|z13[aeroway=airport], area|z13[aeroway=aerodrome] -{fill-color: @aerodrome3;fill-opacity: 0.75;} +{fill-color: @aerodrome3;fill-opacity: 1;} area|z14[aeroway=airport][aerodrome=international], area|z14[aeroway=aerodrome][aerodrome=international], area|z14[aeroway=airport], area|z14[aeroway=aerodrome] -{fill-color: @aerodrome4;fill-opacity: 0.85;} +{fill-color: @aerodrome4;fill-opacity: 1;} area|z15-19[aeroway=airport][aerodrome=international], area|z15-19[aeroway=aerodrome][aerodrome=international], area|z15-19[aeroway=airport], @@ -541,6 +541,8 @@ area|z15-19[aeroway=aerodrome] area|z15-[amenity=parking] {fill-color: @parking;fill-opacity: 1;} +area|z17-[amenity=parking] +{fill-color: @parking_l;fill-opacity: 1;} /* 8.BUILDINGS */ diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index 7005f6b6b1..75b77a2602 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -365,27 +365,27 @@ node|z13-[place=hamlet] /* 4.4 Districts & Small localities */ node|z8-9[place=region], -node|z10-14[place=suburb], +node|z13-14[place=suburb], node|z13-[place=locality], node|z13-16[place=neighbourhood], node|z14-[place=farm], node|z14-[place=isolated_dwelling], {text: name;text-color: @district_label;} -node|z12-14[place=suburb]::int_name, +node|z13-14[place=suburb]::int_name, node|z13-[place=locality]::int_name, node|z13-16[place=neighbourhood]::int_name, node|z14-[place=farm]::int_name, node|z14-[place=isolated_dwelling]::int_name, {text: int_name;text-color: @district_label;} -node|z10[place=suburb] +/*node|z10[place=suburb] {font-size: 8;} node|z11[place=suburb] {font-size: 8.5;} node|z12[place=suburb] {font-size: 9;} node|z12[place=suburb]::int_name -{font-size: 8;} +{font-size: 8;}*/ node|z13-14[place=suburb] {font-size: 10;} node|z13-14[place=suburb]::int_name @@ -424,7 +424,7 @@ area|z16-[leisure=garden][name]::int_name area|z14-[leisure=park][name], area|z14-[landuse=forest][name] -{icon-image: park-s.svg;text-offset: 6;font-size: 10;} +{icon-image: park-s.svg;text-offset: 6;font-size: 11;} area|z14-[leisure=park][name]::int_name, area|z14-[landuse=forest][name]::int_name {text-offset: 6;} @@ -434,7 +434,7 @@ area|z14-[landuse=forest][!name] area|z15-[leisure=park][name], area|z15-[landuse=forest][name] -{icon-image: park-m.svg;text-offset: 8;font-size: 11;} +{icon-image: park-m.svg;text-offset: 8;font-size: 12;} area|z15-17[leisure=park][name]::int_name, area|z15-17[landuse=forest][name]::int_name, area|z16-17[landuse=forest][name]::int_name @@ -445,9 +445,9 @@ area|z15[landuse=forest][!name] area|z16[leisure=park][name], area|z16[landuse=forest][name] -{icon-image: park-m.svg;text-offset: 10;font-size: 11;} +{icon-image: park-m.svg;text-offset: 10;font-size: 12.5;} area|z16[leisure=garden][name] -{icon-image: garden-m.svg;text-offset: 10;font-size: 11;} +{icon-image: garden-m.svg;text-offset: 10;font-size: 12.5;} area|z16[leisure=park][!name], area|z16[leisure=garden][!name], area|z16[landuse=forest][!name], @@ -458,7 +458,7 @@ area|z16[landuse=forest][!name]::int_name area|z18-[leisure=park][name], area|z18-[landuse=forest][name] -{icon-image: park-l.svg;text-offset: 10;font-size: 10;} +{icon-image: park-l.svg;text-offset: 10;font-size: 13.5;} area|z18-[leisure=park][name], area|z18-[landuse=forest][name] {} @@ -474,9 +474,9 @@ area|z17[leisure=forest][!name]::int_name area|z18-[leisure=park], area|z18-[landuse=forest] -{icon-image: park-l.svg;text-offset: 10;font-size: 13;} +{icon-image: park-l.svg;text-offset: 10;font-size: 13.5;} area|z18-[leisure=garden] -{icon-image: garden-l.svg;text-offset: 10;font-size: 13;} +{icon-image: garden-l.svg;text-offset: 10;font-size: 13.5;} area|z18-[leisure=park]::int_name, area|z18-[leisure=garden]::int_name, area|z18-[leisure=forest]::int_name @@ -677,40 +677,40 @@ area|z16[building], node|z16[building], area|z16[addr:housenumber][addr:street], node|z16[addr:housenumber][addr:street], -{text:"addr:housename";font-size: 10.5;text-color: @housename;} +{text:"addr:housename";font-size: 11.5;text-color: @housename;} area|z17[building], node|z17[building], area|z17[addr:housenumber][addr:street], node|z17[addr:housenumber][addr:street] -{font-size: 11;} +{font-size: 12.5;} area|z17[building]::int_name, node|z17[building]::int_name, area|z17[addr:housenumber][addr:street]::int_name, node|z17[addr:housenumber][addr:street]::int_name -{font-size: 11;} +{font-size: 12.5;} area|z18[building], node|z18[building], area|z18[addr:housenumber][addr:street], node|z18[addr:housenumber][addr:street] -{font-size: 11;} +{font-size: 13.5;} area|z18[building]::int_name, node|z18[building]::int_name, area|z18[addr:housenumber][addr:street]::int_name, node|z18[addr:housenumber][addr:street]::int_name -{font-size: 11;} +{font-size: 13.5;} area|z19[building], node|z19[building], area|z19[addr:housenumber][addr:street], node|z19[addr:housenumber][addr:street] -{font-size: 12;} +{font-size: 14;} area|z19[building]::int_name, node|z19[building]::int_name, area|z19[addr:housenumber][addr:street]::int_name, node|z19[addr:housenumber][addr:street]::int_name -{font-size: 12;} +{font-size: 14;} /*node|z18-[entrance] {icon-image: entrance-s.svg;font-size: 10;text: ref;text-offset-x: 10;} diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 04f2b64c11..927be87af1 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -384,6 +384,8 @@ node[amenity=hospital], node[building=hospital], area[building=hospital], area[amenity=hospital], +node[building=university], +area[building=university], {z-index: 2900;} /*node[shop=mall], @@ -397,7 +399,6 @@ area[barrier=toll_booth], node[barrier=lift_gate], area[barrier=lift_gate], node[railway=level_crossing], -node[highway=speed_camera], {z-index: 2950;} node[railway=station], @@ -429,6 +430,7 @@ node[olympics=transport_tram], area[olympics=transport_tram], node[olympics=transport_subway], area[building=train_station], +node[highway=speed_camera], {z-index: 8000;} /* 2. NATURAL */ @@ -593,16 +595,16 @@ area|z17-[amenity=water_point], area|z17-[highway=bus_stop], {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}*/ area|z11-[building=train_station], -{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light; icon-min-distance: 2; -x-me-icon-priority: 3100;} +{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light; icon-min-distance: 2; -x-me-icon-priority: 9100;} area|z11-[building=train_station]::int_name, -{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;icon-min-distance: 2; -x-me-icon-priority: 3100;} +{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;icon-min-distance: 2; -x-me-icon-priority: 9100;} -node|z12-[railway=station], -node|z13-[railway=halt], +node|z13-[railway=station], +node|z14-[railway=halt], node|z14-15[railway=station][transport=subway], {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;} -node|z12-17[railway=station]::int_name, -node|z13-17[railway=halt]::int_name, +node|z13-17[railway=station]::int_name, +node|z14-17[railway=halt]::int_name, node|z14-15[railway=station][transport=subway]::int_name, {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;} @@ -657,11 +659,11 @@ node|z12-[aeroway=aerodrome]::int_name, /* 3. TRANSPORT */ -node|z12-[railway=halt], +node|z14-[railway=halt], node|z14-[railway=station][transport=subway], node|z16-[railway=subway_entrance] {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;} -node|z12-[railway=halt]::int_name, +node|z14-[railway=halt]::int_name, node|z14-[railway=station][transport=subway]::int_name, node|z16-[railway=subway_entrance]::int_name {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;} @@ -720,18 +722,16 @@ node|z12-[aeroway=aerodrome]::int_name, /*check offset int_name*/ -node|z11[railway=halt] +/*node|z11[railway=halt] {icon-image: train-s.svg;icon-min-distance: 10;} node|z12[railway=halt] {icon-image: train-s.svg;text-offset: 6;font-size: 9;} node|z12[railway=halt]::int_name -{text-offset: 6;font-size: 8;} +{text-offset: 6;font-size: 8;}*/ node|z13[railway=station], -node|z13[railway=halt], area|z13[building=train_station], {icon-image: train-s.svg;text-offset: 6;font-size: 10;} node|z13[railway=station]::int_name, -node|z13[railway=halt]::int_name, area|z13[building=train_station]::int_name, {text-offset: 6;font-size: 9;} node|z14[railway=station], @@ -1497,7 +1497,7 @@ node|z16-[amenity=restaurant], area|z16-[amenity=restaurant], node|z17-[amenity=fast_food], area|z17-[amenity=fast_food], -{text: name;text-color: @poi_label;text-offset: 10;font-size: 11;} +{text: name;text-color: @poi_label;text-offset: 10;font-size: 13;} /*node|z17-[amenity=bar], area|z17-[amenity=bar], @@ -1537,10 +1537,10 @@ area|z16[amenity=pub] {icon-image: beer-m.svg;icon-min-distance: 12;}*/ node|z15[amenity=cafe], area|z15[amenity=cafe] -{icon-image: cafe-m.svg;icon-min-distance: 3;font-size: 10;} +{icon-image: cafe-m.svg;icon-min-distance: 3;font-size: 11;} node|z16[amenity=cafe], area|z16[amenity=cafe] -{icon-image: cafe-m.svg;icon-min-distance: 10;font-size: 10;} +{icon-image: cafe-m.svg;icon-min-distance: 10;font-size: 12.5;} node|z16[amenity=restaurant], area|z16[amenity=restaurant] {icon-image: restaurant-m.svg;icon-min-distance: 22;} @@ -1643,7 +1643,7 @@ area|z17[building=hospital] node|z18-[amenity=hospital], node|z18-[building=hospital], area|z18-[building=hospital], -{icon-image: hospital-l.svg;font-size: 11;} +{icon-image: hospital-l.svg;font-size: 13;} /*node|z16[amenity=veterinary], area|z16[amenity=veterinary] @@ -1688,7 +1688,7 @@ area|z18[amenity=university][!name] {} node|z19[amenity=university][name], area|z19[amenity=university][name] -{icon-image: college-l.svg;font-size: 11;-x-me-text-priority:16000;} +{icon-image: college-l.svg;font-size: 113;-x-me-text-priority:16000;} node|z19[amenity=university][!name], area|z19[amenity=university][!name] {} @@ -1922,10 +1922,10 @@ area|z16[amenity=bank] {icon-image: bank-m.svg;text-offset: 6;font-size: 11;}*/ node|z17[amenity=bank], area|z17[amenity=bank] -{icon-image: bank-m.svg;font-size: 11; icon-min-distance: 15} +{icon-image: bank-m.svg;font-size: 12.75; icon-min-distance: 15} node|z18-[amenity=bank], area|z18-[amenity=bank] -{icon-image: bank-l.svg;font-size: 11; icon-min-distance: 10} +{icon-image: bank-l.svg;font-size: 13; icon-min-distance: 10} /*node|z15-[landuse=landfill], area|z15-[landuse=landfill] @@ -2117,7 +2117,7 @@ area|z17-[amenity=vending_machine] {icon-image: vending-l.svg;icon-min-distance: 20;} node|z17-[amenity=vending_machine][vending=parking_tickets], area|z17-[amenity=vending_machine][vending=parking_tickets] -{icon-image: parking-meter-l.svg;font-size: 11;} +{icon-image: parking-meter-l.svg;font-size: 12.5;} node|z18-[amenity=vending_machine], area|z18-[amenity=vending_machine] {icon-image: vending-l.svg;} @@ -2185,7 +2185,7 @@ node|z14-[shop=supermarket], area|z14-[shop=supermarket], node|z15-[shop=car_repair][service=tyres], area|z15-[shop=car_repair][service=tyres], -{text: name;text-color: @poi_label;text-offset: 8;font-size: 10;text-min-distance: 3;} +{text: name;text-color: @poi_label;text-offset: 8;font-size: 11.5;text-min-distance: 3;} node|z12[shop=mall], area|z12[shop=mall] @@ -2198,26 +2198,26 @@ area|z14[shop=mall] {icon-image: shop-s.svg;icon-min-distance: 5;-x-me-icon-priority:15500;-x-me-text-priority:15500;} node|z15-16[shop=mall], area|z15-16[shop=mall] -{icon-image: shop-m.svg;font-size:11;icon-min-distance: 6;-x-me-icon-priority:15500; -x-me-text-priority:15500;} +{icon-image: shop-m.svg;font-size:12;icon-min-distance: 6;-x-me-icon-priority:15500; -x-me-text-priority:15500;} node|z17-[shop=mall], area|z17-[shop=mall] -{icon-image: shop-l.svg;font-size: 11;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;} +{icon-image: shop-l.svg;font-size: 12.75;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;} node|z14[shop=supermarket], area|z14[shop=supermarket] {icon-image: grocery-s.svg;icon-min-distance: 4;} node|z15[shop=supermarket], area|z15[shop=supermarket] -{icon-image: grocery-m.svg;font-size:9;icon-min-distance: 3;} +{icon-image: grocery-m.svg;font-size:12;icon-min-distance: 3;} node|z16[shop=supermarket], area|z16[shop=supermarket] -{icon-image: grocery-m.svg;font-size: 11;icon-min-distance: 16;text-min-distance:6;} +{icon-image: grocery-m.svg;font-size: 12;icon-min-distance: 16;text-min-distance:6;} /*node|z16[amenity=marketplace], area|z16[amenity=marketplace] {icon-image: marketplace-s.svg;text-offset: 11;font-size: 11;icon-min-distance: 24;}*/ node|z17-[shop=supermarket], area|z17-[shop=supermarket] -{icon-image: grocery-l.svg;font-size: 11;icon-min-distance: 15;} +{icon-image: grocery-l.svg;font-size: 12.75;icon-min-distance: 15;} /*node|z17[amenity=marketplace], area|z17[amenity=marketplace] {icon-image: marketplace-m.svg;font-size: 11;icon-min-distance: 8;} @@ -2236,7 +2236,7 @@ area|z17[shop=car_repair][service=tyres] {icon-image: car-repair-l.svg;} node|z18-[shop=car_repair][service=tyres], area|z18-[shop=car_repair][service=tyres] -{icon-image: car-repair-l.svg;font-size: 11;} +{icon-image: car-repair-l.svg;font-size: 13;} /*node|z16-[shop], area|z16-[shop] @@ -2531,7 +2531,7 @@ node|z18-[amenity=car_rental], area|z18-[amenity=car_rental], node|z18-[amenity=car_sharing], area|z18-[amenity=car_sharing] -{text: name;text-color: @poi_label;text-offset: 8;font-size: 10;} +{text: name;text-color: @poi_label;text-offset: 8;font-size: 11;} node|z12[amenity=fuel], area|z12[amenity=fuel] @@ -2553,11 +2553,11 @@ area|z17[amenity=fuel] {icon-image: fuel-l.svg;} node|z18-[amenity=fuel], area|z18-[amenity=fuel] -{icon-image: fuel-l.svg;font-size: 11;text:} +{icon-image: fuel-l.svg;font-size: 13;text:} node|z14[amenity=charging_station], area|z14[amenity=charging_station] -{icon-image: charging-station-s.svg;text-offset: 6;font-size: 10;-x-me-text-priority:15500;icon-min-distance: 20;} +{icon-image: charging-station-s.svg;text-offset: 6;font-size: 11;-x-me-text-priority:15500;icon-min-distance: 20;} node|z15[amenity=charging_station], area|z15[amenity=charging_station] {icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;} @@ -2569,21 +2569,21 @@ area|z17[amenity=charging_station] {icon-image: charging-station-l.svg;} node|z18-[amenity=charging_station], area|z18-[amenity=charging_station] -{icon-image: charging-station-l.svg;font-size: 11;} +{icon-image: charging-station-l.svg;font-size: 12.75;} node|z13[highway=speed_camera] {icon-image: speedcam-m.svg;} node|z14-[highway=speed_camera] {icon-image: speedcam-m.svg;} node|z16-[highway=speed_camera] -{icon-image: speedcam-l.svg;} +{icon-image: speedcam1-l.svg;} node|z17[amenity=car_wash], area|z17[amenity=car_wash] {icon-image: car-wash-l.svg;font-size: 11;icon-min-distance: 24;} node|z18-[amenity=car_wash], area|z18-[amenity=car_wash ] -{icon-image: car-wash-l.svg;text-offset: 10;font-size: 11;} +{icon-image: car-wash-l.svg;text-offset: 10;font-size: 12.75;} node|z18-[amenity=car_rental], area|z18-[amenity=car_rental] @@ -2610,7 +2610,7 @@ node|z18[amenity=parking][access=private] node|z19-[amenity=parking], area|z19-[amenity=parking] -{icon-image: parking-m.svg;font-size: 11;icon-min-distance: 6;} +{icon-image: parking-m.svg;font-size: 13;icon-min-distance: 6;} /*node|z17-[amenity=bicycle_parking], area|z17-[amenity=bicycle_parking] diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index e008ca7819..5844bfe19d 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -124,7 +124,8 @@ line[highway=footway][bridge?]::bridgeblack, line[highway=steps][bridge?]::bridgeblack, line[highway=road][bridge?]::bridgeblack, line[highway=service][bridge?]::bridgeblack, -line[railway=rail][bridge?]::bridgeblack +line[railway=rail][bridge?]::bridgeblack, +line[railway=tram][bridge?]::bridgeblack, {z-index: 390;} line[highway=motorway][bridge?]::bridgewhite, @@ -144,7 +145,8 @@ line[highway=footway][bridge?]::bridgewhite, line[highway=steps][bridge?]::bridgewhite, line[highway=road][bridge?]::bridgewhite, line[highway=service][bridge?]::bridgewhite, -line[railway=rail][bridge?]::bridgewhite +line[railway=rail][bridge?]::bridgewhite, +line[railway=tram][bridge?]::bridgewhite, {z-index: 400;} line[highway=construction], @@ -202,8 +204,8 @@ line[highway=secondary_link] line[highway=secondary] {z-index: 800;} -line[highway=primary_link] -{z-index: 840;} +/*line[highway=primary_link] +{z-index: 840;}*/ line[highway=motorway_link], line[highway=trunk_link], @@ -212,14 +214,15 @@ line|z8-9[highway=world_level], {z-index: 850;} +line[highway=primary_link], line[highway=primary], -{z-index: 900;} +{z-index: 910;} line|z4-7[highway=world_towns_level], line|z4-7[highway=world_level], line[highway=trunk], line[highway=motorway] -{z-index: 910;} +{z-index: 940;} line[railway=monorail], line[railway=narrow_gauge], @@ -1075,11 +1078,13 @@ line|z16-[railway=yard]::dash {color: @railway_dash;opacity:1;} line|z14-[railway=rail][bridge?]::bridgewhite, line|z14-[railway=light_rail][bridge?]::bridgewhite, -line|z14-[railway=yard][bridge?]::bridgewhite +line|z14-[railway=yard][bridge?]::bridgewhite, +line|z16-[railway=tram][bridge?]::bridgewhite, {casing-linecap: butt;casing-color:@bridge_background;} line|z14-[railway=rail][bridge?]::bridgeblack, line|z14-[railway=light_rail][bridge?]::bridgeblack, -line|z14-[railway=yard][bridge?]::bridgeblack +line|z14-[railway=yard][bridge?]::bridgeblack, +line|z16-[railway=tram][bridge?]::bridgeblack, {casing-linecap: butt;casing-color:@bridge_casing;} /* 9.1 RAIL 11-22 ZOOM */ diff --git a/data/styles/vehicle/include/Roads_label.mapcss b/data/styles/vehicle/include/Roads_label.mapcss index 64697f706b..e090099312 100644 --- a/data/styles/vehicle/include/Roads_label.mapcss +++ b/data/styles/vehicle/include/Roads_label.mapcss @@ -173,111 +173,6 @@ line[hwtag=oneway]::arrows /* 2.SHIELD 10-22 ZOOM */ -line|z10-[highway=motorway], -line|z10-[highway=trunk], -line|z10-[highway=motorway_link], -line|z10-[highway=trunk_link], -line|z10-[highway=primary], -line|z10-[highway=primary_link], -line|z12-[highway=secondary], -line|z12-[highway=residential], -line|z12-[highway=tertiary] -{shield-font-size: 10;shield-text-color: @shield_text;shield-text-halo-radius: 0;shield-text-halo-color: @shield_text_halo;shield-color: @shield;shield-outline-radius: 1;shield-outline-color: @shield_outline;} - -line|z10[highway=motorway], -line|z10[highway=trunk], -line|z10[highway=motorway_link], -line|z10[highway=trunk_link], -line|z10[highway=primary], -line|z10[highway=primary_link] -{shield-min-distance: 60;} -line|z11[highway=motorway], -line|z11[highway=trunk], -line|z11[highway=motorway_link], -line|z11[highway=trunk_link], -line|z11[highway=primary], -line|z11[highway=primary_link] -{shield-min-distance: 60;} -line|z12[highway=motorway], -line|z12[highway=trunk], -line|z12[highway=motorway_link], -line|z12[highway=trunk_link], -line|z12[highway=primary], -line|z12[highway=primary_link], -line|z12[highway=secondary], -line|z12[highway=residential], -line|z12[highway=tertiary] -{shield-min-distance: 60;} -line|z13[highway=motorway], -line|z13[highway=trunk], -line|z13[highway=motorway_link], -line|z13[highway=trunk_link], -line|z13[highway=primary], -line|z13[highway=primary_link], -line|z13[highway=secondary], -line|z13[highway=residential], -line|z13[highway=tertiary] -{shield-min-distance: 100;} -line|z14[highway=motorway], -line|z14[highway=trunk], -line|z14[highway=motorway_link], -line|z14[highway=trunk_link], -line|z14[highway=primary], -line|z14[highway=primary_link], -line|z14[highway=secondary], -line|z14[highway=residential], -line|z14[highway=tertiary] -{shield-min-distance: 100;} -line|z15[highway=motorway], -line|z15[highway=trunk], -line|z15[highway=motorway_link], -line|z15[highway=trunk_link], -line|z15[highway=primary], -line|z15[highway=primary_link], -line|z15[highway=secondary], -line|z15[highway=residential], -line|z15[highway=tertiary] -{shield-min-distance: 150;} -line|z16[highway=motorway], -line|z16[highway=trunk], -line|z16[highway=motorway_link], -line|z16[highway=trunk_link], -line|z16[highway=primary], -line|z16[highway=primary_link], -line|z16[highway=secondary], -line|z16[highway=residential], -line|z16[highway=tertiary] -{shield-min-distance: 250;} -line|z17[highway=motorway], -line|z17[highway=trunk], -line|z17[highway=motorway_link], -line|z17[highway=trunk_link], -line|z17[highway=primary], -line|z17[highway=primary_link], -line|z17[highway=secondary], -line|z17[highway=residential], -line|z17[highway=tertiary] -{shield-min-distance: 250;} -line|z18[highway=motorway], -line|z18[highway=trunk], -line|z18[highway=motorway_link], -line|z18[highway=trunk_link], -line|z18[highway=primary], -line|z18[highway=primary_link], -line|z18[highway=secondary], -line|z18[highway=residential], -line|z18[highway=tertiary] -{shield-font-size: 11;shield-min-distance: 400;} -line|z19[highway=motorway], -line|z19[highway=trunk], -line|z19[highway=motorway_link], -line|z19[highway=trunk_link], -line|z19[highway=primary], -line|z19[highway=primary_link], -line|z19[highway=secondary], -line|z19[highway=residential], -line|z19[highway=tertiary] -{shield-font-size: 11;shield-min-distance: 500;} /* 3.TRUNK & MOTORWAY 10-22 ZOOM */ @@ -291,30 +186,30 @@ line|z10-11[highway=motorway], line|z10-11[highway=trunk], line|z10-11[highway=motorway_link], line|z10-11[highway=trunk_link] -{font-size: 10.5;text-color: @label_dark;text-halo-opacity: 0.8;text-halo-color: @label_halo_medium;} +{font-size: 11.5;text-color: @label_dark;text-halo-opacity: 0.8;text-halo-color: @label_halo_medium;} line|z12-13[highway=motorway], line|z12-13[highway=trunk], line|z12-13[highway=motorway_link], line|z12-13[highway=trunk_link] -{font-size: 12.5;text-halo-color: @label_halo_medium;} +{font-size: 13.5;text-halo-color: @label_halo_medium;} line|z14-15[highway=motorway], line|z14-15[highway=trunk], -{font-size: 13.5;text-color: @label_dark;text-halo-opacity: 0.8;} +{font-size: 14.5;text-color: @label_dark;text-halo-opacity: 0.8;} line|z14[highway=motorway_link], line|z14[highway=trunk_link] -{font-size: 11;text-halo-color: @label_halo_medium;} +{font-size: 12;text-halo-color: @label_halo_medium;} line|z15[highway=motorway_link], line|z15[highway=trunk_link] -{font-size: 11.5;text-halo-color: @label_halo_medium;} +{font-size: 12.5;text-halo-color: @label_halo_medium;} line|z16-17[highway=trunk], line|z16-17[highway=motorway], -{font-size: 14.5;text-color: @label_dark;text-halo-opacity: 0.8;} +{font-size: 15.5;text-color: @label_dark;text-halo-opacity: 0.8;} line|z16-[highway=motorway_link], line|z16-[highway=trunk_link] -{font-size: 12.5;text-halo-opacity: 1;} +{font-size: 14.5;text-halo-opacity: 1;} line|z18-[highway=trunk], line|z18-[highway=motorway], -{font-size: 15;text-color: @label_dark;text-halo-opacity: 1;} +{font-size: 16;text-color: @label_dark;text-halo-opacity: 1;} /* 4.PRIMARY 10-22 ZOOM */ @@ -324,22 +219,22 @@ line|z10-[highway=primary_link], line|z10-11[highway=primary], line|z10-11[highway=primary_link] -{font-size: 10.5;text-halo-color: @label_halo_medium;} +{font-size: 11;text-halo-color: @label_halo_medium;} line|z12-13[highway=primary], line|z12-13[highway=primary_link] -{font-size: 11;text-halo-opacity: 0.9;text-halo-color: @label_halo_medium;} +{font-size: 12.75;text-halo-opacity: 0.9;text-halo-color: @label_halo_medium;} line|z14-15[highway=primary], {font-size: 13.5;text-color: @label_dark;} line|z14[highway=primary_link] -{font-size: 11;text-halo-color: @label_halo_medium;} +{font-size: 12;text-halo-color: @label_halo_medium;} line|z15[highway=primary_link] -{font-size: 11.5;text-halo-color: @label_halo_medium;} +{font-size: 14;text-halo-color: @label_halo_medium;} line|z16-[highway=primary], -{font-size: 14.5;text-color: @label_dark;} +{font-size: 15.5;text-color: @label_dark;} line|z16-17[highway=primary_link], -{font-size: 12.25;} +{font-size: 13.25;} line|z18-[highway=primary_link], -{font-size: 12.5;text-halo-opacity: 1;} +{font-size: 14.5;text-halo-opacity: 1;} /* 5.SECONDARY 10-22 ZOOM */ @@ -348,13 +243,13 @@ line|z16-[highway=secondary_link] {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;} line|z10-11[highway=secondary] -{font-size: 10;text-color: @label_light;} +{font-size: 11;text-color: @label_light;} line|z12-13[highway=secondary] -{font-size: 10;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;} +{font-size: 12;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;} line|z14[highway=secondary], -{font-size: 11.5;} +{font-size: 12.5;} line|z15[highway=secondary], -{font-size: 12;} +{font-size: 13;} line|z16-17[highway=secondary], line|z16-17[highway=secondary_link] {font-size: 14;text-color: @label_dark;text-halo-color: @label_halo_light;} @@ -375,18 +270,18 @@ line|z12-13[highway=tertiary] {font-size: 10;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;} line|z14[highway=residential], line|z14[highway=tertiary], -{font-size: 10.5;} +{font-size: 11.5;} line|z15[highway=residential], line|z15[highway=tertiary], -{font-size: 11.5;} +{font-size: 12.5;} line|z16-17[highway=residential], line|z16-17[highway=tertiary], -{font-size: 12.5;text-halo-color: @label_halo_light;} +{font-size: 13;text-halo-color: @label_halo_light;} line|z18-[highway=residential], line|z18-[highway=residential_link], line|z18-[highway=tertiary], line|z18-[highway=tertiary_link] -{font-size: 13;text-halo-opacity: 1;text-halo-color: @label_halo_light;} +{font-size: 13.5;text-halo-opacity: 1;text-halo-color: @label_halo_light;} /* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 14-22 ZOOM */ @@ -399,17 +294,17 @@ line|z16-[highway=service], line|z14[highway=unclassified], line|z14[highway=living_street], line|z14[highway=road], -{font-size: 10.5;} +{font-size: 11;} line|z15[highway=unclassified], line|z15[highway=living_street], line|z15[highway=road], -{font-size: 11;} +{font-size: 11.5;} line|z16-17[highway=unclassified], line|z16-17[highway=living_street], {font-size: 12;text-halo-color: @label_halo_light;} line|z16-17[highway=service], line|z16-17[highway=road], -{font-size: 11;text-halo-color: @label_halo_light;} +{font-size: 12;text-halo-color: @label_halo_light;} line|z18-[highway=unclassified], line|z18-[highway=living_street], line|z18-[highway=service], @@ -543,3 +438,106 @@ node|z15[highway=motorway_junction] {font-size: 9;} node|z16-[highway=motorway_junction] {font-size: 10;} + + +line|z10-[highway=motorway], +line|z10-[highway=trunk], +line|z10-[highway=motorway_link], +line|z10-[highway=trunk_link], +line|z10-[highway=primary], +line|z10-[highway=primary_link], +line|z12-[highway=secondary], +line|z12-[highway=residential], +line|z12-[highway=tertiary] +{shield-font-size: 9;shield-text-color: @shield_text;shield-text-halo-radius: 0;shield-text-halo-color: @shield_text_halo;shield-color: @shield;shield-outline-radius: 1;shield-outline-color: @shield_outline;-x-me-icon-priority: 20000;z-index:60000;} + +line|z10[highway=motorway], +line|z10[highway=trunk], +line|z10[highway=motorway_link], +line|z10[highway=trunk_link], +line|z10[highway=primary], +line|z10[highway=primary_link], +line|z10[highway=secondary], +line|z10[highway=residential], +line|z10[highway=tertiary] +{shield-min-distance: 85;-x-me-icon-priority: 75000;z-index:60000;} +line|z11-12[highway=motorway], +line|z11-12[highway=trunk], +line|z11-12[highway=motorway_link], +line|z11-12[highway=trunk_link], +line|z11-12[highway=primary], +line|z11-12[highway=primary_link], +line|z11-12[highway=secondary], +line|z11-12[highway=residential], +line|z11-12[highway=tertiary] +{shield-min-distance: 90;-x-me-icon-priority: 75000;z-index:60000;} +line|z13[highway=motorway], +line|z13[highway=trunk], +line|z13[highway=motorway_link], +line|z13[highway=trunk_link], +line|z13[highway=primary], +line|z13[highway=primary_link], +line|z13[highway=secondary], +line|z13[highway=residential], +line|z13[highway=tertiary] +{shield-min-distance: 120;-x-me-icon-priority: 75000;z-index:60000;} +line|z14[highway=motorway], +line|z14[highway=trunk], +line|z14[highway=motorway_link], +line|z14[highway=trunk_link], +line|z14[highway=primary], +line|z14[highway=primary_link], +line|z14[highway=secondary], +line|z14[highway=residential], +line|z14[highway=tertiary] +{shield-min-distance: 175;-x-me-icon-priority: 75000;z-index:60000;} +line|z15[highway=motorway], +line|z15[highway=trunk], +line|z15[highway=motorway_link], +line|z15[highway=trunk_link], +line|z15[highway=primary], +line|z15[highway=primary_link], +line|z15[highway=secondary], +line|z15[highway=residential], +line|z15[highway=tertiary] +{shield-min-distance: 250;-x-me-icon-priority: 75000;z-index:60000;} +line|z16[highway=motorway], +line|z16[highway=trunk], +line|z16[highway=motorway_link], +line|z16[highway=trunk_link], +line|z16[highway=primary], +line|z16[highway=primary_link], +line|z16[highway=secondary], +line|z16[highway=residential], +line|z16[highway=tertiary] +{shield-min-distance: 300;-x-me-icon-priority: 75000;z-index:60000;} +line|z17[highway=motorway], +line|z17[highway=trunk], +line|z17[highway=motorway_link], +line|z17[highway=trunk_link], +line|z17[highway=primary], +line|z17[highway=primary_link], +line|z17[highway=secondary], +line|z17[highway=residential], +line|z17[highway=tertiary] +{shield-font-size: 10;shield-min-distance: 300;-x-me-icon-priority: 75000;z-index:60000;} +line|z18[highway=motorway], +line|z18[highway=trunk], +line|z18[highway=motorway_link], +line|z18[highway=trunk_link], +line|z18[highway=primary], +line|z18[highway=primary_link], +line|z18[highway=secondary], +line|z18[highway=residential], +line|z18[highway=tertiary] +{shield-font-size: 10;shield-min-distance: 300;-x-me-icon-priority: 75000;z-index:60000;} +line|z19[highway=motorway], +line|z19[highway=trunk], +line|z19[highway=motorway_link], +line|z19[highway=trunk_link], +line|z19[highway=primary], +line|z19[highway=primary_link], +line|z19[highway=secondary], +line|z19[highway=residential], +line|z19[highway=tertiary] +{shield-font-size: 11;shield-min-distance: 350;-x-me-icon-priority: 75000;z-index:60000;} diff --git a/data/styles/vehicle/include/common_colors.mapcss b/data/styles/vehicle/include/common_colors.mapcss index 9d2ec0fa89..6c2e8614d1 100755 --- a/data/styles/vehicle/include/common_colors.mapcss +++ b/data/styles/vehicle/include/common_colors.mapcss @@ -1,2 +1,2 @@ @traffic_arrow_light: 1.0; -@traffic_arrow_dark: 0.5; +@traffic_arrow_dark: 1.0; diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss index 64b6383f23..b047f7aa50 100644 --- a/data/styles/vehicle/style-clear/colors.mapcss +++ b/data/styles/vehicle/style-clear/colors.mapcss @@ -27,11 +27,11 @@ @trunk: #FF8800; @trunk_orange: #FF5919; -@trunk_orange_medium: #FF7F33; -@trunk_orange_light: #FF7A26; +@trunk_orange_medium: #FF9140; +@trunk_orange_light: #FF8742; @primary_orange: #FF8726; -@primary_orange_medium: #FF9440; -@primary_orange_light: #FFA14C; +@primary_orange_medium: #FFAD57; +@primary_orange_light: #FFAD57; @secondary: #FFFFFF; @residential: #FCFCFC; @unclassified: #FCFCFC; @@ -79,12 +79,12 @@ @ferry: #4499Bb; /*aerodrome*/ -@aerodrome0: #D4BFF2; -@aerodrome1: #D4BFF2; -@aerodrome2: #D1C0EB; -@aerodrome3: #CFC1E8; -@aerodrome4: #CDC0E3; -@aerodrome5: #C8BCDE; +@aerodrome0: #D8D1E8; +@aerodrome1: #D8D1E8; +@aerodrome2: #D8D1E8; +@aerodrome3: #D8D1E8; +@aerodrome4: #D8D1E8; +@aerodrome5: #D8D1E8; /* NATURAL */ @glacier: #FFFFFF; @@ -110,8 +110,8 @@ @building_label: #61615A; @building: #D4D3CA;/*#C9C8BB;*/ @building_dark: #C7C6BF;/*#C2C0B3;*/ -@building_border: #A1A096; -@building_dark_border: #9B9A8F; +@building_border: #D4D3CA; +@building_dark_border: #D4D3CA; /* LANDUSE */ @@ -122,7 +122,8 @@ @hospital: #F8D9D9;/*FADCDB*/ @industrial: #DED8E0;/*#D5D5DE; #E4E2EB;*/ @sport: #C8DBAD; -@parking: #F2F2CE;/*#F0EBC5;DCDCB9; #F2F2CE;*/ +@parking: #F2F2CE; +@parking_l: #FCFCC2;/*#F0EBC5;DCDCB9; #F2F2CE;*/ /* BARRIERS */ @fence: #999999; diff --git a/data/styles/vehicle/style-clear/style.mapcss b/data/styles/vehicle/style-clear/style.mapcss index cbb9d3dad7..83b3785adc 100644 --- a/data/styles/vehicle/style-clear/style.mapcss +++ b/data/styles/vehicle/style-clear/style.mapcss @@ -27,9 +27,9 @@ colors Route-color: #0087FF; RouteOutline-color: #055FCD; RouteTrafficG0-color: #9B2300; - RouteTrafficG1-color: #F03C0A; - RouteTrafficG2-color: #F03C0A; - RouteTrafficG3-color: #F5D728; + RouteTrafficG1-color: #E82705; + RouteTrafficG2-color: #E82705; + RouteTrafficG3-color: #FFE500; RouteTrafficG3-opacity: @traffic_arrow_dark; RoutePedestrian-color: #1D339E; RoutePedestrian-opacity: 0.8; @@ -42,27 +42,27 @@ colors Arrow3DShadow-opacity: 0.24; Arrow3DOutline-color: #FFFFFF; TrackHumanSpeed-color: #1D339E; - TrackCarSpeed-color: #1579F4; - TrackPlaneSpeed-color: #0AC4FF; + TrackCarSpeed-color: #7C8EDE; + TrackPlaneSpeed-color: #A8B7ED; TrackUnknownDistance-color: #616161; - TrafficG0-color: #9B2305; - TrafficG1-color: #E63C37; - TrafficG2-color: #E63C37; - TrafficG3-color: #FAB423; + TrafficG0-color: #7E1712; + TrafficG1-color: #E42300; + TrafficG2-color: #E42300; + TrafficG3-color: #FCDE00; TrafficG3-opacity: @traffic_arrow_dark; - TrafficG4-color: #9BAF37; - TrafficG5-color: #468755; + TrafficG4-color: #39962E; + TrafficG5-color: #39962E; TrafficTempBlock-color: #464646; TrafficUnknown-color: #000000; TrafficArrowLight-color: #FFFFFF; - TrafficArrowDark-color: #6B5114; - TrafficOutline-color: #FFFFFF; + TrafficArrowDark-color: #473635; + TrafficOutline-color: #F0F0F0; RoadShieldBlackText-color: #000000; RoadShieldWhiteText-color: #FFFFFF; - RoadShieldUKYellowText-color: #FFCC66; - RoadShieldBlueBackground-color: #2E6FC9; - RoadShieldGreenBackground-color: #22723B; - RoadShieldRedBackground-color: #CD2828; + RoadShieldUKYellowText-color: #FFD400; + RoadShieldBlueBackground-color: #1A5EC1; + RoadShieldGreenBackground-color: #309302; + RoadShieldRedBackground-color: #E63534; RoadShieldOrangeBackground-color: #FFBE00; PoiHotelTextOutline-color: #FFFFFF; PoiHotelTextOutline-opacity: 0.6; diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/style-night/colors.mapcss index 0f7233fb5c..c6267ddd13 100644 --- a/data/styles/vehicle/style-night/colors.mapcss +++ b/data/styles/vehicle/style-night/colors.mapcss @@ -62,16 +62,17 @@ @hospital: #261916; @industrial: #141014; @sport: #070F0A; -@parking: #1F1A10; +@parking: #332D14; +@parking_l: #403819; /*4.2 Aerodrome*/ -@aerodrome0: #41334F; -@aerodrome1: #4C3C5C; -@aerodrome2: #392D45; -@aerodrome3: #392D45; -@aerodrome4: #342A40; -@aerodrome5: #292133; +@aerodrome0: #1B1821; +@aerodrome1: #1B1821; +@aerodrome2: #1B1821; +@aerodrome3: #1B1821; +@aerodrome4: #1B1821; +@aerodrome5: #1B1821; /* 4.3 Barriers */ @fence: #444444; @@ -80,8 +81,8 @@ @building: #191919; @building_dark: #191919; -@building_border: #303030; -@building_dark_border: #474747; +@building_border: #1C1C1C; +@building_dark_border: #191919; /* 5.ROADS */ /* 5.1 All roads */ @@ -173,7 +174,7 @@ /* 6.4 Road labels */ @road_label_halo: #000000; -@shield_text: #b2b2b2; +@shield_text: #303030; @shield_text_halo: #000000; -@shield: #000000; -@shield_outline: #b2b2b2; +@shield: #999999; +@shield_outline: #303030;