From 15fa6459c4ff72bf4183bed6a6f751d97e1761b7 Mon Sep 17 00:00:00 2001 From: Naoki Ohashi Date: Tue, 24 May 2022 10:50:44 +0900 Subject: [PATCH 1/6] remove comment out (#197) --- layers/landcover-wood.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/layers/landcover-wood.yml b/layers/landcover-wood.yml index 8a01f95..8baeb8f 100644 --- a/layers/landcover-wood.yml +++ b/layers/landcover-wood.yml @@ -10,16 +10,10 @@ layout: visibility: visible paint: fill-color: '#bce398' - # fill-opacity: - # stops: - # - - 11 - # - 1 - # - - 12 - # - 0.4 fill-antialias: base: 1 stops: - - 0 - false - - 9 - - true \ No newline at end of file + - true From 6577e137209fe13145c7921ef0d7382a1dd5a324 Mon Sep 17 00:00:00 2001 From: Naoki Ohashi Date: Tue, 24 May 2022 10:52:56 +0900 Subject: [PATCH 2/6] fix highway blur (#195) --- layers/bridge-motorway-casing-blur.yml | 16 ++-------------- layers/bridge-motorway-link-casing-blur.yml | 16 +++------------- layers/bridge-secondary-tertiary-casing-blur.yml | 10 ++-------- layers/bridge-trunk-primary-casing-blur.yml | 16 ++-------------- 4 files changed, 9 insertions(+), 49 deletions(-) diff --git a/layers/bridge-motorway-casing-blur.yml b/layers/bridge-motorway-casing-blur.yml index 61d5532..5396eb9 100644 --- a/layers/bridge-motorway-casing-blur.yml +++ b/layers/bridge-motorway-casing-blur.yml @@ -15,19 +15,7 @@ layout: line-cap: "round" paint: line-color: '#000000' - line-width: - base: 1.2 - stops: - - - 5 - - 0.4 - - - 6 - - 0.6 - - - 7 - - 1.5 - - - 15 - - 14 - - - 20 - - 18 + line-width: !!inc/file layers/components/broad-road-width-casing.yml line-translate: stops: - - 14 @@ -40,7 +28,7 @@ paint: - 0.2 - - 17 - 0.6 - line-blur: + line-blur: stops: - - 14 - 20 diff --git a/layers/bridge-motorway-link-casing-blur.yml b/layers/bridge-motorway-link-casing-blur.yml index a5d86a4..2b0da5d 100644 --- a/layers/bridge-motorway-link-casing-blur.yml +++ b/layers/bridge-motorway-link-casing-blur.yml @@ -12,17 +12,7 @@ filter: - motorway_link paint: line-color: '#000000' - line-width: - base: 1.2 - stops: - - - 12 - - 1 - - - 13 - - 3 - - - 14 - - 4 - - - 20 - - 20 + line-width: !!inc/file layers/components/broad-road-width-casing.yml line-translate: stops: - - 14 @@ -35,9 +25,9 @@ paint: - 0.2 - - 17 - 0.8 - line-blur: + line-blur: stops: - - 14 - 20 - - 17 - - 25 \ No newline at end of file + - 25 diff --git a/layers/bridge-secondary-tertiary-casing-blur.yml b/layers/bridge-secondary-tertiary-casing-blur.yml index 397dca7..c639bf8 100644 --- a/layers/bridge-secondary-tertiary-casing-blur.yml +++ b/layers/bridge-secondary-tertiary-casing-blur.yml @@ -16,13 +16,7 @@ layout: line-cap: "round" paint: line-color: '#000000' - line-width: - base: 1.2 - stops: - - - 8 - - 1.5 - - - 20 - - 15 + line-width: !!inc/file layers/components/broad-road-width-casing.yml line-translate: stops: - - 14 @@ -35,7 +29,7 @@ paint: - 0.2 - - 17 - 0.8 - line-blur: + line-blur: stops: - - 14 - 20 diff --git a/layers/bridge-trunk-primary-casing-blur.yml b/layers/bridge-trunk-primary-casing-blur.yml index ee12124..689dd6f 100644 --- a/layers/bridge-trunk-primary-casing-blur.yml +++ b/layers/bridge-trunk-primary-casing-blur.yml @@ -16,19 +16,7 @@ layout: line-cap: "round" paint: line-color: '#000000' - line-width: - base: 1.2 - stops: - - - 5 - - 0.4 - - - 6 - - 0.6 - - - 7 - - 1.5 - - - 14 - - 10 - - - 20 - - 25 + line-width: !!inc/file layers/components/broad-road-width-casing.yml line-translate: stops: - - 14 @@ -41,7 +29,7 @@ paint: - 0.2 - - 17 - 0.8 - line-blur: + line-blur: stops: - - 14 - 20 From 55eb737605cf4c417d9fadbc4f14a02940ee6ffb Mon Sep 17 00:00:00 2001 From: Naoki Ohashi Date: Tue, 24 May 2022 10:53:09 +0900 Subject: [PATCH 3/6] remove aeroway-area (#194) --- layers/aeroway-area.yml | 25 ------------------------- style.yml | 1 - 2 files changed, 26 deletions(-) delete mode 100644 layers/aeroway-area.yml diff --git a/layers/aeroway-area.yml b/layers/aeroway-area.yml deleted file mode 100644 index 60c84a2..0000000 --- a/layers/aeroway-area.yml +++ /dev/null @@ -1,25 +0,0 @@ -id: aeroway-area -type: fill -source: geolonia -source-layer: aeroway -minzoom: 4 -filter: - - all - - - '==' - - $type - - Polygon - - - in - - class - - runway - - taxiway -layout: - visibility: visible -paint: - fill-opacity: - base: 1 - stops: - - - 13 - - 0 - - - 14 - - 1 - fill-color: rgba(255, 255, 255, 1) diff --git a/style.yml b/style.yml index d928bdf..d20b027 100644 --- a/style.yml +++ b/style.yml @@ -96,7 +96,6 @@ layers: - !!inc/file layers/tunnel-motorway.yml - !!inc/file layers/aeroway-taxiway-casing.yml - !!inc/file layers/aeroway-runway-casing.yml - - !!inc/file layers/aeroway-area.yml - !!inc/file layers/aeroway-taxiway.yml - !!inc/file layers/aeroway-runway.yml - !!inc/file layers/building.yml From 24ebed8335d56c3088efc4ad65b3c13d6e556457 Mon Sep 17 00:00:00 2001 From: naoki Date: Wed, 8 Jun 2022 10:44:41 +0900 Subject: [PATCH 4/6] some fix --- layers/oc-label-pref.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/layers/oc-label-pref.yml b/layers/oc-label-pref.yml index ad5db8b..97dd1b3 100644 --- a/layers/oc-label-pref.yml +++ b/layers/oc-label-pref.yml @@ -4,12 +4,12 @@ source: oceanus source-layer: oc-label minzoom: 5 maxzoom: 6 -filter: - - all - - - '==' - - - get - - class - - pref +# filter: +# - all +# - - '==' +# - - get +# - class +# - pref layout: text-font: - Noto Sans Regular From 05565194ebb6d7f3307bed7bd3410ef6715a06b0 Mon Sep 17 00:00:00 2001 From: naoki Date: Wed, 8 Jun 2022 10:49:20 +0900 Subject: [PATCH 5/6] some fix --- layers/oc-label-pref.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/oc-label-pref.yml b/layers/oc-label-pref.yml index 97dd1b3..b67f056 100644 --- a/layers/oc-label-pref.yml +++ b/layers/oc-label-pref.yml @@ -6,7 +6,7 @@ minzoom: 5 maxzoom: 6 # filter: # - all -# - - '==' + - - '==' # - - get # - class # - pref From 9df6f21a9894d4f5d1370731e75fd9b122c94feb Mon Sep 17 00:00:00 2001 From: naoki Date: Wed, 8 Jun 2022 18:13:49 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A6=96=E9=83=BD=E5=90=8D=E3=80=81?= =?UTF-8?q?=E5=B7=9E=E5=90=8D=E3=80=81=E5=B7=9E=E5=A2=83=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layers/oc-boundary-land-level-1-ja.yml | 2 +- layers/oc-boundary-land-level-1.yml | 2 +- layers/oc-label-capital.yml | 37 ++++++++++++++++++++++++++ layers/oc-label-pref.yml | 12 ++++----- style.yml | 3 ++- 5 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 layers/oc-label-capital.yml diff --git a/layers/oc-boundary-land-level-1-ja.yml b/layers/oc-boundary-land-level-1-ja.yml index 3dd85de..558a02d 100644 --- a/layers/oc-boundary-land-level-1-ja.yml +++ b/layers/oc-boundary-land-level-1-ja.yml @@ -2,7 +2,7 @@ id: oc-boundary-land-level-1-ja type: line source: oceanus source-layer: oc-boundary -minzoom: 4 +minzoom: 3 maxzoom: 6 filter: - all diff --git a/layers/oc-boundary-land-level-1.yml b/layers/oc-boundary-land-level-1.yml index cd191db..2b0148c 100644 --- a/layers/oc-boundary-land-level-1.yml +++ b/layers/oc-boundary-land-level-1.yml @@ -2,7 +2,7 @@ id: oc-boundary-land-level-1 type: line source: oceanus source-layer: oc-boundary -minzoom: 4 +minzoom: 3 maxzoom: 6 filter: - all diff --git a/layers/oc-label-capital.yml b/layers/oc-label-capital.yml new file mode 100644 index 0000000..6067c9c --- /dev/null +++ b/layers/oc-label-capital.yml @@ -0,0 +1,37 @@ +id: oc-label-capital +type: symbol +source: oceanus +source-layer: oc-label +minzoom: 3 +maxzoom: 6 +filter: + - all + - - '==' + - - get + - class + - capital +layout: + icon-image: circle-stroked + icon-size: 0.8 + text-anchor: top + text-offset: + - 0 + - 0.2 + text-font: + - Noto Sans Regular + text-size: 15 + text-field: '{name}' + text-max-width: 8 + visibility: visible +paint: + icon-color: '#000000' + icon-opacity: + stops: + - - 11.9 + - 1 + - - 12 + - 0 + text-color: rgba(68, 68, 68, 1) + text-halo-width: 1.2 + text-halo-color: rgba(255,255,255,0.8) + diff --git a/layers/oc-label-pref.yml b/layers/oc-label-pref.yml index b67f056..6267df8 100644 --- a/layers/oc-label-pref.yml +++ b/layers/oc-label-pref.yml @@ -2,14 +2,14 @@ id: oc-label-pref type: symbol source: oceanus source-layer: oc-label -minzoom: 5 +minzoom: 3 maxzoom: 6 -# filter: -# - all +filter: + - all - - '==' -# - - get -# - class -# - pref + - - get + - class + - pref layout: text-font: - Noto Sans Regular diff --git a/style.yml b/style.yml index 3a90c11..58cf261 100644 --- a/style.yml +++ b/style.yml @@ -8,7 +8,7 @@ sources: oceanus: type: vector maxzoom: 5 - url: https://tileserver.geolonia.com/oceanus/tiles.json?key=YOUR-API-KEY + url: https://tileserver.geolonia.com/oceanus-pr-28/tiles.json?key=YOUR-API-KEY geolonia-water: type: vector url: https://tileserver.geolonia.com/water/tiles.json?key=YOUR-API-KEY @@ -61,6 +61,7 @@ layers: - !!inc/file layers/oc-label-town-ja.yml - !!inc/file layers/oc-label-pref-capital-ja.yml - !!inc/file layers/oc-label-town.yml + - !!inc/file layers/oc-label-capital.yml - !!inc/file layers/oc-airport.yml - !!inc/file layers/landuse-commercial.yml - !!inc/file layers/landuse-industrial.yml