@wemap/providers 14.3.1 → 14.5.0

package/dist/index.js

@@ -3052,7 +3052,7 @@ var field = function(e, C, w) {
 	}
 }(), package_default = {
 	name: "@wemap/providers",
-	version: "14.3.0",
+	version: "14.4.0",
 	type: "module",
 	publishConfig: { access: "public" },
 	main: "./dist/index.js",
@@ -3063,12 +3063,12 @@ var field = function(e, C, w) {
 	} },
 	files: ["dist"],
 	dependencies: {
-		"@wemap/camera": "14.3.0",
-		"@wemap/core": "14.3.0",
-		"@wemap/geo": "14.3.0",
-		"@wemap/osm": "14.3.0",
-		"@wemap/routers": "14.3.0",
-		"@wemap/utils": "14.3.0"
+		"@wemap/camera": "14.4.0",
+		"@wemap/core": "14.4.0",
+		"@wemap/geo": "14.4.0",
+		"@wemap/osm": "14.4.0",
+		"@wemap/routers": "14.4.0",
+		"@wemap/utils": "14.4.0"
 	},
 	devDependencies: {
 		"@wemap/logger-legacy": "^13.3.0",
@@ -3169,18 +3169,29 @@ var field = function(e, C, w) {
 }, VpsRequest_default = class e {
 	metadata;
 	image;
-	constructor(e, C) {
-		this.metadata = e, this.image = C;
+	imageQuality;
+	localPose;
+	constructor(e, C, w = .8, T = null) {
+		this.metadata = e, this.image = C, this.imageQuality = w, this.localPose = T;
 	}
 	toJson() {
 		return {
-			image: canvasToBase64(this.image, "image/jpeg"),
+			image: canvasToBase64(this.image, "image/jpeg", this.imageQuality),
+			...this.localPose && { local_pose: this.localPose },
 			...this.metadata.toJson()
 		};
 	}
 	static fromJson(C) {
 		return new e(VpsMetadata_default.fromJson(C), base64ToCanvas(C.image));
 	}
+	toFormData() {
+		let e = this.image.toDataURL("image/jpeg", this.imageQuality).split(",")[1] || "", C = atob(e), w = new Uint8Array(C.length);
+		for (let e = 0; e < C.length; e++) w[e] = C.charCodeAt(e);
+		let T = new FormData();
+		T.append("image", new Blob([w], { type: "image/jpeg" }), "image.jpg");
+		let E = this.metadata.toJson();
+		return E.calibration && T.append("calibration", JSON.stringify(E.calibration)), E.coarse && T.append("coarse", JSON.stringify(E.coarse)), E.device && T.append("device", JSON.stringify(E.device)), this.localPose && T.append("local_pose", JSON.stringify(this.localPose)), T;
+	}
 }, VpsResponse_default = class e {
 	success;
 	attitude;
@@ -3202,31 +3213,28 @@ var field = function(e, C, w) {
 		return w.position && (D = UserPosition.fromJson(w.position), D.time = T), new e(w.success, E, D);
 	}
 }, ImageRelocalization_default = class {
-	static _prepareRequest(e, C = null, w = null, T = null) {
-		let E = reduceImageSize(e, 1280), D = UserAgentUtils.getDeviceFromUserAgent() || {};
-		return T && (D.session_id = T.session_id, D.installation_id = T.installation_id, D.attempt_id = T.attempt_id, D.caller = T.caller), new VpsRequest_default(new VpsMetadata_default({
-			width: E.width,
-			height: E.height
-		}, C, w, D), E);
-	}
-	static async relocalize(e, C, w = null, T = null, E = null, D = null) {
-		let O = TimeUtils.preciseTime() / 1e3, k = this._prepareRequest(C, w, T, E), A;
+	static _prepareRequest(e, C = null, w = null, T = null, E = null) {
+		let D = reduceImageSize(e, 720, 720), O = UserAgentUtils.getDeviceFromUserAgent() || {};
+		return T && (O.session_id = T.session_id, O.installation_id = T.installation_id, O.attempt_id = T.attempt_id, O.caller = T.caller), new VpsRequest_default(new VpsMetadata_default({
+			width: D.width,
+			height: D.height
+		}, C, w, O), D, .8, E);
+	}
+	static async relocalize(e, C, w = null, T = null, E = null, D = null, O = null) {
+		let k = TimeUtils.preciseTime() / 1e3, A = this._prepareRequest(C, w, T, E, D), j;
 		try {
-			let C = JSON.stringify(k.toJson());
-			Logger.debug(`[VPS] Request (${(C.length / 1024).toFixed(0)} kB) sent to server ${e}`), A = await fetch(e, {
+			let C = A.toFormData();
+			j = await fetch(e, {
 				method: "POST",
 				body: C,
-				headers: Object.assign({
-					"Content-Type": "application/json",
-					Accept: "application/vnd.geopose+json; version=1"
-				}, D || {})
+				headers: Object.assign({ Accept: "application/vnd.geopose+json; version=1" }, O || {})
 			});
 		} catch {
 			return Logger.debug("[VPS] Server respond error"), null;
 		}
-		if (A.status !== 200) return Logger.debug("[VPS] Server respond error"), null;
-		let j = await A.json(), M = VpsResponse_default.fromJson(j, O);
-		return Logger.debug(`[VPS] Server respond ${M.success ? "success" : "not found"}`), M;
+		if (j.status !== 200) return Logger.debug("[VPS] Server respond error"), null;
+		let M = await j.json(), F = VpsResponse_default.fromJson(M, k);
+		return Logger.debug(`[VPS] Server respond ${F.success ? "success" : "not found"}`), F;
 	}
 	static getHeadingFromQuaternion(e) {
 		let [C, w, T, E] = e, D = Math.sqrt(2) / 2, O = [
@@ -3237,7 +3245,35 @@ var field = function(e, C, w) {
 		];
 		return -Math.atan2(2 * O[3] * O[0] - 2 * O[2] * O[1], 1 - 2 * O[1] ** 2 - 2 * O[3] ** 2);
 	}
-}, RelativeRotationCalc = class {
+}, RelativeAttitudeProvider_default = new class extends Provider_default {
+	arCoreMonitoringId;
+	arCoreProviderId;
+	inertialProviderId;
+	getName = () => "RelativeAttitude";
+	availability = () => RelativeAttitudeFromInertialProvider_default.getAvailability();
+	start() {
+		this.arCoreMonitoringId = ArCoreProvider_default.addMonitoringListener(() => {
+			this.listenArCore(), this.unlistenInertial();
+		}, () => {
+			this.unlistenArCore(), this.listenInertial();
+		}), ArCoreProvider_default.state === "started" ? this.listenArCore() : this.listenInertial();
+	}
+	stop() {
+		ArCoreProvider_default.removeMonitoringListener(this.arCoreMonitoringId), this.unlistenArCore(), this.unlistenInertial();
+	}
+	listenInertial = () => {
+		this.inertialProviderId = RelativeAttitudeFromInertialProvider_default.addEventListener(this.notify, this.notifyError);
+	};
+	unlistenInertial = () => {
+		RelativeAttitudeFromInertialProvider_default.removeEventListener(this.inertialProviderId);
+	};
+	listenArCore = () => {
+		this.arCoreProviderId = ArCoreProvider_default.addEventListener((e) => this.notify(e.relativeAttitude), null, !1);
+	};
+	unlistenArCore = () => {
+		ArCoreProvider_default.removeEventListener(this.arCoreProviderId);
+	};
+}(), RelativeRotationCalc = class {
 	_providerId;
 	_isRunning = !1;
 	_dataOnStart = null;
@@ -3310,6 +3346,12 @@ var field = function(e, C, w) {
 		0,
 		0
 	], Math.PI);
+	static ENU_TO_ARCORE_ROT = Quaternion.fromAxisAngle([
+		1,
+		0,
+		0
+	], -Math.PI / 2);
+	static _scanFailureCallbackUniqueId = 0;
 	_relativeRotationCalc;
 	_serverError = !1;
 	_cameraError = !1;
@@ -3320,8 +3362,13 @@ var field = function(e, C, w) {
 	_waitTimeMinInclinationForRequest = e.DEFAULT_WAIT_TIME_MIN_INCLINATION_FOR_REQUEST;
 	_useCoarsePose = e.DEFAULT_USE_COARSE_POSE;
 	_requestCaller = e.DEFAULT_REQUEST_CALLER;
-	_currentSessionId = null;
-	_attemptId = 0;
+	_sessionId;
+	_attemptIdCounter = 0;
+	_currentAttemptId = null;
+	_scanFailureCallbacks = [];
+	constructor() {
+		super(), this._sessionId = this._generateUuid();
+	}
 	getName = () => "Vps";
 	availability = () => Camera.checkAvailability();
 	start() {
@@ -3363,29 +3410,43 @@ var field = function(e, C, w) {
 			this._useCoarsePose && (k || AbsoluteAttitudeProvider_default.lastEvent) && (O = {
 				...k && { position: k },
 				...AbsoluteAttitudeProvider_default.lastEvent && { attitude: AbsoluteAttitudeProvider_default.lastEvent }
-			}), this._currentSessionId || (this._currentSessionId = this._generateUuid(), this._attemptId = 0), this._attemptId += 1;
-			let A = await ImageRelocalization_default.relocalize(this._endpoint, D, null, O, {
-				session_id: this._currentSessionId,
+			}), this._currentAttemptId === null && (this._attemptIdCounter += 1, this._currentAttemptId = this._attemptIdCounter);
+			let A = RelativeAttitudeProvider_default.lastEvent, j = GeoRelativePositionProvider_default.lastEvent, M = A && j ? {
+				position: Quaternion.rotate(e.ENU_TO_ARCORE_ROT, [
+					j.x,
+					j.y,
+					j.z
+				]),
+				orientation: Quaternion.multiply(e.ENU_TO_ARCORE_ROT, A.quaternion)
+			} : null, F = await ImageRelocalization_default.relocalize(this._endpoint, D, null, O, {
+				session_id: this._sessionId,
 				installation_id: null,
-				attempt_id: this._attemptId,
+				...this._currentAttemptId !== null && { attempt_id: this._currentAttemptId },
 				caller: this._requestCaller
-			});
-			if (!A || !A.success) continue;
-			this._currentSessionId = null, this._attemptId = 0;
-			let j = A.attitude.quaternion, M = Quaternion.multiply(j, e.CAMERA_TO_SMARTPHONE_ROT), F = Quaternion.multiply(Quaternion.fromAxisAngle([
+			}, M);
+			if (!F || !F.success) {
+				this._scanFailureCallbacks.forEach(({ id: e, callback: C }) => C({
+					listenerId: e,
+					sessionId: this._sessionId,
+					attemptId: this._currentAttemptId
+				}));
+				continue;
+			}
+			this._currentAttemptId = null;
+			let I = F.attitude.quaternion, L = Quaternion.multiply(I, e.CAMERA_TO_SMARTPHONE_ROT), R = Quaternion.multiply(Quaternion.fromAxisAngle([
 				0,
 				0,
 				1
-			], deg2rad(window.orientation || 0)), M), I = this._relativeRotationCalc?.tickEnd() || new Attitude([
+			], deg2rad(window.orientation || 0)), L), z = this._relativeRotationCalc?.tickEnd() || new Attitude([
 				1,
 				0,
 				0,
 				0
-			]), L = new AbsoluteAttitude(Quaternion.multiply(F, I.quaternion), A.attitude.time, A.attitude.accuracy), R = A.position.clone();
-			if (R.accuracy === null && (R.accuracy = 5), T()) break;
+			]), B = new AbsoluteAttitude(Quaternion.multiply(R, z.quaternion), F.attitude.time, F.attitude.accuracy), V = F.position.clone();
+			if (V.accuracy === null && (V.accuracy = 5), T()) break;
 			this.notify({
-				absoluteAttitude: L,
-				absolutePosition: R
+				absoluteAttitude: B,
+				absolutePosition: V
 			});
 		}
 	};
@@ -3396,6 +3457,19 @@ var field = function(e, C, w) {
 			return (e === "x" ? C : C & 3 | 8).toString(16);
 		});
 	}
+	addScanFailureListener(C) {
+		let w = ++e._scanFailureCallbackUniqueId;
+		return this._scanFailureCallbacks.push({
+			id: w,
+			callback: C
+		}), w;
+	}
+	removeScanFailureListener(e) {
+		this._scanFailureCallbacks = this._scanFailureCallbacks.filter(({ id: C }) => C !== e);
+	}
+	resetCurrentAttempt() {
+		this._currentAttemptId = null;
+	}
 	get endpoint() {
 		return this._endpoint;
 	}
@@ -3606,34 +3680,6 @@ var field = function(e, C, w) {
 		let T = deg2rad(e), E = deg2rad(C), D = deg2rad(w), O = Math.cos(T / 2), k = Math.cos(E / 2), A = Math.cos(D / 2), j = Math.sin(T / 2), M = Math.sin(E / 2), N = Math.sin(D / 2), F = O * k * A - j * M * N, I = j * k * A + O * M * N;
 		return rad2deg(-2 * Math.atan(I / F));
 	}
-}(), RelativeAttitudeProvider_default = new class extends Provider_default {
-	arCoreMonitoringId;
-	arCoreProviderId;
-	inertialProviderId;
-	getName = () => "RelativeAttitude";
-	availability = () => RelativeAttitudeFromInertialProvider_default.getAvailability();
-	start() {
-		this.arCoreMonitoringId = ArCoreProvider_default.addMonitoringListener(() => {
-			this.listenArCore(), this.unlistenInertial();
-		}, () => {
-			this.unlistenArCore(), this.listenInertial();
-		}), ArCoreProvider_default.state === "started" ? this.listenArCore() : this.listenInertial();
-	}
-	stop() {
-		ArCoreProvider_default.removeMonitoringListener(this.arCoreMonitoringId), this.unlistenArCore(), this.unlistenInertial();
-	}
-	listenInertial = () => {
-		this.inertialProviderId = RelativeAttitudeFromInertialProvider_default.addEventListener(this.notify, this.notifyError);
-	};
-	unlistenInertial = () => {
-		RelativeAttitudeFromInertialProvider_default.removeEventListener(this.inertialProviderId);
-	};
-	listenArCore = () => {
-		this.arCoreProviderId = ArCoreProvider_default.addEventListener((e) => this.notify(e.relativeAttitude), null, !1);
-	};
-	unlistenArCore = () => {
-		ArCoreProvider_default.removeEventListener(this.arCoreProviderId);
-	};
 }(), AbsoluteAttitudeProvider_default = new class w extends Provider_default {
 	static REL_ABS_DIVERGENCE_ANGLE_THRESHOLD = deg2rad(25);
 	static REL_ABS_DIVERGENCE_TIME_THRESHOLD = 2.5;
@@ -4108,12 +4154,15 @@ var field = function(e, C, w) {
 		this.notify(T);
 	}
 	stop() {}
-}(), VpsBackgroundScanner = class {
+}(), VpsBackgroundScanner = class e {
+	static MAX_CONSECUTIVE_FAILURES = 10;
 	intervalMs;
 	enabled;
 	timeoutId = null;
 	listenerId = null;
+	scanFailureListenerId = null;
 	isBackgroundScanRunning = !1;
+	consecutiveFailures = 0;
 	_status;
 	statusCallbacks = /* @__PURE__ */ new Set();
 	onResult;
@@ -4141,10 +4190,10 @@ var field = function(e, C, w) {
 		}, this.intervalMs), this.setStatus("scheduled"));
 	}
 	async cancelRunningScan() {
-		this.isBackgroundScanRunning && (this.listenerId !== null && (VpsProvider_default.removeEventListener(this.listenerId), this.listenerId = null, VpsProvider_default.stop()), this.isBackgroundScanRunning = !1, this.setStatus(this.enabled ? "idle" : "disabled"));
+		this.isBackgroundScanRunning && (this.listenerId !== null && (VpsProvider_default.removeEventListener(this.listenerId), this.listenerId = null, VpsProvider_default.stop()), this.scanFailureListenerId !== null && (VpsProvider_default.removeScanFailureListener(this.scanFailureListenerId), this.scanFailureListenerId = null), this.isBackgroundScanRunning = !1, this.setStatus(this.enabled ? "idle" : "disabled"));
 	}
 	clear() {
-		this.clearTimeoutOnly(), this.listenerId !== null && (VpsProvider_default.removeEventListener(this.listenerId), this.listenerId = null), this.isBackgroundScanRunning = !1, this.setStatus(this.enabled ? "idle" : "disabled");
+		this.clearTimeoutOnly(), this.listenerId !== null && (VpsProvider_default.removeEventListener(this.listenerId), this.listenerId = null), this.scanFailureListenerId !== null && (VpsProvider_default.removeScanFailureListener(this.scanFailureListenerId), this.scanFailureListenerId = null), this.isBackgroundScanRunning = !1, this.setStatus(this.enabled ? "idle" : "disabled");
 	}
 	runNow() {
 		this.enabled && (this.clearTimeoutOnly(), this.startBackgroundScan());
@@ -4154,19 +4203,21 @@ var field = function(e, C, w) {
 	}
 	async startBackgroundScan() {
 		if (!this.enabled || this.isBackgroundScanRunning || this.listenerId !== null) return;
-		let e = await VpsProvider_default.getAvailability();
-		if (e instanceof Error) {
-			this.onError(e), this.setStatus("idle");
+		let C = await VpsProvider_default.getAvailability();
+		if (C instanceof Error) {
+			this.onError(C), this.setStatus("idle");
 			return;
 		}
-		this.isBackgroundScanRunning = !0, this.setStatus("scanning"), this.listenerId = VpsProvider_default.addEventListener((e) => {
-			this.cleanupListener(), this.onResult(e), this.schedule();
+		this.isBackgroundScanRunning = !0, this.setStatus("scanning"), this.scanFailureListenerId = VpsProvider_default.addScanFailureListener((C) => {
+			!this.isBackgroundScanRunning || this.scanFailureListenerId === null || C.listenerId !== this.scanFailureListenerId || (this.consecutiveFailures += 1, this.consecutiveFailures >= e.MAX_CONSECUTIVE_FAILURES && (this.consecutiveFailures = 0, VpsProvider_default.resetCurrentAttempt(), this.cleanupListener(), this.schedule()));
+		}), this.listenerId = VpsProvider_default.addEventListener((e) => {
+			this.consecutiveFailures = 0, this.cleanupListener(), this.onResult(e), this.schedule();
 		}, (e) => {
 			this.cleanupListener(), this.onError(e), this.schedule();
 		});
 	}
 	cleanupListener() {
-		this.listenerId !== null && (VpsProvider_default.removeEventListener(this.listenerId), this.listenerId = null), VpsProvider_default.stop(), this.isBackgroundScanRunning = !1, this.enabled ? this.setStatus("idle") : this.setStatus("disabled");
+		this.listenerId !== null && (VpsProvider_default.removeEventListener(this.listenerId), this.listenerId = null), this.scanFailureListenerId !== null && (VpsProvider_default.removeScanFailureListener(this.scanFailureListenerId), this.scanFailureListenerId = null), VpsProvider_default.stop(), this.isBackgroundScanRunning = !1, this.enabled ? this.setStatus("idle") : this.setStatus("disabled");
 	}
 	setStatus(e) {
 		this._status !== e && (this._status = e, this.statusCallbacks.forEach((C) => {

package/dist/src/providers/vision/vps/ImageRelocalization.d.ts

@@ -1,11 +1,11 @@
 import { Calibration } from '../../../../../camera';
 import { Quaternion_t } from '@wemap/maths-legacy';
 import { CoarsePose, VpsDeviceMetadata } from './VpsMetadata';
-import { default as VpsRequest } from './VpsRequest';
+import { default as VpsRequest, LocalPose } from './VpsRequest';
 import { default as VpsResponse } from './VpsResponse';
 declare class ImageRelocalization {
-    static _prepareRequest(imageCanvas: HTMLCanvasElement, calibration?: Calibration | null, coarsePose?: CoarsePose | null, deviceMetadata?: Pick<VpsDeviceMetadata, 'session_id' | 'installation_id' | 'attempt_id' | 'caller'> | null): VpsRequest;
-    static relocalize(endpointUrl: string, imageCanvas: HTMLCanvasElement, calibration?: Calibration | null, coarsePose?: CoarsePose | null, deviceMetadata?: Pick<VpsDeviceMetadata, 'session_id' | 'installation_id' | 'attempt_id' | 'caller'> | null, customHeaders?: Record<string, string> | null): Promise<VpsResponse | null>;
+    static _prepareRequest(imageCanvas: HTMLCanvasElement, calibration?: Calibration | null, coarsePose?: CoarsePose | null, deviceMetadata?: Pick<VpsDeviceMetadata, 'session_id' | 'installation_id' | 'attempt_id' | 'caller'> | null, localPose?: LocalPose | null): VpsRequest;
+    static relocalize(endpointUrl: string, imageCanvas: HTMLCanvasElement, calibration?: Calibration | null, coarsePose?: CoarsePose | null, deviceMetadata?: Pick<VpsDeviceMetadata, 'session_id' | 'installation_id' | 'attempt_id' | 'caller'> | null, localPose?: LocalPose | null, customHeaders?: Record<string, string> | null): Promise<VpsResponse | null>;
     static getHeadingFromQuaternion(quaternion: Quaternion_t): number;
 }
 export default ImageRelocalization;

package/dist/src/providers/vision/vps/ImageRelocalization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImageRelocalization.d.ts","sourceRoot":"","sources":["../../../../../src/providers/vision/vps/ImageRelocalization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAmB,MAAM,eAAe,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAoB,EAAE,KAAK,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAErF,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,cAAM,mBAAmB;IAErB,MAAM,CAAC,eAAe,CAClB,WAAW,EAAE,iBAAiB,EAC9B,WAAW,GAAE,WAAW,GAAG,IAAW,EACtC,UAAU,GAAE,UAAU,GAAG,IAAW,EACpC,cAAc,GAAE,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,iBAAiB,GAAG,YAAY,GAAG,QAAQ,CAAC,GAAG,IAAW;WAuBxG,UAAU,CACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,iBAAiB,EAC9B,WAAW,GAAE,WAAW,GAAG,IAAW,EACtC,UAAU,GAAE,UAAU,GAAG,IAAW,EACpC,cAAc,GAAE,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,iBAAiB,GAAG,YAAY,GAAG,QAAQ,CAAC,GAAG,IAAW,EACjH,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAW;IA8CvD,MAAM,CAAC,wBAAwB,CAAC,UAAU,EAAE,YAAY;CAmB3D;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"ImageRelocalization.d.ts","sourceRoot":"","sources":["../../../../../src/providers/vision/vps/ImageRelocalization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAmB,MAAM,eAAe,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAoB,EAAE,KAAK,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAErF,OAAO,UAAU,EAAE,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,cAAM,mBAAmB;IAErB,MAAM,CAAC,eAAe,CAClB,WAAW,EAAE,iBAAiB,EAC9B,WAAW,GAAE,WAAW,GAAG,IAAW,EACtC,UAAU,GAAE,UAAU,GAAG,IAAW,EACpC,cAAc,GAAE,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,iBAAiB,GAAG,YAAY,GAAG,QAAQ,CAAC,GAAG,IAAW,EACjH,SAAS,GAAE,SAAS,GAAG,IAAW;WAuBzB,UAAU,CACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,iBAAiB,EAC9B,WAAW,GAAE,WAAW,GAAG,IAAW,EACtC,UAAU,GAAE,UAAU,GAAG,IAAW,EACpC,cAAc,GAAE,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,iBAAiB,GAAG,YAAY,GAAG,QAAQ,CAAC,GAAG,IAAW,EACjH,SAAS,GAAE,SAAS,GAAG,IAAW,EAClC,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAW;IA6CvD,MAAM,CAAC,wBAAwB,CAAC,UAAU,EAAE,YAAY;CAmB3D;AAED,eAAe,mBAAmB,CAAC"}

package/dist/src/providers/vision/vps/VpsBackgroundScanner.d.ts

@@ -37,11 +37,14 @@ export interface VpsBackgroundScanOptions {
  * the same provider, use {@link cancelRunningScan} first to avoid conflicts.
  */
 export declare class VpsBackgroundScanner {
+    private static readonly MAX_CONSECUTIVE_FAILURES;
     private readonly intervalMs;
     private enabled;
     private timeoutId;
     private listenerId;
+    private scanFailureListenerId;
     private isBackgroundScanRunning;
+    private consecutiveFailures;
     private _status;
     private statusCallbacks;
     private readonly onResult;

package/dist/src/providers/vision/vps/VpsBackgroundScanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VpsBackgroundScanner.d.ts","sourceRoot":"","sources":["../../../../../src/providers/vision/vps/VpsBackgroundScanner.ts"],"names":[],"mappings":"AAAA,OAAoB,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE3D;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,uBAAuB,GAAG,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,UAAU,CAAC;AAErF;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,sFAAsF;IACtF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kEAAkE;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;;;GASG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,SAAS,CAA8C;IAC/D,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,uBAAuB,CAAS;IACxC,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,eAAe,CAAwD;IAE/E,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4B;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IAEjD;;;;OAIG;gBACS,OAAO,EAAE,wBAAwB,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI;IAQnH,IAAI,MAAM,IAAI,uBAAuB,CAEpC;IAED;;;;;OAKG;IACH,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAUlC;;;;OAIG;IACH,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,uBAAuB,KAAK,IAAI,GAAG,MAAM,IAAI;IAO/E;;OAEG;IACH,eAAe,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,uBAAuB,KAAK,IAAI,GAAG,IAAI;IAI1E;;;OAGG;IACH,QAAQ,IAAI,IAAI;IAYhB;;;;;OAKG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAexC;;OAEG;IACH,KAAK,IAAI,IAAI;IAUb;;;;;OAKG;IACH,MAAM,IAAI,IAAI;IAQd,OAAO,CAAC,gBAAgB;YAUV,mBAAmB;IA6BjC,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,SAAS;CAclB"}
+{"version":3,"file":"VpsBackgroundScanner.d.ts","sourceRoot":"","sources":["../../../../../src/providers/vision/vps/VpsBackgroundScanner.ts"],"names":[],"mappings":"AAAA,OAAoB,EAAE,KAAK,QAAQ,EAA4B,MAAM,eAAe,CAAC;AAErF;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,uBAAuB,GAAG,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,UAAU,CAAC;AAErF;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,sFAAsF;IACtF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kEAAkE;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;;;GASG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAM;IAEtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,SAAS,CAA8C;IAC/D,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,qBAAqB,CAAuB;IACpD,OAAO,CAAC,uBAAuB,CAAS;IACxC,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,eAAe,CAAwD;IAE/E,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4B;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IAEjD;;;;OAIG;gBACS,OAAO,EAAE,wBAAwB,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI;IAQnH,IAAI,MAAM,IAAI,uBAAuB,CAEpC;IAED;;;;;OAKG;IACH,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAUlC;;;;OAIG;IACH,cAAc,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,uBAAuB,KAAK,IAAI,GAAG,MAAM,IAAI;IAO/E;;OAEG;IACH,eAAe,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,uBAAuB,KAAK,IAAI,GAAG,IAAI;IAI1E;;;OAGG;IACH,QAAQ,IAAI,IAAI;IAYhB;;;;;OAKG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBxC;;OAEG;IACH,KAAK,IAAI,IAAI;IAcb;;;;;OAKG;IACH,MAAM,IAAI,IAAI;IAQd,OAAO,CAAC,gBAAgB;YAUV,mBAAmB;IA8CjC,OAAO,CAAC,eAAe;IAkBvB,OAAO,CAAC,SAAS;CAclB"}

package/dist/src/providers/vision/vps/VpsProvider.d.ts

@@ -6,6 +6,11 @@ export type VpsEvent = {
     absoluteAttitude: AbsoluteAttitude;
     absolutePosition: AbsolutePosition;
 };
+export type VpsScanFailureEvent = {
+    listenerId: number;
+    sessionId: string;
+    attemptId: number | null;
+};
 declare class VpsProvider extends Provider<VpsEvent> {
     static MIN_TIME_BETWEEN_TWO_REQUESTS: number;
     static DEFAULT_MIN_INCLINATION_FOR_REQUEST: number;
@@ -13,6 +18,8 @@ declare class VpsProvider extends Provider<VpsEvent> {
     static DEFAULT_USE_COARSE_POSE: boolean;
     static DEFAULT_REQUEST_CALLER: string;
     static CAMERA_TO_SMARTPHONE_ROT: import('@wemap/maths-legacy').Quaternion_t;
+    static ENU_TO_ARCORE_ROT: import('@wemap/maths-legacy').Quaternion_t;
+    static _scanFailureCallbackUniqueId: number;
     _relativeRotationCalc?: RelativeRotationCalc;
     _serverError: boolean;
     _cameraError: boolean;
@@ -23,8 +30,14 @@ declare class VpsProvider extends Provider<VpsEvent> {
     _waitTimeMinInclinationForRequest: number;
     _useCoarsePose: boolean;
     _requestCaller: string;
-    _currentSessionId: string | null;
-    _attemptId: number;
+    _sessionId: string;
+    _attemptIdCounter: number;
+    _currentAttemptId: number | null;
+    _scanFailureCallbacks: {
+        id: number;
+        callback: (event: VpsScanFailureEvent) => void;
+    }[];
+    constructor();
     getName: () => string;
     availability: () => Promise<void>;
     start(): void;
@@ -37,6 +50,9 @@ declare class VpsProvider extends Provider<VpsEvent> {
     _internalStart: () => Promise<void>;
     _internalStop: () => void;
     _generateUuid(): string;
+    addScanFailureListener(callback: (event: VpsScanFailureEvent) => void): number;
+    removeScanFailureListener(listenerId: number): void;
+    resetCurrentAttempt(): void;
     get endpoint(): string | null;
     set endpoint(endpoint: string | null);
     get minInclinationForRequest(): number;

package/dist/src/providers/vision/vps/VpsProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VpsProvider.d.ts","sourceRoot":"","sources":["../../../../../src/providers/vision/vps/VpsProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,MAAM,EAAE,MAAM,eAAe,CAAC;AAOtD,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAItC,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAI1D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG3E,MAAM,MAAM,QAAQ,GAAG;IAAE,gBAAgB,EAAE,gBAAgB,CAAC;IAAC,gBAAgB,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAClG,cAAM,WAAY,SAAQ,QAAQ,CAAC,QAAQ,CAAC;IAExC,MAAM,CAAC,6BAA6B,SAAQ;IAC5C,MAAM,CAAC,mCAAmC,SAAe;IACzD,MAAM,CAAC,6CAA6C,SAAO;IAC3D,MAAM,CAAC,uBAAuB,UAAQ;IACtC,MAAM,CAAC,sBAAsB,SAA0D;IACvF,MAAM,CAAC,wBAAwB,6CAAgD;IAE/E,qBAAqB,CAAC,EAAE,oBAAoB,CAAC;IAE7C,YAAY,UAAS;IACrB,YAAY,UAAS;IAErB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC9B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEhC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,yBAAyB,SAAmD;IAC5E,iCAAiC,SAA6D;IAC9F,cAAc,UAAuC;IACrD,cAAc,SAAsC;IACpD,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAQ;IACxC,UAAU,SAAK;IAEf,OAAO,eAAe;IAEtB,YAAY,sBAAoC;IAEhD,KAAK;IAsBL,IAAI;IAYJ,iBAAiB,GAAI,YAAY;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,UAMlD;IAED,gBAAgB,aAQf;IAED,UAAU,CAAC,MAAM,EAAE,MAAM;IAYzB,cAAc,sBAwHb;IAED,aAAa,aAEZ;IAED,aAAa;IAab,IAAI,QAAQ,kBAEX;IAED,IAAI,QAAQ,CAAC,QAAQ,eAAA,EAEpB;IAED,IAAI,wBAAwB,WAE3B;IAED,IAAI,wBAAwB,CAAC,wBAAwB,QAAA,EAEpD;IAED,IAAI,gCAAgC,WAEnC;IAED,IAAI,gCAAgC,CAAC,gCAAgC,QAAA,EAEpE;IAED,IAAI,aAAa,YAEhB;IAED,IAAI,aAAa,CAAC,aAAa,SAAA,EAE9B;IAED,IAAI,aAAa,WAEhB;IAED,IAAI,aAAa,CAAC,aAAa,QAAA,EAE9B;CACJ;;AAED,wBAAiC"}
+{"version":3,"file":"VpsProvider.d.ts","sourceRoot":"","sources":["../../../../../src/providers/vision/vps/VpsProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,MAAM,EAAE,MAAM,eAAe,CAAC;AAOtD,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAKtC,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAI1D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAI3E,MAAM,MAAM,QAAQ,GAAG;IAAE,gBAAgB,EAAE,gBAAgB,CAAC;IAAC,gBAAgB,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAClG,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAC3B,CAAC;AAEF,cAAM,WAAY,SAAQ,QAAQ,CAAC,QAAQ,CAAC;IAExC,MAAM,CAAC,6BAA6B,SAAQ;IAC5C,MAAM,CAAC,mCAAmC,SAAe;IACzD,MAAM,CAAC,6CAA6C,SAAO;IAC3D,MAAM,CAAC,uBAAuB,UAAQ;IACtC,MAAM,CAAC,sBAAsB,SAA0D;IACvF,MAAM,CAAC,wBAAwB,6CAAgD;IAG/E,MAAM,CAAC,iBAAiB,6CAAqD;IAC7E,MAAM,CAAC,4BAA4B,SAAK;IAExC,qBAAqB,CAAC,EAAE,oBAAoB,CAAC;IAE7C,YAAY,UAAS;IACrB,YAAY,UAAS;IAErB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC9B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEhC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,yBAAyB,SAAmD;IAC5E,iCAAiC,SAA6D;IAC9F,cAAc,UAAuC;IACrD,cAAc,SAAsC;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,SAAK;IACtB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAQ;IACxC,qBAAqB,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAA;KAAE,EAAE,CAAM;;IAQ7F,OAAO,eAAe;IAEtB,YAAY,sBAAoC;IAEhD,KAAK;IAsBL,IAAI;IAYJ,iBAAiB,GAAI,YAAY;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,UAMlD;IAED,gBAAgB,aAQf;IAED,UAAU,CAAC,MAAM,EAAE,MAAM;IAYzB,cAAc,sBA8Ib;IAED,aAAa,aAEZ;IAED,aAAa;IAab,sBAAsB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI;IAMrE,yBAAyB,CAAC,UAAU,EAAE,MAAM;IAI5C,mBAAmB;IAInB,IAAI,QAAQ,kBAEX;IAED,IAAI,QAAQ,CAAC,QAAQ,eAAA,EAEpB;IAED,IAAI,wBAAwB,WAE3B;IAED,IAAI,wBAAwB,CAAC,wBAAwB,QAAA,EAEpD;IAED,IAAI,gCAAgC,WAEnC;IAED,IAAI,gCAAgC,CAAC,gCAAgC,QAAA,EAEpE;IAED,IAAI,aAAa,YAEhB;IAED,IAAI,aAAa,CAAC,aAAa,SAAA,EAE9B;IAED,IAAI,aAAa,WAEhB;IAED,IAAI,aAAa,CAAC,aAAa,QAAA,EAE9B;CACJ;;AAED,wBAAiC"}

package/dist/src/providers/vision/vps/VpsRequest.d.ts

@@ -2,18 +2,26 @@ import { default as VpsMetadata, VpsMetadataJson } from './VpsMetadata';
 export type VpsRequestJson = VpsMetadataJson & {
     image: string;
 };
+export type LocalPose = {
+    position: [number, number, number];
+    orientation: [number, number, number, number];
+};
 declare class VpsRequest {
     metadata: VpsMetadata;
     image: HTMLCanvasElement;
-    constructor(metadata: VpsMetadata, image: HTMLCanvasElement);
+    imageQuality: number;
+    localPose: LocalPose | null;
+    constructor(metadata: VpsMetadata, image: HTMLCanvasElement, imageQuality?: number, localPose?: LocalPose | null);
     toJson(): {
         size: [number, number];
         calibration?: import('../../../../../camera').Calibration;
         coarse?: import('./VpsMetadata').CoarsePoseJson;
         device?: import('./VpsMetadata').VpsDeviceMetadata;
+        local_pose?: LocalPose | undefined;
         image: string;
     };
     static fromJson(json: VpsRequestJson): VpsRequest;
+    toFormData(): FormData;
 }
 export default VpsRequest;
 //# sourceMappingURL=VpsRequest.d.ts.map

package/dist/src/providers/vision/vps/VpsRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VpsRequest.d.ts","sourceRoot":"","sources":["../../../../../src/providers/vision/vps/VpsRequest.ts"],"names":[],"mappings":"AAEA,OAAO,WAAW,EAAE,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG;IAC3C,KAAK,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,cAAM,UAAU;IACZ,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,iBAAiB,CAAC;gBAEb,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,iBAAiB;IAK3D,MAAM;;;;;;;IAQN,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc;CAMvC;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"VpsRequest.d.ts","sourceRoot":"","sources":["../../../../../src/providers/vision/vps/VpsRequest.ts"],"names":[],"mappings":"AAEA,OAAO,WAAW,EAAE,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG;IAC3C,KAAK,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;CAChD,CAAA;AAED,cAAM,UAAU;IACZ,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,iBAAiB,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;gBAGxB,QAAQ,EAAE,WAAW,EACrB,KAAK,EAAE,iBAAiB,EACxB,YAAY,GAAE,MAAY,EAC1B,SAAS,GAAE,SAAS,GAAG,IAAW;IAQtC,MAAM;;;;;;;;IASN,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc;IAOpC,UAAU;CA0Bb;AAED,eAAe,UAAU,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wemap/providers",
-  "version": "14.3.1",
+  "version": "14.5.0",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -17,12 +17,12 @@
     "dist"
   ],
   "dependencies": {
-    "@wemap/camera": "14.3.1",
-    "@wemap/core": "14.3.1",
-    "@wemap/geo": "14.3.1",
-    "@wemap/osm": "14.3.1",
-    "@wemap/routers": "14.3.1",
-    "@wemap/utils": "14.3.1"
+    "@wemap/camera": "14.5.0",
+    "@wemap/core": "14.5.0",
+    "@wemap/geo": "14.5.0",
+    "@wemap/osm": "14.5.0",
+    "@wemap/routers": "14.5.0",
+    "@wemap/utils": "14.5.0"
   },
   "devDependencies": {
     "@wemap/logger-legacy": "^13.3.0",