From 9a3159959264a3aed65f2e547c067df7929573f0 Mon Sep 17 00:00:00 2001 From: Fynn Godau Date: Wed, 20 Sep 2023 18:15:24 +0200 Subject: [PATCH 1/2] Force no POI to show at zoom <= 14 --- artwork/styles/style-microg-normal-openmaptiles.json | 4 ++++ artwork/styles/style-microg-normal-stadia.json | 4 ++++ artwork/styles/style-microg-satellite-stadia.json | 4 ++++ .../src/main/assets/style-microg-normal-stadia.json | 4 ++++ .../src/main/assets/style-microg-satellite-stadia.json | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/artwork/styles/style-microg-normal-openmaptiles.json b/artwork/styles/style-microg-normal-openmaptiles.json index 9ca3e71dd..90a3b39a8 100644 --- a/artwork/styles/style-microg-normal-openmaptiles.json +++ b/artwork/styles/style-microg-normal-openmaptiles.json @@ -3230,6 +3230,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -3536,6 +3537,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -3842,6 +3844,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -4169,6 +4172,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ diff --git a/artwork/styles/style-microg-normal-stadia.json b/artwork/styles/style-microg-normal-stadia.json index af23da4c8..277758396 100644 --- a/artwork/styles/style-microg-normal-stadia.json +++ b/artwork/styles/style-microg-normal-stadia.json @@ -3384,6 +3384,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -3690,6 +3691,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -3996,6 +3998,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -4323,6 +4326,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ diff --git a/artwork/styles/style-microg-satellite-stadia.json b/artwork/styles/style-microg-satellite-stadia.json index f83bfbe1f..553ca7961 100644 --- a/artwork/styles/style-microg-satellite-stadia.json +++ b/artwork/styles/style-microg-satellite-stadia.json @@ -2281,6 +2281,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -2587,6 +2588,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -2893,6 +2895,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -3220,6 +3223,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json b/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json index af23da4c8..277758396 100644 --- a/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json +++ b/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json @@ -3384,6 +3384,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -3690,6 +3691,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -3996,6 +3998,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -4323,6 +4326,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json b/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json index f83bfbe1f..553ca7961 100644 --- a/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json +++ b/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json @@ -2281,6 +2281,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -2587,6 +2588,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -2893,6 +2895,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ @@ -3220,6 +3223,7 @@ }, "source": "openmaptiles", "source-layer": "poi", + "minzoom": 14, "filter": [ "all", [ -- GitLab From 8d1591457526562f5e964b83115500f5d45677da Mon Sep 17 00:00:00 2001 From: Fynn Godau Date: Wed, 20 Sep 2023 18:26:46 +0200 Subject: [PATCH 2/2] Align POI label colors and improve ledgebility of borders --- .../styles/style-microg-satellite-stadia.json | 60 +++++++++---------- .../assets/style-microg-satellite-stadia.json | 60 +++++++++---------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/artwork/styles/style-microg-satellite-stadia.json b/artwork/styles/style-microg-satellite-stadia.json index 553ca7961..8996cb00c 100644 --- a/artwork/styles/style-microg-satellite-stadia.json +++ b/artwork/styles/style-microg-satellite-stadia.json @@ -736,7 +736,7 @@ 1 ], "hsl(0, 24%, 48%)", - "#787a7b" + "hsl(200, 0%, 80%)" ] } }, @@ -789,7 +789,7 @@ 1 ], "hsl(0, 24%, 48%)", - "#787a7b" + "hsl(200, 0%, 80%)" ], "line-dasharray": [ 1, @@ -2514,13 +2514,13 @@ "pitch", "cemetery" ], - "hsl(117, 53%, 31%)", + "hsl(117, 53%, 65%)", [ "bank", "parking", "garages" ], - "#737b9b", + "hsl(228, 17%, 65%)", [ "bar", "cafe", @@ -2529,7 +2529,7 @@ "restaurant", "ice_cream" ], - "#c77d57", + "hsl(20, 50%, 65%)", [ "museum", "theatre", @@ -2541,12 +2541,12 @@ "music_venue", "monument" ], - "hsl(186, 78%, 44%)", + "hsl(186, 78%, 65%)", [ "hospital", "doctors" ], - "#a47172", + "hsl(359, 22%, 65%)", [ "match", [ @@ -2561,8 +2561,8 @@ "grocery", "shop" ], - "hsl(213, 40%, 48%)", - "#67747b" + "hsl(213, 40%, 65%)", + "hsl(201, 9%, 80%)" ] ], "text-halo-color": "#000000", @@ -2821,13 +2821,13 @@ "pitch", "cemetery" ], - "hsl(117, 53%, 31%)", + "hsl(117, 53%, 65%)", [ "bank", "parking", "garages" ], - "#737b9b", + "hsl(228, 17%, 65%)", [ "bar", "cafe", @@ -2836,7 +2836,7 @@ "restaurant", "ice_cream" ], - "#c77d57", + "hsl(20, 50%, 65%)", [ "museum", "theatre", @@ -2848,12 +2848,12 @@ "music_venue", "monument" ], - "hsl(186, 78%, 44%)", + "hsl(186, 78%, 65%)", [ "hospital", "doctors" ], - "#a47172", + "hsl(359, 22%, 65%)", [ "match", [ @@ -2868,8 +2868,8 @@ "grocery", "shop" ], - "hsl(213, 40%, 48%)", - "#67747b" + "hsl(213, 40%, 65%)", + "hsl(201, 9%, 80%)" ] ], "text-halo-color": "#000000", @@ -3149,13 +3149,13 @@ "pitch", "cemetery" ], - "hsl(117, 53%, 31%)", + "hsl(117, 53%, 65%)", [ "bank", "parking", "garages" ], - "#737b9b", + "hsl(228, 17%, 65%)", [ "bar", "cafe", @@ -3164,7 +3164,7 @@ "restaurant", "ice_cream" ], - "#c77d57", + "hsl(20, 50%, 65%)", [ "museum", "theatre", @@ -3176,12 +3176,12 @@ "music_venue", "monument" ], - "hsl(186, 78%, 44%)", + "hsl(186, 78%, 65%)", [ "hospital", "doctors" ], - "#a47172", + "hsl(359, 22%, 65%)", [ "match", [ @@ -3196,8 +3196,8 @@ "grocery", "shop" ], - "hsl(213, 40%, 48%)", - "#67747b" + "hsl(213, 40%, 65%)", + "hsl(201, 9%, 80%)" ] ], "text-halo-color": "#000000", @@ -3477,13 +3477,13 @@ "pitch", "cemetery" ], - "hsl(117, 53%, 31%)", + "hsl(117, 53%, 65%)", [ "bank", "parking", "garages" ], - "#737b9b", + "hsl(228, 17%, 65%)", [ "bar", "cafe", @@ -3492,7 +3492,7 @@ "restaurant", "ice_cream" ], - "#c77d57", + "hsl(20, 50%, 65%)", [ "museum", "theatre", @@ -3504,12 +3504,12 @@ "music_venue", "monument" ], - "hsl(186, 78%, 44%)", + "hsl(186, 78%, 65%)", [ "hospital", "doctors" ], - "#a47172", + "hsl(359, 22%, 65%)", [ "match", [ @@ -3524,8 +3524,8 @@ "grocery", "shop" ], - "hsl(213, 40%, 48%)", - "#67747b" + "hsl(213, 40%, 65%)", + "hsl(201, 9%, 80%)" ] ], "text-halo-color": "#000000", diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json b/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json index 553ca7961..8996cb00c 100644 --- a/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json +++ b/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json @@ -736,7 +736,7 @@ 1 ], "hsl(0, 24%, 48%)", - "#787a7b" + "hsl(200, 0%, 80%)" ] } }, @@ -789,7 +789,7 @@ 1 ], "hsl(0, 24%, 48%)", - "#787a7b" + "hsl(200, 0%, 80%)" ], "line-dasharray": [ 1, @@ -2514,13 +2514,13 @@ "pitch", "cemetery" ], - "hsl(117, 53%, 31%)", + "hsl(117, 53%, 65%)", [ "bank", "parking", "garages" ], - "#737b9b", + "hsl(228, 17%, 65%)", [ "bar", "cafe", @@ -2529,7 +2529,7 @@ "restaurant", "ice_cream" ], - "#c77d57", + "hsl(20, 50%, 65%)", [ "museum", "theatre", @@ -2541,12 +2541,12 @@ "music_venue", "monument" ], - "hsl(186, 78%, 44%)", + "hsl(186, 78%, 65%)", [ "hospital", "doctors" ], - "#a47172", + "hsl(359, 22%, 65%)", [ "match", [ @@ -2561,8 +2561,8 @@ "grocery", "shop" ], - "hsl(213, 40%, 48%)", - "#67747b" + "hsl(213, 40%, 65%)", + "hsl(201, 9%, 80%)" ] ], "text-halo-color": "#000000", @@ -2821,13 +2821,13 @@ "pitch", "cemetery" ], - "hsl(117, 53%, 31%)", + "hsl(117, 53%, 65%)", [ "bank", "parking", "garages" ], - "#737b9b", + "hsl(228, 17%, 65%)", [ "bar", "cafe", @@ -2836,7 +2836,7 @@ "restaurant", "ice_cream" ], - "#c77d57", + "hsl(20, 50%, 65%)", [ "museum", "theatre", @@ -2848,12 +2848,12 @@ "music_venue", "monument" ], - "hsl(186, 78%, 44%)", + "hsl(186, 78%, 65%)", [ "hospital", "doctors" ], - "#a47172", + "hsl(359, 22%, 65%)", [ "match", [ @@ -2868,8 +2868,8 @@ "grocery", "shop" ], - "hsl(213, 40%, 48%)", - "#67747b" + "hsl(213, 40%, 65%)", + "hsl(201, 9%, 80%)" ] ], "text-halo-color": "#000000", @@ -3149,13 +3149,13 @@ "pitch", "cemetery" ], - "hsl(117, 53%, 31%)", + "hsl(117, 53%, 65%)", [ "bank", "parking", "garages" ], - "#737b9b", + "hsl(228, 17%, 65%)", [ "bar", "cafe", @@ -3164,7 +3164,7 @@ "restaurant", "ice_cream" ], - "#c77d57", + "hsl(20, 50%, 65%)", [ "museum", "theatre", @@ -3176,12 +3176,12 @@ "music_venue", "monument" ], - "hsl(186, 78%, 44%)", + "hsl(186, 78%, 65%)", [ "hospital", "doctors" ], - "#a47172", + "hsl(359, 22%, 65%)", [ "match", [ @@ -3196,8 +3196,8 @@ "grocery", "shop" ], - "hsl(213, 40%, 48%)", - "#67747b" + "hsl(213, 40%, 65%)", + "hsl(201, 9%, 80%)" ] ], "text-halo-color": "#000000", @@ -3477,13 +3477,13 @@ "pitch", "cemetery" ], - "hsl(117, 53%, 31%)", + "hsl(117, 53%, 65%)", [ "bank", "parking", "garages" ], - "#737b9b", + "hsl(228, 17%, 65%)", [ "bar", "cafe", @@ -3492,7 +3492,7 @@ "restaurant", "ice_cream" ], - "#c77d57", + "hsl(20, 50%, 65%)", [ "museum", "theatre", @@ -3504,12 +3504,12 @@ "music_venue", "monument" ], - "hsl(186, 78%, 44%)", + "hsl(186, 78%, 65%)", [ "hospital", "doctors" ], - "#a47172", + "hsl(359, 22%, 65%)", [ "match", [ @@ -3524,8 +3524,8 @@ "grocery", "shop" ], - "hsl(213, 40%, 48%)", - "#67747b" + "hsl(213, 40%, 65%)", + "hsl(201, 9%, 80%)" ] ], "text-halo-color": "#000000", -- GitLab