editoast: host fonts for the map in editoast

The glyphs are generated during the build step

Closes #10627

Signed-off-by: Tristram Gräbener <tristram+git@tristramg.eu>

Author: Tristramg

editoast/.gitignore

@@ -1,3 +1,4 @@
 target
 *.snap.new
-assets/sprites/*/sprites*
+assets/sprites/*/sprites.*
+assets/fonts/glyphs/*

editoast/Dockerfile

@@ -23,11 +23,15 @@ COPY --from=static_assets . /assets
 #######################
 # Build assets        #
 #######################
-FROM alpine:latest AS editoast_assets
+FROM ubuntu:latest AS editoast_assets
+RUN apt update && apt install --yes wget
 RUN wget https://github.com/flother/spreet/releases/download/v0.11.0/spreet-x86_64-unknown-linux-musl.tar.gz
 RUN tar xvf spreet-x86_64-unknown-linux-musl.tar.gz --directory /usr/bin
+RUN wget http://github.com/stadiamaps/sdf_font_tools/releases/download/cli-v1.4.2/build_pbf_glyphs.x86_64-unknown-linux-gnu -O /usr/bin/build_pbf_glyphs
+RUN chmod +x /usr/bin/build_pbf_glyphs
 COPY ./assets /assets
 RUN /assets/sprites/generate-atlas.sh
+RUN /assets/fonts/generate-glyphs.sh
 
 ######################
 # Testing env: build #
@@ -44,6 +48,7 @@ ENV RUSTFLAGS="-Cinstrument-coverage -C target-feature=-crt-static -C link-arg=-
 ENV LLVM_PROFILE_FILE="editoast-%p-%m.profraw"
 RUN cargo chef cook --tests --recipe-path recipe.json
 COPY . .
+COPY --from=editoast_assets /assets /editoast/assets
 
 #######################
 # Running env : build #

editoast/README.md

@@ -24,6 +24,8 @@ $ diesel migration run
 # build the assets
 $ cargo install spreet
 $ ./assets/sprites/generate-atlas.sh
+$ cargo install build_pbf_glyphs
+$ ./assets/fonts/generate-glyphs.sh
 # Build and run
 $ cargo build
 $ cargo run -- runserver

editoast/assets/fonts/Roboto Bold.ttf

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This script should be used to generate glyphs from ttf fonts.
+# Those glyphs are used to display text on the map
+# You will need build_pbf_glyphs, you can install it with:
+# `$ cargo install build_pbf_glyphs`
+set -e
+
+fonts_directory=$(dirname "$(realpath "$0")")
+echo "Converting fonts in ${fonts_directory} to glyphs"
+build_pbf_glyphs "${fonts_directory}" "${fonts_directory}"/glyphs/

editoast/assets/fonts/Roboto Condensed Italic.ttf

@@ -0,0 +1,77 @@
+use axum::extract::Path;
+use axum::extract::Request;
+use axum::response::IntoResponse;
+use editoast_derive::EditoastError;
+use thiserror::Error;
+use tower::ServiceExt;
+use tower_http::services::ServeFile;
+
+use crate::client::get_dynamic_assets_path;
+use crate::error::Result;
+
+crate::routes! {
+    "/fonts/{font}/{glyph}" => fonts,
+}
+
+#[derive(Debug, Error, EditoastError)]
+#[editoast_error(base_id = "fonts")]
+enum FontErrors {
+    #[error("File '{file}' not found")]
+    #[editoast_error(status = 404)]
+    FileNotFound { file: String },
+}
+
+/// This endpoint is used by map libre to retrieve the fonts. They are separated by font and unicode block
+#[utoipa::path(
+    get, path = "",
+    tag = "fonts",
+    params(
+        ("font" = String, Path, description = "Requested font"),
+        ("glyph" = String, Path, description = "Requested unicode block"),
+    ),
+    responses(
+        (status = 200, description = "Glyphs in PBF format of the font at the requested unicode block"),
+        (status = 404, description = "Font not found"),
+    ),
+)]
+async fn fonts(
+    Path((font, file_name)): Path<(String, String)>,
+    request: Request,
+) -> Result<impl IntoResponse> {
+    let path = get_dynamic_assets_path().join(format!("fonts/glyphs/{font}/{file_name}"));
+
+    if !path.is_file() {
+        return Err(FontErrors::FileNotFound { file: file_name }.into());
+    }
+
+    Ok(ServeFile::new(&path).oneshot(request).await)
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::views::test_app::TestAppBuilder;
+
+    use super::*;
+    use axum::http::StatusCode;
+    use rstest::rstest;
+
+    #[rstest]
+    async fn test_font() {
+        let app = TestAppBuilder::default_app();
+        let request = app.get("/fonts/Roboto%20Bold/0-255.pbf");
+        let response = app.fetch(request).assert_status(StatusCode::OK);
+        assert_eq!("application/octet-stream", response.content_type());
+        let response = response.bytes();
+        let expected =
+            std::fs::read(get_dynamic_assets_path().join("fonts/glyphs/Roboto Bold/0-255.pbf"))
+                .unwrap();
+        assert_eq!(response, expected);
+    }
+
+    #[rstest]
+    async fn test_font_not_found() {
+        let app = TestAppBuilder::default_app();
+        let request = app.get("/fonts/Comic%20Sans/0-255.pbf");
+        app.fetch(request).assert_status(StatusCode::NOT_FOUND);
+    }
+}

editoast/assets/fonts/Roboto Condensed.ttf

@@ -1,6 +1,7 @@
 mod authz;
 mod documents;
 pub mod electrical_profiles;
+pub mod fonts;
 pub mod infra;
 mod layers;
 mod openapi;
@@ -99,6 +100,7 @@ crate::routes! {
     &authz,
     &documents,
     &electrical_profiles,
+    &fonts,
     &infra,
     &layers,
     &projects,

editoast/assets/fonts/Roboto Italic.ttf

@@ -61,6 +61,9 @@
     "electrical_profiles": {
       "NotFound": "Electrical Profile Set '{{electrical_profile_set_id}}', could not be found"
     },
+    "fonts": {
+      "FileNotFound": "File for the requested font not found"
+    },
     "geometry": {
       "UnexpectedGeometry": "Expected geometry {{expected}} but got {{actual}}"
     },

editoast/assets/fonts/Roboto Medium.ttf

@@ -61,6 +61,9 @@
     "electrical_profiles": {
       "NotFound": "Profil électrique '{{electrical_profile_set_id}}' non trouvé"
     },
+    "fonts": {
+      "FileNotFound": "Fichier pour la police de charactère demandée non trouvé"
+    },
     "geometry": {
       "UnexpectedGeometry": "Géometrie {{expected}} attendue mais {{actual}} reçue"
     },