高速道路の色とズームを調整、高速道路の橋を削除、全ての道路のトンネルのケーシングを削除、トンネルの色を変更

geoloniamaps · Dec 14, 2022 · 99466ff · 99466ff
1 parent 01824ba
commit 99466ff
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 269 deletions.
diff --git a/layers/components/motorway-road-width.yml b/layers/components/motorway-road-width.yml
@@ -0,0 +1,17 @@
+  - interpolate
+  - - linear
+  - - zoom
+  - 6    # zl 6
+  - 2    # 2 から始めて
+  - 8    # zl 8
+  - 2    # width: 2
+  - 14
+  - 3
+  - 16   # zl 16 で building の表示が始まり、太さコントロールが必要になる
+  - 10
+  - 18
+  - 20
+  - 19
+  - 68
+  - 20   # 最大zl, つまり20で
+  - 160  # はみ出さない太さ
diff --git a/layers/components/tunnel-casing-color.yml b/layers/components/tunnel-casing-color.yml
@@ -0,0 +1 @@
+'#9C9DA2'
diff --git a/layers/components/tunnel-color.yml b/layers/components/tunnel-color.yml
@@ -0,0 +1 @@
+'#D8D8D8'
diff --git a/layers/highway-motorway-bridge-casing-blur.yml b/layers/highway-motorway-bridge-casing-blur.yml
diff --git a/layers/highway-motorway-bridge-casing.yml b/layers/highway-motorway-bridge-casing.yml
diff --git a/layers/highway-motorway-bridge.yml b/layers/highway-motorway-bridge.yml
diff --git a/layers/highway-motorway-tunnel-casing.yml b/layers/highway-motorway-tunnel-casing.yml
diff --git a/layers/highway-motorway-tunnel.yml b/layers/highway-motorway-tunnel.yml
@@ -19,5 +19,10 @@ layout:
   line-join: round
   visibility: visible
 paint:
-  line-color: '#ffdaa6'
-  line-width: !!inc/file layers/components/broad-road-width.yml
+  line-color:
+    stops:
+    - - 8
+      - '#00A54E'
+    - - 13 # z13 からトンネル独自の色に変更
+      - '#D8D8D8' #トンネル色
+  line-width: !!inc/file layers/components/motorway-road-width.yml
diff --git a/layers/highway-motorway.yml b/layers/highway-motorway.yml
@@ -2,7 +2,7 @@ id: highway-motorway
 type: line
 source: gsi-japan
 source-layer: road
-minzoom: 5
+minzoom: 6
 filter:
   - any
   - - all
@@ -12,12 +12,12 @@ filter:
     - - <
       - ftCode
       - 2800
-    - - '!='
-      - ftCode
-      - 2702
-    - - '!='
-      - ftCode
-      - 2703
+    # - - '!='
+    #   - ftCode
+    #   - 2702
+    # - - '!='
+    #   - ftCode
+    #   - 2703
     - - '!='
       - ftCode
       - 2704
@@ -39,17 +39,9 @@ paint:
     - interpolate
     - - linear
     - - zoom
-    - 8
-    - '#4ed19e'
-    - 11
-    - '#9be0c5'
-  line-opacity:
-    - interpolate
-    - - linear
-    - - zoom
-    - 8
-    - 0.6
-    - 11
-    - 1
-  line-width: !!inc/file layers/components/broad-road-width.yml
+    - 6
+    - '#00A54E'
+    - 13
+    - '#3dcc80'
+  line-width: !!inc/file layers/components/motorway-road-width.yml
 
diff --git a/layers/highway-primary-tunnel-casing.yml b/layers/highway-primary-tunnel-casing.yml
diff --git a/layers/highway-primary-tunnel.yml b/layers/highway-primary-tunnel.yml
@@ -34,5 +34,5 @@ layout:
   line-join: round
   visibility: visible
 paint:
-  line-color: '#ffdaa6'
+  line-color: !!inc/file layers/components/tunnel-color.yml
   line-width: !!inc/file layers/components/broad-road-width.yml
diff --git a/layers/highway-secondary-tunnel-casing.yml b/layers/highway-secondary-tunnel-casing.yml
diff --git a/layers/highway-secondary-tunnel.yml b/layers/highway-secondary-tunnel.yml
@@ -37,11 +37,5 @@ filter:
 layout:
   line-join: round
 paint:
-  line-color: '#fff4c6'
-  line-opacity:
-    stops:
-      - - 12
-        - 0
-      - - 13
-        - 1
+  line-color: !!inc/file layers/components/tunnel-color.yml
   line-width: !!inc/file layers/components/broad-road-width.yml
diff --git a/layers/oc-road.yml b/layers/oc-road.yml
@@ -0,0 +1,21 @@
+id: oc-road
+type: line
+source: oceanus
+source-layer: oc-road
+minzoom: 5
+maxzoom: 6
+filter:
+  - all
+  - - '=='
+    - - get
+      - class
+    - highway
+  - - '=='
+    - - has
+      - jflag
+    - true
+layout:
+  line-cap: round
+paint:
+  line-color: '#00A54E'
+  line-width: 2