geoloniamaps · keichan34 · 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/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/landcover-grass-park.yml b/layers/landcover-grass-park.yml
@@ -1,6 +1,6 @@
 id: landcover-grass-park
 type: fill
-source: geolonia-gsi-custom
+source: v3
 source-layer: park
 filter:
   - '=='

diff --git a/layers/landcover-grass.yml b/layers/landcover-grass.yml
@@ -1,6 +1,6 @@
 id: landcover-grass
 type: fill
-source: geolonia-gsi-custom
+source: v3
 source-layer: landcover
 filter:
   - '=='

diff --git a/layers/landcover-wood-blur.yml b/layers/landcover-wood-blur.yml
@@ -1,6 +1,6 @@
 id: landcover-wood-blur
 type: line
-source: geolonia-gsi-custom
+source: v3
 source-layer: landcover
 filter:
   - '=='

diff --git a/layers/landcover-wood.yml b/layers/landcover-wood.yml
@@ -1,6 +1,6 @@
 id: landcover-wood
 type: fill
-source: geolonia-gsi-custom
+source: v3
 source-layer: landcover
 filter:
   - '=='
@@ -9,7 +9,13 @@ filter:
 layout:
   visibility: visible
 paint:
-  fill-color: '#bce398'
+  fill-color:
+    stops:
+      - - 5
+        - '#a5d47b'
+      - - 8
+        - '#bce398'
+
   fill-antialias:
     base: 1
     stops:

diff --git a/layers/landuse-cemetery.yml b/layers/landuse-cemetery.yml
@@ -1,6 +1,6 @@
 id: landuse-cemetery
 type: fill
-source: geolonia-gsi-custom
+source: v3
 source-layer: landuse
 filter:
   - '=='

diff --git a/layers/landuse-commercial.yml b/layers/landuse-commercial.yml
@@ -1,6 +1,6 @@
 id: landuse-commercial
 type: fill
-source: geolonia-gsi-custom
+source: v3
 source-layer: landuse
 filter:
   - all

diff --git a/layers/landuse-hospital.yml b/layers/landuse-hospital.yml
@@ -1,6 +1,6 @@
 id: landuse-hospital
 type: fill
-source: geolonia-gsi-custom
+source: v3
 source-layer: landuse
 filter:
   - '=='

diff --git a/layers/landuse-industrial.yml b/layers/landuse-industrial.yml
@@ -1,6 +1,6 @@
 id: landuse-industrial
 type: fill
-source: geolonia-gsi-custom
+source: v3
 source-layer: landuse
 filter:
   - all

diff --git a/layers/landuse-railway.yml b/layers/landuse-railway.yml
@@ -1,6 +1,6 @@
 id: landuse-railway
 type: fill
-source: geolonia-gsi-custom
+source: v3
 source-layer: landuse
 filter:
   - '=='

diff --git a/layers/landuse-school.yml b/layers/landuse-school.yml
@@ -1,6 +1,6 @@
 id: landuse-school
 type: fill
-source: geolonia-gsi-custom
+source: v3
 source-layer: landuse
 filter:
   - '=='

diff --git a/layers/nt-water-name-ocean.yml b/layers/nt-water-name-ocean.yml
@@ -1,6 +1,6 @@
 id: nt-water-name-ocean
 type: symbol
-source: oceanus
+source: v3
 source-layer: nt-water-name
 minzoom: 8
 filter:

diff --git a/layers/nt-water-name-river.yml b/layers/nt-water-name-river.yml
@@ -1,6 +1,6 @@
 id: nt-water-name-river
 type: symbol
-source: oceanus
+source: v3
 source-layer: nt-water-name
 minzoom: 13
 filter:

diff --git a/layers/oc-boundary-land-level-0.yml b/layers/oc-boundary-land-level-0.yml
diff --git a/layers/oc-boundary-land-level-1.yml b/layers/oc-boundary-land-level-1.yml
diff --git a/layers/oc-boundary-land-level-1-ja.yml → layers/oc-boundary-land-level-4-ja.yml b/layers/oc-boundary-land-level-1-ja.yml → layers/oc-boundary-land-level-4-ja.yml
@@ -1,15 +1,15 @@
 id: oc-boundary-land-level-1-ja
 type: line
-source: oceanus
-source-layer: oc-boundary
+source: v3
+source-layer: boundary
 minzoom: 4
 maxzoom: 6
 filter:
   - all
   - - '=='
     - - get
       - admin_level
-    - 1
+    - 4
   - - has
     - jflag
 layout:

diff --git a/layers/oc-forest.yml b/layers/oc-forest.yml
diff --git a/layers/oc-glacier.yml b/layers/oc-glacier.yml
@@ -1,6 +1,6 @@
 id: oc-glacier
 type: fill
-source: oceanus
+source: v3
 source-layer: oc-glacier
 maxzoom: 8
 layout:

diff --git a/layers/oc-label-country.yml b/layers/oc-label-country.yml
@@ -1,13 +1,19 @@
 id: oc-label-country
 type: symbol
-source: oceanus
-source-layer: oc-label
-maxzoom: 7
+source: v3
+source-layer: place
+minzoom: 0
+maxzoom: 6
 filter:
-  - '=='
-  - - get
-    - class
-  - country
+  - all
+  - - '=='
+    - - 'get'
+      - 'class'
+    - 'country'
+  - - '=='
+    - - 'has'
+      - osm_id
+    - false
 layout:
   text-font:
     - Noto Sans CJK JP Bold

diff --git a/layers/oc-label-pref-capital-ja.yml b/layers/oc-label-pref-capital-ja.yml
@@ -1,6 +1,6 @@
 id: oc-label-pref-capital-ja
 type: symbol
-source: oceanus
+source: v3
 source-layer: oc-label
 minzoom: 7
 maxzoom: 8

diff --git a/layers/oc-label-pref-capital-popular-ja.yml b/layers/oc-label-pref-capital-popular-ja.yml
@@ -1,15 +1,17 @@
 id: oc-label-pref-capital-popular-ja
 type: symbol
-source: oceanus
-source-layer: oc-label
+source: v3
+source-layer: place
 minzoom: 5
 maxzoom: 8
 filter:
   - all
-  - - has
-    - jflag
-  - - has
-    - pref-capital
+  - - '!='
+    - capital
+    - 2
+  - - '=='
+    - class
+    - city
   - - in # TODO: タイル側で対応する https://github.com/geoloniamaps/gsi/pull/112
     - name
     - '福岡市'

diff --git a/layers/oc-label-pref-ja.yml b/layers/oc-label-pref-ja.yml
@@ -1,9 +1,9 @@
 id: oc-label-pref-ja
 type: symbol
-source: oceanus
-source-layer: oc-label
-minzoom: 6
-maxzoom: 8
+source: v3
+source-layer: place
+minzoom: 5
+maxzoom: 6
 filter:
   - all
   - - '=='

diff --git a/layers/oc-label-pref.yml b/layers/oc-label-pref.yml
@@ -1,6 +1,6 @@
 id: oc-label-pref
 type: symbol
-source: oceanus
+source: v3
 source-layer: oc-label
 minzoom: 5
 filter:

diff --git a/layers/oc-label-town-ja.yml b/layers/oc-label-town-ja.yml
@@ -1,21 +1,36 @@
 id: oc-label-town-ja
 type: symbol
-source: oceanus
-source-layer: oc-label
+source: v3
+source-layer: place
 minzoom: 7
 maxzoom: 8
 filter:
   - all
+  - - '!='
+    - capital
+    - 2
   - - '=='
-    - - get
-      - class
-    - town
-  - - has
-    - jflag
-  - - '=='
-    - - has
-      - pref-capital
-    - false
+    - class
+    - city
+  - - any
+    - - '=='
+      - rank
+      - 2
+    - - '=='
+      - rank
+      - 3
+    - - '=='
+      - rank
+      - 4
+    - - '=='
+      - rank
+      - 5
+    - - '=='
+      - rank
+      - 6
+  - - '!='
+    - disputed
+    - japan_northern_territories
 layout:
   text-padding: 2
   text-font:

diff --git a/layers/oc-label-town.yml b/layers/oc-label-town.yml
@@ -1,6 +1,6 @@
 id: oc-label-town
 type: symbol
-source: oceanus
+source: v3
 source-layer: oc-label
 minzoom: 6
 filter:

diff --git a/layers/oc-lake-blur.yml b/layers/oc-lake-blur.yml
@@ -1,6 +1,6 @@
 id: oc-lake-blur
 type: line
-source: oceanus
+source: v3
 source-layer: oc-water
 minzoom: 17
 filter:

diff --git a/layers/oc-lake-ja.yml b/layers/oc-lake-ja.yml
@@ -2,7 +2,7 @@
 
 id: oc-lake-ja
 type: fill
-source: oceanus
+source: v3
 source-layer: oc-water
 minzoom: 4
 maxzoom: 8

diff --git a/layers/oc-lake.yml b/layers/oc-lake.yml
@@ -1,6 +1,6 @@
 id: oc-lake
 type: fill
-source: oceanus
+source: v3
 source-layer: oc-water
 minzoom: 4
 filter:

diff --git a/layers/oc-landuse-commercial-ja.yml b/layers/oc-landuse-commercial-ja.yml
@@ -1,6 +1,6 @@
 id: oc-landuse-commercial-ja
 type: fill
-source: oceanus
+source: v3
 source-layer: oc-landuse
 minzoom: 5
 maxzoom: 8

diff --git a/layers/oc-landuse-commercial.yml b/layers/oc-landuse-commercial.yml
@@ -1,6 +1,6 @@
 id: oc-landuse-commercial
 type: fill
-source: oceanus
+source: v3
 source-layer: oc-landuse
 minzoom: 5
 filter:

diff --git a/layers/oc-motorway.yml b/layers/oc-motorway.yml
@@ -1,6 +1,6 @@
 id: oc-motorway
 type: line
-source: oceanus
+source: v3
 source-layer: oc-road
 minzoom: 6
 maxzoom: 6