@tileflow/maps 0.1.0-alpha.13 → 0.1.0-alpha.15

package/dist/index.js

@@ -25,6 +25,7 @@ function packageDirectory(path) {
   return Object.freeze({ kind: "package-directory", package: "@tileflow/maps", path });
 }
 var streetsIcons = packageDirectory("assets/streets/icons");
+var streetsFonts = packageDirectory("assets/streets/fonts");
 var streetsModels = packageDirectory("assets/streets/models");
 var map1777Fonts = packageDirectory("assets/map-1777/fonts");
 var map1777Icons = packageDirectory("assets/map-1777/icons");
@@ -10312,7 +10313,7 @@ var streetsSurfaceProfiles = {
 
 // src/official/streets-tree-colors.ts
 var streetsTreeProfiles = {
-  "default-day": { bark: "#C3D3B1", crown: "#96C498" },
+  "default-day": { bark: "#C3D3B1", crown: "#A4CFA5" },
   "default-dawn": { bark: "#BCBC94", crown: "#97B37F" },
   "default-dusk": { bark: "#564B43", crown: "#3D4538" },
   "default-night": { bark: "#0E1D28", crown: "#0E1D24" },
@@ -10328,6 +10329,7 @@ var streetsTreeProfiles = {
 
 // src/official/streets-themes.ts
 var streetsLightColors = {
+  "labels.address": "#808080",
   "boundaries.admin": "#CE9298",
   "boundaries.default": "#CE9298",
   "boundaries.disputed": "#CE9298",
@@ -10486,15 +10488,16 @@ var streetsLightColors = {
   "terrain.hillshade.shadow": "#727B64",
   "transit.primary": "#5C74D6",
   "vegetation.tree.bark": "#918878",
-  "vegetation.tree.broadleaf.a": "#83AD83",
+  "vegetation.tree.broadleaf.a": "#77AA88",
   "vegetation.tree.broadleaf.b": "#91BA8D",
-  "vegetation.tree.broadleaf.c": "#A1C99B",
-  "vegetation.tree.broadleaf.d": "#AFD4A7",
+  "vegetation.tree.broadleaf.c": "#A6C682",
+  "vegetation.tree.broadleaf.d": "#AECFA2",
   "vegetation.tree.conifer.a": "#729B78",
   "vegetation.tree.conifer.b": "#81A880",
   "vegetation.tree.conifer.c": "#91B68B"
 };
 var streetsDarkColors = {
+  "labels.address": "#808080",
   "boundaries.admin": "#9A6177",
   "boundaries.default": "#9A6177",
   "boundaries.disputed": "#9A6177",
@@ -10783,9 +10786,16 @@ function calibratedStreetsColors(preset, theme) {
   return { ...colors, "roads.detail.casing": roadCasings.hd };
 }
 function streetsPaletteColors(preset, colorTheme) {
-  return {
+  const palette = {
     ...calibratedStreetsColors(preset, colorTheme),
-    ...streetsCartographyColors(colorTheme, preset),
+    ...streetsCartographyColors(colorTheme, preset)
+  };
+  return {
+    ...palette,
+    // The parts building models name water, vegetation and wood take the map's water and trees.
+    "buildings.modelWater": palette["hydro.water"],
+    "buildings.modelVegetation": palette["vegetation.tree.broadleaf.b"],
+    "buildings.modelWood": palette["vegetation.tree.bark"],
     "buildings.floodLight": !isDarkStreetsPreset(preset) ? "#FFFFFF" : colorTheme === "monochrome" ? "#E5E5E5" : colorTheme === "faded" ? "#F8E4C4" : "#F5CFA8",
     ...streetsModelLighting(preset, colorTheme).colors,
     ...streetsSkyTokens(preset, colorTheme).colors
@@ -10802,10 +10812,10 @@ function streetsLightingNumbers(preset, colorTheme) {
     ...streetsSkyTokens(preset, colorTheme).numbers
   };
 }
-var streetsFonts = {
-  // DIN Pro Medium has much lighter strokes than Noto Sans Bold. Of the
-  // hosted Noto faces, Regular is the closer match for navigation and POIs.
+var streetsFonts2 = {
   default: "Noto Sans Regular",
+  navigation: "DINish Medium",
+  shield: "DINish Bold",
   places: "Noto Sans Bold",
   regular: "Noto Sans Regular",
   water: "Noto Sans Italic"
@@ -10835,7 +10845,7 @@ var streetsLightTheme = defineTheme3({
   tokens: {
     color: streetsPaletteColors("day", "default"),
     number: streetsLightingNumbers("day", "default"),
-    font: streetsFonts,
+    font: streetsFonts2,
     image: { ...streetsImages, ...streetsPoiImageTokens("light") }
   },
   typography: {
@@ -10861,7 +10871,7 @@ var streetsDarkTheme = defineTheme3({
   tokens: {
     color: streetsPaletteColors("night", "default"),
     number: streetsLightingNumbers("night", "default"),
-    font: streetsFonts,
+    font: streetsFonts2,
     image: {
       ...streetsImages,
       ...streetsPoiImageTokens("dark"),
@@ -10948,6 +10958,7 @@ var streetsVisual = {
     waterway: token7.color("hydro.waterway")
   },
   label: {
+    address: token7.color("labels.address"),
     aerodrome: token7.color("labels.aerodrome"),
     country: token7.color("labels.country"),
     ferry: token7.color("labels.ferry"),
@@ -11101,6 +11112,8 @@ var streetsVisual = {
   },
   font: {
     default: token7.font("default"),
+    navigation: token7.font("navigation"),
+    shield: token7.font("shield"),
     places: token7.font("places"),
     regular: token7.font("regular"),
     water: token7.font("water")
@@ -11306,12 +11319,14 @@ var streetsTrees = withRenderStack9(
       hedgeColors: [token8.color("landcover.hedgeShade"), token8.color("landcover.hedge")],
       crownScale: 1,
       heightScale: 1,
-      finish: "faceted",
+      minimumHeight: 8,
+      materialVariation: 1,
+      finish: "smooth",
       edges: 0,
       forms: {
-        round: { models: ["streets-tree-round"] },
+        round: { models: ["streets-tree-round", "streets-tree-open"] },
         open: { models: ["streets-tree-open"] },
-        tall: { models: ["streets-tree-tall"] },
+        tall: { models: ["streets-tree-tall", "streets-tree-open"] },
         conifer: { models: ["streets-tree-conifer"] },
         columnar: { models: ["streets-tree-columnar"] },
         palm: { models: ["streets-tree-palm-feather", "streets-tree-palm-fan"] }
@@ -11484,7 +11499,8 @@ function streetsPoiStyle(category) {
       size: 1
     },
     text: {
-      font: streetsVisual.font.default,
+      font: streetsVisual.font.navigation,
+      fallbacks: [streetsVisual.font.regular],
       haloWidth: 1,
       haloBlur: 0,
       letterSpacing: 0.01,
@@ -12058,7 +12074,8 @@ function streetsBuildingRenderStack() {
       }
     }),
     extrusion: renderPass10({
-      placement: { above: "buildings.flat.outline" },
+      // Keep raised geometry after the ground names, which already cover flat footprints.
+      placement: "above-buildings",
       feature: "building",
       renderer: "extrusion",
       selector: visibleBuilding3dSelector,
@@ -12537,17 +12554,44 @@ function roadLabelStyle(kind, minZoom) {
   return {
     placement: "line",
     minZoom,
-    priority: major ? 90 : 50,
-    spacing: 250,
+    // Resolve dense parallel streets by road hierarchy, not incidental tile order.
+    // All classes share this expression so the compiler retains one collision network.
+    priority: expr12.match(
+      expr12.coalesce(expr12.get(field11("class")), "minor"),
+      [
+        { labels: ["motorway", "motorway_construction"], value: 6 },
+        { labels: ["trunk", "trunk_construction"], value: 5 },
+        { labels: ["primary", "primary_construction"], value: 4 },
+        { labels: ["secondary", "secondary_construction"], value: 3 },
+        { labels: ["tertiary", "tertiary_construction"], value: 2 },
+        { labels: ["minor", "minor_construction"], value: 1 }
+      ],
+      0
+    ),
+    // World name geometry is split into more short segments at street detail.
+    // Increase repeat distance gently without thinning the overview network.
+    spacing: zoom10.linear([
+      [13, 250],
+      [15, 300],
+      [17, 400],
+      [19, 450]
+    ]),
     text: {
       color: streetsVisual.label.road,
-      font: streetsVisual.font.default,
+      font: streetsVisual.font.navigation,
+      fallbacks: [streetsVisual.font.regular],
       haloColor: streetsVisual.label.roadHalo,
       haloWidth: 1,
       letterSpacing: path || pedestrian ? 0.01 : 0.15,
       maxAngle: 30,
-      padding: 1,
-      pitchAlignment: "map",
+      // Screen-space breathing room at city overview. Restore normal padding by z14
+      // so the same policy does not suppress useful names on the neighbourhood view.
+      padding: zoom10.linear([
+        [13, 5],
+        [14, 1]
+      ]),
+      // Follow the road's bearing while retaining readable glyph height in perspective.
+      pitchAlignment: "viewport",
       rotationAlignment: "map",
       size: zoom10.linear([
         [10, startSize],
@@ -12562,11 +12606,7 @@ var streets = bindOfficialMapTheme(
     id: "streets",
     version: 1,
     name: "Streets",
-    glyphs: {
-      kind: "url",
-      url: "https://api.tileflow.dev/base/33d4de5e8086d9d629d67d3f39fedb87e23686c4c1ac653c27e2a52aee9d00b3/glyphs/{fontstack}/{range}.pbf",
-      fontStacks: ["Noto Sans Regular", "Noto Sans Bold", "Noto Sans Italic"]
-    },
+    fonts: [streetsFonts],
     themes: streetsThemes,
     timeOfDay: {
       light: { day: "light", dawn: "dawn", dusk: "dusk", night: "dark" },
@@ -12621,14 +12661,14 @@ var streets = bindOfficialMapTheme(
       // Optional keys: addresses, aeroways, boundaries, buildings, labels, land,
       // landforms, poi, roads, transit, vegetation, water. Object order never
       // controls layer order.
-      // Streets deliberately omits parcel-level house numbers. POI and road/place
-      // labels carry the useful navigation hierarchy without close-zoom numeric noise.
+      // House numbers arrive at close zooms and yield in the distance when tilted.
       addresses: addresses4({
         labels: {
           minZoom: 17,
           text: {
-            font: streetsVisual.font.default,
-            color: streetsVisual.label.muted,
+            font: streetsVisual.font.navigation,
+            fallbacks: [streetsVisual.font.regular],
+            color: streetsVisual.label.address,
             haloColor: streetsVisual.label.placeHalo,
             haloWidth: 1,
             maxWidth: 10,
@@ -13357,6 +13397,12 @@ var streets = bindOfficialMapTheme(
           // stand beside the flat fill, so they require this mode.
           mode: "flat",
           threeDimensional: {
+            // Models name pools, planting and timber with these parts to follow the map's colours.
+            modelColors: {
+              water: token9.color("buildings.modelWater"),
+              vegetation: token9.color("buildings.modelVegetation"),
+              wood: token9.color("buildings.modelWood")
+            },
             floodLight: {
               intensity: token9.number("buildings.floodLight.intensity"),
               brightnessScale: token9.number("buildings.floodLight.brightnessScale"),
@@ -13471,10 +13517,14 @@ var streets = bindOfficialMapTheme(
           // 'auto' | 'local' | 'en' | another language field suffix.
           places: "all",
           // 'none' | 'major' | 'all'.
+          // Street names yield to foreground destinations and are hidden by 3D buildings.
+          // Their viewport-aligned lettering stays readable at an oblique camera angle.
           roadPlacement: "ground",
+          roadNameFormat: "compact",
+          roadGrouping: "network",
           roads: "all",
           // Preserve Streets' selection while Core owns class aliases, language
-          // fallback, ground placement and collision ordering.
+          // fallback and collision ordering.
           roadClasses: [
             "motorway",
             "trunk",
@@ -13483,6 +13533,7 @@ var streets = bindOfficialMapTheme(
             "tertiary",
             "minor",
             "service",
+            "track",
             "pathway",
             "footway",
             "cycleway",
@@ -13504,6 +13555,7 @@ var streets = bindOfficialMapTheme(
               tertiary: roadLabelStyle("major", 13),
               minor: roadLabelStyle("street", 13),
               service: roadLabelStyle("service", 15),
+              track: roadLabelStyle("service", 15),
               pathway: roadLabelStyle("path", 15),
               footway: roadLabelStyle("path", 15),
               cycleway: roadLabelStyle("path", 15),
@@ -13847,10 +13899,11 @@ var streets = bindOfficialMapTheme(
               placement: "point",
               text: {
                 color: streetsVisual.label.road,
-                font: streetsVisual.font.places,
+                font: streetsVisual.font.shield,
+                fallbacks: [streetsVisual.font.regular],
                 haloColor: streetsDetailPalette.halo,
                 haloWidth: 1,
-                size: 10
+                size: 9
               }
             },
             shields: {
@@ -13868,7 +13921,8 @@ var streets = bindOfficialMapTheme(
                 },
                 text: {
                   color: streetsVisual.label.shieldDark,
-                  font: streetsVisual.font.places,
+                  font: streetsVisual.font.shield,
+                  fallbacks: [streetsVisual.font.regular],
                   haloWidth: 0,
                   letterSpacing: 0.05,
                   maxAngle: 38,
@@ -13876,7 +13930,7 @@ var streets = bindOfficialMapTheme(
                   padding: 2,
                   pitchAlignment: "viewport",
                   rotationAlignment: "viewport",
-                  size: 10
+                  size: 9
                 }
               },
               overview: {
@@ -13884,10 +13938,12 @@ var streets = bindOfficialMapTheme(
                 minZoom: 6
               },
               detail: {
-                // Core switches to line placement at street scale while retaining viewport
-                // alignment, so each route reference remains horizontal during navigation.
+                // World splits route lines more often than the reference source. A shorter
+                // interval keeps route references available in regional views; collision
+                // still suppresses adjacent shields, and street-scale repetition stays sparse.
                 spacing: zoom10.linear([
-                  [11, 400],
+                  [11, 220],
+                  [13, 300],
                   [14, 600]
                 ])
               },
@@ -14003,9 +14059,8 @@ var streets = bindOfficialMapTheme(
         streetsLabelRenderStack()
       ),
       poi: poi4({
-        // World owns taxonomy, zoom eligibility, density ranks and importance. Streets
-        // shows every category at one density and places them all in World's importance
-        // order, so collision keeps the most relevant places whatever their category.
+        // Keep World's importance order while reserving room for navigation and landmarks.
+        // Everyday businesses enter progressively; tilted views also limit distant labels.
         categories: [
           "transport",
           "food-drink",
@@ -14025,7 +14080,14 @@ var streets = bindOfficialMapTheme(
         // A uniform grey treatment suppresses a meaningful amount of chroma
         // and makes the whole light map read as if a pale overlay sat above it.
         color: "category",
-        density: 3,
+        density: 2,
+        detailZoom: 18,
+        densityByCategory: {
+          lodging: 1,
+          "park-nature": 3,
+          religion: 1,
+          transport: 3
+        },
         icons: true,
         labels: true,
         placement: {
@@ -14034,8 +14096,8 @@ var streets = bindOfficialMapTheme(
           coupleIconAndLabel: true,
           iconPadding: 3,
           order: "importance",
-          // Street and place names outrank everyday destinations ('navigation' labels), but
-          // not the places that make a city recognisable: World's two most important ranks.
+          // Landmarks retain their priority. Ground street names yield to destinations;
+          // the navigation policy keeps the city and district hierarchy above them.
           prominentRank: 1,
           textPadding: 3
         },
@@ -14090,6 +14152,7 @@ export {
   soundings2 as soundings,
   soundingsIcons,
   streets2 as streets,
+  streetsFonts,
   streetsIcons,
   streetsModels,
   streetsThemes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tileflow/maps",
-  "version": "0.1.0-alpha.13",
+  "version": "0.1.0-alpha.15",
   "license": "Apache-2.0",
   "description": "Official themed Streets, Baedeker, Cívica, 1777, Siegfried, Soundings, and Blueprint maps for Tileflow.",
   "type": "module",
@@ -52,12 +52,12 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@tileflow/core": ">=0.1.0-alpha.39 <0.1.0-beta.0"
+    "@tileflow/core": ">=0.1.0-alpha.41 <0.1.0-beta.0"
   },
   "devDependencies": {
     "@maplibre/maplibre-gl-style-spec": "24.8.5",
     "@maplibre/maplibre-gl-style-spec-v6": "npm:@maplibre/maplibre-gl-style-spec@26.4.4",
-    "@tileflow/core": "0.1.0-alpha.39"
+    "@tileflow/core": "0.1.0-alpha.41"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm --dts --clean --no-splitting",