geoloniamaps · sugama-satsuki · Jun 8, 2023 · Jun 8, 2023 · Jun 13, 2023 · Sep 20, 2023
diff --git a/docs/style.json b/docs/style.json
diff --git a/layers/airport-label-major.yml b/layers/airport-label-major.yml
@@ -1,6 +1,6 @@
 id: airport-label-major
 type: symbol
-source: geolonia-gsi-custom
+source: v3
 source-layer: aerodrome_label
 minzoom: 5
 filter:

diff --git a/layers/background.yml b/layers/background.yml
@@ -3,13 +3,13 @@ type: background
 paint:
   background-color:
     stops:
-    - - 1
-      - '#f2f5d6'
-    - - 5
-      - '#dae2c1'
-    - - 8
-      - '#EDE6DD'
-    - - 10
-      - '#e6e5e3'
-    - - 16
-      - '#f5f5f5'
+      - - 1
+        - '#f2f5d6'
+      - - 5
+        - '#dae2c1'
+      - - 8
+        - '#EDE6DD'
+      - - 10
+        - '#e6e5e3'
+      - - 16
+        - '#f5f5f5'
diff --git a/layers/boundary.yml b/layers/boundary.yml
@@ -14,7 +14,7 @@ filter:
 layout:
   line-join: round
 paint:
-  line-color: 'rgba(68,68,68,0.7)'
+  line-color: rgba(68,68,68,0.7)
   line-dasharray:
     - 3
     - 1

diff --git a/layers/building.yml b/layers/building.yml
@@ -13,6 +13,6 @@ filter:
     - 3112
     - 3111
 paint:
-  fill-color: 'rgba(236, 236, 236, 0.9)'
+  fill-color: rgba(236, 236, 236, 0.9)
   fill-outline-color: '#ccc'
   fill-antialias: true
diff --git a/layers/geolonia-water-ocean.yml b/layers/geolonia-water-ocean.yml
@@ -1,6 +1,6 @@
 id: geolonia-water-ocean
 type: fill
-source: geolonia-water
+source: v3
 source-layer: water
 layout:
   visibility: visible

diff --git a/layers/highway-minor-bridge-casing-blur.yml b/layers/highway-minor-bridge-casing-blur.yml
@@ -36,10 +36,21 @@ paint:
   line-translate:
     stops:
       - - 14
-        - [0, 0]
+        - - 0
+          - 0
       - - 17
-        - [5, 2]
-  line-opacity: !!inc/file layers/components/road-blur-opacity.yml
+        - - 5
+          - 2
+  line-opacity:
+    - interpolate
+    - - linear
+    - - zoom
+    - 14
+    - 0.2
+    - 17
+    - 0.8
+    - 18
+    - 0
   line-blur:
     stops:
       - - 14

diff --git a/layers/highway-minor-bridge.yml b/layers/highway-minor-bridge.yml
@@ -25,7 +25,12 @@ filter:
     - rdCtg
     - 3
 paint:
-  line-color: !!inc/file layers/components/road-color.yml
+  line-color:
+    - step
+    - - zoom
+    - '#ffffff'
+    - 16
+    - '#f5f5f5'
   line-width:
     base: 1.2
     stops:

diff --git a/layers/highway-minor.yml b/layers/highway-minor.yml
@@ -17,17 +17,22 @@ layout:
   line-cap: round
   line-join: round
 paint:
-  line-color: !!inc/file layers/components/road-color.yml
+  line-color:
+    - step
+    - - zoom
+    - '#ffffff'
+    - 16
+    - '#f5f5f5'
   line-width:
     - interpolate
     - - exponential
-      - 0.9 # カーブが大きい
+      - 0.9
     - - zoom
-    - 13.5 # zl 8
-    - 0    # 0 から始めて
-    - 14    # zl 9 から本格的に描画
+    - 13.5
+    - 0
+    - 14
     - 1.2
-    - 16   # zl 16 で building の表示が始まり、太さコントロールが必要になる
+    - 16
     - 2.2
-    - 20   # 最大zl, つまり20で
-    - 16   # 太さ20 ならはみ出さない
+    - 20
+    - 16
diff --git a/layers/highway-motorway-bridge-casing-blur.yml b/layers/highway-motorway-bridge-casing-blur.yml
@@ -22,15 +22,17 @@ filter:
     - 52703
 layout:
   line-join: round
-  line-cap: "round"
+  line-cap: round
 paint:
   line-color: '#000000'
   line-translate:
     stops:
       - - 14
-        - [0, 0]
+        - - 0
+          - 0
       - - 17
-        - [5, 2]
+        - - 5
+          - 2
   line-opacity:
     stops:
       - - 14
@@ -43,4 +45,24 @@ paint:
         - 20
       - - 17
         - 30
-  line-width: !!inc/file layers/components/broad-road-width-casing.yml
+  line-width:
+    - interpolate
+    - - exponential
+      - 0.9
+    - - zoom
+    - 8
+    - 0
+    - 9
+    - 0.6
+    - 12
+    - 0.9
+    - 14
+    - 4
+    - 16
+    - 14
+    - 18
+    - 24
+    - 19
+    - 72
+    - 20
+    - 166
diff --git a/layers/highway-motorway-bridge-casing.yml b/layers/highway-motorway-bridge-casing.yml
@@ -32,4 +32,24 @@ paint:
     - 0
     - 11
     - 1
-  line-width: !!inc/file layers/components/broad-road-width-casing.yml
+  line-width:
+    - interpolate
+    - - exponential
+      - 0.9
+    - - zoom
+    - 8
+    - 0
+    - 9
+    - 0.6
+    - 12
+    - 0.9
+    - 14
+    - 4
+    - 16
+    - 14
+    - 18
+    - 24
+    - 19
+    - 72
+    - 20
+    - 166
diff --git a/layers/highway-motorway-bridge.yml b/layers/highway-motorway-bridge.yml
@@ -31,4 +31,24 @@ paint:
     - '#00A54E'
     - 13
     - '#3dcc80'
-  line-width: !!inc/file layers/components/broad-road-width.yml
+  line-width:
+    - interpolate
+    - - exponential
+      - 0.9
+    - - zoom
+    - 8
+    - 0
+    - 9
+    - 0.5
+    - 12
+    - 0.8
+    - 14
+    - 3
+    - 16
+    - 10
+    - 18
+    - 20
+    - 19
+    - 68
+    - 20
+    - 160
diff --git a/layers/highway-motorway-casing.yml b/layers/highway-motorway-casing.yml
@@ -37,7 +37,27 @@ layout:
   visibility: visible
 paint:
   line-color: '#4ed19e'
-  line-width: !!inc/file layers/components/broad-road-width-casing.yml
+  line-width:
+    - interpolate
+    - - exponential
+      - 0.9
+    - - zoom
+    - 8
+    - 0
+    - 9
+    - 0.6
+    - 12
+    - 0.9
+    - 14
+    - 4
+    - 16
+    - 14
+    - 18
+    - 24
+    - 19
+    - 72
+    - 20
+    - 166
   line-opacity:
     - interpolate
     - - linear

diff --git a/layers/highway-motorway-tunnel-casing.yml b/layers/highway-motorway-tunnel-casing.yml
@@ -19,8 +19,28 @@ layout:
   line-join: round
   visibility: visible
 paint:
-  line-color: !!inc/file layers/components/tunnel-casing-color.yml
+  line-color: '#9C9DA2'
   line-dasharray:
     - 0.5
     - 0.25
-  line-width: !!inc/file layers/components/broad-road-width-casing.yml
+  line-width:
+    - interpolate
+    - - exponential
+      - 0.9
+    - - zoom
+    - 8
+    - 0
+    - 9
+    - 0.6
+    - 12
+    - 0.9
+    - 14
+    - 4
+    - 16
+    - 14
+    - 18
+    - 24
+    - 19
+    - 72
+    - 20
+    - 166
diff --git a/layers/highway-motorway-tunnel.yml b/layers/highway-motorway-tunnel.yml
@@ -21,8 +21,25 @@ layout:
 paint:
   line-color:
     stops:
-    - - 8
-      - '#00A54E'
-    - - 13 # z13 からトンネル独自の色に変更
-      - '#D8D8D8' #トンネル色
-  line-width: !!inc/file layers/components/motorway-road-width.yml
+      - - 8
+        - '#00A54E'
+      - - 13
+        - '#D8D8D8'
+  line-width:
+    - interpolate
+    - - linear
+    - - zoom
+    - 6
+    - 2
+    - 8
+    - 2
+    - 14
+    - 3
+    - 16
+    - 10
+    - 18
+    - 20
+    - 19
+    - 68
+    - 20
+    - 160
diff --git a/layers/highway-motorway.yml b/layers/highway-motorway.yml
@@ -43,5 +43,21 @@ paint:
     - '#00A54E'
     - 13
     - '#3dcc80'
-  line-width: !!inc/file layers/components/motorway-road-width.yml
-
+  line-width:
+    - interpolate
+    - - linear
+    - - zoom
+    - 6
+    - 2
+    - 8
+    - 2
+    - 14
+    - 3
+    - 16
+    - 10
+    - 18
+    - 20
+    - 19
+    - 68
+    - 20
+    - 160
diff --git a/layers/highway-primary-bridge-casing-blur.yml b/layers/highway-primary-bridge-casing-blur.yml
@@ -33,17 +33,48 @@ filter:
       - 52703
 layout:
   line-join: round
-  line-cap: "round"
+  line-cap: round
 paint:
   line-color: '#000000'
-  line-width: !!inc/file layers/components/broad-road-width-casing.yml
+  line-width:
+    - interpolate
+    - - exponential
+      - 0.9
+    - - zoom
+    - 8
+    - 0
+    - 9
+    - 0.6
+    - 12
+    - 0.9
+    - 14
+    - 4
+    - 16
+    - 14
+    - 18
+    - 24
+    - 19
+    - 72
+    - 20
+    - 166
   line-translate:
     stops:
       - - 14
-        - [0, 0]
+        - - 0
+          - 0
       - - 17
-        - [5, 2]
-  line-opacity: !!inc/file layers/components/road-blur-opacity.yml
+        - - 5
+          - 2
+  line-opacity:
+    - interpolate
+    - - linear
+    - - zoom
+    - 14
+    - 0.2
+    - 17
+    - 0.8
+    - 18
+    - 0
   line-blur:
     stops:
       - - 14