首都名、州名、州境を追加

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

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
+        - 25

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

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

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
+        - true

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

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

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)
+

layers/oc-label-pref.yml

@@ -2,7 +2,7 @@ id: oc-label-pref
 type: symbol
 source: oceanus
 source-layer: oc-label
-minzoom: 5
+minzoom: 3
 maxzoom: 6
 filter:
   - all

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
@@ -98,7 +99,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