From c5acfc7c65ddd963f8fab67bccdf081ef2d6be5d Mon Sep 17 00:00:00 2001 From: naoki Date: Mon, 27 Jun 2022 12:01:20 +0900 Subject: [PATCH 1/4] hide country, prefcture border on sea --- layers/boundary-land-level-2.yml | 2 ++ layers/boundary-land-level-4.yml | 2 ++ style.yml | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/layers/boundary-land-level-2.yml b/layers/boundary-land-level-2.yml index 50d6468..cf096fc 100644 --- a/layers/boundary-land-level-2.yml +++ b/layers/boundary-land-level-2.yml @@ -8,6 +8,8 @@ filter: - - '==' - admin_level - 2 + - - '!has' + - 'maritime' layout: line-join: round paint: diff --git a/layers/boundary-land-level-4.yml b/layers/boundary-land-level-4.yml index e9b461a..c5f5830 100644 --- a/layers/boundary-land-level-4.yml +++ b/layers/boundary-land-level-4.yml @@ -8,6 +8,8 @@ filter: - - '==' - admin_level - 4 + - - '!has' + - 'maritime' layout: line-join: round paint: diff --git a/style.yml b/style.yml index 1d9bbd9..0a0bd8f 100644 --- a/style.yml +++ b/style.yml @@ -136,7 +136,7 @@ layers: - !!inc/file layers/railway-subway.yml - !!inc/file layers/cablecar.yml - !!inc/file layers/cablecar-dash.yml - # - !!inc/file layers/boundary-land-level-2.yml + - !!inc/file layers/boundary-land-level-2.yml - !!inc/file layers/boundary-land-level-4.yml - !!inc/file layers/railway-name.yml # - !!inc/file layers/railway-subway-name.yml From 0e45988c62540b35bcdd26a24dd712f4684168a8 Mon Sep 17 00:00:00 2001 From: naoki Date: Wed, 29 Jun 2022 15:42:11 +0900 Subject: [PATCH 2/4] fix boundary over z5 --- layers/boundary-land-level-2.yml | 10 ++++++++-- layers/boundary-land-level-4.yml | 24 +++++++++++++----------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/layers/boundary-land-level-2.yml b/layers/boundary-land-level-2.yml index cf096fc..c11eb6b 100644 --- a/layers/boundary-land-level-2.yml +++ b/layers/boundary-land-level-2.yml @@ -14,5 +14,11 @@ layout: line-join: round paint: line-color: '#9e9cab' - line-width: 1 - line-blur: 0.4 + line-width: + - interpolate + - - linear + - - zoom + - 6 + - 2 + - 14 + - 2.5 diff --git a/layers/boundary-land-level-4.yml b/layers/boundary-land-level-4.yml index c5f5830..e6aa43b 100644 --- a/layers/boundary-land-level-4.yml +++ b/layers/boundary-land-level-4.yml @@ -13,16 +13,18 @@ filter: layout: line-join: round paint: - line-color: 'rgba(68,68,68,0.7)' + line-color: '#9e9cab' line-dasharray: - - 3 - - 1 - - 1 - - 1 - line-width: - base: 1.4 stops: - - - 8 - - 1.2 - - - 12 - - 2 + - - 6 + - [2, 2] + - - 14 + - [1, 1] + line-width: + - interpolate + - - linear + - - zoom + - 6 + - 1 + - 14 + - 2 From 805069ead731368767a5898bd29c49077c829e00 Mon Sep 17 00:00:00 2001 From: naoki Date: Wed, 29 Jun 2022 16:30:40 +0900 Subject: [PATCH 3/4] fix highway color --- layers/oc-highway-inner.yml | 15 +++------------ layers/oc-highway-outer-ja.yml | 17 ++--------------- layers/oc-highway-outer.yml | 17 ++--------------- 3 files changed, 7 insertions(+), 42 deletions(-) diff --git a/layers/oc-highway-inner.yml b/layers/oc-highway-inner.yml index 029f0b7..1e46888 100644 --- a/layers/oc-highway-inner.yml +++ b/layers/oc-highway-inner.yml @@ -15,21 +15,12 @@ layout: line-join: round visibility: visible paint: - line-color: - - interpolate - - - linear - - - zoom - - 5 - - '#59ad8c' - - 8 - - '#4ed19e' + line-color: '#F0762D' line-opacity: 0.6 line-width: base: 1.2 stops: - - - 6.5 - - 0 - - 8 - - 0.8 + - 1.5 - - 20 - - 13 + - 17 diff --git a/layers/oc-highway-outer-ja.yml b/layers/oc-highway-outer-ja.yml index 534d5e0..4241ed4 100644 --- a/layers/oc-highway-outer-ja.yml +++ b/layers/oc-highway-outer-ja.yml @@ -17,19 +17,6 @@ layout: line-join: round visibility: visible paint: - line-color: - - interpolate - - - linear - - - zoom - - 5 - - '#59ad8c' - - 8 - - '#4ed19e' + line-color: '#ffffff' line-opacity: 0.6 - line-width: - base: 1.2 - stops: - - - 8 - - 1.5 - - - 20 - - 17 + line-width: 3 diff --git a/layers/oc-highway-outer.yml b/layers/oc-highway-outer.yml index f1f9137..a7ce561 100644 --- a/layers/oc-highway-outer.yml +++ b/layers/oc-highway-outer.yml @@ -15,19 +15,6 @@ layout: line-join: round visibility: visible paint: - line-color: - - interpolate - - - linear - - - zoom - - 5 - - '#59ad8c' - - 8 - - '#4ed19e' + line-color: '#ffffff' line-opacity: 0.6 - line-width: - base: 1.2 - stops: - - - 8 - - 1.5 - - - 20 - - 17 + line-width: 3 From 843ac2e1241f5fb3797cf514cea493b1aa4e87fa Mon Sep 17 00:00:00 2001 From: naoki Date: Wed, 29 Jun 2022 18:10:34 +0900 Subject: [PATCH 4/4] fix motorway color --- layers/bridge-motorway-casing.yml | 2 +- layers/bridge-motorway-link-casing.yml | 2 +- layers/bridge-motorway-link.yml | 2 +- layers/bridge-motorway.yml | 9 +-------- layers/components/broad-road-width-casing.yml | 10 ++++------ layers/components/broad-road-width.yml | 6 ++---- layers/highway-motorway-casing.yml | 8 ++++---- layers/highway-motorway-link-casing.yml | 2 +- layers/highway-motorway-link.yml | 9 +-------- layers/highway-motorway.yml | 15 ++++----------- layers/oc-highway-inner.yml | 10 ++-------- 11 files changed, 22 insertions(+), 53 deletions(-) diff --git a/layers/bridge-motorway-casing.yml b/layers/bridge-motorway-casing.yml index 4b7c6c2..793746b 100644 --- a/layers/bridge-motorway-casing.yml +++ b/layers/bridge-motorway-casing.yml @@ -13,7 +13,7 @@ filter: layout: line-join: round paint: - line-color: '#4ed19e' + line-color: '#ffffff' line-opacity: - interpolate - - linear diff --git a/layers/bridge-motorway-link-casing.yml b/layers/bridge-motorway-link-casing.yml index 6d4ac6e..66368af 100644 --- a/layers/bridge-motorway-link-casing.yml +++ b/layers/bridge-motorway-link-casing.yml @@ -13,6 +13,6 @@ filter: layout: line-join: round paint: - line-color: '#e9ac77' + line-color: '#ffffff' line-opacity: 1 line-width: !!inc/file layers/components/broad-road-width-casing.yml diff --git a/layers/bridge-motorway-link.yml b/layers/bridge-motorway-link.yml index 66dc528..666434d 100644 --- a/layers/bridge-motorway-link.yml +++ b/layers/bridge-motorway-link.yml @@ -13,5 +13,5 @@ filter: layout: line-join: round paint: - line-color: '#fc8' + line-color: '#f0762d' line-width: !!inc/file layers/components/broad-road-width.yml diff --git a/layers/bridge-motorway.yml b/layers/bridge-motorway.yml index f56b774..15a896d 100644 --- a/layers/bridge-motorway.yml +++ b/layers/bridge-motorway.yml @@ -13,14 +13,7 @@ filter: layout: line-join: round paint: - line-color: - - interpolate - - - linear - - - zoom - - 8 - - '#4ed19e' - - 11 - - '#9be0c5' + line-color: '#f0762d' line-opacity: - interpolate - - linear diff --git a/layers/components/broad-road-width-casing.yml b/layers/components/broad-road-width-casing.yml index c7a0b53..bd35121 100644 --- a/layers/components/broad-road-width-casing.yml +++ b/layers/components/broad-road-width-casing.yml @@ -2,12 +2,10 @@ - - exponential - 0.9 # カーブが大きい - - zoom - - 8 # zl 8 - - 0 # 0 から始めて - - 9 # zl 9 から本格的に描画 - - 0.6 - - 12 # zl - - 0.9 + - 6 # zl 8 + - 0.5 # 0 から始めて + - 12 # zl 10 まで太くしない + - 1.5 - 14 # zl - 4 - 16 # zl 16 で building の表示が始まり、太さコントロールが必要になる diff --git a/layers/components/broad-road-width.yml b/layers/components/broad-road-width.yml index fbb6946..07c7359 100644 --- a/layers/components/broad-road-width.yml +++ b/layers/components/broad-road-width.yml @@ -2,12 +2,10 @@ - - exponential - 0.9 # カーブが大きい - - zoom - - 8 # zl 8 - - 0 # 0 から始めて - - 9 # zl 9 から本格的に描画 + - 6 # zl 9 から本格的に描画 - 0.5 - 12 # zl 10 まで太くしない - - 0.8 + - 1.5 - 14 - 3 - 16 # zl 16 で building の表示が始まり、太さコントロールが必要になる diff --git a/layers/highway-motorway-casing.yml b/layers/highway-motorway-casing.yml index bbb6db2..a142b5f 100644 --- a/layers/highway-motorway-casing.yml +++ b/layers/highway-motorway-casing.yml @@ -2,7 +2,7 @@ id: highway-motorway-casing type: line source: geolonia source-layer: transportation -minzoom: 4 +minzoom: 6 filter: - all - - '==' @@ -22,13 +22,13 @@ layout: line-join: round visibility: visible paint: - line-color: '#4ed19e' + line-color: '#ffffff' line-width: !!inc/file layers/components/broad-road-width-casing.yml line-opacity: - interpolate - - linear - - zoom - - 8 + - 6 - 0.6 - - 11 + - 12 - 1 diff --git a/layers/highway-motorway-link-casing.yml b/layers/highway-motorway-link-casing.yml index 07573b0..bd7f813 100644 --- a/layers/highway-motorway-link-casing.yml +++ b/layers/highway-motorway-link-casing.yml @@ -19,7 +19,7 @@ layout: line-cap: round line-join: round paint: - line-color: '#4ed19e' + line-color: '#ffffff' line-opacity: - interpolate - - linear diff --git a/layers/highway-motorway-link.yml b/layers/highway-motorway-link.yml index ca645a0..9d34949 100644 --- a/layers/highway-motorway-link.yml +++ b/layers/highway-motorway-link.yml @@ -19,14 +19,7 @@ layout: line-cap: round line-join: round paint: - line-color: - - interpolate - - - linear - - - zoom - - 8 - - '#4ed19e' - - 11 - - '#9be0c5' + line-color: '#f0762d' line-opacity: - interpolate - - linear diff --git a/layers/highway-motorway.yml b/layers/highway-motorway.yml index ab77858..2142064 100644 --- a/layers/highway-motorway.yml +++ b/layers/highway-motorway.yml @@ -2,7 +2,7 @@ id: highway-motorway type: line source: geolonia source-layer: transportation -minzoom: 5 +minzoom: 6 filter: - all - - '==' @@ -21,20 +21,13 @@ layout: line-cap: round line-join: round paint: - line-color: - - interpolate - - - linear - - - zoom - - 8 - - '#4ed19e' - - 11 - - '#9be0c5' + line-color: '#f0762d' line-opacity: - interpolate - - linear - - zoom - - 8 + - 6 - 0.6 - - 11 + - 12 - 1 line-width: !!inc/file layers/components/broad-road-width.yml diff --git a/layers/oc-highway-inner.yml b/layers/oc-highway-inner.yml index 1e46888..6e9e1fe 100644 --- a/layers/oc-highway-inner.yml +++ b/layers/oc-highway-inner.yml @@ -15,12 +15,6 @@ layout: line-join: round visibility: visible paint: - line-color: '#F0762D' + line-color: '#f0762d' line-opacity: 0.6 - line-width: - base: 1.2 - stops: - - - 8 - - 1.5 - - - 20 - - 17 + line-width: 1.5