landxml 0.4.1 → 0.5.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # landxml
 
+## 0.5.0
+
+### Minor Changes
+
+- df95e64: Added ability to generate surface outline geojson
+
+### Patch Changes
+
+- df95e64: LandXML Face with with "i" attribute equal to "1" will now be correctly ignored
+- df95e64: Improved contour generation algorithm
+
+## 0.4.2
+
+### Patch Changes
+
+- fbd9682: Contour elevations from surface min/max elevations and increment are now calculated correctly (bugfix).
+
 ## 0.4.1
 
 ### Patch Changes

package/dist/index.d.mts

@@ -39,7 +39,7 @@ declare const toGlb: (landXmlString: string, center?: "auto" | "origin" | [
  * @returns {string} surfaceContours[].wktString - WKT string of LandXML coordinate system projection
  * @returns {Object} surfaceContours[].geojson - Geojson feature collection of contour lines
  */
-declare const toGeojsonContours: (landXmlString: string, contourInterval?: number, surfaceId?: string | number) => Promise<{
+declare const toGeojsonContours: (landXmlString: string, contourInterval?: number, generateOutline?: boolean, surfaceId?: string | number) => Promise<{
     name: string;
     description: string;
     sourceFile: string;

package/dist/index.d.ts

@@ -39,7 +39,7 @@ declare const toGlb: (landXmlString: string, center?: "auto" | "origin" | [
  * @returns {string} surfaceContours[].wktString - WKT string of LandXML coordinate system projection
  * @returns {Object} surfaceContours[].geojson - Geojson feature collection of contour lines
  */
-declare const toGeojsonContours: (landXmlString: string, contourInterval?: number, surfaceId?: string | number) => Promise<{
+declare const toGeojsonContours: (landXmlString: string, contourInterval?: number, generateOutline?: boolean, surfaceId?: string | number) => Promise<{
     name: string;
     description: string;
     sourceFile: string;

package/dist/index.js

@@ -164,14 +164,16 @@ var parseXML = (xmlString) => __async(void 0, null, function* () {
       points.push([x, y, z]);
       pointIdMap[attr.id] = points.length - 1;
     }, []);
-    faces = surface.Definition.Faces.F.map((face) => {
-      const { content } = face;
+    faces = surface.Definition.Faces.F.reduce((faceList, face) => {
+      const { attr, content } = face;
+      if (attr.i === "1")
+        return faceList;
       const [a, b, c] = content.split(" ").map((v) => pointIdMap[v]);
       if ([a, b, c].filter((v) => typeof v === "undefined").length > 0) {
         throw `Invalid LandXML. A face is referencing a point that doesn't exist. Face is referencing points: ${content}`;
       }
-      return [a, b, c];
-    });
+      return faceList.concat([[a, b, c]]);
+    }, []);
     return {
       sourceFile: LandXML.Project.attr.name,
       timeStamp: LandXML.Application.attr.timeStamp,
@@ -220,11 +222,14 @@ var contourLineOnFace = (face, z) => {
   for (let i = 0; i < face.length; i++) {
     let vertex1 = face[i];
     let vertex2 = face[(i + 1) % face.length];
-    if (vertex1[2] <= z && vertex2[2] >= z || vertex1[2] >= z && vertex2[2] <= z) {
+    if ((vertex1[2] <= z && vertex2[2] >= z || vertex1[2] >= z && vertex2[2] <= z) && !Number.isNaN((z - vertex1[2]) / (vertex2[2] - vertex1[2]))) {
       let t = (z - vertex1[2]) / (vertex2[2] - vertex1[2]);
       line.push([vertex1[0] + t * (vertex2[0] - vertex1[0]), vertex1[1] + t * (vertex2[1] - vertex1[1])]);
     }
   }
+  if (line.length > 2) {
+    line = [...new Set(line.map((v) => JSON.stringify(v)))].map((s) => JSON.parse(s));
+  }
   return line.length > 0 ? line : void 0;
 };
 var linesToPolyLines = (lineSegments) => {
@@ -281,11 +286,14 @@ var linesToPolyLines = (lineSegments) => {
   return polylines;
 };
 var contourElevations = (minElevation, maxElevation, interval) => {
-  if (maxElevation >= Infinity) {
+  if (!Number.isFinite(minElevation) || !Number.isFinite(maxElevation) || !Number.isFinite(interval)) {
     throw new Error("Contour elevations have to be finite numbers");
   }
+  if (minElevation + interval > maxElevation) {
+    throw new Error(`No contour lines at interval: ${interval} between elevation ${minElevation} and ${maxElevation}`);
+  }
   const elevations = [];
-  let elevation = Math.ceil(minElevation * interval) / interval;
+  let elevation = Math.ceil(minElevation / interval) * interval;
   while (elevation < maxElevation) {
     elevations.push(elevation);
     elevation += interval;
@@ -322,29 +330,76 @@ var getContours = (data, interval = 2) => __async(void 0, null, function* () {
     [Infinity, -Infinity]
   );
   const elevations = contourElevations(minElevation, maxElevation, interval);
-  const elevationPolylines = elevations.map((e) => ({
-    elevation: e,
-    polylines: linesToPolyLines(
-      triangles.reduce((prev, curr) => {
-        const line = contourLineOnFace(curr, e);
-        if (line)
-          prev.push(line);
-        return prev;
-      }, [])
-    )
-  }));
+  const elevationPolylines = elevations.map((e) => {
+    const linesAtElevationE = triangles.reduce((prev, curr) => {
+      const line = contourLineOnFace(curr, e);
+      if (line)
+        prev.push(line);
+      return prev;
+    }, []);
+    const polylinesAtElevationE = linesToPolyLines(linesAtElevationE);
+    return {
+      elevation: e,
+      polylines: polylinesAtElevationE
+    };
+  });
   return constructGeojson(elevationPolylines);
 });
 var get_contours_default = getContours;
 
+// src/private/get-outline.ts
+var getOutline = (surface) => {
+  const triangleVertexIdEdgePairs = [];
+  let i = -1;
+  let pairs = [];
+  surface.surfaceDefinition.faces.forEach((f) => {
+    pairs = [];
+    [
+      [f[0], f[1]],
+      [f[1], f[2]],
+      [f[2], f[0]]
+    ].forEach(([a, b]) => {
+      if (a < b) {
+        pairs.push(`${a};${b}`);
+      } else {
+        pairs.push(`${b};${a}`);
+      }
+    });
+    pairs.forEach((pair) => {
+      i = triangleVertexIdEdgePairs.indexOf(pair);
+      if (i >= 0) {
+        triangleVertexIdEdgePairs.splice(i, 1);
+      } else {
+        triangleVertexIdEdgePairs.push(pair);
+      }
+    });
+  });
+  const edges = [];
+  triangleVertexIdEdgePairs.map((pair) => {
+    const [v1, v2] = pair.split(";").map((v) => {
+      var _a;
+      return (_a = surface.surfaceDefinition.points[parseInt(v, 10)]) == null ? void 0 : _a.slice(0, 2);
+    });
+    if (v1 && v2)
+      edges.push([v1, v2]);
+  });
+  return constructGeojson([{ elevation: 0, polylines: linesToPolyLines(edges) }]);
+};
+var get_outline_default = getOutline;
+
 // src/public/to-geojson-contours.ts
-var toGeojsonContours = (landXmlString, contourInterval = 2, surfaceId = -1) => __async(void 0, null, function* () {
+var toGeojsonContours = (landXmlString, contourInterval = 2, generateOutline = true, surfaceId = -1) => __async(void 0, null, function* () {
   let requestedParsedSurfaces = filter_by_surfaceId_default(yield parse_xml_default(landXmlString), surfaceId);
   const contours = yield Promise.all(
     requestedParsedSurfaces.map(
       (surface) => new Promise((resolve, reject) => __async(void 0, null, function* () {
         try {
           const geojson = yield get_contours_default(surface, contourInterval);
+          if (generateOutline) {
+            const outlineGeojson = get_outline_default(surface);
+            console.log(outlineGeojson.features);
+            geojson.features = [...geojson.features, ...outlineGeojson.features];
+          }
           const _a = surface, { surfaceDefinition } = _a, rest = __objRest(_a, ["surfaceDefinition"]);
           resolve(__spreadProps(__spreadValues({}, rest), {
             geojson

package/dist/index.mjs

@@ -129,14 +129,16 @@ var parseXML = (xmlString) => __async(void 0, null, function* () {
       points.push([x, y, z]);
       pointIdMap[attr.id] = points.length - 1;
     }, []);
-    faces = surface.Definition.Faces.F.map((face) => {
-      const { content } = face;
+    faces = surface.Definition.Faces.F.reduce((faceList, face) => {
+      const { attr, content } = face;
+      if (attr.i === "1")
+        return faceList;
       const [a, b, c] = content.split(" ").map((v) => pointIdMap[v]);
       if ([a, b, c].filter((v) => typeof v === "undefined").length > 0) {
         throw `Invalid LandXML. A face is referencing a point that doesn't exist. Face is referencing points: ${content}`;
       }
-      return [a, b, c];
-    });
+      return faceList.concat([[a, b, c]]);
+    }, []);
     return {
       sourceFile: LandXML.Project.attr.name,
       timeStamp: LandXML.Application.attr.timeStamp,
@@ -185,11 +187,14 @@ var contourLineOnFace = (face, z) => {
   for (let i = 0; i < face.length; i++) {
     let vertex1 = face[i];
     let vertex2 = face[(i + 1) % face.length];
-    if (vertex1[2] <= z && vertex2[2] >= z || vertex1[2] >= z && vertex2[2] <= z) {
+    if ((vertex1[2] <= z && vertex2[2] >= z || vertex1[2] >= z && vertex2[2] <= z) && !Number.isNaN((z - vertex1[2]) / (vertex2[2] - vertex1[2]))) {
       let t = (z - vertex1[2]) / (vertex2[2] - vertex1[2]);
       line.push([vertex1[0] + t * (vertex2[0] - vertex1[0]), vertex1[1] + t * (vertex2[1] - vertex1[1])]);
     }
   }
+  if (line.length > 2) {
+    line = [...new Set(line.map((v) => JSON.stringify(v)))].map((s) => JSON.parse(s));
+  }
   return line.length > 0 ? line : void 0;
 };
 var linesToPolyLines = (lineSegments) => {
@@ -246,11 +251,14 @@ var linesToPolyLines = (lineSegments) => {
   return polylines;
 };
 var contourElevations = (minElevation, maxElevation, interval) => {
-  if (maxElevation >= Infinity) {
+  if (!Number.isFinite(minElevation) || !Number.isFinite(maxElevation) || !Number.isFinite(interval)) {
     throw new Error("Contour elevations have to be finite numbers");
   }
+  if (minElevation + interval > maxElevation) {
+    throw new Error(`No contour lines at interval: ${interval} between elevation ${minElevation} and ${maxElevation}`);
+  }
   const elevations = [];
-  let elevation = Math.ceil(minElevation * interval) / interval;
+  let elevation = Math.ceil(minElevation / interval) * interval;
   while (elevation < maxElevation) {
     elevations.push(elevation);
     elevation += interval;
@@ -287,29 +295,76 @@ var getContours = (data, interval = 2) => __async(void 0, null, function* () {
     [Infinity, -Infinity]
   );
   const elevations = contourElevations(minElevation, maxElevation, interval);
-  const elevationPolylines = elevations.map((e) => ({
-    elevation: e,
-    polylines: linesToPolyLines(
-      triangles.reduce((prev, curr) => {
-        const line = contourLineOnFace(curr, e);
-        if (line)
-          prev.push(line);
-        return prev;
-      }, [])
-    )
-  }));
+  const elevationPolylines = elevations.map((e) => {
+    const linesAtElevationE = triangles.reduce((prev, curr) => {
+      const line = contourLineOnFace(curr, e);
+      if (line)
+        prev.push(line);
+      return prev;
+    }, []);
+    const polylinesAtElevationE = linesToPolyLines(linesAtElevationE);
+    return {
+      elevation: e,
+      polylines: polylinesAtElevationE
+    };
+  });
   return constructGeojson(elevationPolylines);
 });
 var get_contours_default = getContours;
 
+// src/private/get-outline.ts
+var getOutline = (surface) => {
+  const triangleVertexIdEdgePairs = [];
+  let i = -1;
+  let pairs = [];
+  surface.surfaceDefinition.faces.forEach((f) => {
+    pairs = [];
+    [
+      [f[0], f[1]],
+      [f[1], f[2]],
+      [f[2], f[0]]
+    ].forEach(([a, b]) => {
+      if (a < b) {
+        pairs.push(`${a};${b}`);
+      } else {
+        pairs.push(`${b};${a}`);
+      }
+    });
+    pairs.forEach((pair) => {
+      i = triangleVertexIdEdgePairs.indexOf(pair);
+      if (i >= 0) {
+        triangleVertexIdEdgePairs.splice(i, 1);
+      } else {
+        triangleVertexIdEdgePairs.push(pair);
+      }
+    });
+  });
+  const edges = [];
+  triangleVertexIdEdgePairs.map((pair) => {
+    const [v1, v2] = pair.split(";").map((v) => {
+      var _a;
+      return (_a = surface.surfaceDefinition.points[parseInt(v, 10)]) == null ? void 0 : _a.slice(0, 2);
+    });
+    if (v1 && v2)
+      edges.push([v1, v2]);
+  });
+  return constructGeojson([{ elevation: 0, polylines: linesToPolyLines(edges) }]);
+};
+var get_outline_default = getOutline;
+
 // src/public/to-geojson-contours.ts
-var toGeojsonContours = (landXmlString, contourInterval = 2, surfaceId = -1) => __async(void 0, null, function* () {
+var toGeojsonContours = (landXmlString, contourInterval = 2, generateOutline = true, surfaceId = -1) => __async(void 0, null, function* () {
   let requestedParsedSurfaces = filter_by_surfaceId_default(yield parse_xml_default(landXmlString), surfaceId);
   const contours = yield Promise.all(
     requestedParsedSurfaces.map(
       (surface) => new Promise((resolve, reject) => __async(void 0, null, function* () {
         try {
           const geojson = yield get_contours_default(surface, contourInterval);
+          if (generateOutline) {
+            const outlineGeojson = get_outline_default(surface);
+            console.log(outlineGeojson.features);
+            geojson.features = [...geojson.features, ...outlineGeojson.features];
+          }
           const _a = surface, { surfaceDefinition } = _a, rest = __objRest(_a, ["surfaceDefinition"]);
           resolve(__spreadProps(__spreadValues({}, rest), {
             geojson

package/package.json

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