landxml 0.3.0 → 0.4.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # landxml
 
+## 0.4.1
+
+### Patch Changes
+
+- 4edb0de: Contour elevations from surface min/max elevations and increment are now calculated correctly.
+
+## 0.4.0
+
+### Minor Changes
+
+- e2e4513: Rewrote contour lines polyline builder
+
 ## 0.3.0
 
 ### Minor Changes

package/dist/index.js

@@ -228,61 +228,67 @@ var contourLineOnFace = (face, z) => {
   return line.length > 0 ? line : void 0;
 };
 var linesToPolyLines = (lineSegments) => {
+  var _a, _b;
   if (!Array.isArray(lineSegments) || lineSegments.length === 0) {
     throw new Error("Invalid input: Please provide a non-empty array of line segments.");
   }
-  const segmentsMap = /* @__PURE__ */ new Map();
+  const segmentsMapIndexes = {};
   const polylines = [];
-  lineSegments.forEach(([start, end]) => {
-    const startKey = start.join(",");
-    const endKey = end.join(",");
-    segmentsMap.set(startKey, segmentsMap.get(startKey) || []);
-    segmentsMap.set(endKey, segmentsMap.get(endKey) || []);
-    segmentsMap.get(startKey).push(end);
-    segmentsMap.get(endKey).push(start);
+  const parsedSegmentIndexes = [];
+  const lineSegmentStrings = lineSegments.map((v) => v.map((c) => c.join(",")));
+  lineSegmentStrings.forEach(([start, end], i) => {
+    segmentsMapIndexes[start] = segmentsMapIndexes[start] ? [...segmentsMapIndexes[start] || [], i] : [i];
+    segmentsMapIndexes[end] = segmentsMapIndexes[end] ? [...segmentsMapIndexes[end] || [], i] : [i];
   });
-  const constructPolyline = (start, polyline) => {
-    let current = start;
-    while (segmentsMap.has(current.join(",")) && segmentsMap.get(current.join(",")).length > 0) {
-      const next = segmentsMap.get(current.join(",")).pop();
-      polyline.push(current);
-      if (next) {
-        const nextKey = next.join(",");
-        segmentsMap.delete(current.join(","));
-        current = next;
-        if (segmentsMap.has(nextKey)) {
-          segmentsMap.set(
-            nextKey,
-            (segmentsMap.get(nextKey) || []).filter((point) => point.join(",") !== current.join(","))
-          );
-        }
+  for (let i = 0; i < lineSegmentStrings.length; i++) {
+    if (parsedSegmentIndexes.includes(i))
+      continue;
+    parsedSegmentIndexes.push(i);
+    let [start, end] = lineSegmentStrings[i];
+    let polyline = [start, end];
+    while (start && segmentsMapIndexes[start]) {
+      const nextLineIndex = (_a = segmentsMapIndexes[start]) == null ? void 0 : _a.find(
+        (lineIndex) => !parsedSegmentIndexes.includes(lineIndex)
+      );
+      if (nextLineIndex) {
+        parsedSegmentIndexes.push(nextLineIndex);
+        const nextLineSegment = lineSegmentStrings[nextLineIndex];
+        const nextLineSegmentPointIndex = nextLineSegment[0] === start ? 1 : 0;
+        const newPoint = nextLineSegment[nextLineSegmentPointIndex];
+        polyline.unshift(newPoint);
+        start = newPoint;
+      } else {
+        start = null;
       }
     }
-    polyline.push(current);
-    return polyline;
-  };
-  const traverseSegmentsMap = (endpoints, startKey) => {
-    let start = startKey.split(",").map(Number);
-    while (endpoints.length > 0) {
-      const newPolyline = constructPolyline(start, []);
-      polylines.push(newPolyline);
-      start = endpoints.pop();
-    }
-  };
-  for (const [startKey, endpoints] of segmentsMap.entries()) {
-    if (endpoints && endpoints.length === 0) {
-      continue;
+    while (end && segmentsMapIndexes[end]) {
+      const nextLineIndex = (_b = segmentsMapIndexes[end]) == null ? void 0 : _b.find(
+        (lineIndex) => !parsedSegmentIndexes.includes(lineIndex)
+      );
+      if (nextLineIndex) {
+        parsedSegmentIndexes.push(nextLineIndex);
+        const nextLineSegment = lineSegmentStrings[nextLineIndex];
+        const nextLineSegmentPointIndex = nextLineSegment[0] === end ? 1 : 0;
+        const newPoint = nextLineSegment[nextLineSegmentPointIndex];
+        polyline.push(newPoint);
+        end = newPoint;
+      } else {
+        end = null;
+      }
     }
-    traverseSegmentsMap(endpoints || [], startKey);
+    polylines.push(polyline.map((coord) => coord.split(",").map((v) => parseFloat(v))));
   }
   return polylines;
 };
-var contourElevations = (minElevation, maxElevation, increment) => {
+var contourElevations = (minElevation, maxElevation, interval) => {
+  if (maxElevation >= Infinity) {
+    throw new Error("Contour elevations have to be finite numbers");
+  }
   const elevations = [];
-  const start = Math.ceil(minElevation * 2) / 2;
-  const end = Math.floor(maxElevation * 2) / 2;
-  for (let elevation = start; elevation <= end; elevation += increment) {
+  let elevation = Math.ceil(minElevation * interval) / interval;
+  while (elevation < maxElevation) {
     elevations.push(elevation);
+    elevation += interval;
   }
   return elevations;
 };

package/dist/index.mjs

@@ -193,61 +193,67 @@ var contourLineOnFace = (face, z) => {
   return line.length > 0 ? line : void 0;
 };
 var linesToPolyLines = (lineSegments) => {
+  var _a, _b;
   if (!Array.isArray(lineSegments) || lineSegments.length === 0) {
     throw new Error("Invalid input: Please provide a non-empty array of line segments.");
   }
-  const segmentsMap = /* @__PURE__ */ new Map();
+  const segmentsMapIndexes = {};
   const polylines = [];
-  lineSegments.forEach(([start, end]) => {
-    const startKey = start.join(",");
-    const endKey = end.join(",");
-    segmentsMap.set(startKey, segmentsMap.get(startKey) || []);
-    segmentsMap.set(endKey, segmentsMap.get(endKey) || []);
-    segmentsMap.get(startKey).push(end);
-    segmentsMap.get(endKey).push(start);
+  const parsedSegmentIndexes = [];
+  const lineSegmentStrings = lineSegments.map((v) => v.map((c) => c.join(",")));
+  lineSegmentStrings.forEach(([start, end], i) => {
+    segmentsMapIndexes[start] = segmentsMapIndexes[start] ? [...segmentsMapIndexes[start] || [], i] : [i];
+    segmentsMapIndexes[end] = segmentsMapIndexes[end] ? [...segmentsMapIndexes[end] || [], i] : [i];
   });
-  const constructPolyline = (start, polyline) => {
-    let current = start;
-    while (segmentsMap.has(current.join(",")) && segmentsMap.get(current.join(",")).length > 0) {
-      const next = segmentsMap.get(current.join(",")).pop();
-      polyline.push(current);
-      if (next) {
-        const nextKey = next.join(",");
-        segmentsMap.delete(current.join(","));
-        current = next;
-        if (segmentsMap.has(nextKey)) {
-          segmentsMap.set(
-            nextKey,
-            (segmentsMap.get(nextKey) || []).filter((point) => point.join(",") !== current.join(","))
-          );
-        }
+  for (let i = 0; i < lineSegmentStrings.length; i++) {
+    if (parsedSegmentIndexes.includes(i))
+      continue;
+    parsedSegmentIndexes.push(i);
+    let [start, end] = lineSegmentStrings[i];
+    let polyline = [start, end];
+    while (start && segmentsMapIndexes[start]) {
+      const nextLineIndex = (_a = segmentsMapIndexes[start]) == null ? void 0 : _a.find(
+        (lineIndex) => !parsedSegmentIndexes.includes(lineIndex)
+      );
+      if (nextLineIndex) {
+        parsedSegmentIndexes.push(nextLineIndex);
+        const nextLineSegment = lineSegmentStrings[nextLineIndex];
+        const nextLineSegmentPointIndex = nextLineSegment[0] === start ? 1 : 0;
+        const newPoint = nextLineSegment[nextLineSegmentPointIndex];
+        polyline.unshift(newPoint);
+        start = newPoint;
+      } else {
+        start = null;
       }
     }
-    polyline.push(current);
-    return polyline;
-  };
-  const traverseSegmentsMap = (endpoints, startKey) => {
-    let start = startKey.split(",").map(Number);
-    while (endpoints.length > 0) {
-      const newPolyline = constructPolyline(start, []);
-      polylines.push(newPolyline);
-      start = endpoints.pop();
-    }
-  };
-  for (const [startKey, endpoints] of segmentsMap.entries()) {
-    if (endpoints && endpoints.length === 0) {
-      continue;
+    while (end && segmentsMapIndexes[end]) {
+      const nextLineIndex = (_b = segmentsMapIndexes[end]) == null ? void 0 : _b.find(
+        (lineIndex) => !parsedSegmentIndexes.includes(lineIndex)
+      );
+      if (nextLineIndex) {
+        parsedSegmentIndexes.push(nextLineIndex);
+        const nextLineSegment = lineSegmentStrings[nextLineIndex];
+        const nextLineSegmentPointIndex = nextLineSegment[0] === end ? 1 : 0;
+        const newPoint = nextLineSegment[nextLineSegmentPointIndex];
+        polyline.push(newPoint);
+        end = newPoint;
+      } else {
+        end = null;
+      }
     }
-    traverseSegmentsMap(endpoints || [], startKey);
+    polylines.push(polyline.map((coord) => coord.split(",").map((v) => parseFloat(v))));
   }
   return polylines;
 };
-var contourElevations = (minElevation, maxElevation, increment) => {
+var contourElevations = (minElevation, maxElevation, interval) => {
+  if (maxElevation >= Infinity) {
+    throw new Error("Contour elevations have to be finite numbers");
+  }
   const elevations = [];
-  const start = Math.ceil(minElevation * 2) / 2;
-  const end = Math.floor(maxElevation * 2) / 2;
-  for (let elevation = start; elevation <= end; elevation += increment) {
+  let elevation = Math.ceil(minElevation * interval) / interval;
+  while (elevation < maxElevation) {
     elevations.push(elevation);
+    elevation += interval;
   }
   return elevations;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "landxml",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Parse LandXML surfaces on the modern web.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",