From eff34b152404c38ce381416d593fbe1a74169501 Mon Sep 17 00:00:00 2001 From: Adamant36 Date: Sun, 18 Nov 2018 22:31:28 -0800 Subject: [PATCH 01/13] Add sport icons --- amenity-points.mss | 33 +++++++++++++++++++++ project.mml | 12 ++++---- symbols/sport/baseball.svg | 56 ++++++++++++++++++++++++++++++++++++ symbols/sport/basketball.svg | 39 +++++++++++++++++++++++++ symbols/sport/soccer.svg | 39 +++++++++++++++++++++++++ symbols/sport/tennis.svg | 35 ++++++++++++++++++++++ 6 files changed, 208 insertions(+), 6 deletions(-) create mode 100644 symbols/sport/baseball.svg create mode 100644 symbols/sport/basketball.svg create mode 100644 symbols/sport/soccer.svg create mode 100644 symbols/sport/tennis.svg diff --git a/amenity-points.mss b/amenity-points.mss index 2098f74d1e..a3f3e415d3 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -195,6 +195,34 @@ marker-clip: false; } + [feature = 'leisure_pitch'][sport = 'baseball'][zoom >= 17] { + marker-file: url('symbols/sport/baseball.svg'); + marker-fill: @leisure-green; + marker-placement: interior; + marker-clip: false; + } + + [feature = 'leisure_pitch'][sport = 'basketball'][zoom >= 17] { + marker-file: url('symbols/sport/basketball.svg'); + marker-fill: @leisure-green; + marker-placement: interior; + marker-clip: false; + } + + [feature = 'leisure_pitch'][sport = 'soccer'][zoom >= 17] { + marker-file: url('symbols/sport/soccer.svg'); + marker-fill: @leisure-green; + marker-placement: interior; + marker-clip: false; + } + + [feature = 'leisure_pitch'][sport = 'tennis'][zoom >= 17] { + marker-file: url('symbols/sport/tennis.svg'); + marker-fill: @leisure-green; + marker-placement: interior; + marker-clip: false; + } + [feature = 'tourism_artwork'][zoom >= 17] { [artwork_type != 'statue'] { marker-file: url('symbols/tourism/artwork.svg'); @@ -2540,6 +2568,11 @@ text-placement: interior; } + + + + + [feature = 'amenity_hospital'][zoom >= 16] { text-name: "[name]"; text-fill: @health-color; diff --git a/project.mml b/project.mml index 1389537cb6..2a535ed66c 100644 --- a/project.mml +++ b/project.mml @@ -1463,7 +1463,7 @@ Layer: 'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END, 'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort', - 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre', 'swimming_area') + 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre', 'swimming_area', 'pitch') THEN leisure ELSE NULL END, 'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END, @@ -1531,7 +1531,7 @@ Layer: OR (tags->'office') IS NOT NULL OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating', 'bird_hide', - 'amusement_arcade', 'sports_centre', 'swimming_area') + 'amusement_arcade', 'sports_centre', 'swimming_area', 'pitch') OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) OR "natural" IN ('spring') @@ -1598,7 +1598,7 @@ Layer: 'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway', 'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre', - 'swimming_area') THEN leisure ELSE NULL END, + 'swimming_area', 'pitch') THEN leisure ELSE NULL END, 'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END, 'natural_' || CASE WHEN "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance') THEN "natural" ELSE NULL END, @@ -1685,7 +1685,7 @@ Layer: OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway', 'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre', - 'swimming_area') + 'swimming_area', 'pitch') OR barrier IN ('toll_booth') OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'cross', 'obelisk', 'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) @@ -2083,7 +2083,7 @@ Layer: 'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track', 'pitch', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina', 'picnic_table', 'dog_park', 'fitness_station', 'firepit', 'sauna', 'beach_resort', - 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'swimming_area') THEN leisure ELSE NULL END, + 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'swimming_area', 'pitch') THEN leisure ELSE NULL END, 'power_' || CASE WHEN power IN ('plant', 'station', 'generator', 'sub_station', 'substation') THEN power ELSE NULL END, 'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland', @@ -2268,7 +2268,7 @@ Layer: 'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track', 'pitch','playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina', 'slipway', 'picnic_table', 'dog_park', 'fitness_station', 'firepit', 'sauna', 'beach_resort', - 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'swimming_area') THEN leisure ELSE NULL END, + 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'swimming_area', 'pitch') THEN leisure ELSE NULL END, 'power_' || CASE WHEN power IN ('plant', 'station', 'generator', 'sub_station', 'substation') THEN power ELSE NULL END, 'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland', diff --git a/symbols/sport/baseball.svg b/symbols/sport/baseball.svg new file mode 100644 index 0000000000..9966f81766 --- /dev/null +++ b/symbols/sport/baseball.svg @@ -0,0 +1,56 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/symbols/sport/basketball.svg b/symbols/sport/basketball.svg new file mode 100644 index 0000000000..8df529605b --- /dev/null +++ b/symbols/sport/basketball.svg @@ -0,0 +1,39 @@ + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/symbols/sport/soccer.svg b/symbols/sport/soccer.svg new file mode 100644 index 0000000000..cf9bdb8608 --- /dev/null +++ b/symbols/sport/soccer.svg @@ -0,0 +1,39 @@ + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/symbols/sport/tennis.svg b/symbols/sport/tennis.svg new file mode 100644 index 0000000000..2b713d4bc2 --- /dev/null +++ b/symbols/sport/tennis.svg @@ -0,0 +1,35 @@ + + + + + + + image/svg+xml + + + + + + + + From 200d9089d9e82937fd239bbb131adc3fd7d4c386 Mon Sep 17 00:00:00 2001 From: jeisenbe <42757252+jeisenbe@users.noreply.github.com> Date: Thu, 20 Dec 2018 06:15:39 +0900 Subject: [PATCH 02/13] Change allotments color and pattern (#3548) --- amenity-points.mss | 6 ++---- landcover.mss | 7 +++---- symbols/allotments.png | Bin 114 -> 269 bytes symbols/generating_patterns/allotments.md | 20 ++++++++++++++++++++ symbols/generating_patterns/allotments.svg | 9 +++++++++ 5 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 symbols/generating_patterns/allotments.md create mode 100644 symbols/generating_patterns/allotments.svg diff --git a/amenity-points.mss b/amenity-points.mss index b8258053d6..785a0e1fd0 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -2463,11 +2463,9 @@ } [feature = 'landuse_meadow'], [feature = 'natural_grassland'], - [feature = 'landuse_grass'] { - text-fill: darken(@grass, 50%); - } + [feature = 'landuse_grass'], [feature = 'landuse_allotments'] { - text-fill: darken(@allotments, 50%); + text-fill: darken(@grass, 50%); } [feature = 'landuse_farmyard'] { text-fill: darken(@farmyard, 50%); diff --git a/landcover.mss b/landcover.mss index 18773d38e7..2050919e7e 100644 --- a/landcover.mss +++ b/landcover.mss @@ -1,6 +1,6 @@ // --- Parks, woods, other green things --- -@grass: #cdebb0; // also grassland, meadow, common, village_green, garden +@grass: #cdebb0; // Lch(90,32,128) also grassland, meadow, common, village_green, garden, allotments @scrub: #c8d7ab; // Lch(84,24,122) @forest: #add19e; // Lch(80,30,135) @forest-text: #46673b; // Lch(40,30,135) @@ -38,7 +38,6 @@ // --- Other ---- -@allotments: #eecfb3; // Lch(85,19,70) @bare_ground: #eee5dc; @campsite: #def6c0; // also caravan_site, picnic_site @cemetery: #aacbaf; // also grave_yard @@ -302,11 +301,11 @@ [feature = 'landuse_allotments'] { [zoom >= 10] { - polygon-fill: @allotments; + polygon-fill: @grass; [way_pixels >= 4] { polygon-gamma: 0.75; } [way_pixels >= 64] { polygon-gamma: 0.3; } } - [zoom >= 14] { + [zoom >= 13] { polygon-pattern-file: url('symbols/allotments.png'); polygon-pattern-alignment: global; [way_pixels >= 4] { polygon-pattern-gamma: 0.75; } diff --git a/symbols/allotments.png b/symbols/allotments.png index c4077a7374522c8cc1163b1043f163238dbe61fc..63ac7bd4ee1cbedf4fa618cf8d192ac9a360cd6c 100644 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1ULJY5_^ zD(1YsqR4kZfq~g!)Bpb>?MF7~` + + + + + + + + Created with Snap \ No newline at end of file From 6f56069bed4ab25af5eb1772474ca3788db4aff0 Mon Sep 17 00:00:00 2001 From: kocio-pl Date: Wed, 19 Dec 2018 22:17:35 +0100 Subject: [PATCH 03/13] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4eaf7515fc..82751a1b7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Changing hospital icon - Changing healthcare color to red - Changing natural=scrub color +- Changing allotments color and pattern - Adding rendering for natural=cape - Rendering leisure=ice_rink - Addind rendering for man_made=crane From 5f5c9cd07001f11d69e6d216ca47cd6ab26c283b Mon Sep 17 00:00:00 2001 From: kocio-pl Date: Wed, 19 Dec 2018 22:18:37 +0100 Subject: [PATCH 04/13] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82751a1b7c..4128ffa58c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Changing hospital icon - Changing healthcare color to red - Changing natural=scrub color -- Changing allotments color and pattern +- Changing landuse=allotments color and pattern - Adding rendering for natural=cape - Rendering leisure=ice_rink - Addind rendering for man_made=crane From 64c1f3820a50ddc950ef484e3ee45a5ccf20779d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 20 Dec 2018 18:28:50 +0100 Subject: [PATCH 05/13] use dedicated icon for artwork_type=bust (#3576) --- amenity-points.mss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/amenity-points.mss b/amenity-points.mss index 785a0e1fd0..fd192ce18c 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -293,6 +293,9 @@ [artwork_type = 'statue'] { marker-file: url('symbols/historic/statue.svg'); } + [artwork_type = 'bust'] { + marker-file: url('symbols/historic/bust.svg'); + } marker-fill: @memorials; marker-placement: interior; } From ba90cdce9c188c26c909c18859e1ea3ea348a1e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 20 Dec 2018 21:08:42 +0100 Subject: [PATCH 06/13] Add rendering for private POI (#3528) --- amenity-points.mss | 87 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 78 insertions(+), 9 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index fd192ce18c..a5034302bd 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -54,6 +54,9 @@ marker-fill: @accommodation-icon; marker-placement: interior; marker-clip: false; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } [feature = 'amenity_atm'][zoom >= 19] { @@ -128,6 +131,9 @@ marker-fill: @amenity-brown; marker-placement: interior; marker-clip: false; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } [feature = 'amenity_public_bookcase'][zoom >= 19] { @@ -403,6 +409,9 @@ marker-fill: @transportation-icon; marker-placement: interior; marker-clip: false; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } [feature = 'amenity_fuel'][zoom >= 17] { @@ -431,6 +440,9 @@ marker-fill: @amenity-brown; marker-placement: interior; marker-clip: false; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } [feature = 'amenity_casino'][zoom >= 17] { @@ -530,6 +542,9 @@ marker-fill: @amenity-brown; marker-placement: interior; marker-clip: false; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } [feature = 'amenity_social_facility'][zoom >= 17] { @@ -930,6 +945,9 @@ marker-fill: @amenity-brown; marker-placement: interior; marker-clip: false; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } } @@ -938,6 +956,9 @@ marker-fill: @amenity-brown; marker-placement: interior; marker-clip: false; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } [feature = 'amenity_prison'][zoom >= 17] { @@ -1449,6 +1470,9 @@ marker-placement: interior; marker-fill: @leisure-green; marker-clip: false; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } [feature = 'leisure_dog_park'][zoom >= 17] { @@ -1487,6 +1511,9 @@ marker-fill: @leisure-green; marker-placement: interior; marker-clip: false; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } [feature = 'leisure_picnic_table'][zoom >= 17] { @@ -1494,6 +1521,9 @@ marker-fill: @amenity-brown; marker-placement: interior; marker-clip: false; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } [feature = 'leisure_firepit'][zoom >= 17] { @@ -1501,6 +1531,9 @@ marker-fill: @amenity-brown; marker-placement: interior; marker-clip: false; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } [feature = 'leisure_sauna'][zoom >= 17] { @@ -1772,12 +1805,18 @@ marker-file: url('symbols/amenity/bench.svg'); marker-fill: @amenity-brown; marker-placement: interior; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } [feature = 'amenity_waste_basket'][zoom >= 19]::amenity { marker-file: url('symbols/amenity/waste_basket.svg'); marker-fill: @amenity-brown; marker-placement: interior; + [access != ''][access != 'permissive'][access != 'yes'] { + marker-opacity: 0.33; + } } // waste_disposal tagging on nodes - tagging on ways is defined earlier @@ -1970,22 +2009,18 @@ [feature = 'amenity_vehicle_inspection'][zoom >= 17], [feature = 'amenity_car_wash'][zoom >= 17], - [feature = 'amenity_drinking_water'][zoom >= 17], [feature = 'amenity_internet_cafe'][zoom >= 17], - [feature = 'tourism_picnic_site'][zoom >= 17], [feature = 'leisure_bowling_alley'][zoom >= 17], [feature = 'leisure_beach_resort'][zoom >= 17], [feature = 'leisure_bird_hide'][zoom >= 17], [feature = 'leisure_amusement_arcade'][zoom >= 17], [feature = 'leisure_outdoor_seating'][zoom >= 19], - [feature = 'leisure_fishing'][zoom >= 17], - [feature = 'leisure_picnic_table'][zoom >= 17] { + [feature = 'leisure_fishing'][zoom >= 17] { text-name: "[name]"; text-size: @standard-font-size; text-wrap-width: @standard-wrap-width; text-line-spacing: @standard-line-spacing-size; text-fill: @amenity-brown; - [feature = 'tourism_picnic_site'], [feature = 'leisure_outdoor_seating'], [feature = 'leisure_fishing'], [feature = 'leisure_bowling_alley'], @@ -2001,6 +2036,31 @@ text-placement: interior; } + [feature = 'amenity_bbq'][zoom >= 17], + [feature = 'amenity_bicycle_repair_station'][zoom >= 19], + [feature = 'amenity_drinking_water'][zoom >= 17], + [feature = 'amenity_shower'][zoom >= 18], + [feature = 'tourism_picnic_site'][zoom >= 17], + [feature = 'leisure_picnic_table'][zoom >= 17] { + text-name: "[name]"; + text-size: @standard-font-size; + text-wrap-width: @standard-wrap-width; + text-line-spacing: @standard-line-spacing-size; + text-fill: @amenity-brown; + [feature = 'tourism_picnic_site'] { + text-fill: @leisure-green; + } + text-dy: 10; + text-face-name: @standard-font; + text-halo-radius: @standard-halo-radius; + text-halo-fill: @standard-halo-fill; + text-placement: interior; + [access != ''][access != 'permissive'][access != 'yes'] { + text-opacity: 0.33; + text-halo-radius: 0; + } + } + [feature = 'amenity_place_of_worship'][zoom >= 16][way_pixels > 3000], [feature = 'amenity_place_of_worship'][zoom >= 17] { text-name: "[name]"; @@ -2536,6 +2596,10 @@ [feature = 'leisure_fitness_centre'], [feature = 'leisure_fitness_station'] { text-fill: @leisure-green; + [access != ''][access != 'permissive'][access != 'yes'] { + text-opacity: 0.33; + text-halo-radius: 0; + } } [feature = 'leisure_dog_park'] { text-fill: @leisure-green; @@ -2581,12 +2645,9 @@ text-face-name: @standard-font; } - [feature = 'amenity_shower'][zoom >= 18], - [feature = 'amenity_bbq'][zoom >= 17], [feature = 'amenity_bureau_de_change'][zoom >= 17], [feature = 'amenity_public_bookcase'][zoom >= 19], - [feature = 'tourism_gallery'][zoom >= 17], - [feature = 'amenity_bicycle_repair_station'][zoom >= 19] { + [feature = 'tourism_gallery'][zoom >= 17] { text-name: "[name]"; text-size: @standard-font-size; text-wrap-width: @standard-wrap-width; @@ -2630,6 +2691,10 @@ [feature = 'amenity_shelter'] { text-fill: @amenity-brown; } + [access != ''][access != 'permissive'][access != 'yes'] { + text-opacity: 0.33; + text-halo-radius: 0; + } } [feature = 'amenity_taxi'][zoom >= 17] { @@ -2663,6 +2728,10 @@ [feature = 'highway_bus_stop'] { text-dy: 9; } + [access != ''][access != 'permissive'][access != 'yes'] { + text-opacity: 0.33; + text-halo-radius: 0; + } } } From 1a56cdb73c65aea896410239b3050ef22c1e0e2c Mon Sep 17 00:00:00 2001 From: kocio-pl Date: Thu, 20 Dec 2018 21:15:05 +0100 Subject: [PATCH 07/13] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4128ffa58c..c2002ad1ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,11 @@ - Addind rendering for man_made=crane - Adding icons for shop=fabric and shop=carpet - Updating icons for amenity=arts_centre, leisure=slipway, amenity=restaurant/amenity=food_court and man_made=storage_tank/man_made=silo +- Using dedicated icon for artwork_type=bust - Rendering railway pattern on z12 - Showing labels of big states (like Alaska) - Moving railway=tram_stop and station=subway later +- Adding rendering for more private POIs - Removing smoothing in leisure=track and attraction=water_slide - Using subway bridge style for subway construction bridges - Rendering wind turbines names and other tweaks From 4902fb17149e2503ff36e5342778003ba88f574e Mon Sep 17 00:00:00 2001 From: kocio-pl Date: Fri, 21 Dec 2018 15:47:30 +0100 Subject: [PATCH 08/13] Update CHANGELOG.md --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2002ad1ba..9687c2cb71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ -## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.17.0...master) +## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.18.0...master) + +## [v4.18.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.17.0...v4.18.0) - 2018-12-21 ## Changes - Adding rendering for healthcare tag scheme - Changing hospital icon From 66dfd05088ca795bf6549ec8f2f8c80c99ab457e Mon Sep 17 00:00:00 2001 From: kocio-pl Date: Fri, 21 Dec 2018 16:31:03 +0100 Subject: [PATCH 09/13] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9687c2cb71..c7f7be705f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ - Changing landuse=allotments color and pattern - Adding rendering for natural=cape - Rendering leisure=ice_rink -- Addind rendering for man_made=crane +- Adding rendering for man_made=crane - Adding icons for shop=fabric and shop=carpet - Updating icons for amenity=arts_centre, leisure=slipway, amenity=restaurant/amenity=food_court and man_made=storage_tank/man_made=silo - Using dedicated icon for artwork_type=bust From 251756d7457d2ba592cfab089a784f94ee3e7f60 Mon Sep 17 00:00:00 2001 From: jeisenbe <42757252+jeisenbe@users.noreply.github.com> Date: Thu, 27 Dec 2018 11:34:36 +0900 Subject: [PATCH 10/13] Add tertiary-link width, same as other links (#3570) --- roads.mss | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/roads.mss b/roads.mss index 74824d5cb0..e3a95d84ed 100644 --- a/roads.mss +++ b/roads.mss @@ -96,6 +96,7 @@ @secondary-width-z12: 3.5; @secondary-link-width-z12: 1.5; @tertiary-width-z12: 2.5; +@tertiary-link-width-z12: 1.5; @residential-width-z12: 0.5; @unclassified-width-z12: 0.8; @@ -108,6 +109,7 @@ @secondary-width-z13: 5; @secondary-link-width-z13: 4; @tertiary-width-z13: 4; +@tertiary-link-width-z13: 3; @residential-width-z13: 2.5; @living-street-width-z13: 2; @bridleway-width-z13: 0.3; @@ -135,6 +137,7 @@ @secondary-width-z15: 9; @secondary-link-width-z15: 7; @tertiary-width-z15: 9; +@tertiary-link-width-z15: 7; @residential-width-z15: 5; @living-street-width-z15: 5; @pedestrian-width-z15: 5; @@ -166,6 +169,7 @@ @secondary-width-z17: 18; @secondary-link-width-z17: 12; @tertiary-width-z17: 18; +@tertiary-link-width-z17: 12; @residential-width-z17: 12; @living-street-width-z17: 12; @pedestrian-width-z17: 12; @@ -182,6 +186,7 @@ @secondary-width-z18: 21; @secondary-link-width-z18: 13; @tertiary-width-z18: 21; +@tertiary-link-width-z18: 13; @residential-width-z18: 13; @living-street-width-z18: 13; @pedestrian-width-z18: 13; @@ -198,6 +203,7 @@ @secondary-width-z19: 27; @secondary-link-width-z19: 16; @tertiary-width-z19: 27; +@tertiary-link-width-z19: 16; @residential-width-z19: 17; @living-street-width-z19: 17; @pedestrian-width-z19: 17; @@ -460,6 +466,14 @@ [zoom >= 17] { line-width: @tertiary-width-z17; } [zoom >= 18] { line-width: @tertiary-width-z18; } [zoom >= 19] { line-width: @tertiary-width-z19; } + [link = 'yes'] { + line-width: @tertiary-link-width-z12; + [zoom >= 13] { line-width: @tertiary-link-width-z13; } + [zoom >= 15] { line-width: @tertiary-link-width-z15; } + [zoom >= 17] { line-width: @tertiary-link-width-z17; } + [zoom >= 18] { line-width: @tertiary-link-width-z18; } + [zoom >= 19] { line-width: @tertiary-link-width-z19; } + } #roads-casing { line-join: round; line-cap: round; @@ -1444,6 +1458,14 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ [zoom >= 17] { line-width: @tertiary-width-z17 - 2 * @casing-width-z17; } [zoom >= 18] { line-width: @tertiary-width-z18 - 2 * @casing-width-z18; } [zoom >= 19] { line-width: @tertiary-width-z19 - 2 * @casing-width-z19; } + [link = 'yes'] { + line-width: @tertiary-link-width-z12 - 2 * @casing-width-z12; + [zoom >= 13] { line-width: @tertiary-link-width-z13 - 2 * @casing-width-z13; } + [zoom >= 15] { line-width: @tertiary-link-width-z15 - 2 * @casing-width-z15; } + [zoom >= 17] { line-width: @tertiary-link-width-z17 - 2 * @casing-width-z17; } + [zoom >= 18] { line-width: @tertiary-link-width-z18 - 2 * @casing-width-z18; } + [zoom >= 19] { line-width: @tertiary-link-width-z19 - 2 * @casing-width-z19; } + } #tunnels { line-color: @tertiary-tunnel-fill; } @@ -1456,6 +1478,14 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */ [zoom >= 17] { line-width: @tertiary-width-z17 - 2 * @bridge-casing-width-z17; } [zoom >= 18] { line-width: @tertiary-width-z18 - 2 * @bridge-casing-width-z18; } [zoom >= 19] { line-width: @tertiary-width-z19 - 2 * @bridge-casing-width-z19; } + [link = 'yes'] { + line-width: @tertiary-link-width-z12 - 2 * @bridge-casing-width-z12; + [zoom >= 13] { line-width: @tertiary-link-width-z13 - 2 * @bridge-casing-width-z13; } + [zoom >= 15] { line-width: @tertiary-link-width-z15 - 2 * @bridge-casing-width-z15; } + [zoom >= 17] { line-width: @tertiary-link-width-z17 - 2 * @bridge-casing-width-z17; } + [zoom >= 18] { line-width: @tertiary-link-width-z18 - 2 * @bridge-casing-width-z18; } + [zoom >= 19] { line-width: @tertiary-link-width-z19 - 2 * @bridge-casing-width-z19; } + } } line-cap: round; line-join: round; From d031bafa9f113d7a77a2ae2d65ce2242ee145e19 Mon Sep 17 00:00:00 2001 From: vholten Date: Thu, 27 Dec 2018 04:05:43 +0100 Subject: [PATCH 11/13] Nature reserve boundaries revision (#3574) --- admin.mss | 58 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/admin.mss b/admin.mss index 750c33df14..4a2ab8115d 100644 --- a/admin.mss +++ b/admin.mss @@ -221,34 +221,48 @@ overlapping borders correctly. } #nature-reserve-boundaries { - [way_pixels > 3000][zoom >= 8] { - [zoom < 10] { + [way_pixels > 3000] { + [zoom >= 8][zoom < 10] { ::fill { opacity: 0.05; polygon-fill: green; } + ::outline { + opacity: 0.25; + line-width: 1.2; + line-color: green; + [zoom >= 9] { + line-width: 1.5; + } + } } - a/line-width: 1; - a/line-offset: -0.5; - a/line-color: green; - a/line-opacity: 0.15; - a/line-join: round; - a/line-cap: round; - b/line-width: 2; - b/line-offset: -1; - b/line-color: green; - b/line-opacity: 0.15; - b/line-join: round; - b/line-cap: round; [zoom >= 10] { - a/line-width: 2; - a/line-offset: -1; - b/line-width: 4; - b/line-offset: -2; - } - [zoom >= 14] { - b/line-width: 6; - b/line-offset: -3; + ::wideline { + opacity: 0.15; + line-width: 3.6; + line-offset: -0.9; + line-color: green; + line-join: round; + line-cap: round; + [zoom >= 12] { + line-width: 4; + line-offset: -1; + } + [zoom >= 14] { + line-width: 6; + line-offset: -2; + } + } + ::narrowline { + opacity: 0.15; + line-width: 1.8; + line-color: green; + line-join: round; + line-cap: round; + [zoom >= 12] { + line-width: 2; + } + } } } } From 44992316c90f3701b5e84f2abbd49a7c584a641c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 27 Dec 2018 04:25:02 +0100 Subject: [PATCH 12/13] remove variable [way_pixels > 3000] for leisure=ice_rink (#3598) --- landcover.mss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/landcover.mss b/landcover.mss index 2050919e7e..8944db26bf 100644 --- a/landcover.mss +++ b/landcover.mss @@ -269,7 +269,7 @@ } [feature = 'leisure_ice_rink'][is_building = 'no'] { - [zoom >= 10][way_pixels > 3000] { + [zoom >= 10] { polygon-fill: @glacier; line-width: 0.5; line-color: saturate(darken(@pitch, 30%), 20%); From 0ea3822e2764654667cd13c755ef7d71603f9eab Mon Sep 17 00:00:00 2001 From: jeisenbe <42757252+jeisenbe@users.noreply.github.com> Date: Thu, 27 Dec 2018 12:35:36 +0900 Subject: [PATCH 13/13] Change tourism color to #660033 (#3582) --- amenity-points.mss | 2 +- landcover.mss | 2 +- symbols/sport/basketball.svg | 49 +++++++++++++----------------------- symbols/sport/running.svg | 36 +++++++++++--------------- 4 files changed, 33 insertions(+), 56 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index a5034302bd..315325a796 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -2567,7 +2567,7 @@ text-face-name: @bold-fonts; /*rendered bold to improve visibility since theme parks tend to have crowded backgrounds*/ } [feature = 'tourism_attraction'] { - text-fill: #660033; + text-fill: @tourism; text-face-name: @standard-font; } [feature = 'amenity_kindergarten'], diff --git a/landcover.mss b/landcover.mss index 8944db26bf..8c9edfbb18 100644 --- a/landcover.mss +++ b/landcover.mss @@ -51,7 +51,7 @@ @power-line: darken(@industrial-line, 5%); @sand: #f5e9c6; @societal_amenities: #ffffe5; // Lch(99,13,109) -@tourism: #734a08; +@tourism: #660033; @quarry: #c5c3c3; @military: #f55; @beach: #fff1ba; diff --git a/symbols/sport/basketball.svg b/symbols/sport/basketball.svg index 24312d2ea5..68346c5c86 100644 --- a/symbols/sport/basketball.svg +++ b/symbols/sport/basketball.svg @@ -5,15 +5,13 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + version="1.1" width="14" height="14" - id="svg3800" - version="1.1" - viewBox="0 0 14 14"> - + viewBox="0 0 14 14" + id="svg8093"> + id="metadata8101"> @@ -24,30 +22,17 @@ - - - - - - - - - - - + +