From 34eb093f2ed31076c339903f137fc1d204a8e00d Mon Sep 17 00:00:00 2001
From: Mai Kosoba <mmm.tate@gmail.com>
Date: Tue, 14 Jun 2022 10:27:24 +0900
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E4=B8=8B=E9=89=84=E3=81=AE=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layers/railway-subway.yml | 20 +++++++++++++++-----
 style.yml                 | 14 +++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/layers/railway-subway.yml b/layers/railway-subway.yml
index c0e34cb..5307c6a 100644
--- a/layers/railway-subway.yml
+++ b/layers/railway-subway.yml
@@ -14,13 +14,23 @@ paint:
   line-offset: 
     stops:
       - - 14
-        - 1
+        - 2
       - - 15
-        - 1.5
+        - 2.5
       - - 16
-        - 2
+        - 2.5
       - - 17
         - 8
+  line-opacity:
+    stops:
+      - - 14
+        - 0.5
+      - - 17
+        - 0.3
   line-color: '#9dabdd'
-  line-opacity: 1
-  line-width: 1.5
\ No newline at end of file
+  line-width: 
+      stops:
+      - - 14
+        - 1.5
+      - - 17
+        - 2
diff --git a/style.yml b/style.yml
index d20b027..4eb4fb9 100644
--- a/style.yml
+++ b/style.yml
@@ -7,20 +7,22 @@ name: $name
 sources:
   oceanus:
     type: vector
-    url: https://tileserver.geolonia.com/oceanus/tiles.json?key=YOUR-API-KEY
+    maxzoom: 5
+    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
   geolonia:
     type: vector
-    minzoom: 8
-    url: https://tileserver.geolonia.com/v2/tiles.json?key=YOUR-API-KEY
+    minzoom: 6
+    url: https://tileserver-dev.geolonia.com/v3/tiles.json?key=YOUR-API-KEY
   dem:
     type: raster-dem
     url: https://tileserver.geolonia.com/gsi-dem/tiles.json?key=YOUR-API-KEY
     attribution: <a href="https://maps.gsi.go.jp/development/ichiran.html" target="_blank">© GSI Japan</a>
 sprite: https://geoloniamaps.github.io/basic/basic
-glyphs: https://glyphs.geolonia.com/{fontstack}/{range}.pbf
+# glyphs: https://glyphs.geolonia.com/{fontstack}/{range}.pbf
+glyphs: https://deploy-preview-12--geolonia-glyphs.netlify.app/{fontstack}/{range}.pbf
 layers:
   - !!inc/file layers/background.yml
   - !!inc/file layers/landcover-grass.yml
@@ -59,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
@@ -133,9 +136,10 @@ layers:
   - !!inc/file layers/railway-subway.yml
   - !!inc/file layers/cablecar.yml
   - !!inc/file layers/cablecar-dash.yml
+  - !!inc/file layers/boundary-land-level-2.yml
   - !!inc/file layers/boundary-land-level-4.yml
   - !!inc/file layers/railway-name.yml
-  - !!inc/file layers/railway-subway-name.yml
+  # - !!inc/file layers/railway-subway-name.yml
   - !!inc/file layers/road_oneway.yml
   - !!inc/file layers/road_oneway_opposite.yml
   - !!inc/file layers/poi-z16.yml