From c707ff176567a0b98246728d2fcdaf867fd5d55a Mon Sep 17 00:00:00 2001 From: naoki Date: Mon, 4 Jul 2022 17:42:03 +0900 Subject: [PATCH 1/3] fix poi minzoom --- layers/poi-airport-primary.yml | 3 +-- layers/poi-park-primary.yml | 2 +- layers/poi-z11.yml | 5 +++-- layers/poi-z14.yml | 1 - layers/poi-z15.yml | 2 +- style.yml | 8 ++++---- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/layers/poi-airport-primary.yml b/layers/poi-airport-primary.yml index e4fc4e4..7e8d9f4 100644 --- a/layers/poi-airport-primary.yml +++ b/layers/poi-airport-primary.yml @@ -2,7 +2,7 @@ id: poi-airport-primary type: symbol source: geolonia source-layer: aerodrome_label -minzoom: 10 +minzoom: 8 filter: - all - - has @@ -24,7 +24,6 @@ layout: text-max-width: 9 visibility: visible icon-size: 1 - text-optional: true paint: text-halo-blur: 0.5 text-color: '#666' diff --git a/layers/poi-park-primary.yml b/layers/poi-park-primary.yml index fc7c98f..64ac848 100644 --- a/layers/poi-park-primary.yml +++ b/layers/poi-park-primary.yml @@ -36,7 +36,7 @@ layout: - - linear - - zoom - 11 - - 15 + - 50 - 15 - 2 text-field: '{name}' diff --git a/layers/poi-z11.yml b/layers/poi-z11.yml index 237a0dd..af97614 100644 --- a/layers/poi-z11.yml +++ b/layers/poi-z11.yml @@ -12,12 +12,13 @@ filter: - name - - 'in' - class + - college - stadium - landmark - - monument - - museum + # - museum #z12 に移動 - town_hall - golf + - hospital - - '!in' - subclass - community_centre # class town_hall内でも diff --git a/layers/poi-z14.yml b/layers/poi-z14.yml index 5fd3b62..1e18d4b 100644 --- a/layers/poi-z14.yml +++ b/layers/poi-z14.yml @@ -12,7 +12,6 @@ filter: - name - - 'in' - class - - college - castle - aquarium - cinema diff --git a/layers/poi-z15.yml b/layers/poi-z15.yml index 0b4de1c..4c1aa17 100644 --- a/layers/poi-z15.yml +++ b/layers/poi-z15.yml @@ -17,7 +17,7 @@ filter: - grocery - shop - school - - hospital + - monument - - '!=' - disputed - japan_northern_territories diff --git a/style.yml b/style.yml index 270c530..172d749 100644 --- a/style.yml +++ b/style.yml @@ -141,15 +141,15 @@ layers: # - !!inc/file layers/railway-subway-name.yml - !!inc/file layers/road_oneway.yml - !!inc/file layers/road_oneway_opposite.yml + - !!inc/file layers/poi-worship.yml + - !!inc/file layers/poi-worship-primary.yml + - !!inc/file layers/poi-park.yml + - !!inc/file layers/poi-park-primary.yml - !!inc/file layers/poi-z16.yml - !!inc/file layers/poi-z16-primary.yml - !!inc/file layers/poi-z15.yml - !!inc/file layers/poi-z14.yml - !!inc/file layers/poi-z11.yml - - !!inc/file layers/poi-worship.yml - - !!inc/file layers/poi-worship-primary.yml - - !!inc/file layers/poi-park.yml - - !!inc/file layers/poi-park-primary.yml - !!inc/file layers/poi-railway.yml - !!inc/file layers/poi-airport-primary.yml - !!inc/file layers/poi-mountain.yml From b828339f6cbd6588836c823b78c978de455a813c Mon Sep 17 00:00:00 2001 From: naoki Date: Mon, 4 Jul 2022 17:58:54 +0900 Subject: [PATCH 2/3] some fix --- layers/poi-railway.yml | 1 + layers/poi-z11.yml | 1 - layers/poi-z12.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ style.yml | 1 + 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 layers/poi-z12.yml diff --git a/layers/poi-railway.yml b/layers/poi-railway.yml index 2f6c1e0..6220d8f 100644 --- a/layers/poi-railway.yml +++ b/layers/poi-railway.yml @@ -57,3 +57,4 @@ paint: text-color: '#415CBD' text-halo-width: 2 text-halo-color: '#ffffff' + text-opacity: ['step', ['zoom'], 0, 12, 0, 14, 1] diff --git a/layers/poi-z11.yml b/layers/poi-z11.yml index af97614..c41871a 100644 --- a/layers/poi-z11.yml +++ b/layers/poi-z11.yml @@ -15,7 +15,6 @@ filter: - college - stadium - landmark - # - museum #z12 に移動 - town_hall - golf - hospital diff --git a/layers/poi-z12.yml b/layers/poi-z12.yml new file mode 100644 index 0000000..832ba16 --- /dev/null +++ b/layers/poi-z12.yml @@ -0,0 +1,42 @@ +id: poi-z12 +type: symbol +source: geolonia +source-layer: poi +minzoom: 12 +filter: + - all + - - '==' + - $type + - Point + - - has + - name + - - 'in' + - class + - museum + - - '!=' + - disputed + - japan_northern_territories +layout: + text-padding: 2 + text-font: + - Noto Sans Universal Regular + text-anchor: top + icon-anchor: bottom + icon-image: + - coalesce + - - image + - - get + - class + - - image + - circle-stroked + text-field: '{name}' + text-offset: + - 0 + - 0.3 + text-size: 12 + text-max-width: 9 +paint: + text-halo-blur: 0.5 + text-color: '#666' + text-halo-width: 1 + text-halo-color: '#ffffff' diff --git a/style.yml b/style.yml index 172d749..f9650f5 100644 --- a/style.yml +++ b/style.yml @@ -149,6 +149,7 @@ layers: - !!inc/file layers/poi-z16-primary.yml - !!inc/file layers/poi-z15.yml - !!inc/file layers/poi-z14.yml + - !!inc/file layers/poi-z12.yml - !!inc/file layers/poi-z11.yml - !!inc/file layers/poi-railway.yml - !!inc/file layers/poi-airport-primary.yml From 28f7007f4354d2ac3dbb4cb5e51507eea2d5cbbe Mon Sep 17 00:00:00 2001 From: naoki Date: Tue, 5 Jul 2022 12:13:13 +0900 Subject: [PATCH 3/3] fix building minzoom --- layers/building.yml | 4 +--- style.yml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/layers/building.yml b/layers/building.yml index a282f67..c13103b 100644 --- a/layers/building.yml +++ b/layers/building.yml @@ -2,9 +2,7 @@ id: building type: fill source: geolonia source-layer: building -minzoom: 16 -# layout: -# visibility: none +minzoom: 15 paint: fill-color: 'rgba(236, 236, 236, 0.9)' fill-outline-color: '#ccc' diff --git a/style.yml b/style.yml index f9650f5..ec8ef00 100644 --- a/style.yml +++ b/style.yml @@ -153,7 +153,7 @@ layers: - !!inc/file layers/poi-z11.yml - !!inc/file layers/poi-railway.yml - !!inc/file layers/poi-airport-primary.yml - - !!inc/file layers/poi-mountain.yml + # - !!inc/file layers/poi-mountain.yml - !!inc/file layers/road_shield_prefectural.yml - !!inc/file layers/road_shield_national.yml - !!inc/file layers/road_shield_highway.yml