osm2geojson-lite 0.9.1 → 0.9.2

package/bench/package-lock.json

@@ -10,7 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "osmtogeojson": "^3.0.0-beta.3",
-        "xmldom": "^0.1.27"
+        "xmldom": "^0.6.0"
       }
     },
     "node_modules/@mapbox/geojson-area": {
@@ -292,6 +292,15 @@
         "@types/geojson": "^1.0.2"
       }
     },
+    "node_modules/osmtogeojson/node_modules/xmldom": {
+      "version": "0.1.31",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
+      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
+      "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
+      "engines": {
+        "node": ">=0.1"
+      }
+    },
     "node_modules/pbf": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
@@ -442,12 +451,11 @@
       }
     },
     "node_modules/xmldom": {
-      "version": "0.1.31",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
-      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
-      "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz",
+      "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==",
       "engines": {
-        "node": ">=0.1"
+        "node": ">=10.0.0"
       }
     }
   },
@@ -683,6 +691,13 @@
         "osm-polygon-features": "^0.9.1",
         "tiny-osmpbf": "^0.1.0",
         "xmldom": "~0.1.16"
+      },
+      "dependencies": {
+        "xmldom": {
+          "version": "0.1.31",
+          "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
+          "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
+        }
       }
     },
     "pbf": {
@@ -808,9 +823,9 @@
       "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
     },
     "xmldom": {
-      "version": "0.1.31",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
-      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz",
+      "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg=="
     }
   }
 }

package/bench/package.json

@@ -10,6 +10,6 @@
   "license": "ISC",
   "dependencies": {
     "osmtogeojson": "^3.0.0-beta.3",
-    "xmldom": "^0.1.27"
+    "xmldom": "^0.6.0"
   }
 }

package/lib/index.js

@@ -1,205 +1,205 @@
 const {Node, Way, Relation} = require('./osmobjs.js'),
-	{purgeProps, RefElements} = require('./utils.js'),
-	XmlParser = require('./xmlparser.js');
+    {purgeProps, RefElements} = require('./utils.js'),
+    XmlParser = require('./xmlparser.js');
 
 module.exports = (osm, opts) => {
-	let completeFeature = false, renderTagged = false, excludeWay = true;
-
-	const parseOpts = opts => {
-		if (opts) {
-			completeFeature = opts.completeFeature || opts.allFeatures? true : false;
-			renderTagged = opts.renderTagged? true : false;
-			let wayOpt = opts.suppressWay || opts.excludeWay;
-			if (wayOpt !== undefined && !wayOpt) {
-				excludeWay = false;
-			}
-		}
-	}
-
-	parseOpts(opts);
-
-	const detectFormat = osm => {
-		if (osm.elements) {
-			return 'json';
-		}
-		if (osm.indexOf('<osm') >= 0) {
-			return 'xml';
-		}
-		if (osm.trim().startsWith('{')) {
-			return 'json-raw';
-		}
-		return 'invalid';
-	}
-
-	let format = detectFormat(osm);
-
-	let refElements = new RefElements(), featureArray = [];
-
-	const analyzeFeaturesFromJson = osm => {
-		for (let elem of osm.elements) {
-			switch(elem.type) {
-				case 'node':
-					let node = new Node(elem.id, refElements);
-					if (elem.tags) {
-						node.addTags(elem.tags);
-					}
-					node.addProps(purgeProps(elem, ['id', 'type', 'tags', 'lat', 'lon']));
-					node.setLatLng(elem);
-					break;
-
-				case 'way':
-					let way = new Way(elem.id, refElements);
-					if (elem.tags) {
-						way.addTags(elem.tags);
-					}
-					way.addProps(purgeProps(elem, ['id', 'type', 'tags', 'nodes', 'geometry']));
-					if (elem.nodes) {
-						for (let n of elem.nodes) {
-							way.addNodeRef(n);
-						}
-					} else if (elem.geometry) {
-						way.setLatLngArray(elem.geometry);
-					}
-					break;
-
-				case 'relation':
-					let relation = new Relation(elem.id, refElements);
-					  if (elem.bounds) {
-						relation.setBounds([parseFloat(elem.bounds.minlon), parseFloat(elem.bounds.minlat), parseFloat(elem.bounds.maxlon), parseFloat(elem.bounds.maxlat)]);
-					}
-					if (elem.tags) {
-						relation.addTags(elem.tags);
-					}
-					relation.addProps(purgeProps(elem, ['id', 'type', 'tags', 'bounds', 'members']));
-					if (elem.members) {
-						for (let member of elem.members) {
-							relation.addMember(member);
-						}
-					}
-					break;
-
-				default:
-					break;
-			}
-		}
-	}
-
-	const analyzeFeaturesFromXml = osm => {
-		const xmlParser = new XmlParser({progressive: true});
-
-		xmlParser.on('</osm.node>', node => {
-			let nd = new Node(node.id, refElements);
-			for (let [k, v] of Object.entries(node))
-				if (!k.startsWith('$') && ['id', 'lon', 'lat'].indexOf(k) < 0) {
-					nd.addProp(k, v);
-				}
-			nd.setLatLng(node);
-			if (node.$innerNodes) {
-				for (let ind of node.$innerNodes) {
-					if(ind.$tag === 'tag') {
-						nd.addTag(ind.k, ind.v);
-					}
-				}
-			}
-		});
-
-		xmlParser.on('</osm.way>', node => {
-			let way = new Way(node.id, refElements);
-			for (let [k, v] of Object.entries(node)) {
-				if (!k.startsWith('$') && ['id'].indexOf(k) < 0) {
-					way.addProp(k, v);
-				}
-			}
-			if (node.$innerNodes) {
-				for (let ind of node.$innerNodes) {
-					if (ind.$tag === 'nd') {
-						if (ind.lon && ind.lat) {
-							way.addLatLng(ind);
-						} else if (ind.ref) {
-							way.addNodeRef(ind.ref);
-						}
-					} else if (ind.$tag === 'tag')
-						way.addTag(ind.k, ind.v);
-				}
-			}
-		});
-
-		xmlParser.on('<osm.relation>', node => {
-			new Relation(node.id, refElements);
-		});
-
-		xmlParser.on('</osm.relation.member>', (node, parent) => {
-			let relation = refElements.get(`relation/${parent.id}`);
-			let member = {
-				type: node.type,
-				role: node.role? node.role : '',
-				ref: node.ref
-			};
-			if (node.lat && node.lon) {
-				member.lat = node.lat, member.lon = node.lon, member.tags = {};
-				for (let [k, v] of Object.entries(node)) {
-					if (!k.startsWith('$') && ['type', 'lat', 'lon'].indexOf(k) < 0) {
-						member[k] = v;
-					}
-				}
-			}
-			if (node.$innerNodes) {
-				let geometry = [];
-				let nodes = [];
-				for (let ind of node.$innerNodes) {
-					if (ind.lat && ind.lon) {
-						geometry.push(ind);
-					} else {
-						nodes.push(ind.ref);
-					}
-				}
-				if (geometry.length > 0) {
-					member.geometry = geometry;
-				} else if (nodes.length > 0) {
-					member.nodes = nodes;
-				}
-			}
-			relation.addMember(member);
-		});
-
-		xmlParser.on('</osm.relation.bounds>', (node, parent) => {
-			refElements.get(`relation/${parent.id}`).setBounds([parseFloat(node.minlon), parseFloat(node.minlat), parseFloat(node.maxlon), parseFloat(node.maxlat)]);
-		});
-
-		xmlParser.on('</osm.relation.tag>', (node, parent) => {
-			refElements.get(`relation/${parent.id}`).addTag(node.k, node.v);
-		});
-		
-		xmlParser.parse(osm);
-	}
-
-	if (format === 'json-raw') {
-		osm = JSON.parse(osm);
-		if (osm.elements) {
-			format = 'json';
-		} else {
-			format = 'invalid';
-		}
-	}
-
-	if (format === 'json') {
-		analyzeFeaturesFromJson(osm);
-	} else if (format === 'xml') {
-		analyzeFeaturesFromXml(osm);
-	}
-
-	refElements.bindAll();
-
-	for (let v of refElements.values()) {
-		if (v.refCount <= 0 || (v.hasTag && renderTagged && !(v instanceof Way && excludeWay))) {
-			let features = v.toFeatureArray();
-			// return the first geometry of the first relation element
-			if (v instanceof Relation && !completeFeature && features.length > 0) {
-				return features[0].geometry;
-			}
-			featureArray = featureArray.concat(features);
-		}
-	}
-
-	return {type: 'FeatureCollection', features: featureArray};
+    let completeFeature = false, renderTagged = false, excludeWay = true;
+
+    const parseOpts = opts => {
+        if (opts) {
+            completeFeature = opts.completeFeature || opts.allFeatures? true : false;
+            renderTagged = opts.renderTagged? true : false;
+            let wayOpt = opts.suppressWay || opts.excludeWay;
+            if (wayOpt !== undefined && !wayOpt) {
+                excludeWay = false;
+            }
+        }
+    }
+
+    parseOpts(opts);
+
+    const detectFormat = osm => {
+        if (osm.elements) {
+            return 'json';
+        }
+        if (osm.indexOf('<osm') >= 0) {
+            return 'xml';
+        }
+        if (osm.trim().startsWith('{')) {
+            return 'json-raw';
+        }
+        return 'invalid';
+    }
+
+    let format = detectFormat(osm);
+
+    let refElements = new RefElements(), featureArray = [];
+
+    const analyzeFeaturesFromJson = osm => {
+        for (let elem of osm.elements) {
+            switch(elem.type) {
+                case 'node':
+                    let node = new Node(elem.id, refElements);
+                    if (elem.tags) {
+                        node.addTags(elem.tags);
+                    }
+                    node.addProps(purgeProps(elem, ['id', 'type', 'tags', 'lat', 'lon']));
+                    node.setLatLng(elem);
+                    break;
+
+                case 'way':
+                    let way = new Way(elem.id, refElements);
+                    if (elem.tags) {
+                        way.addTags(elem.tags);
+                    }
+                    way.addProps(purgeProps(elem, ['id', 'type', 'tags', 'nodes', 'geometry']));
+                    if (elem.nodes) {
+                        for (let n of elem.nodes) {
+                            way.addNodeRef(n);
+                        }
+                    } else if (elem.geometry) {
+                        way.setLatLngArray(elem.geometry);
+                    }
+                    break;
+
+                case 'relation':
+                    let relation = new Relation(elem.id, refElements);
+                      if (elem.bounds) {
+                        relation.setBounds([parseFloat(elem.bounds.minlon), parseFloat(elem.bounds.minlat), parseFloat(elem.bounds.maxlon), parseFloat(elem.bounds.maxlat)]);
+                    }
+                    if (elem.tags) {
+                        relation.addTags(elem.tags);
+                    }
+                    relation.addProps(purgeProps(elem, ['id', 'type', 'tags', 'bounds', 'members']));
+                    if (elem.members) {
+                        for (let member of elem.members) {
+                            relation.addMember(member);
+                        }
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+    }
+
+    const analyzeFeaturesFromXml = osm => {
+        const xmlParser = new XmlParser({progressive: true});
+
+        xmlParser.on('</osm.node>', node => {
+            let nd = new Node(node.id, refElements);
+            for (let [k, v] of Object.entries(node))
+                if (!k.startsWith('$') && ['id', 'lon', 'lat'].indexOf(k) < 0) {
+                    nd.addProp(k, v);
+                }
+            nd.setLatLng(node);
+            if (node.$innerNodes) {
+                for (let ind of node.$innerNodes) {
+                    if(ind.$tag === 'tag') {
+                        nd.addTag(ind.k, ind.v);
+                    }
+                }
+            }
+        });
+
+        xmlParser.on('</osm.way>', node => {
+            let way = new Way(node.id, refElements);
+            for (let [k, v] of Object.entries(node)) {
+                if (!k.startsWith('$') && ['id'].indexOf(k) < 0) {
+                    way.addProp(k, v);
+                }
+            }
+            if (node.$innerNodes) {
+                for (let ind of node.$innerNodes) {
+                    if (ind.$tag === 'nd') {
+                        if (ind.lon && ind.lat) {
+                            way.addLatLng(ind);
+                        } else if (ind.ref) {
+                            way.addNodeRef(ind.ref);
+                        }
+                    } else if (ind.$tag === 'tag')
+                        way.addTag(ind.k, ind.v);
+                }
+            }
+        });
+
+        xmlParser.on('<osm.relation>', node => {
+            new Relation(node.id, refElements);
+        });
+
+        xmlParser.on('</osm.relation.member>', (node, parent) => {
+            let relation = refElements.get(`relation/${parent.id}`);
+            let member = {
+                type: node.type,
+                role: node.role? node.role : '',
+                ref: node.ref
+            };
+            if (node.lat && node.lon) {
+                member.lat = node.lat, member.lon = node.lon, member.tags = {};
+                for (let [k, v] of Object.entries(node)) {
+                    if (!k.startsWith('$') && ['type', 'lat', 'lon'].indexOf(k) < 0) {
+                        member[k] = v;
+                    }
+                }
+            }
+            if (node.$innerNodes) {
+                let geometry = [];
+                let nodes = [];
+                for (let ind of node.$innerNodes) {
+                    if (ind.lat && ind.lon) {
+                        geometry.push(ind);
+                    } else {
+                        nodes.push(ind.ref);
+                    }
+                }
+                if (geometry.length > 0) {
+                    member.geometry = geometry;
+                } else if (nodes.length > 0) {
+                    member.nodes = nodes;
+                }
+            }
+            relation.addMember(member);
+        });
+
+        xmlParser.on('</osm.relation.bounds>', (node, parent) => {
+            refElements.get(`relation/${parent.id}`).setBounds([parseFloat(node.minlon), parseFloat(node.minlat), parseFloat(node.maxlon), parseFloat(node.maxlat)]);
+        });
+
+        xmlParser.on('</osm.relation.tag>', (node, parent) => {
+            refElements.get(`relation/${parent.id}`).addTag(node.k, node.v);
+        });
+        
+        xmlParser.parse(osm);
+    }
+
+    if (format === 'json-raw') {
+        osm = JSON.parse(osm);
+        if (osm.elements) {
+            format = 'json';
+        } else {
+            format = 'invalid';
+        }
+    }
+
+    if (format === 'json') {
+        analyzeFeaturesFromJson(osm);
+    } else if (format === 'xml') {
+        analyzeFeaturesFromXml(osm);
+    }
+
+    refElements.bindAll();
+
+    for (let v of refElements.values()) {
+        if (v.refCount <= 0 || (v.hasTag && renderTagged && !(v instanceof Way && excludeWay))) {
+            let features = v.toFeatureArray();
+            // return the first geometry of the first relation element
+            if (v instanceof Relation && !completeFeature && features.length > 0) {
+                return features[0].geometry;
+            }
+            featureArray = featureArray.concat(features);
+        }
+    }
+
+    return {type: 'FeatureCollection', features: featureArray};
 }