@expofp/floorplan 3.25.1 → 3.25.2

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

@@ -1 +1 @@
-import{jsx as Q}from"react/jsx-runtime";import{degToRad as w}from"@expofp/geometry";import Y from"color";import{runInAction as q}from"mobx";import{observer as ee}from"mobx-react-lite";import{useCallback as $,useEffect as B,useMemo as d,useRef as g,useState as j}from"react";import re from"../../data";import{getLayerSvg as te,svgArea as P,svgAreaExplicit as oe}from"../../data/svg";import{createSceneDef as ne}from"../../renderer";import c,{uiState as s}from"../../store";import v from"../../tools/settings";import{fitRectIsFraming as ie,getVenueFitMarginPercent as ae,resolveVenueFitRect as ce}from"../../utils/scene-bounds";import se from"../Map/drawing/config/config-all";import{loadLayersImages as le}from"../Map/drawing/config/loadBoothsImages";import{useBuildRoute as ue}from"../Map/traffic/useBuildRoute";import{useManageTraffic as fe}from"../Map/traffic/useManageTraffic";import me from"./MaplibreWrapper";import{useCameraReactions as pe}from"./useCameraReactions";import{useDimming as ge}from"./useDimming";import{useKioskIdleEvents as de}from"./useKioskIdleEvents";import{useLayerVisibilitySync as be}from"./useLayerVisibilitySync";import{usePoiMarkers as Re}from"./usePoiMarkers";import{useRendererEvents as Se}from"./useRendererEvents";import{useWayfindingAndMarkers as he}from"./useWayfindingAndMarkers";import{cameraForLocalRect as ye,deriveGeoConfig as Ce,getLocalRectGeoBounds as Me,getVisibleRectFitPadding as Ae,INITIAL_FIT_ZOOM_ADJUSTMENT as De}from"./utils/geo-config";import{applyMapOptions as N,DEFAULT_MAP_OPTIONS as Pe,getTileSource as ve,MAP_2D_OPTIONS as Te}from"./utils/map-helpers";import{calculateTransformMatrix as ze}from"./utils/solver";const U="routes-api.expofp.com",Le=800;function Ee(r,l,i){return{getCameraState:()=>{const o=r.getCenter();return{lng:o.lng,lat:o.lat,zoom:r.getZoom(),bearing:r.getBearing(),pitch:r.getPitch()}},applyCameraState:o=>{r.easeTo({center:[o.lng,o.lat],zoom:o.zoom,bearing:o.bearing??l,pitch:o.pitch??i(),duration:Le,essential:!0})},resetPitch:()=>{const o=i();r.getPitch()!==o&&r.jumpTo({pitch:o})}}}function V(){c.poiMarkerStore.clear(),q(()=>{c.layerStore.layers.forEach(r=>{r.configured=!1,r.children=[],r.loaded=!1}),c.layerStore.layersLoaded=!1})}function G(r,l){const i=[];for(const o of r.rollRegistry.invoke(l))Array.isArray(o)?i.push(...o):i.push(o);i.length&&r.update(...i)}function Oe(r){const l=Math.abs(r[0]??0),i=Math.hypot(r[0]??0,r[1]??0);return l<=0||i<=0?1:l/i}const xe=ee(function({viewMode:l}){const[i,o]=j(null),[y,x]=j(null),n=c.rendererService,T=g(null),u=g(null),C=g(null),z=g(null),I=g(null),M=g(null),e=d(()=>Ce(),[]),L=d(()=>ce({layerViewbox:c.layerStore.viewboxRectangle,explicitArea:oe?P:null,layerRectangle:c.layerStore.rectangle,sceneDef:i,svgArea:P}),[i]),A=L.rect,b=d(()=>{if(!e)return null;const a=ie(L.source)?0:ae(A,P),t=Ae(0);a&&s.screenSize&&(t.left+=s.screenSize.width*a,t.right+=s.screenSize.width*a,t.top+=s.screenSize.height*a,t.bottom+=s.screenSize.height*a);const m=s.screenSize?ye(A,e.gpsConfig,e.bearing,{width:s.screenSize.width,height:s.screenSize.height},t):null;return m?{center:m.center,bearing:e.bearing,zoom:m.zoom}:{center:e.center,bearing:e.bearing,zoom:e.zoom,bounds:Me(A,e.gpsConfig),fitPadding:t,zoomAdjustment:De}},[e,L,A]),R=d(()=>e?ze(e.gpsConfig,te()?.getAttribute("units")):null,[e]),S=d(()=>({...l==="map2d"?Te:Pe}),[l]),E=g(S),X=d(()=>ve(),[]),{mapDimAnimatorRef:_,venueDimAnimatorRef:k,applyDimmingTarget:F,handleMapDimLayerReady:J}=ge(u,n);B(()=>{if(!e)return;let a=!1;V();const t=se(n).then(({layers:f,cleanup:p})=>{if(a){p();return}z.current=p;const D=Y(v.backgroundColor==="none"?"#ebebeb":v.backgroundColor).string(),O=ne(f,P,D);o(O)}).catch(f=>{a||console.warn("Maplibre scene configuration failed.",f)}),m=_.current,h=k.current;return()=>{a=!0,V();const f=T.current;t.finally(()=>n.disposeIfCurrent(f)),C.current?.(),C.current=null,z.current?.(),z.current=null,M.current&&(c.maplibreStore.clearCameraPortIfCurrent(M.current),M.current=null),T.current=null,u.current=null,I.current=null,x(null),m?.stop(),h?.stop(),s.sceneDefReady=!1}},[e,_,n,k]);const K=$((a,t,m,h)=>{T.current=a,u.current=t,I.current=h,x(a),n.attach(a,m,h,R?Oe(R):1),N(t,E.current);const f=Ee(t,e?.bearing??t.getBearing(),()=>E.current.pitch??0);M.current=f,c.maplibreStore.setCameraPort(f),F({immediate:!0}),C.current?.();const p=()=>{const O=t.getBearing()-(e?.bearing??0);G(n,w(O))};t.on("rotate",p),t.on("rotateend",p),C.current=()=>{t.off("rotate",p),t.off("rotateend",p)},le(n);const D=n.ptScaleRegistry.invoke(n.scale||1);D.length&&n.update(...D),G(n,w(t.getBearing()-(e?.bearing??0))),c.layerStore.layersLoaded=!0,c.fp.onFpConfigured&&c.fp.onFpConfigured(),s.sceneDefReady=!0,h()},[n,F,R,e]);B(()=>{E.current=S,N(u.current,S,!0)},[S]),Se(y,n),de(y,u),he(y,n),Re(y,u,e),be(n,u,e),pe(u,e,i),ue({enabled:c.layerStore.layersLoaded&&s.buildRoute,rendererService:n});const W=re.busRoutes??!1;fe({permission:c.layerStore.layersLoaded&&W,rendererService:n,dataJsonUrl:`https://${U}/v1/routes?expo=${v.EXPO}`,websocketUrl:`wss://${U}/locations?expo=${v.EXPO}`});const Z=$(a=>{console.warn("Maplibre map failed to load; falling back to floorplan mode.",a),c.maplibreStore.deactivateMaplibre()},[]);if(!e||!b||!R||!i)return null;const H=`${b.center.join(",")}:${b.bearing}:${b.zoom}`;return Q(me,{sceneDef:i,geoConfig:b,staticTransform:R,tileSource:X,mapOptions:S,onRendererReady:K,onMapDimLayerReady:J,onMapLoadError:Z},H)});export default xe;
+import{jsx as re}from"react/jsx-runtime";import{degToRad as $}from"@expofp/geometry";import te from"color";import{runInAction as oe}from"mobx";import{observer as ne}from"mobx-react-lite";import{useCallback as B,useEffect as j,useMemo as b,useRef as d,useState as N}from"react";import ie from"../../data";import{getLayerSvg as ae,svgArea as P,svgAreaExplicit as ce}from"../../data/svg";import{createSceneDef as se}from"../../renderer";import{pickDefaultScenePoint as le}from"../../renderer/engine-core/defs";import c,{uiState as s}from"../../store";import{LayerMode as U}from"../../store/LayerStore";import T from"../../tools/settings";import{fitRectIsFraming as ue,getVenueFitMarginPercent as fe,resolveVenueFitRect as me}from"../../utils/scene-bounds";import pe from"../Map/drawing/config/config-all";import{loadLayersImages as de}from"../Map/drawing/config/loadBoothsImages";import{useBuildRoute as ge}from"../Map/traffic/useBuildRoute";import{useManageTraffic as be}from"../Map/traffic/useManageTraffic";import Se from"./MaplibreWrapper";import{useCameraReactions as Re}from"./useCameraReactions";import{useDimming as ye}from"./useDimming";import{useKioskIdleEvents as he}from"./useKioskIdleEvents";import{useLayerVisibilitySync as Ce}from"./useLayerVisibilitySync";import{usePoiMarkers as Me}from"./usePoiMarkers";import{useRendererEvents as ve}from"./useRendererEvents";import{useWayfindingAndMarkers as Ae}from"./useWayfindingAndMarkers";import{cameraForLocalRect as De,deriveGeoConfig as Pe,getLocalRectGeoBounds as Te,getVisibleRectFitPadding as ze,INITIAL_FIT_ZOOM_ADJUSTMENT as Le}from"./utils/geo-config";import{applyMapOptions as V,DEFAULT_MAP_OPTIONS as Oe,getTileSource as Ee,MAP_2D_OPTIONS as xe}from"./utils/map-helpers";import{calculateTransformMatrix as ke}from"./utils/solver";const G="routes-api.expofp.com",_e=800;function Fe(r,l,a){return{getCameraState:()=>{const o=r.getCenter();return{lng:o.lng,lat:o.lat,zoom:r.getZoom(),bearing:r.getBearing(),pitch:r.getPitch()}},applyCameraState:o=>{r.easeTo({center:[o.lng,o.lat],zoom:o.zoom,bearing:o.bearing??l,pitch:o.pitch??a(),duration:_e,essential:!0})},resetPitch:()=>{const o=a();r.getPitch()!==o&&r.jumpTo({pitch:o})}}}function W(){c.poiMarkerStore.clear(),oe(()=>{c.layerStore.layers.forEach(r=>{r.configured=!1,r.children=[],r.loaded=!1}),c.layerStore.layersLoaded=!1})}function X(r,l){const a=[];for(const o of r.rollRegistry.invoke(l))Array.isArray(o)?a.push(...o):a.push(o);a.length&&r.update(...a)}function we(r){const l=Math.abs(r[0]??0),a=Math.hypot(r[0]??0,r[1]??0);return l<=0||a<=0?1:l/a}const Ie=ne(function({viewMode:l}){const[a,o]=N(null),[C,x]=N(null),n=c.rendererService,z=d(null),u=d(null),M=d(null),L=d(null),k=d(null),v=d(null),e=b(()=>Pe(),[]),O=b(()=>me({layerViewbox:c.layerStore.viewboxRectangle,explicitArea:ce?P:null,layerRectangle:c.layerStore.rectangle,sceneDef:a,svgArea:P}),[a]),A=O.rect,S=b(()=>{if(!e)return null;const i=ue(O.source)?0:fe(A,P),t=ze(0);i&&s.screenSize&&(t.left+=s.screenSize.width*i,t.right+=s.screenSize.width*i,t.top+=s.screenSize.height*i,t.bottom+=s.screenSize.height*i);const m=s.screenSize?De(A,e.gpsConfig,e.bearing,{width:s.screenSize.width,height:s.screenSize.height},t):null;return m?{center:m.center,bearing:e.bearing,zoom:m.zoom}:{center:e.center,bearing:e.bearing,zoom:e.zoom,bounds:Te(A,e.gpsConfig),fitPadding:t,zoomAdjustment:Le}},[e,O,A]),R=b(()=>e?ke(e.gpsConfig,ae()?.getAttribute("units")):null,[e]),y=b(()=>({...l==="map2d"?xe:Oe}),[l]),E=d(y),H=b(()=>Ee(),[]),{mapDimAnimatorRef:_,venueDimAnimatorRef:F,applyDimmingTarget:w,handleMapDimLayerReady:J}=ye(u,n);j(()=>{if(!e)return;let i=!1;W();const t=pe(n).then(({layers:f,cleanup:p})=>{if(i){p();return}L.current=p;const D=te(T.backgroundColor==="none"?"#ebebeb":T.backgroundColor).string(),g=se(f,P,D);o(g)}).catch(f=>{i||console.warn("Maplibre scene configuration failed.",f)}),m=_.current,h=F.current;return()=>{i=!0,W();const f=z.current;t.finally(()=>n.disposeIfCurrent(f)),M.current?.(),M.current=null,L.current?.(),L.current=null,v.current&&(c.maplibreStore.clearCameraPortIfCurrent(v.current),v.current=null),z.current=null,u.current=null,k.current=null,x(null),m?.stop(),h?.stop(),s.sceneDefReady=!1}},[e,_,n,F]);const K=B((i,t,m,h)=>{z.current=i,u.current=t,k.current=h,x(i),n.attach(i,m,h,R?we(R):1),V(t,E.current);const f=Fe(t,e?.bearing??t.getBearing(),()=>E.current.pitch??0);v.current=f,c.maplibreStore.setCameraPort(f),c.fp.getCenterCoordinates=()=>{const{canvas:g}=i,q=le(i.viewport.canvasToSvg({x:g.clientWidth/2,y:g.clientHeight/2})),ee=c.layerStore.visible.find(I=>I.mode===U.TurnedOff||I.mode===U.TurnedOn);return{...q,z:ee?.name||null}},w({immediate:!0}),M.current?.();const p=()=>{const g=t.getBearing()-(e?.bearing??0);X(n,$(g))};t.on("rotate",p),t.on("rotateend",p),M.current=()=>{t.off("rotate",p),t.off("rotateend",p)},de(n);const D=n.ptScaleRegistry.invoke(n.scale||1);D.length&&n.update(...D),X(n,$(t.getBearing()-(e?.bearing??0))),c.layerStore.layersLoaded=!0,c.fp.onFpConfigured&&c.fp.onFpConfigured(),s.sceneDefReady=!0,h()},[n,w,R,e]);j(()=>{E.current=y,V(u.current,y,!0)},[y]),ve(C,n),he(C,u),Ae(C,n),Me(C,u,e),Ce(n,u,e),Re(u,e,a),ge({enabled:c.layerStore.layersLoaded&&s.buildRoute,rendererService:n});const Z=ie.busRoutes??!1;be({permission:c.layerStore.layersLoaded&&Z,rendererService:n,dataJsonUrl:`https://${G}/v1/routes?expo=${T.EXPO}`,websocketUrl:`wss://${G}/locations?expo=${T.EXPO}`});const Q=B(i=>{console.warn("Maplibre map failed to load; falling back to floorplan mode.",i),c.maplibreStore.deactivateMaplibre()},[]);if(!e||!S||!R||!a)return null;const Y=`${S.center.join(",")}:${S.bearing}:${S.zoom}`;return re(Se,{sceneDef:a,geoConfig:S,staticTransform:R,tileSource:H,mapOptions:y,onRendererReady:K,onMapDimLayerReady:J,onMapLoadError:Q},Y)});export default Ie;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expofp/floorplan",
-  "version": "3.25.1",
+  "version": "3.25.2",
   "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.25.1",
-    "@expofp/debug": "3.25.1",
-    "@expofp/geometry": "3.25.1",
-    "@expofp/resolve": "3.25.1",
-    "@expofp/schema": "3.25.1",
-    "@expofp/ui": "3.25.1",
-    "@expofp/utils": "3.25.1",
-    "@expofp/wayfinding": "3.25.1"
+    "@expofp/config": "3.25.2",
+    "@expofp/debug": "3.25.2",
+    "@expofp/geometry": "3.25.2",
+    "@expofp/resolve": "3.25.2",
+    "@expofp/schema": "3.25.2",
+    "@expofp/ui": "3.25.2",
+    "@expofp/utils": "3.25.2",
+    "@expofp/wayfinding": "3.25.2"
   },
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "^8.0.2",