Add street name

layers/highway-minor-casing.yml

@@ -24,15 +24,15 @@ paint:
   line-color: 'rgba(222, 222, 222, 1)'
   line-width:
     - interpolate
-    - - exponential
+    - - linear
       - 0.9 # カーブが大きい
     - - zoom
     - 13.5 # zl 8
     - 0    # 0 から始めて
     - 14    # zl 9 から本格的に描画
-    - 1
+    - 4
     - 16   # zl 16 で building の表示が始まり、太さコントロールが必要になる
-    - 3
+    - 10
     - 20   # 最大zl, つまり20で
     - 20   # はみ出さないギリギリの太さ
 

layers/highway-minor.yml

@@ -2,7 +2,7 @@ id: highway-minor
 type: line
 source: geolonia
 source-layer: transportation
-minzoom: 13
+minzoom: 11
 filter:
   - all
   - - '=='
@@ -23,15 +23,17 @@ paint:
   line-color: '#ffffff'
   line-width:
     - interpolate
-    - - exponential
+    - - linear
       - 0.9 # カーブが大きい
     - - zoom
-    - 13.5 # zl 8
-    - 0    # 0 から始めて
+    - 11 # zl 8
+    - 0.2    # 0 から始めて
+    - 13     # zl 8
+    - 0.5    # 0 から始めて
     - 14    # zl 9 から本格的に描画
-    - 1.2
+    - 2
     - 16   # zl 16 で building の表示が始まり、太さコントロールが必要になる
-    - 2.2
+    - 6
     - 20   # 最大zl, つまり20で
     - 16   # 太さ20 ならはみ出さない
 

layers/poi-z11.yml

@@ -16,7 +16,6 @@ filter:
     - stadium
     - landmark
     - town_hall
-    - golf
     - hospital
   - - '!in'
     - subclass

layers/poi-z14.yml

@@ -19,6 +19,8 @@ filter:
     - zoo
     - convenience
     - lodging
+    - museum
+    - golf
   - - '!='
     - disputed
     - japan_northern_territories

layers/poi-z15.yml

@@ -18,6 +18,16 @@ filter:
     - shop
     - school
     - monument
+    - restaurant
+    - bar
+    - cafe
+    - sushi
+    - restaurant_noodle
+    - fast_food
+    - ice_cream
+    - restaurant_pizza
+    - restaurant_seafood
+    - beer
   - - '!='
     - disputed
     - japan_northern_territories
@@ -34,6 +44,14 @@ layout:
         - class
     - - image
       - circle-stroked
+  icon-padding:
+    - interpolate
+    - - linear
+    - - zoom
+    - 15
+    - 30
+    - 16
+    - 0
   text-field: '{name}'
   text-offset:
     - 0

layers/poi-z16-primary.yml

@@ -14,16 +14,6 @@ filter:
     - - 'in'
       - class
       - cemetery
-      - restaurant
-      - bar
-      - cafe
-      - sushi
-      - restaurant_noodle
-      - fast_food
-      - ice_cream
-      - restaurant_pizza
-      - restaurant_seafood
-      - beer
       - library
       - fuel
       - post

layers/railway-name.yml → layers/road_name-minor.yml

@@ -1,25 +1,29 @@
-id: railway-name
+id: road_name-minor
 type: symbol
 source: geolonia
 source-layer: transportation_name
 minzoom: 8
 filter:
   - all
   - - '=='
+    - network
+    - road
+  - - in
     - class
-    - rail
+    - minor
+    - service
+    - track
+    - path
   - - '!in'
     - brunnel
     - tunnel
-  - - '!='
-    - subclass
-    - subway
 layout:
   text-font:
     - Noto Sans Universal Regular
   text-size: 12
   text-field: '{name}'
   text-max-width: 8
+  text-padding: 50
   visibility: visible
   symbol-placement: line
   symbol-spacing:
@@ -32,6 +36,6 @@ layout:
       - - 15
         - 600
 paint:
-  text-color: rgba(102, 102, 102, 1)
+  text-color: '#666666'
   text-halo-width: 1.2
   text-halo-color: rgba(255,255,255,0.8)

layers/road_name.yml

@@ -0,0 +1,41 @@
+id: road_name
+type: symbol
+source: geolonia
+source-layer: transportation_name
+minzoom: 8
+filter:
+  - all
+  - - '=='
+    - network
+    - road
+  - - in
+    - class
+    - trunk
+    - primary
+    - secondary
+    - tertiary
+  - - '!in'
+    - brunnel
+    - tunnel
+layout:
+  text-font:
+    - Noto Sans Universal Regular
+  text-size: 13
+  text-field: '{name}'
+  text-max-width: 8
+  text-padding: 50
+  visibility: visible
+  symbol-placement: line
+  symbol-spacing:
+    base: 1000
+    stops:
+      - - 10
+        - 1000
+      - - 12
+        - 800
+      - - 15
+        - 600
+paint:
+  text-color: '#666666'
+  text-halo-width: 1.2
+  text-halo-color: rgba(255,255,255,0.8)

style.yml

@@ -85,7 +85,6 @@ layers:
   - !!inc/file layers/bridge-trunk-primary-casing-blur.yml
   - !!inc/file layers/bridge-path-casing-blur.yml
   - !!inc/file layers/bridge-motorway-casing-blur.yml
-  - !!inc/file layers/tunnel-railway.yml
   - !!inc/file layers/tunnel-service-track-casing.yml
   - !!inc/file layers/tunnel-minor-casing.yml
   - !!inc/file layers/tunnel-secondary-tertiary-casing.yml
@@ -137,8 +136,6 @@ layers:
   - !!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/road_oneway.yml
   - !!inc/file layers/road_oneway_opposite.yml
   - !!inc/file layers/poi-worship.yml
@@ -149,14 +146,14 @@ layers:
   - !!inc/file layers/poi-z16-primary.yml
   - !!inc/file layers/poi-z15.yml
   - !!inc/file layers/poi-z14.yml
-  - !!inc/file layers/poi-z12.yml
   - !!inc/file layers/poi-z11.yml
   - !!inc/file layers/poi-railway.yml
   - !!inc/file layers/poi-airport-primary.yml
-  # - !!inc/file layers/poi-mountain.yml
   - !!inc/file layers/road_shield_prefectural.yml
   - !!inc/file layers/road_shield_national.yml
   - !!inc/file layers/road_shield_highway.yml
+  - !!inc/file layers/road_name-minor.yml
+  - !!inc/file layers/road_name.yml
   - !!inc/file layers/nt-label-small.yml
   - !!inc/file layers/nt-label-large.yml
   - !!inc/file layers/place-island-name.yml