Update style to display altitudes of major contour lines on the map

utagawal · Dec 17, 2024 · de068a9 · de068a9
1 parent 3629d63
commit de068a9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/style/utagawa.typ b/style/utagawa.typ
diff --git a/style/utagawa/lines b/style/utagawa/lines
@@ -2232,13 +2232,13 @@ barrier = hedge_bank [ 0x012111 resolution 24 ]
 # 0x21 = 1 (Label, SmallFont)
 # 0x22 = 2 (Label, SmallFont)
 
-  contour = elevation & contour_ext = elevation_minor  & ele > 0 { set name = '${ele|conv:m=>ft}'; } [0x20 resolution 24]
+  contour = elevation & contour_ext = elevation_minor  & ele > 0 { name '${ele|conv:m=>ft}' } [0x20 resolution 24]
 
-  contour = elevation & contour_ext = elevation_medium & ele > 0 { set name = '${ele|conv:m=>ft}'; } [0x21 resolution 24 continue with_actions]
-  contour = elevation & contour_ext = elevation_medium & ele > 0 { set name = '${ele|conv:m=>ft}'; } [0x20 resolution 22-23]
+  contour = elevation & contour_ext = elevation_medium & ele > 0 { name '${ele|conv:m=>ft}' } [0x21 resolution 24 continue with_actions]
+  contour = elevation & contour_ext = elevation_medium & ele > 0 { name '${ele|conv:m=>ft}' } [0x20 resolution 22-23]
 
-  contour = elevation & contour_ext = elevation_major  & ele > 0 { set name = '${ele|conv:m=>ft}';} [0x22 resolution 22 continue with_actions]
-  contour = elevation & contour_ext = elevation_major  & ele > 0 { set name = '${ele|conv:m=>ft}';} [0x20 resolution 20-21]
+  contour = elevation & contour_ext = elevation_major  & ele > 0 { name '${ele|conv:m=>ft}' } [0x22 resolution 22 continue with_actions]
+  contour = elevation & contour_ext = elevation_major  & ele > 0 { name '${ele|conv:m=>ft}' } [0x20 resolution 20-21]
 
 # Needed Include Lines for making
 # old mkgmap styles (pre r2906)
@@ -2249,9 +2249,9 @@ barrier = hedge_bank [ 0x012111 resolution 24 ]
 # deactivated: include 'roadspeed';
 
 
-# name=* { name '${name}' }
-# mkgmap:default_name=* { name '${mkgmap:default_name}' }
-# mkgmap:display_name=* { addlabel '${mkgmap:display_name|subst:;=>/}' }
+name=* { name '${name}' }
+mkgmap:default_name=* { name '${mkgmap:default_name}' }
+mkgmap:display_name=* { addlabel '${mkgmap:display_name|subst:;=>/}' }
 
 mkgmap:label:1!=* & ref=* { addlabel '${ref|part:;:1}' }
 mkgmap:label:1!=* & int_ref=* { addlabel '${int_ref|part:;:1}' }

diff --git a/style/utagawa/points b/style/utagawa/points
@@ -533,7 +533,7 @@ natural = sand & name = * {name "${name} (Sable)"} [0x6600 resolution 24]
 natural = scree & name = * {name "${name} (Pierrier)"} [0x6600 resolution 24]
 
 # Unkultiviertes Land: Unterholz / Busch. [point, closedway]
-# natural = scrub & name = * {name "${name} (Broussailles"} [0x6600 resolution 24]
+# natural = scrub & name = * {name "${name} (Broussailles)"} [0x6600 resolution 24]
 
 # Quelle. [point]
 natural = spring {name "${name} (Source)" | "Source"} [0x6511 resolution 24]