include absolute URL in martin response

www (maplibre-gl-js) was (mostly[^1]) happy with relative URLs in the
style.json, but maplibre-native wasn't able to construct them.

[^1]: tilejson and sprites worked with relative URLs, but glyphs didn't,
so I fixed it with a style-transform handler, but I guess the good news
is my hand was forced to fix this on the service side and thus I can get
rid of that www client-side glyph hack.

Author: michaelkirk

dagger/main.go

@@ -217,11 +217,11 @@ func martinBinary() *dagger.File {
 	const martinFeatures = "fonts,mbtiles,pmtiles,styles,sprites"
 
 	// To build from source (e.g. for debugging a fork), set this to true
-	const buildFromSource = false
+	const buildFromSource = true
 	if buildFromSource {
 		return rustContainer("git").
 			WithEnvVariable("CACHE_BUSTER", time.Now().String()).
-			WithExec([]string{"git", "clone", "--branch", "mkirk/fix-forwarding-header", "--depth=1", "https://github.com/michaelkirk/martin.git", "/martin"}).
+			WithExec([]string{"git", "clone", "--branch", "mkirk/relative-source-urls", "--depth=1", "https://github.com/michaelkirk/martin.git", "/martin"}).
 			WithWorkdir("/martin").
 			WithExec([]string{"cargo", "build", "--release", "--locked", "--no-default-features", "--features", martinFeatures}).
 			File("target/release/martin")

services/frontend/www-app/src/components/BaseMap.vue

@@ -20,7 +20,6 @@ import maplibregl, {
   MapOptions,
   Marker,
   SourceSpecification,
-  StyleSpecification,
 } from 'maplibre-gl';
 import 'maplibre-gl/dist/maplibre-gl.css';
 import Prefs from 'src/utils/Prefs';
@@ -51,6 +50,7 @@ async function loadMap(): Promise<maplibregl.Map> {
 
   const mapOptions: MapOptions = {
     container: mapContainerId,
+    style: '/tileserver/styles/basic/style.json', // style URL
     center: initialCenter, // starting position [lng, lat]
     zoom: initialZoom, // starting zoom
     attributionControl: false,
@@ -78,22 +78,6 @@ async function loadMap(): Promise<maplibregl.Map> {
   }
 
   map = new maplibregl.Map(mapOptions);
-  map.setStyle('/tileserver/style/basic.json', {
-    transformStyle: (
-      _previous: StyleSpecification | undefined,
-      next: StyleSpecification,
-    ): StyleSpecification => {
-      // MapLibre requires sprite URLs to be absolute, but our style uses relative URLs for
-      // portability across domains.
-      //
-      // For some reason font and tile sources are happy with relative URLs, but sprite URLs are not,
-      // so we only transform the sprite URL.
-      if (typeof next.sprite === 'string' && next.sprite.startsWith('/')) {
-        return { ...next, sprite: window.location.origin + next.sprite };
-      }
-      return next;
-    },
-  });
   return map;
 }
 

services/tileserver/martin-dev-config.yaml

@@ -1,10 +1,10 @@
 pmtiles:
   sources:
-    areamap: ../../data/Seattle/Seattle.pmtiles
+    areamap: ../../data/Bogota/Bogota.pmtiles
 mbtiles:
   sources:
-    landcover: ../../data/Seattle/landcover.mbtiles
-    terrain: ../../data/Seattle/terrain.mbtiles
+    landcover: ../../data/Bogota/landcover.mbtiles
+    terrain: ../../data/Bogota/terrain.mbtiles
 styles:
   paths: ['./assets/styles']
 sprites: