osm2geojson-lite 0.8.13 → 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/index.html

@@ -75,7 +75,7 @@ this page is based on https://github.com/aaronlidman/osm-and-geojson (c)Aaron Li
         #osmdata, #geojson {
             width: 100%;
             background: white;
-            border: 1px solid #ccc;
+            border: 1px solid #cccccc;
             height: 320px;
             overflow: auto;
             margin-bottom: 20px;
@@ -115,6 +115,10 @@ this page is based on https://github.com/aaronlidman/osm-and-geojson (c)Aaron Li
             outline: none;
         }
 
+        textarea:focus {
+            box-shadow: 0 0 2px 1px #0c74a97f;
+        }
+
         #top {
             font-size: 22px;
             text-align: center;
@@ -219,11 +223,11 @@ this page is based on https://github.com/aaronlidman/osm-and-geojson (c)Aaron Li
         <div id="example">
             <div id="left">
                 <h3>OSM Data</h3>
-                <textarea id="osmdata" contenteditable="true"></textarea>
+                <textarea class="ta" id="osmdata" contenteditable="true"></textarea>
             </div>
             <div id="right">
                 <h3>GeoJSON</h3>
-                <textarea id="geojson" contenteditable="true"></textarea>
+                <textarea class="ta" id="geojson" contenteditable="true"></textarea>
             </div>
             <a class="button" href="" id="toGeo">Convert to GeoJSON &rarr;</a>
         </div>

package/lib/index.d.ts

@@ -0,0 +1,21 @@
+import {FeatureCollection, GeometryObject} from 'geojson';
+
+export = osm2geojson;
+export as namespace osm2geojson;
+
+declare var osm2geojson: osm2geojson.Default;
+
+declare namespace osm2geojson {
+    interface Options {
+        completeFeature?: boolean;
+        allFeatures?: boolean;
+        renderTagged?: boolean;
+        excludeWay?: boolean;
+        suppressWay?: boolean;
+    }
+
+    export interface Default {
+        // tslint:disable-next-line:no-any
+        (osm: string | {[k: string]: any}, opts?: Options): FeatureCollection<GeometryObject>;
+    }
+}

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/lib/osmobjs.js

@@ -192,7 +192,7 @@ module.exports = (() => {
 					break;
 
 				case 'way':
-					if (!member.role) member.role === '';
+					if (!member.role) member.role = '';
 					let ways = this[member.role];
 					if (!ways) ways = this[member.role] = [];
 					if (member.geometry) {

package/lib/xmlparser.js

@@ -27,7 +27,7 @@ module.exports = (() => {
 			this.evtListeners = {};
 		}
 
-		parse(xml, parent?, dir?) {
+		parse(xml, parent, dir) {
 			dir = dir? dir + '.' : '';
 			let nodeRegEx = /<([^ >\/]+)(.*?)>/mg, nodeMatch = null, nodes = [];
 			while (nodeMatch = nodeRegEx.exec(xml)) {

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"
   },
@@ -52,10 +55,17 @@
   "scripts": {
     "test": "npm run --prefix test test"
   },
-  "version": "0.8.13",
+  "optionalDependencies": {
+    "@types/geojson": "^1.0.6"
+  },
+  "types": "lib/index.d.ts",
+  "version": "0.9.0",
   "directories": {
     "lib": "lib",
     "test": "test"
   },
-  "devDependencies": {}
+  "devDependencies": {
+    "browserify": "^17.0.0",
+    "uglify-js": "^3.14.5"
+  }
 }

package/ts/release/index.js

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