From 3f51aa8fc0788d75a3949839f7a6adc08574094d Mon Sep 17 00:00:00 2001 From: David Mease Date: Wed, 25 Jul 2018 19:25:10 -0700 Subject: [PATCH 1/9] Standard text halo for fitness_center and fitness_station --- amenity-points.mss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 60d68c3d80..32df3a314a 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -2160,9 +2160,10 @@ [feature = 'leisure_stadium'] { text-fill: darken(@stadium, 70%); } - [feature = 'leisure_dog_park'], [feature = 'leisure_fitness_centre'], - [feature = 'leisure_fitness_station'], + [feature = 'leisure_fitness_station'] { + text-fill: @leisure-green; + } [feature = 'leisure_dog_park'] { text-fill: @leisure-green; text-halo-radius: @standard-halo-radius * 1.5; /* Extra halo needed to stand out from paw pattern. */ From d66f9a3bcd1f2947daca8b268cd9f38a4245347a Mon Sep 17 00:00:00 2001 From: David Mease Date: Sun, 30 Sep 2018 11:47:55 -0700 Subject: [PATCH 2/9] Rewrite buildings query, support for minor buildings --- buildings.mss | 47 +++++++++++++++++++++++++---------------------- project.mml | 31 ++----------------------------- 2 files changed, 27 insertions(+), 51 deletions(-) diff --git a/buildings.mss b/buildings.mss index 4d1ec0e122..f66a5b3968 100644 --- a/buildings.mss +++ b/buildings.mss @@ -1,40 +1,43 @@ -@building-fill: #d9d0c9; //Lch(84, 5, 70) -@building-line: darken(@building-fill, 15%); +@building-fill: lighten(#d9d0c9, 2%); +@building-line: darken(@building-fill, 18%); @building-low-zoom: darken(@building-fill, 4%); -@building-major-fill: darken(@building-fill, 20%); -@building-major-line: darken(@building-major-fill, 25%); +@building-major-fill: darken(@building-fill, 8%); +@building-major-line: darken(@building-line, 4%); + +@building-minor-fill: lighten(@building-fill, 4%); +@building-minor-line: lighten(@building-line, 14%); @entrance-permissive: darken(@building-line, 15%); @entrance-normal: @building-line; #buildings { [zoom >= 13] { - polygon-fill: @building-low-zoom; + polygon-fill: @building-fill; + line-color: @building-line; polygon-clip: false; - [zoom >= 15] { - line-color: @building-line; - polygon-fill: @building-fill; - line-width: .75; - line-clip: false; - } - } -} - -#buildings-major { - [zoom >= 13] { + line-width: .75; + line-clip: false; [aeroway = 'terminal'], [amenity = 'place_of_worship'], [building = 'train_station'], [aerialway = 'station'], [public_transport = 'station'] { polygon-fill: @building-major-fill; - polygon-clip: false; - [zoom >= 15] { - line-width: .75; - line-clip: false; - line-color: @building-major-line; - } + line-color: @building-major-line; + } + [building = 'garage'], + [building = 'garages'], + [building = 'carport'], + [building = 'shed'], + [building = 'greenhouse'], + [building = 'farm_auxiliary'], + [building = 'construction'], + [building = 'service'], + [building = 'ger'], + [building = 'ruins'] { + polygon-fill: @building-minor-fill; + line-color: @building-minor-line; } } } diff --git a/project.mml b/project.mml index 3e1e1cf5fc..26a6779062 100644 --- a/project.mml +++ b/project.mml @@ -418,28 +418,6 @@ Layer: properties: minzoom: 12 - id: buildings - geometry: polygon - <<: *extents - Datasource: - <<: *osm2pgsql - table: |- - (SELECT - way, - building - FROM planet_osm_polygon - WHERE building IS NOT NULL - AND building != 'no' - AND (aeroway IS NULL OR aeroway != 'terminal') - AND (amenity IS NULL OR amenity != 'place_of_worship') - AND building != 'train_station' - AND (aerialway IS NULL OR aerialway != 'station') - AND ((tags->'public_transport') IS NULL OR tags->'public_transport' != 'station') - AND way_area > 1*!pixel_width!::real*!pixel_height!::real - ORDER BY COALESCE(layer,0), way_area DESC - ) AS buildings - properties: - minzoom: 13 - - id: buildings-major geometry: polygon <<: *extents Datasource: @@ -455,14 +433,9 @@ Layer: FROM planet_osm_polygon WHERE building IS NOT NULL AND building != 'no' - AND (aeroway = 'terminal' - OR amenity = 'place_of_worship' - OR building = 'train_station' - OR aerialway = 'station' - OR tags->'public_transport' = 'station') AND way_area > 1*!pixel_width!::real*!pixel_height!::real - ORDER BY COALESCE(layer,0), way_area DESC) - AS buildings_major + ORDER BY COALESCE(layer,0), way_area DESC + ) AS buildings properties: minzoom: 13 - id: tunnels From ea68394a961d1f7f333bd29c9f699d69ce827657 Mon Sep 17 00:00:00 2001 From: David Mease Date: Thu, 4 Oct 2018 18:44:29 -0700 Subject: [PATCH 3/9] Adjust colors --- buildings.mss | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/buildings.mss b/buildings.mss index f66a5b3968..47ee799aea 100644 --- a/buildings.mss +++ b/buildings.mss @@ -1,27 +1,31 @@ -@building-fill: lighten(#d9d0c9, 2%); -@building-line: darken(@building-fill, 18%); -@building-low-zoom: darken(@building-fill, 4%); +@building-fill: #d9d0c9; +@building-line: darken(@building-fill, 12%); +@building-low-zoom: darken(@building-fill, 2%); -@building-major-fill: darken(@building-fill, 8%); -@building-major-line: darken(@building-line, 4%); +@building-major-fill: darken(@building-fill, 12%); +@building-major-line: darken(@building-major-fill, 12%); -@building-minor-fill: lighten(@building-fill, 4%); -@building-minor-line: lighten(@building-line, 14%); +@building-minor-fill: lighten(@building-fill, 7%); +@building-minor-line: darken(@building-minor-fill, 12%); @entrance-permissive: darken(@building-line, 15%); @entrance-normal: @building-line; #buildings { [zoom >= 13] { - polygon-fill: @building-fill; - line-color: @building-line; + polygon-fill: @building-low-zoom; polygon-clip: false; - line-width: .75; - line-clip: false; - [aeroway = 'terminal'], + line-width: 0; + [zoom >= 15] { + polygon-fill: @building-fill; + line-color: @building-line; + line-width: .75; + line-clip: false; + } [amenity = 'place_of_worship'], - [building = 'train_station'], + [aeroway = 'terminal'], [aerialway = 'station'], + [building = 'train_station'], [public_transport = 'station'] { polygon-fill: @building-major-fill; line-color: @building-major-line; From 6f86fef0db54174d36a60e06f0d6ac9d39f4226a Mon Sep 17 00:00:00 2001 From: David Mease Date: Thu, 4 Oct 2018 18:45:57 -0700 Subject: [PATCH 4/9] Add comment --- buildings.mss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildings.mss b/buildings.mss index 47ee799aea..eaa564b266 100644 --- a/buildings.mss +++ b/buildings.mss @@ -1,4 +1,4 @@ -@building-fill: #d9d0c9; +@building-fill: #d9d0c9; //Lch(84, 5, 70) @building-line: darken(@building-fill, 12%); @building-low-zoom: darken(@building-fill, 2%); From e0cfe662a243e158c823c84b067298544074b36b Mon Sep 17 00:00:00 2001 From: David Mease Date: Thu, 4 Oct 2018 19:14:34 -0700 Subject: [PATCH 5/9] Original building color --- buildings.mss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildings.mss b/buildings.mss index eaa564b266..dbd5d65438 100644 --- a/buildings.mss +++ b/buildings.mss @@ -1,8 +1,8 @@ @building-fill: #d9d0c9; //Lch(84, 5, 70) -@building-line: darken(@building-fill, 12%); -@building-low-zoom: darken(@building-fill, 2%); +@building-line: darken(@building-fill, 15%); +@building-low-zoom: darken(@building-fill, 4%); -@building-major-fill: darken(@building-fill, 12%); +@building-major-fill: darken(@building-fill, 10%); @building-major-line: darken(@building-major-fill, 12%); @building-minor-fill: lighten(@building-fill, 7%); From 37589b2a10b4cda95eb8087424ad9f4782b93c03 Mon Sep 17 00:00:00 2001 From: David Mease Date: Sun, 7 Oct 2018 09:46:05 -0700 Subject: [PATCH 6/9] Add more types to minor buildings --- buildings.mss | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/buildings.mss b/buildings.mss index dbd5d65438..bf7db6208d 100644 --- a/buildings.mss +++ b/buildings.mss @@ -30,14 +30,22 @@ polygon-fill: @building-major-fill; line-color: @building-major-line; } + [building = 'roof'], + [building = 'construction'], + [building = 'damaged'], + [building = 'collapsed'], + [building = 'underground'], + [building = 'service'], + [building = 'slurry_tank'], + [building = 'shed'], [building = 'garage'], [building = 'garages'], + [building = 'farm_auxiliary'], [building = 'carport'], - [building = 'shed'], + [building = 'barn'], + [building = 'stable'], + [building = 'cowshed'], [building = 'greenhouse'], - [building = 'farm_auxiliary'], - [building = 'construction'], - [building = 'service'], [building = 'ger'], [building = 'ruins'] { polygon-fill: @building-minor-fill; From 112ee62e7299e12d77db37fac1ce5ad839689e6b Mon Sep 17 00:00:00 2001 From: David Mease Date: Sat, 13 Oct 2018 09:49:28 -0700 Subject: [PATCH 7/9] Add cabin, hut, remove collapsed. --- buildings.mss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildings.mss b/buildings.mss index bf7db6208d..cbcb3978d9 100644 --- a/buildings.mss +++ b/buildings.mss @@ -33,7 +33,6 @@ [building = 'roof'], [building = 'construction'], [building = 'damaged'], - [building = 'collapsed'], [building = 'underground'], [building = 'service'], [building = 'slurry_tank'], @@ -42,6 +41,8 @@ [building = 'garages'], [building = 'farm_auxiliary'], [building = 'carport'], + [building = 'cabin'], + [building = 'hut'], [building = 'barn'], [building = 'stable'], [building = 'cowshed'], From 46a6f7bb456e8ec23448f16a98b4f86befe1aa96 Mon Sep 17 00:00:00 2001 From: David Mease Date: Sun, 14 Oct 2018 08:42:36 -0700 Subject: [PATCH 8/9] Return major building to their original color. --- buildings.mss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildings.mss b/buildings.mss index cbcb3978d9..67e39f7be3 100644 --- a/buildings.mss +++ b/buildings.mss @@ -2,8 +2,8 @@ @building-line: darken(@building-fill, 15%); @building-low-zoom: darken(@building-fill, 4%); -@building-major-fill: darken(@building-fill, 10%); -@building-major-line: darken(@building-major-fill, 12%); +@building-major-fill: darken(@building-fill, 20%); +@building-major-line: darken(@building-major-fill, 25%); @building-minor-fill: lighten(@building-fill, 7%); @building-minor-line: darken(@building-minor-fill, 12%); From 19d758b4e4eb89a568c388fc95ce95870421894b Mon Sep 17 00:00:00 2001 From: David Mease Date: Tue, 16 Oct 2018 18:10:53 -0700 Subject: [PATCH 9/9] Remove minor building styling. --- buildings.mss | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/buildings.mss b/buildings.mss index 67e39f7be3..0b5a365902 100644 --- a/buildings.mss +++ b/buildings.mss @@ -5,9 +5,6 @@ @building-major-fill: darken(@building-fill, 20%); @building-major-line: darken(@building-major-fill, 25%); -@building-minor-fill: lighten(@building-fill, 7%); -@building-minor-line: darken(@building-minor-fill, 12%); - @entrance-permissive: darken(@building-line, 15%); @entrance-normal: @building-line; @@ -30,28 +27,6 @@ polygon-fill: @building-major-fill; line-color: @building-major-line; } - [building = 'roof'], - [building = 'construction'], - [building = 'damaged'], - [building = 'underground'], - [building = 'service'], - [building = 'slurry_tank'], - [building = 'shed'], - [building = 'garage'], - [building = 'garages'], - [building = 'farm_auxiliary'], - [building = 'carport'], - [building = 'cabin'], - [building = 'hut'], - [building = 'barn'], - [building = 'stable'], - [building = 'cowshed'], - [building = 'greenhouse'], - [building = 'ger'], - [building = 'ruins'] { - polygon-fill: @building-minor-fill; - line-color: @building-minor-line; - } } }