Tweaks to run on UKz14 setup

Fonts -> Gillius No ice sheets
dch0ph · Oct 23, 2023 · 88f07af · 88f07af
1 parent 3c60a7b
commit 88f07af
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 26 deletions.
diff --git a/project.mml b/project.mml
@@ -37,7 +37,7 @@ srs: *srs
 
 Stylesheet:
   - style/style.mss
-  - style/fonts.mss
+  - style/fonts-GilliusNo1.mss
   - style/shapefiles.mss
   - style/landcover.mss
   - style/water.mss
@@ -157,18 +157,18 @@ Layer:
         ) AS landcover_line
     properties:
       minzoom: 14
-  - id: icesheet-poly
-    geometry: polygon
-    <<: *extents
-    Datasource:
-      <<: *osm2pgsql
-      table: |-
-        (SELECT
-            way
-          FROM icesheet_polygons
-        ) AS icesheet_polygons
-    properties:
-      minzoom: 5
+#  - id: icesheet-poly
+#    geometry: polygon
+#    <<: *extents
+#    Datasource:
+#      <<: *osm2pgsql
+#      table: |-
+#        (SELECT
+#            way
+#          FROM icesheet_polygons
+#        ) AS icesheet_polygons
+#    properties:
+#      minzoom: 5
   - id: water-lines-low-zoom
     geometry: linestring
     <<: *extents
@@ -293,19 +293,19 @@ Layer:
     properties:
       cache-features: true
       minzoom: 9
-  - id: icesheet-outlines
-    geometry: linestring
-    <<: *extents
-    Datasource:
-      <<: *osm2pgsql
-      table: |-
-        (SELECT
-            way,
-            ice_edge
-          FROM icesheet_outlines
-        ) AS icesheet_outlines
-    properties:
-      minzoom: 5
+#  - id: icesheet-outlines
+#    geometry: linestring
+#    <<: *extents
+#    Datasource:
+#      <<: *osm2pgsql
+#      table: |-
+#        (SELECT
+#            way,
+#            ice_edge
+#          FROM icesheet_outlines
+#        ) AS icesheet_outlines
+#    properties:
+#      minzoom: 5
   - id: marinas-area
     geometry: polygon
     <<: *extents

diff --git a/style/fonts-GilliusNo1.mss b/style/fonts-GilliusNo1.mss
@@ -0,0 +1,29 @@
+/*
+
+3. Fallback fonts:
+
+Hanazono covers almost all CJK characters, even in Unicode Plane 2.
+*/
+
+/* Use vendored fonts. This allows for more recent versions and better coverage */
+Map {
+  font-directory: url('fonts');
+}
+
+/*
+A regular style.
+*/
+@book-fonts:    "Gillius ADF Regular",
+                "HanaMinA Regular", "HanaMinB Regular";
+
+/*
+Bold text is heavier than regular text and can be used for emphasis. Fallback is a regular style.
+*/
+@bold-fonts:    "Gillius ADF Bold",
+                @book-fonts;
+
+/*
+Italics are only available for the (Latin-Greek-Cyrillic) base font, not the other scripts.
+For a considerable number of labels this style will make no difference to the regular style.
+*/
+@oblique-fonts: "Gillius ADF Italic", @book-fonts;