landxml 0.1.0 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # landxml
 
+## 0.2.0
+
+### Minor Changes
+
+- ae3bcf7: Swapped xml reader package from `xml2json` to `xml-js`
+- ae3bcf7: Added `glb` download example into README.md
+
+### Patch Changes
+
+- ae3bcf7: Fixed dependency list
+
 ## 0.1.0
 
 ### Minor Changes

package/README.md

@@ -27,3 +27,22 @@ const loadGeojson = async () => {
     return reprojectGeoJson(geojson, wktString, targetCoordinateSystem, keepOriginalGeometryAsFeatureProperties);
 }
 ```
+
+### Example: Convert to GLB 3D model
+
+```typescript
+import { toGlb } from "landxml";
+
+const LandXml2GlbModel = async () => {
+    const landXmlString = "<?xml version="1.0"?>...</LandXML>";
+
+    // Define how the model's origin should be positioned (options: "origin" | "auto" | [x: number, y: number])
+    const center = "auto";
+    const glbSurfaces = await toGlb(landXmlString, center);
+
+    let { download, glb } = glbSurfaces[0];
+    download()
+
+    // Alternatively, process the raw binary data from the 'glb' variable (Uint8Array)
+}
+```

package/dist/index.js

@@ -145,34 +145,39 @@ var downloadGlb = (glbData, fileName) => {
 var download_glb_default = downloadGlb;
 
 // src/private/parse-xml.ts
-var import_xml2json = __toESM(require("xml2json"));
+var import_xml_js = __toESM(require("xml-js"));
 var parseXML = (xmlString) => __async(void 0, null, function* () {
-  const { LandXML } = yield import_xml2json.default.toJson(xmlString, { object: true, coerce: true, arrayNotation: true });
-  return LandXML[0].Surfaces[0].Surface.map((surface) => {
-    var _a, _b, _c;
+  const { LandXML } = import_xml_js.default.xml2js(xmlString, {
+    compact: true,
+    attributesKey: "attr",
+    textKey: "content"
+  });
+  const landXML_surfaces = Array.isArray(LandXML.Surfaces.Surface) ? LandXML.Surfaces.Surface : [LandXML.Surfaces.Surface];
+  return landXML_surfaces.map((surface) => {
+    var _a, _b;
     let points = [];
     let faces = [];
     let pointIdMap = {};
-    surface.Definition[0].Pnts[0].P.forEach((pt) => {
-      const { id, $t } = pt;
-      const [y, x, z] = $t.split(" ").map((v) => parseFloat(v));
+    surface.Definition.Pnts.P.forEach((pt) => {
+      const { attr, content } = pt;
+      const [y, x, z] = content.split(" ").map((v) => parseFloat(v));
       points.push([x, y, z]);
-      pointIdMap[id] = points.length - 1;
+      pointIdMap[attr.id] = points.length - 1;
     }, []);
-    faces = surface.Definition[0].Faces[0].F.map((face) => {
-      const { $t } = face;
-      const [a, b, c] = $t.split(" ").map((v) => pointIdMap[v]);
+    faces = surface.Definition.Faces.F.map((face) => {
+      const { content } = face;
+      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: ${$t}`;
+        throw `Invalid LandXML. A face is referencing a point that doesn't exist. Face is referencing points: ${content}`;
       }
       return [a, b, c];
     });
     return {
-      sourceFile: LandXML[0].Project[0].name,
-      timeStamp: LandXML[0].Application[0].timeStamp,
-      name: surface.name,
-      description: surface.desc,
-      wktString: ((_c = (_b = (_a = LandXML[0]) == null ? void 0 : _a.CoordinateSystem) == null ? void 0 : _b[0]) == null ? void 0 : _c.ogcWktCode) || void 0,
+      sourceFile: LandXML.Project.attr.name,
+      timeStamp: LandXML.Application.attr.timeStamp,
+      name: surface.attr.name,
+      description: surface.attr.desc,
+      wktString: (_b = (_a = LandXML.CoordinateSystem) == null ? void 0 : _a.attr) == null ? void 0 : _b.ogcWktCode,
       surfaceDefinition: {
         points,
         faces

package/dist/index.mjs

@@ -110,34 +110,39 @@ var downloadGlb = (glbData, fileName) => {
 var download_glb_default = downloadGlb;
 
 // src/private/parse-xml.ts
-import xml2json from "xml2json";
+import convert from "xml-js";
 var parseXML = (xmlString) => __async(void 0, null, function* () {
-  const { LandXML } = yield xml2json.toJson(xmlString, { object: true, coerce: true, arrayNotation: true });
-  return LandXML[0].Surfaces[0].Surface.map((surface) => {
-    var _a, _b, _c;
+  const { LandXML } = convert.xml2js(xmlString, {
+    compact: true,
+    attributesKey: "attr",
+    textKey: "content"
+  });
+  const landXML_surfaces = Array.isArray(LandXML.Surfaces.Surface) ? LandXML.Surfaces.Surface : [LandXML.Surfaces.Surface];
+  return landXML_surfaces.map((surface) => {
+    var _a, _b;
     let points = [];
     let faces = [];
     let pointIdMap = {};
-    surface.Definition[0].Pnts[0].P.forEach((pt) => {
-      const { id, $t } = pt;
-      const [y, x, z] = $t.split(" ").map((v) => parseFloat(v));
+    surface.Definition.Pnts.P.forEach((pt) => {
+      const { attr, content } = pt;
+      const [y, x, z] = content.split(" ").map((v) => parseFloat(v));
       points.push([x, y, z]);
-      pointIdMap[id] = points.length - 1;
+      pointIdMap[attr.id] = points.length - 1;
     }, []);
-    faces = surface.Definition[0].Faces[0].F.map((face) => {
-      const { $t } = face;
-      const [a, b, c] = $t.split(" ").map((v) => pointIdMap[v]);
+    faces = surface.Definition.Faces.F.map((face) => {
+      const { content } = face;
+      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: ${$t}`;
+        throw `Invalid LandXML. A face is referencing a point that doesn't exist. Face is referencing points: ${content}`;
       }
       return [a, b, c];
     });
     return {
-      sourceFile: LandXML[0].Project[0].name,
-      timeStamp: LandXML[0].Application[0].timeStamp,
-      name: surface.name,
-      description: surface.desc,
-      wktString: ((_c = (_b = (_a = LandXML[0]) == null ? void 0 : _a.CoordinateSystem) == null ? void 0 : _b[0]) == null ? void 0 : _c.ogcWktCode) || void 0,
+      sourceFile: LandXML.Project.attr.name,
+      timeStamp: LandXML.Application.attr.timeStamp,
+      name: surface.attr.name,
+      description: surface.attr.desc,
+      wktString: (_b = (_a = LandXML.CoordinateSystem) == null ? void 0 : _a.attr) == null ? void 0 : _b.ogcWktCode,
       surfaceDefinition: {
         points,
         faces

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "landxml",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Parse LandXML surfaces on the modern web.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -23,6 +23,7 @@
   "license": "MIT",
   "devDependencies": {
     "@changesets/cli": "^2.26.2",
+    "@types/geojson": "^7946.0.13",
     "@types/proj4": "^2.5.5",
     "@types/xml2json": "^0.11.6",
     "tsup": "^8.0.0",
@@ -31,8 +32,7 @@
   },
   "dependencies": {
     "@gltf-transform/core": "^3.9.0",
-    "@types/geojson": "^7946.0.13",
     "proj4": "^2.9.2",
-    "xml2json": "^0.12.0"
+    "xml-js": "^1.6.11"
   }
 }