@expofp/floorplan 3.24.2 → 3.24.3

package/dist/esm/components/Maplibre/MaplibreWrapper.d.ts

@@ -10,6 +10,12 @@ export declare const MAP_DIM_LAYER_ID = "expofp-map-dim";
 export interface TileSourceConfig {
     /** Maplibre style URL or inline style JSON object */
     style: string | StyleSpecification;
+    /**
+     * The style and everything it references ship inside the plan archive. Local
+     * hosts serve those files themselves, so PMTiles archives get a source that
+     * tolerates a host without Range support.
+     */
+    offline?: boolean;
 }
 export interface CameraPaddingOptions {
     top: number;

package/dist/esm/components/Maplibre/MaplibreWrapper.js

@@ -1 +1 @@
-import{jsx as B}from"react/jsx-runtime";import"maplibre-gl/dist/maplibre-gl.css";import{Renderer as N}from"@expofp/renderer";import{addProtocol as G,Map as Y}from"maplibre-gl";import{Protocol as k}from"pmtiles";import{useEffect as E,useRef as l}from"react";import{createStyleTransform as q}from"./utils/resolve-map-style";import{createUpdatePump as H}from"./utils/update-pump";export const MAP_DIM_LAYER_ID="expofp-map-dim";const y="expofp-map-dim-source",J="3d-expofp";let g=null;const Q=["coalesce",["get","name:en"],["get","name_en"],["get","name:latin"],["get","name"]],V={type:"Feature",geometry:{type:"Polygon",coordinates:[[[-180,-85],[180,-85],[180,85],[-180,85],[-180,-85]]]},properties:{}};function I(e){if(!e||typeof e!="object")return!1;const r=e.length;if(typeof r!="number"||r<16)return!1;const o=e[0];return typeof o=="number"&&Number.isFinite(o)}function W(e){if(I(e))return Array.from(e);const o=e?.defaultProjectionData?.mainMatrix;return I(o)?Array.from(o):(console.warn("Maplibre custom layer received an unsupported projection matrix payload.",e),null)}function b(e){return typeof e=="string"?e.includes("name"):Array.isArray(e)?e.some(r=>b(r)):!e||typeof e!="object"?!1:Object.values(e).some(r=>b(r))}function X(e){return e.type!=="symbol"||!e.id||!e.layout?!1:b(e.layout["text-field"])}function K(e){const r=e.getStyle();for(const o of r.layers??[])X(o)&&e.setLayoutProperty(o.id,"text-field",Q)}function $(){if(!g){g=new k;try{G("pmtiles",g.tile)}catch(e){console.warn("Maplibre PMTiles protocol registration failed.",e)}}}export default function v({sceneDef:e,geoConfig:r,staticTransform:o,tileSource:w,mapOptions:O,onRendererReady:h,onMapDimLayerReady:x,onMapLoadError:M}){const d=l(null),P=l(null),a=l(null),L=l(h),S=l(x),_=l(M),C=l({sceneDef:e,geoConfig:r,staticTransform:o,tileSource:w,mapOptions:O});return E(()=>{L.current=h,S.current=x,_.current=M}),E(()=>{if(!d.current)return;const{sceneDef:m,geoConfig:n,staticTransform:F,tileSource:A,mapOptions:f}=C.current;let p=!1;const u={...m};u.rootLayer={...m.rootLayer};const T=m.rootLayer.children;u.rootLayer.children=T.filter(i=>i?.name?.toString().toLowerCase()!=="areamap"),u.background=void 0,u.staticTransform=F,$();const z=n.bounds?{bounds:n.bounds,fitBoundsOptions:{padding:n.fitPadding,bearing:n.bearing}}:{center:n.center,zoom:n.zoom},j=q(A.style),t=new Y({container:d.current,...z,bearing:n.bearing,pitch:f?.pitch??30,maxPitch:f?.maxPitch??70,minZoom:f?.minZoom,maxZoom:f?.maxZoom,maxBounds:f?.maxBounds,bearingSnap:0,canvasContextAttributes:{antialias:!0}});n.zoomAdjustment&&t.jumpTo({zoom:t.getZoom()+n.zoomAdjustment}),P.current=t,t.once("error",i=>{t.isStyleLoaded()||_.current?.(i?.error??i)});const R=i=>{const s=i?.id;!s||t.hasImage(s)||t.addImage(s,{width:1,height:1,data:new Uint8Array(4)})};t.on("styleimagemissing",R);const U=H({requestFrame:()=>t.triggerRepaint()}),Z={id:J,type:"custom",renderingMode:"3d",onAdd(i,s){if(p)return;const c=new N({canvas:t.getCanvas(),gl:s});if(p){c.dispose();return}c.init(u),a.current=c,L.current?.(c,t,u,()=>t.triggerRepaint())},render(i,s){if(!a.current||a.current.isDisposed)return;const c=W(s??i);c&&(a.current.render(c),U(a.current))}},D=()=>{K(t),t.getSource(y)||t.addSource(y,{type:"geojson",data:V}),t.getLayer(MAP_DIM_LAYER_ID)||t.addLayer({id:MAP_DIM_LAYER_ID,type:"fill",source:y,paint:{"fill-color":"#000000","fill-opacity":0,"fill-opacity-transition":{duration:0,delay:0}}}),S.current?.(t),t.addLayer(Z)};return t.on("style.load",D),t.setStyle(A.style,j?{transformStyle:j}:void 0),()=>{p=!0,t.off("style.load",D),t.off("styleimagemissing",R),a.current?.dispose(),a.current=null,t.remove(),P.current=null}},[]),B("div",{ref:d,style:{position:"absolute",top:0,left:0,width:"100%",height:"100%"}})}
+import{jsx as N}from"react/jsx-runtime";import"maplibre-gl/dist/maplibre-gl.css";import{Renderer as G}from"@expofp/renderer";import{addProtocol as Y,Map as k}from"maplibre-gl";import{Protocol as q}from"pmtiles";import{useEffect as E,useRef as l}from"react";import{registerPmtilesArchive as H}from"./utils/pmtiles-range-fallback";import{createStyleTransform as J}from"./utils/resolve-map-style";import{createUpdatePump as Q}from"./utils/update-pump";export const MAP_DIM_LAYER_ID="expofp-map-dim";const g="expofp-map-dim-source",V="3d-expofp";let b=null;const W=["coalesce",["get","name:en"],["get","name_en"],["get","name:latin"],["get","name"]],X={type:"Feature",geometry:{type:"Polygon",coordinates:[[[-180,-85],[180,-85],[180,85],[-180,85],[-180,-85]]]},properties:{}};function I(e){if(!e||typeof e!="object")return!1;const r=e.length;if(typeof r!="number"||r<16)return!1;const n=e[0];return typeof n=="number"&&Number.isFinite(n)}function K(e){if(I(e))return Array.from(e);const n=e?.defaultProjectionData?.mainMatrix;return I(n)?Array.from(n):(console.warn("Maplibre custom layer received an unsupported projection matrix payload.",e),null)}function h(e){return typeof e=="string"?e.includes("name"):Array.isArray(e)?e.some(r=>h(r)):!e||typeof e!="object"?!1:Object.values(e).some(r=>h(r))}function $(e){return e.type!=="symbol"||!e.id||!e.layout?!1:h(e.layout["text-field"])}function v(e){const r=e.getStyle();for(const n of r.layers??[])$(n)&&e.setLayoutProperty(n.id,"text-field",W)}function ee(){if(b)return b;const e=new q;b=e;try{Y("pmtiles",e.tile)}catch(r){console.warn("Maplibre PMTiles protocol registration failed.",r)}return e}export default function te({sceneDef:e,geoConfig:r,staticTransform:n,tileSource:w,mapOptions:O,onRendererReady:x,onMapDimLayerReady:P,onMapLoadError:M}){const m=l(null),L=l(null),a=l(null),S=l(x),A=l(P),_=l(M),C=l({sceneDef:e,geoConfig:r,staticTransform:n,tileSource:w,mapOptions:O});return E(()=>{S.current=x,A.current=P,_.current=M}),E(()=>{if(!m.current)return;const{sceneDef:d,geoConfig:i,staticTransform:F,tileSource:p,mapOptions:f}=C.current;let y=!1;const u={...d};u.rootLayer={...d.rootLayer};const T=d.rootLayer.children;u.rootLayer.children=T.filter(o=>o?.name?.toString().toLowerCase()!=="areamap"),u.background=void 0,u.staticTransform=F;const z=ee(),U=i.bounds?{bounds:i.bounds,fitBoundsOptions:{padding:i.fitPadding,bearing:i.bearing}}:{center:i.center,zoom:i.zoom},j=J(p.style,p.offline?o=>H(z,o):void 0),t=new k({container:m.current,...U,bearing:i.bearing,pitch:f?.pitch??30,maxPitch:f?.maxPitch??70,minZoom:f?.minZoom,maxZoom:f?.maxZoom,maxBounds:f?.maxBounds,bearingSnap:0,canvasContextAttributes:{antialias:!0}});i.zoomAdjustment&&t.jumpTo({zoom:t.getZoom()+i.zoomAdjustment}),L.current=t,t.once("error",o=>{t.isStyleLoaded()||_.current?.(o?.error??o)});const R=o=>{const s=o?.id;!s||t.hasImage(s)||t.addImage(s,{width:1,height:1,data:new Uint8Array(4)})};t.on("styleimagemissing",R);const Z=Q({requestFrame:()=>t.triggerRepaint()}),B={id:V,type:"custom",renderingMode:"3d",onAdd(o,s){if(y)return;const c=new G({canvas:t.getCanvas(),gl:s});if(y){c.dispose();return}c.init(u),a.current=c,S.current?.(c,t,u,()=>t.triggerRepaint())},render(o,s){if(!a.current||a.current.isDisposed)return;const c=K(s??o);c&&(a.current.render(c),Z(a.current))}},D=()=>{v(t),t.getSource(g)||t.addSource(g,{type:"geojson",data:X}),t.getLayer(MAP_DIM_LAYER_ID)||t.addLayer({id:MAP_DIM_LAYER_ID,type:"fill",source:g,paint:{"fill-color":"#000000","fill-opacity":0,"fill-opacity-transition":{duration:0,delay:0}}}),A.current?.(t),t.addLayer(B)};return t.on("style.load",D),t.setStyle(p.style,j?{transformStyle:j}:void 0),()=>{y=!0,t.off("style.load",D),t.off("styleimagemissing",R),a.current?.dispose(),a.current=null,t.remove(),L.current=null}},[]),N("div",{ref:m,style:{position:"absolute",top:0,left:0,width:"100%",height:"100%"}})}

package/dist/esm/components/Maplibre/utils/map-helpers.js

@@ -1 +1 @@
-import{fpGeo as u}from"../../../data/fpGeo.js";import a from"../../../store/index.js";import m from"../../../tools/settings.js";import{MAP_DIM_LAYER_ID as s}from"../MaplibreWrapper.js";import{resolveMapTheme as f}from"./map-theme.js";export const LIGHT_TILE_SOURCE={style:"https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"},DARK_TILE_SOURCE={style:"https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json"};const c=12;export const DEFAULT_MAP_OPTIONS={pitch:30,maxPitch:70,minZoom:c},MAP_2D_OPTIONS={pitch:0,maxPitch:0,minZoom:c};export function applyMapDimValue(t,e){t?.getLayer(s)&&(t.setPaintProperty(s,"fill-opacity",p(e)),t.triggerRepaint())}function p(t){return Math.min(Math.max(t,0),1)}export function applyMapOptions(t,e,n=!1){if(!t)return;t.setMinZoom(e.minZoom??null),t.setMaxZoom(e.maxZoom??null),t.setMaxBounds(e.maxBounds??null);const o=e.pitch,r=e.maxPitch,l=t.getPitch(),i=!!(n&&o!=null&&r!=null&&r<l);r!=null&&!i&&t.setMaxPitch(e.maxPitch),!(o==null||l===o)&&(n?(t.easeTo({pitch:o,duration:300}),i&&t.once("moveend",()=>t.setMaxPitch(r))):t.jumpTo({pitch:o}))}export function getTileSource(){const t=a.fp?.maplibre??window.__efpMaplibre;return t?.style?{style:t.style}:t?.styleUrl?{style:t.styleUrl}:f(u?.properties?.config?.style,m.backgroundColor)==="dark"?DARK_TILE_SOURCE:LIGHT_TILE_SOURCE}
+import{fpGeo as f}from"../../../data/fpGeo.js";import u from"../../../store/index.js";import a from"../../../tools/settings.js";import{MAP_DIM_LAYER_ID as s}from"../MaplibreWrapper.js";import{resolveMapTheme as m}from"./map-theme.js";export const LIGHT_TILE_SOURCE={style:"https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"},DARK_TILE_SOURCE={style:"https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json"};const c=12;export const DEFAULT_MAP_OPTIONS={pitch:30,maxPitch:70,minZoom:c},MAP_2D_OPTIONS={pitch:0,maxPitch:0,minZoom:c};export function applyMapDimValue(t,e){t?.getLayer(s)&&(t.setPaintProperty(s,"fill-opacity",p(e)),t.triggerRepaint())}function p(t){return Math.min(Math.max(t,0),1)}export function applyMapOptions(t,e,n=!1){if(!t)return;t.setMinZoom(e.minZoom??null),t.setMaxZoom(e.maxZoom??null),t.setMaxBounds(e.maxBounds??null);const o=e.pitch,r=e.maxPitch,l=t.getPitch(),i=!!(n&&o!=null&&r!=null&&r<l);r!=null&&!i&&t.setMaxPitch(e.maxPitch),!(o==null||l===o)&&(n?(t.easeTo({pitch:o,duration:300}),i&&t.once("moveend",()=>t.setMaxPitch(r))):t.jumpTo({pitch:o}))}export function getTileSource(){const t=u.fp?.maplibre??window.__efpMaplibre;return t?.style?{style:t.style,offline:t.offline}:t?.styleUrl?{style:t.styleUrl,offline:t.offline}:m(f?.properties?.config?.style,a.backgroundColor)==="dark"?DARK_TILE_SOURCE:LIGHT_TILE_SOURCE}

package/dist/esm/components/Maplibre/utils/pmtiles-range-fallback.d.ts

@@ -0,0 +1,53 @@
+import { type Protocol, type RangeResponse, type Source } from 'pmtiles';
+/**
+ * A PMTiles source that also works against hosts which accept a `Range` header
+ * and then answer `200` with something other than the requested slice.
+ *
+ * The Android SDK serves offline archives through `WebViewAssetLoader`, whose
+ * path handlers never see request headers: Chromium applies the range's start
+ * offset to the file stream and then streams to EOF, answering `200` with a
+ * `Content-Length` that merely echoes the request. PMTiles' own guard compares
+ * that header against the requested length and so lets it through — every tile
+ * read then silently receives the rest of the archive instead of one tile,
+ * which decodes into a mostly blank basemap and no error anywhere.
+ *
+ * So probe once, at offset 0, and decide from the status:
+ *
+ * - `206` — a well-behaved host. Everything is delegated to {@link FetchSource},
+ *   which keeps its 416 retry and ETag-mismatch handling intact.
+ * - `200` — the host ignored the range, which means the body it just returned
+ *   *is* the archive from byte 0. Keep it and slice locally.
+ *
+ * The body is held as a `Blob` rather than an `ArrayBuffer` so the browser can
+ * back it with a temp file instead of the JS heap — an offline basemap runs to
+ * tens of megabytes and the SDK still has to survive older Android WebViews.
+ */
+export declare class RangeTolerantSource implements Source {
+    private readonly url;
+    private readonly ranged;
+    /** Memoised probe: the whole archive, or `null` when ranges are honoured. */
+    private archive;
+    constructor(url: string);
+    getKey(): string;
+    getBytes(offset: number, length: number, signal?: AbortSignal, etag?: string): Promise<RangeResponse>;
+    /**
+     * Read the head of the archive and work out which kind of host this is.
+     *
+     * The probe deliberately ignores the caller's `AbortSignal`. It is memoised
+     * for the source's lifetime, so a first tile that gets cancelled mid-flight
+     * must not leave every later read awaiting a rejected promise.
+     */
+    private probe;
+}
+/**
+ * Point the protocol at {@link RangeTolerantSource} for one archive URL.
+ *
+ * Registering ahead of the first tile request is what makes this take effect:
+ * `Protocol` creates a plain {@link FetchSource} for any `pmtiles://` URL it
+ * has not already been given an instance for.
+ *
+ * Only string-URL styles are covered. An inline style object carries absolute
+ * URLs the SDK never resolves, so its PMTiles sources keep the stock source.
+ */
+export declare function registerPmtilesArchive(protocol: Protocol, url: string): void;
+//# sourceMappingURL=pmtiles-range-fallback.d.ts.map

package/dist/esm/components/Maplibre/utils/pmtiles-range-fallback.js

@@ -0,0 +1 @@
+import{FetchSource as s,PMTiles as u}from"pmtiles";const i=16384;export class RangeTolerantSource{constructor(r){this.url=r,this.ranged=new s(r)}getKey(){return this.url}async getBytes(r,n,t,o){this.archive||(this.archive=this.probe());const a=await this.archive;return a?(c(t),{data:await h(a.slice(r,r+n))}):this.ranged.getBytes(r,n,t,o)}async probe(){let r;try{r=await fetch(this.url,{headers:{Range:`bytes=0-${i-1}`}})}catch{return null}if(r.status!==200)return null;const n=await r.blob();return n.size===i?null:n}}export function registerPmtilesArchive(e,r){e.get(r)||e.add(new u(new RangeTolerantSource(r)))}function c(e){if(e?.aborted)throw e.reason??new DOMException("The operation was aborted.","AbortError")}async function h(e){return typeof e.arrayBuffer=="function"?e.arrayBuffer():new Promise((r,n)=>{const t=new FileReader;t.onload=()=>r(t.result),t.onerror=()=>n(t.error),t.readAsArrayBuffer(e)})}

package/dist/esm/components/Maplibre/utils/resolve-map-style.d.ts

@@ -11,5 +11,5 @@ import { type StyleSpecification, type TransformStyleFunction } from 'maplibre-g
  * Inline style objects have no style URL to resolve against; callers must pass
  * already-absolute internals for those.
  */
-export declare function createStyleTransform(style: string | StyleSpecification): TransformStyleFunction | undefined;
+export declare function createStyleTransform(style: string | StyleSpecification, onPmtilesArchive?: (url: string) => void): TransformStyleFunction | undefined;
 //# sourceMappingURL=resolve-map-style.d.ts.map

package/dist/esm/components/Maplibre/utils/resolve-map-style.js

@@ -1 +1 @@
-export function createStyleTransform(c){if(typeof c!="string")return;const p=new URL(c,window.location.href).href,o=i=>new URL(i,p).href.replace(/%7B/g,"{").replace(/%7D/g,"}"),l=i=>i.startsWith("pmtiles://")?`pmtiles://${o(i.slice(10))}`:o(i);return(i,u)=>{const e={...u};typeof e.sprite=="string"?e.sprite=o(e.sprite):Array.isArray(e.sprite)&&(e.sprite=e.sprite.map(t=>{if(!t||typeof t!="object")return t;const r=t;return typeof r.url!="string"?t:{...r,url:o(r.url)}})),typeof e.glyphs=="string"&&(e.glyphs=o(e.glyphs));const n=e.sources;if(n){e.sources={...n};for(const[t,r]of Object.entries(n)){if(!r||typeof r!="object")continue;const s={...r};typeof s.url=="string"&&(s.url=l(s.url)),Array.isArray(s.tiles)&&(s.tiles=s.tiles.map(f=>typeof f=="string"?l(f):f)),e.sources[t]=s}}return e}}
+export function createStyleTransform(l,p){if(typeof l!="string")return;const y=new URL(l,window.location.href).href,o=i=>new URL(i,y).href.replace(/%7B/g,"{").replace(/%7D/g,"}"),u=i=>{if(!i.startsWith("pmtiles://"))return o(i);const n=o(i.slice(10));return p?.(n),`pmtiles://${n}`};return(i,n)=>{const e={...n};typeof e.sprite=="string"?e.sprite=o(e.sprite):Array.isArray(e.sprite)&&(e.sprite=e.sprite.map(r=>{if(!r||typeof r!="object")return r;const t=r;return typeof t.url!="string"?r:{...t,url:o(t.url)}})),typeof e.glyphs=="string"&&(e.glyphs=o(e.glyphs));const c=e.sources;if(c){e.sources={...c};for(const[r,t]of Object.entries(c)){if(!t||typeof t!="object")continue;const s={...t};typeof s.url=="string"&&(s.url=u(s.url)),Array.isArray(s.tiles)&&(s.tiles=s.tiles.map(f=>typeof f=="string"?u(f):f)),e.sources[r]=s}}return e}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expofp/floorplan",
-  "version": "3.24.2",
+  "version": "3.24.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/expofp/efp-app.git",
@@ -70,14 +70,14 @@
     "tslib": "^2.3.0",
     "uuid": "^9.0.1",
     "zod": "4.4.3",
-    "@expofp/config": "3.24.2",
-    "@expofp/resolve": "3.24.2",
-    "@expofp/schema": "3.24.2",
-    "@expofp/geometry": "3.24.2",
-    "@expofp/ui": "3.24.2",
-    "@expofp/utils": "3.24.2",
-    "@expofp/wayfinding": "3.24.2",
-    "@expofp/debug": "3.24.2"
+    "@expofp/config": "3.24.3",
+    "@expofp/debug": "3.24.3",
+    "@expofp/geometry": "3.24.3",
+    "@expofp/resolve": "3.24.3",
+    "@expofp/schema": "3.24.3",
+    "@expofp/ui": "3.24.3",
+    "@expofp/utils": "3.24.3",
+    "@expofp/wayfinding": "3.24.3"
   },
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "^8.0.2",