protomaps · wipfli · May 27, 2025 · May 27, 2025 · May 27, 2025
diff --git a/render-tests/run_render_tests.ts b/render-tests/run_render_tests.ts
@@ -225,7 +225,7 @@ function getTestStyles(options: RenderOptions, directory: string): StyleWithTest
                 lang: 'en',
                 recycleMap: options.recycleMap || false,
                 allowed: 0.00025,
-                threshold: 0.1285,
+                threshold: 0.05,
                 ...style.metadata.test
             };
 

diff --git a/render-tests/tests/buildings/railway/expected.png b/render-tests/tests/buildings/railway/expected.png
diff --git a/render-tests/tests/buildings/railway/style.json b/render-tests/tests/buildings/railway/style.json
@@ -4,7 +4,7 @@
     "test": {
       "width": 256,
       "height": 256,
-      "flavor": "light",
+      "flavor": "black",
       "lang": "en"
     },
     "link": "https://github.com/protomaps/basemaps/issues/249"

diff --git a/render-tests/tests/earth/minsize/expected.png b/render-tests/tests/earth/minsize/expected.png
diff --git a/render-tests/tests/landuse/grassland/expected.png b/render-tests/tests/landuse/grassland/expected.png
diff --git a/render-tests/tests/places/athens/expected.png b/render-tests/tests/places/athens/expected.png
diff --git a/render-tests/tests/places/capital/expected.png b/render-tests/tests/places/capital/expected.png
diff --git a/render-tests/tests/places/capital/input.osm.pbf b/render-tests/tests/places/capital/input.osm.pbf
diff --git a/render-tests/tests/places/capital/style.json b/render-tests/tests/places/capital/style.json
@@ -0,0 +1,17 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 256,
+      "height": 256,
+      "flavor": "light",
+      "lang": "en"
+    },
+    "link": "https://github.com/protomaps/basemaps/issues/439"
+  },
+  "center": [
+    8.073,
+    47.021
+  ],
+  "zoom": 6
+}
diff --git a/render-tests/tests/places/rome-vatican/expected.png b/render-tests/tests/places/rome-vatican/expected.png
diff --git a/render-tests/tests/places/variable-anchor/expected.png b/render-tests/tests/places/variable-anchor/expected.png
diff --git a/render-tests/tests/water/fountain/expected.png b/render-tests/tests/water/fountain/expected.png
diff --git a/sprites/src/main.rs b/sprites/src/main.rs
@@ -146,6 +146,10 @@ fn extract_groups_from_svg(
                         substr = "townspot".to_string();
                     }
 
+                    if substr == "capital-s" {
+                        substr = "capital".to_string();
+                    }
+
                     if !shader.icons.contains_key(&substr) {
                         continue;
                     }

diff --git a/sprites/themes/black.json b/sprites/themes/black.json
@@ -3,6 +3,7 @@
     "base":["#aaaaaa","#000000"]
   },
   "icons": {
-    "townspot":"base"
+    "townspot":"base",
+    "capital":"base"
   }
 }
diff --git a/sprites/themes/dark.json b/sprites/themes/dark.json
@@ -7,6 +7,7 @@
   },
   "icons": {
     "townspot":"base",
+    "capital":"base",
     "beach":"green",
     "forest":"green",
     "marina":"green",

diff --git a/sprites/themes/grayscale.json b/sprites/themes/grayscale.json
@@ -3,6 +3,7 @@
     "base":["#444444","#dddddd"]
   },
   "icons": {
-    "townspot":"base"
+    "townspot":"base",
+    "capital":"base"
   }
 }
diff --git a/sprites/themes/light.json b/sprites/themes/light.json
@@ -7,6 +7,7 @@
   },
   "icons": {
     "townspot":"base",
+    "capital":"base",
     "beach":"green",
     "forest":"green",
     "marina":"green",

diff --git a/sprites/themes/white.json b/sprites/themes/white.json
@@ -3,6 +3,7 @@
     "base":["#888888","#ffffff"]
   },
   "icons": {
-    "townspot":"base"
+    "townspot":"base",
+    "capital":"base"
   }
 }
diff --git a/styles/src/base_layers.ts b/styles/src/base_layers.ts
@@ -1770,7 +1770,13 @@ export function labels_layers(
       "source-layer": "places",
       filter: ["==", "kind", "locality"],
       layout: {
-        "icon-image": ["step", ["zoom"], "townspot", 8, ""],
+        "icon-image": [
+          "step",
+          ["zoom"],
+          ["case", ["==", ["get", "capital"], "yes"], "capital", "townspot"],
+          8,
+          "",
+        ],
         "icon-size": 0.7,
         "text-field": get_multiline_name(
           lang,