Implement dynamic font support /font/<name>/<start>-<end>

Cargo.toml

@@ -17,6 +17,7 @@ actix-rt = "2"
 actix-web = "4"
 anyhow = "1.0"
 async-trait = "0.1"
+bit-set = "0.5.3"
 brotli = "3"
 cargo-husky = { version = "1", features = ["user-hooks"], default-features = false }
 clap = { version = "4", features = ["derive"] }
@@ -35,6 +36,7 @@ log = "0.4"
 martin-mbtiles = { path = "./martin-mbtiles", version = "0.6.0", default-features = false }
 martin-tile-utils = { path = "./martin-tile-utils", version = "0.1.0" }
 num_cpus = "1"
+pbf_font_tools = { version = "2.5.0", features = ["freetype"] }
 pmtiles = { version = "0.3", features = ["mmap-async-tokio", "tilejson"] }
 postgis = "0.9"
 postgres = { version = "0.19", features = ["with-time-0_3", "with-uuid-1", "with-serde_json-1"] }

martin/Cargo.toml

@@ -56,6 +56,7 @@ actix-http.workspace = true
 actix-rt.workspace = true
 actix-web.workspace = true
 async-trait.workspace = true
+bit-set.workspace = true
 brotli.workspace = true
 clap.workspace = true
 deadpool-postgres.workspace = true
@@ -68,6 +69,7 @@ log.workspace = true
 martin-mbtiles.workspace = true
 martin-tile-utils.workspace = true
 num_cpus.workspace = true
+pbf_font_tools.workspace = true
 pmtiles.workspace = true
 postgis.workspace = true
 postgres-protocol.workspace = true

martin/src/args/root.rs

@@ -10,7 +10,7 @@ use crate::args::srv::SrvArgs;
 use crate::args::State::{Ignore, Share, Take};
 use crate::config::Config;
 use crate::file_config::FileConfigEnum;
-use crate::{Error, Result};
+use crate::{Error, OptOneMany, Result};
 
 #[derive(Parser, Debug, PartialEq, Default)]
 #[command(about, version)]
@@ -44,6 +44,9 @@ pub struct MetaArgs {
     /// Export a directory with SVG files as a sprite source. Can be specified multiple times.
     #[arg(short, long)]
     pub sprite: Vec<PathBuf>,
+    /// Export a directory with font files as a font source. Can be specified multiple times.
+    #[arg(short, long)]
+    pub font: Vec<PathBuf>,
 }
 
 impl Args {
@@ -81,6 +84,10 @@ impl Args {
             config.sprites = FileConfigEnum::new(self.meta.sprite);
         }
 
+        if !self.meta.font.is_empty() {
+            config.fonts = OptOneMany::new(self.meta.font);
+        }
+
         cli_strings.check()
     }
 }

martin/src/config.rs

@@ -2,14 +2,15 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::future::Future;
 use std::io::prelude::*;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::pin::Pin;
 
 use futures::future::try_join_all;
 use serde::{Deserialize, Serialize};
 use subst::VariableMap;
 
 use crate::file_config::{resolve_files, FileConfigEnum};
+use crate::fonts::FontSources;
 use crate::mbtiles::MbtSource;
 use crate::pg::PgConfig;
 use crate::pmtiles::PmtSource;
@@ -24,6 +25,7 @@ pub type UnrecognizedValues = HashMap<String, serde_yaml::Value>;
 pub struct ServerState {
     pub tiles: TileSources,
     pub sprites: SpriteSources,
+    pub fonts: FontSources,
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
@@ -43,6 +45,9 @@ pub struct Config {
     #[serde(default, skip_serializing_if = "FileConfigEnum::is_none")]
     pub sprites: FileConfigEnum,
 
+    #[serde(default, skip_serializing_if = "OptOneMany::is_none")]
+    pub fonts: OptOneMany<PathBuf>,
+
     #[serde(flatten)]
     pub unrecognized: UnrecognizedValues,
 }
@@ -61,10 +66,14 @@ impl Config {
         res.extend(self.mbtiles.finalize("mbtiles.")?);
         res.extend(self.sprites.finalize("sprites.")?);
 
+        // TODO: support for unrecognized fonts?
+        // res.extend(self.fonts.finalize("fonts.")?);
+
         if self.postgres.is_empty()
             && self.pmtiles.is_empty()
             && self.mbtiles.is_empty()
             && self.sprites.is_empty()
+            && self.fonts.is_empty()
         {
             Err(NoSources)
         } else {
@@ -76,6 +85,7 @@ impl Config {
         Ok(ServerState {
             tiles: self.resolve_tile_sources(idr).await?,
             sprites: SpriteSources::resolve(&mut self.sprites)?,
+            fonts: FontSources::resolve(&mut self.fonts)?,
         })
     }