@zhangdali1996/lr-map-viewer 0.0.179 → 0.0.180

package/dist/lr-map-viewer.js

@@ -21,7 +21,7 @@ var le = Object.create, ue = Object.defineProperty, H = Object.getOwnPropertyDes
 }) : n, e)), U = {
 	name: "@zhangdali1996/lr-map-viewer",
 	private: !1,
-	version: "0.0.178",
+	version: "0.0.179",
 	type: "module",
 	files: ["dist"],
 	main: "./dist/lr-map-viewer.js",
@@ -68311,47 +68311,65 @@ function NJ(e = {}) {
 		};
 	}
 	function Oe(e = {}) {
-		let t = Array.isArray(e.personSceneIds) ? e.personSceneIds : [], n = Array.isArray(e.carSceneIds) ? e.carSceneIds : [], r = Math.max(0, Number(e.sceneMoveDuration) || 0), i = [], a = 0, o = 0;
+		let t = Array.isArray(e.personSceneIds) ? e.personSceneIds : [], n = Array.isArray(e.carSceneIds) ? e.carSceneIds : [], r = Math.max(0, Number(e.sceneMoveDuration) || 0), i = [], a = [], o = 0, s = 0, c = 0, l = 0;
 		if (r <= 0) return {
-			adjustedPersonCount: a,
-			adjustedCarCount: o,
+			adjustedPersonCount: o,
+			adjustedCarCount: s,
+			fullDurationPersonCount: c,
+			fullDurationCarCount: l,
 			maxPathLength: 0,
 			referencePathLength: 0,
 			usedPathLengthFallback: !1
 		};
 		t.forEach((e) => {
 			let t = y.get(e);
-			t && i.push({
+			if (!t) return;
+			let n = {
 				entityType: "person",
 				moveState: t
-			});
+			};
+			if (i.push(n), t.sceneWellheadEndInside === !0) a.push(n);
+			else {
+				let e = r, n = t.useScenePlaybackSpeed === !0 ? e / g.value : e;
+				t.baseMoveDuration = e, t.moveDuration = n, t.playbackSpeed = t.useScenePlaybackSpeed === !0 ? g.value : null, o += 1, c += 1;
+			}
 		}), n.forEach((e) => {
 			let t = R.get(e);
-			t && i.push({
+			if (!t) return;
+			let n = {
 				entityType: "car",
 				moveState: t
-			});
+			};
+			if (i.push(n), t.sceneWellheadEndInside === !0) a.push(n);
+			else {
+				let e = r, n = t.useScenePlaybackSpeed === !0 ? e / g.value : e;
+				t.baseMoveDuration = e, t.moveDuration = n, t.playbackSpeed = t.useScenePlaybackSpeed === !0 ? g.value : null, s += 1, l += 1;
+			}
 		});
-		let { maxPathLength: s, referencePathLength: c, usedPathLengthFallback: l } = De(i);
-		return c <= 0 ? {
-			adjustedPersonCount: a,
-			adjustedCarCount: o,
-			maxPathLength: s,
+		let { maxPathLength: u, referencePathLength: d, usedPathLengthFallback: f } = De(a);
+		return d <= 0 ? {
+			adjustedPersonCount: o,
+			adjustedCarCount: s,
+			fullDurationPersonCount: c,
+			fullDurationCarCount: l,
+			maxPathLength: u,
 			referencePathLength: 0,
-			usedPathLengthFallback: l
-		} : (i.forEach((e) => {
-			let t = e.moveState, n = Math.max(0, Number(t?.totalLength) || 0), i = Math.min(n, c) / c * r, s = t.useScenePlaybackSpeed === !0 ? i / g.value : i, l = t.useScenePlaybackSpeed === !0 ? r / g.value : r, u = s > 0 ? Math.min(l, Math.max(AJ, s)) : 0;
-			if (t.baseMoveDuration = i, t.moveDuration = u, t.playbackSpeed = t.useScenePlaybackSpeed === !0 ? g.value : null, e.entityType === "person") {
-				a += 1;
+			usedPathLengthFallback: f
+		} : (a.forEach((e) => {
+			let t = e.moveState, n = Math.max(0, Number(t?.totalLength) || 0), i = Math.min(n, d) / d * r, a = t.useScenePlaybackSpeed === !0 ? i / g.value : i, c = t.useScenePlaybackSpeed === !0 ? r / g.value : r, l = a > 0 ? Math.min(c, Math.max(AJ, a)) : 0;
+			if (t.baseMoveDuration = i, t.moveDuration = l, t.playbackSpeed = t.useScenePlaybackSpeed === !0 ? g.value : null, e.entityType === "person") {
+				o += 1;
 				return;
 			}
-			o += 1;
+			s += 1;
 		}), {
-			adjustedPersonCount: a,
-			adjustedCarCount: o,
-			maxPathLength: s,
-			referencePathLength: c,
-			usedPathLengthFallback: l
+			adjustedPersonCount: o,
+			adjustedCarCount: s,
+			fullDurationPersonCount: c,
+			fullDurationCarCount: l,
+			maxPathLength: u,
+			referencePathLength: d,
+			usedPathLengthFallback: f
 		});
 	}
 	function ke(t) {
@@ -69943,7 +69961,8 @@ function NJ(e = {}) {
 			pathPoints: f,
 			accumulatedLengths: p,
 			totalLength: m,
-			targetPoint: a
+			targetPoint: a,
+			sceneWellheadEndInside: e.sceneWellheadEndInside === !0
 		}), ye.value = !1, Se(), l || vn(), !0;
 	}
 	function lr(e, t = fJ, n = {}) {
@@ -70675,7 +70694,8 @@ function NJ(e = {}) {
 			pathPoints: f,
 			accumulatedLengths: p,
 			totalLength: m,
-			targetPoint: a
+			targetPoint: a,
+			sceneWellheadEndInside: e.sceneWellheadEndInside === !0
 		}), ye.value = !1, Se(), l || X(), !0;
 	}
 	function ni(e, t = pJ, n = {}) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zhangdali1996/lr-map-viewer",
   "private": false,
-  "version": "0.0.179",
+  "version": "0.0.180",
   "type": "module",
   "files": [
     "dist"