osm2geojson-lite 0.8.16 → 0.9.0

package/Makefile

@@ -1,2 +1,2 @@
 osm2geojson-lite.js: lib/index.js package.json
-	browserify -s osm2geojson lib/index.js | uglifyjs -c -m -o dist/osm2geojson-lite.js
+	npx browserify -s osm2geojson lib/index.js | npx uglifyjs -c -m -o dist/osm2geojson-lite.js

package/lib/index.js

@@ -50,8 +50,9 @@ module.exports = (osm, opts) => {
 
 				case 'relation':
 					let relation = new Relation(elem.id, refElements);
-					if (elem.bounds) with (elem.bounds)
-						relation.setBounds([parseFloat(minlon), parseFloat(minlat), parseFloat(maxlon), parseFloat(maxlat)]);
+					  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)
@@ -69,35 +70,31 @@ module.exports = (osm, opts) => {
 		const xmlParser = new XmlParser({progressive: true});
 
 		xmlParser.on('</osm.node>', node => {
-			with (node) {
-				let nd = new 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 $innerNodes)
-						if(ind.$tag === 'tag')
-							nd.addTag(ind.k, ind.v);
-			}
+			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 => {
-			with (node) {
-				let way = new Way(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 $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);
-				}
+			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);
 			}
 		});
 
@@ -106,42 +103,37 @@ module.exports = (osm, opts) => {
 		});
 
 		xmlParser.on('</osm.relation.member>', (node, parent) => {
-			with (node) {
-				let relation = refElements.get(`relation/${parent.id}`);
-				let member = {
-					type: type,
-					role: node.role? role : '',
-					ref: ref
-				};
-
-				if (node.lat && node.lon) {
-					member.lat = lat, member.lon = 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 $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;
+			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);
 				}
-				relation.addMember(member);
+				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) => {
-			with (node)
-				refElements.get(`relation/${parent.id}`).setBounds([parseFloat(minlon), parseFloat(minlat), parseFloat(maxlon), parseFloat(maxlat)]);
+			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) => {

package/osm2geojson-lite

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+
+const fs = require("fs");
+const osm2geojson = require('./lib/index.js');
+
+const data = fs.readFileSync("/dev/stdin", "utf-8");
+
+const geojson = osm2geojson(data, {});
+
+process.stdout.write(JSON.stringify(geojson));

package/package.json

@@ -19,6 +19,9 @@
     "/"
   ],
   "author": "tibetty",
+  "bin": {
+    "osm2geojson-lite": "osm2geojson-lite"
+  },
   "bugs": {
     "url": "https://github.com/tibetty/osm2geojson-lite/issues"
   },
@@ -56,10 +59,13 @@
     "@types/geojson": "^1.0.6"
   },
   "types": "lib/index.d.ts",
-  "version": "0.8.16",
+  "version": "0.9.0",
   "directories": {
     "lib": "lib",
     "test": "test"
   },
-  "devDependencies": {}
+  "devDependencies": {
+    "browserify": "^17.0.0",
+    "uglify-js": "^3.14.5"
+  }
 }