@expofp/offline 3.7.16 → 3.8.0

package/dist/lib/generate-offline-map-data.js

@@ -1,3 +1,4 @@
+import { Box, projectLocalToGps } from '@expofp/geometry';
 import { resolve } from '@expofp/resolve';
 import debug from 'debug';
 import { execScriptInSandbox } from './exec-script-in-sandbox.js';
@@ -103,12 +104,16 @@ async function derivePaddedVenueBbox(manifest, fpSvgContext, signal) {
         throw new Error('Offline map generation requires fpGeo.properties.config.');
     }
     const svgArea = deriveSvgArea(ctx);
+    const [anchorA, anchorB] = geoAnchors(config);
     const corners = [
-        [svgArea.x1, svgArea.y1],
-        [svgArea.x2, svgArea.y1],
-        [svgArea.x2, svgArea.y2],
-        [svgArea.x1, svgArea.y2],
-    ].map(([x, y]) => convertLocalToGps(x, y, config));
+        [svgArea.min.x, svgArea.min.y],
+        [svgArea.max.x, svgArea.min.y],
+        [svgArea.max.x, svgArea.max.y],
+        [svgArea.min.x, svgArea.max.y],
+    ].map(([x, y]) => {
+        const { lat, lng } = projectLocalToGps({ x, y }, anchorA, anchorB);
+        return [lng, lat];
+    });
     if (!corners.every(([lng, lat]) => Number.isFinite(lng) && Number.isFinite(lat))) {
         throw new Error('Offline map generation produced invalid venue GPS bounds.');
     }
@@ -134,7 +139,7 @@ async function resolveFpSvgContext(manifest, signal) {
 function deriveSvgArea(ctx) {
     const viewboxObj = ctx.__viewbox;
     if (viewboxObj) {
-        return fromXywh(viewboxObj.x, viewboxObj.y, viewboxObj.width, viewboxObj.height);
+        return new Box(viewboxObj.x, viewboxObj.y, viewboxObj.width, viewboxObj.height);
     }
     const fpSvg = ctx.__fp;
     if (typeof fpSvg !== 'string') {
@@ -147,7 +152,10 @@ function deriveSvgArea(ctx) {
     if (!svgViewBox) {
         throw new Error('Offline map generation could not derive the SVG viewBox.');
     }
-    return withPadding(svgViewBox, -width(svgViewBox) * 0.05, -height(svgViewBox) * 0.05);
+    // Inflate the viewBox by 10% about its centre (a 5% margin per side), matching
+    // the legacy withPadding(svgViewBox, -w*0.05, -h*0.05): a NEGATIVE padding GREW
+    // the extent per side.
+    return svgViewBox.scale(1.1);
 }
 function getSvgViewBox(svg) {
     const match = svg.match(/\bviewBox\s*=\s*["']([^"']+)["']/i);
@@ -159,7 +167,7 @@ function getSvgViewBox(svg) {
         .map(Number);
     if (![x, y, w, h].every(Number.isFinite))
         return null;
-    return fromXywh(x, y, w, h);
+    return new Box(x, y, w, h);
 }
 function getSvgRectById(svg, id) {
     const rectMatch = svg.match(new RegExp(`<rect\\b(?=[^>]*\\bid=["']${id}["'])[^>]*/?>`, 'i'));
@@ -172,7 +180,7 @@ function getSvgRectById(svg, id) {
     const h = Number(getSvgAttribute(rect, 'height'));
     if (![x, y, w, h].every(Number.isFinite))
         return null;
-    return fromXywh(x, y, w, h);
+    return new Box(x, y, w, h);
 }
 function getSvgAttribute(element, name) {
     return element.match(new RegExp(`\\b${name}\\s*=\\s*["']([^"']+)["']`, 'i'))?.[1];
@@ -404,100 +412,13 @@ function createMapStyle() {
         ],
     };
 }
-function fromXywh(x, y, w, h) {
-    return normalizeRect({ x1: x, y1: y, x2: x + w, y2: y + h });
-}
-function normalizeRect(rect) {
-    return {
-        x1: Math.min(rect.x1, rect.x2),
-        y1: Math.min(rect.y1, rect.y2),
-        x2: Math.max(rect.x1, rect.x2),
-        y2: Math.max(rect.y1, rect.y2),
-    };
-}
-function width(rect) {
-    return Math.abs(rect.x2 - rect.x1);
-}
-function height(rect) {
-    return Math.abs(rect.y2 - rect.y1);
-}
-function withPadding(rect, x, y = x) {
-    if (width(rect) < x * 2 || height(rect) < y * 2)
-        return rect;
-    const cx = (rect.x1 + rect.x2) / 2;
-    const cy = (rect.y1 + rect.y2) / 2;
-    const w = width(rect) - x * 2;
-    const h = height(rect) - y * 2;
-    return normalizeRect({ x1: cx - w / 2, y1: cy - h / 2, x2: cx + w / 2, y2: cy + h / 2 });
-}
-const earthRadius = 6371000.0;
-const minLongitude = -180.0;
-const maxLongitude = 180.0;
-const toRad = (value) => (value * Math.PI) / 180;
-const toDeg = (value) => (value * 180) / Math.PI;
-function convertLocalToGps(x, y, geoConfig) {
-    const diagAngle = -getAngle(geoConfig.p0, geoConfig.p2, {
-        x: geoConfig.p0.x + 10000,
-        y: geoConfig.p0.y,
-    });
-    const pointAngle = -getAngle(geoConfig.p0, { x, y }, { x: geoConfig.p0.x + 10000, y: geoConfig.p0.y });
-    const delta = pointAngle - diagAngle;
-    const diagLen = lineLength(geoConfig.p2, geoConfig.p0);
-    const pointLen = lineLength(geoConfig.p0, { x, y });
-    const perc = pointLen / diagLen;
-    const fullDistance = distance(geoConfig.p0.lat, geoConfig.p0.lng, geoConfig.p2.lat, geoConfig.p2.lng);
-    const pointDist = perc * fullDistance;
-    const baseBearing = bearing(geoConfig.p0.lat, geoConfig.p0.lng, geoConfig.p2.lat, geoConfig.p2.lng);
-    return destinationPoint(geoConfig.p0.lat, geoConfig.p0.lng, pointDist, baseBearing + delta);
-}
-function lineLength(p1, p2) {
-    return Math.sqrt((p1.x - p2.x) ** 2 + (p1.y - p2.y) ** 2);
-}
-function getAngle(centerPoint, startPoint, endPoint) {
-    const a = lineLength(startPoint, centerPoint);
-    const b = lineLength(endPoint, centerPoint);
-    const c = lineLength(startPoint, endPoint);
-    const cos = (a ** 2 + b ** 2 - c ** 2) / (2 * a * b);
-    const direction = getDirection(centerPoint, startPoint, endPoint);
-    return (direction * (Math.acos(Math.max(-1, Math.min(1, cos))) * 180)) / Math.PI || 0;
-}
-function getDirection(centerPoint, startPoint, endPoint) {
-    return (startPoint.x - centerPoint.x) * (endPoint.y - centerPoint.y) -
-        (startPoint.y - centerPoint.y) * (endPoint.x - centerPoint.x) <
-        0
-        ? -1
-        : 1;
-}
-function distance(lat1, lng1, lat2, lng2) {
-    const phi1 = toRad(lat1);
-    const phi2 = toRad(lat2);
-    const deltaPhi = toRad(lat2 - lat1);
-    const deltaLambda = toRad(lng2 - lng1);
-    const a = Math.sin(deltaPhi / 2) * Math.sin(deltaPhi / 2) +
-        Math.cos(phi1) * Math.cos(phi2) * Math.sin(deltaLambda / 2) * Math.sin(deltaLambda / 2);
-    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-    return earthRadius * c;
-}
-function bearing(lat1, lng1, lat2, lng2) {
-    const phi1 = toRad(lat1);
-    const phi2 = toRad(lat2);
-    const deltaLambda = toRad(lng2 - lng1);
-    const y = Math.sin(deltaLambda) * Math.cos(phi2);
-    const x = Math.cos(phi1) * Math.sin(phi2) - Math.sin(phi1) * Math.cos(phi2) * Math.cos(deltaLambda);
-    return (toDeg(Math.atan2(y, x)) + 360) % 360;
-}
-function destinationPoint(lat, lng, distanceMeters, pointBearing) {
-    const delta = distanceMeters / earthRadius;
-    const theta = toRad(pointBearing);
-    const phi1 = toRad(lat);
-    const lambda1 = toRad(lng);
-    const phi2 = Math.asin(Math.sin(phi1) * Math.cos(delta) + Math.cos(phi1) * Math.sin(delta) * Math.cos(theta));
-    let lambda2 = lambda1 +
-        Math.atan2(Math.sin(theta) * Math.sin(delta) * Math.cos(phi1), Math.cos(delta) - Math.sin(phi1) * Math.sin(phi2));
-    let longitude = toDeg(lambda2);
-    if (longitude < minLongitude || longitude > maxLongitude) {
-        lambda2 = ((lambda2 + 3 * Math.PI) % (2 * Math.PI)) - Math.PI;
-        longitude = toDeg(lambda2);
-    }
-    return [longitude, toDeg(phi2)];
+// Builds the two-anchor affine bridge (p0 -> anchor a, p2 -> anchor b) used to
+// project the SVG-area corners into GPS. All GeoConfig parsing / SVG extraction /
+// anchor validation stays at the callsite; only the pure projection math lives in
+// @expofp/geometry's geo module.
+function geoAnchors(config) {
+    return [
+        { local: { x: config.p0.x, y: config.p0.y }, geo: { lat: config.p0.lat, lng: config.p0.lng } },
+        { local: { x: config.p2.x, y: config.p2.y }, geo: { lat: config.p2.lat, lng: config.p2.lng } },
+    ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expofp/offline",
-  "version": "3.7.16",
+  "version": "3.8.0",
   "type": "module",
   "description": "CLI tool for creating offline copies of ExpoFP floor plans",
   "homepage": "https://developer.expofp.com/",
@@ -31,9 +31,10 @@
   "dependencies": {
     "debug": "^4.4.3",
     "tslib": "^2.3.0",
-    "@expofp/data": "3.7.16",
-    "@expofp/floorplan": "3.7.16",
-    "@expofp/resolve": "3.7.16",
-    "@expofp/utils": "3.7.16"
+    "@expofp/floorplan": "3.8.0",
+    "@expofp/data": "3.8.0",
+    "@expofp/geometry": "3.8.0",
+    "@expofp/resolve": "3.8.0",
+    "@expofp/utils": "3.8.0"
   }
 }