osm2geojson-lite 1.2.0 → 2.0.1

package/package.json

@@ -1,33 +1,54 @@
 {
-  "_from": "xml2geojson-lite",
-  "_inBundle": false,
-  "_integrity": "sha512-FGxK8VIn/S86TRwcy9OM64KGOLMOc/952ybsYA9npTXdpfezIfS5khRqW/cC67uu8P0sNuSsk+vx1UbO6VM2jQ==",
-  "_location": "/osm2geojson-lite",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "osm2geojson-lite",
-    "name": "osm2geojson-lite",
-    "escapedName": "osm2geojson-lite",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
+  "name": "osm2geojson-lite",
+  "version": "2.0.1",
+  "description": "a lightweight yet faster osm (either in xml or in json formats) to geojson convertor - 4x faster than xmldom + osmtogeojson in most situations - implemented in pure JavaScript without any 3rd party dependency",
+  "author": "tibetty",
+  "license": "MIT",
+  "main": "dist/index.js",
+  "type": "module",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
   },
-  "_requiredBy": [
-    "#USER",
-    "/"
+  "files": [
+    "dist/**/*.js",
+    "dist/**/*.mjs",
+    "dist/**/*.d.ts",
+    "dist/**/*.json"
   ],
-  "author": "tibetty",
+  "scripts": {
+    "build": "rolldown -c && cp src/polytags.json dist/",
+    "test": "vitest test/e2e.test.ts --coverage"
+  },
+  "optionalDependencies": {
+    "@types/geojson": "^7946.0.16"
+  },
+  "devDependencies": {
+    "@types/node": "^24.12.2",
+    "@vitest/coverage-v8": "^4.1.5",
+    "rolldown": "^1.0.0-rc.18",
+    "rolldown-plugin-dts": "^0.24.1",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.5"
+  },
   "bin": {
-    "osm2geojson-lite": "osm2geojson-lite"
+    "osm2geojson-lite": "dist/cli.mjs"
+  },
+  "directories": {
+    "lib": "lib",
+    "test": "test"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tibetty/osm2geojson-lite.git"
   },
   "bugs": {
     "url": "https://github.com/tibetty/osm2geojson-lite/issues"
   },
-  "bundleDependencies": [],
-  "deprecated": false,
-  "description": "a lightweight yet faster osm (either in xml or in json formats) to geojson convertor - 4x faster than xmldom + osmtogeojson in most situations - implemented in pure JavaScript without any 3rd party dependency",
   "homepage": "https://github.com/tibetty/osm2geojson-lite#readme",
   "keywords": [
     "openstreetmap",
@@ -43,39 +64,5 @@
     "multilinestring",
     "polygon",
     "multipolygon"
-  ],
-  "license": "MIT",
-  "main": "dist/node/index.js",
-  "types": "dist/node/index.d.ts",
-  "name": "osm2geojson-lite",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tibetty/osm2geojson-lite.git"
-  },
-  "scripts": {
-    "build-node": "tsc --declaration && cp src/polytags.json dist/node",
-    "build-web": "mkdir -p dist/web && browserify -s osm2geojson dist/node/index.js | uglifyjs -c -m -o dist/web/osm2geojson-lite.js",
-    "build": "npm run build-node && npm run build-web",
-    "test": "vitest test/e2e.test.ts --coverage"
-  },
-  "optionalDependencies": {
-    "@types/geojson": "^7946.0.16"
-  },
-  "version": "1.2.0",
-  "directories": {
-    "lib": "lib",
-    "test": "test"
-  },
-  "devDependencies": {
-    "@vitest/coverage-v8": "^3.1.3",
-    "browserify": "^17.0.1",
-    "typescript": "^5.8.3",
-    "uglify-js": "^3.19.3",
-    "vitest": "^3.1.3"
-  },
-  "files": [
-    "dist/**/*.js",
-    "dist/**/*.ts",
-    "dist/**/*.json"
   ]
 }

package/dist/node/index.d.ts

@@ -1,25 +0,0 @@
-import type { FeatureCollection, GeometryObject } from 'geojson';
-interface IOptions {
-    /**
-     * When it's set to `true`, the returned geojson will include all elements that meet the specified conditions in `FeatureCollection` format;
-     * otherwise, only the bare geometry of the first `relation` element will be returned.
-     * @default false
-     */
-    completeFeature?: boolean;
-    /**
-     * When it's set to `true`, the returned geojson will include all elements with tags (i.e., tagged)
-     * until `suppressWay` changes its behavior a bit; otherwise only the unreferenced ones get returned.
-     * @default false
-     */
-    renderTagged?: boolean;
-    /**
-     * When it's set to `true`, the returned `FeatureCollection` will exclude all referenced `way`s even though they are tagged;
-     * otherwise the features of those `way`s will be included in the resulted result as well.
-     * @default true
-     */
-    excludeWay?: boolean;
-}
-declare function osm2geojson(osm: string | {
-    [k: string]: any;
-}, opts?: IOptions): FeatureCollection<GeometryObject>;
-export = osm2geojson;

package/dist/node/index.js

@@ -1,196 +0,0 @@
-"use strict";
-const utils_1 = require("./utils");
-const xmlparser_1 = require("./xmlparser");
-const node_1 = require("./node");
-const way_1 = require("./way");
-const relation_1 = require("./relation");
-const ref_elements_1 = require("./ref-elements");
-function parseOptions(options) {
-    if (!options) {
-        return { completeFeature: false, renderTagged: false, excludeWay: true };
-    }
-    let excludeWay = options.excludeWay === undefined || options.excludeWay;
-    let completeFeature = options.completeFeature ? true : false;
-    let renderTagged = options.renderTagged ? true : false;
-    return { completeFeature, renderTagged, excludeWay };
-}
-function detectFormat(o) {
-    if (o.elements) {
-        return 'json';
-    }
-    if (o.indexOf('<osm') >= 0) {
-        return 'xml';
-    }
-    if (o.trim().startsWith('{')) {
-        return 'json-raw';
-    }
-    return 'invalid';
-}
-;
-function analyzeFeaturesFromJson(osm, refElements) {
-    for (const elem of osm.elements) {
-        switch (elem.type) {
-            case 'node':
-                const node = new node_1.Node(elem.id, refElements);
-                if (elem.tags) {
-                    node.addTags(elem.tags);
-                }
-                node.addProps((0, utils_1.purgeProps)(elem, ['id', 'type', 'tags', 'lat', 'lon']));
-                node.setLatLng(elem);
-                break;
-            case 'way':
-                const way = new way_1.Way(elem.id, refElements);
-                if (elem.tags) {
-                    way.addTags(elem.tags);
-                }
-                way.addProps((0, utils_1.purgeProps)(elem, ['id', 'type', 'tags', 'nodes', 'geometry']));
-                if (elem.geometry) {
-                    way.setLatLngArray(elem.geometry);
-                }
-                else if (elem.nodes) {
-                    for (const n of elem.nodes) {
-                        way.addNodeRef(n);
-                    }
-                }
-                break;
-            case 'relation':
-                const relation = new relation_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((0, utils_1.purgeProps)(elem, ['id', 'type', 'tags', 'bounds', 'members']));
-                if (elem.members) {
-                    for (const member of elem.members) {
-                        relation.addMember(member);
-                    }
-                }
-            default:
-                break;
-        }
-    }
-}
-function analyzeFeaturesFromXml(osm, refElements) {
-    const xmlParser = new xmlparser_1.XmlParser({ progressive: true });
-    xmlParser.on('</osm.node>', (node) => {
-        const nd = new node_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 way_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 relation_1.Relation(node.id, refElements));
-    xmlParser.on('</osm.relation.member>', (node, parent) => {
-        const relation = refElements.get(`relation/${parent === null || parent === void 0 ? void 0 : 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 === null || parent === void 0 ? void 0 : 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 === null || parent === void 0 ? void 0 : parent.id}`).addTag(node.k, node.v);
-    });
-    xmlParser.parse(osm);
-}
-;
-function osm2geojson(osm, opts) {
-    let { completeFeature, renderTagged, excludeWay } = parseOptions(opts);
-    let format = detectFormat(osm);
-    const refElements = new ref_elements_1.RefElements();
-    let featureArray = [];
-    if (format === 'json-raw') {
-        osm = JSON.parse(osm);
-        if (osm.elements) {
-            format = 'json';
-        }
-        else {
-            format = 'invalid';
-        }
-    }
-    if (format === 'json') {
-        analyzeFeaturesFromJson(osm, refElements);
-    }
-    else if (format === 'xml') {
-        analyzeFeaturesFromXml(osm, refElements);
-    }
-    refElements.bindAll();
-    for (const v of refElements.values()) {
-        if (v.refCount > 0 && (!v.hasTag || !renderTagged || (v instanceof way_1.Way && excludeWay))) {
-            continue;
-        }
-        const features = v.toFeatureArray();
-        // return the first geometry of the first relation element
-        if (v instanceof relation_1.Relation && !completeFeature && features.length > 0) {
-            return features[0].geometry;
-        }
-        featureArray = featureArray.concat(features);
-    }
-    return { type: 'FeatureCollection', features: featureArray };
-}
-;
-module.exports = osm2geojson;

package/dist/node/late-binder.d.ts

@@ -1,8 +0,0 @@
-export declare class LateBinder<T> {
-    private container;
-    private valueFunc;
-    private ctx;
-    private args;
-    constructor(container: (T | LateBinder<T>)[], valueFunc: (...args: any[]) => T | undefined, ctx: any, args: any[]);
-    bind(): void;
-}

package/dist/node/late-binder.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LateBinder = void 0;
-class LateBinder {
-    constructor(container, valueFunc, ctx, args) {
-        this.container = container;
-        this.valueFunc = valueFunc;
-        this.ctx = ctx;
-        this.args = args;
-    }
-    bind() {
-        const v = this.valueFunc.apply(this.ctx, this.args);
-        const idx = this.container.indexOf(this);
-        if (idx < 0) {
-            return;
-        }
-        const args = [idx, 1];
-        if (v) {
-            args.push(v);
-        }
-        Array.prototype.splice.apply(this.container, args);
-    }
-}
-exports.LateBinder = LateBinder;

package/dist/node/node.d.ts

@@ -1,14 +0,0 @@
-import { OsmObject } from "./osm-object";
-import type { RefElements } from "./ref-elements";
-import type { Feature } from "geojson";
-export type LatLon = {
-    lat: string;
-    lon: string;
-};
-export declare class Node extends OsmObject {
-    private latLng;
-    constructor(id: string, refElems: RefElements);
-    setLatLng(latLng: LatLon): void;
-    toFeatureArray(): Array<Feature<any, any>>;
-    getLatLng(): LatLon | undefined;
-}

package/dist/node/node.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Node = void 0;
-const osm_object_1 = require("./osm-object");
-const utils_1 = require("./utils");
-class Node extends osm_object_1.OsmObject {
-    constructor(id, refElems) {
-        super('node', id, refElems);
-    }
-    setLatLng(latLng) {
-        this.latLng = latLng;
-    }
-    toFeatureArray() {
-        if (this.latLng) {
-            return [{
-                    type: 'Feature',
-                    id: this.getCompositeId(),
-                    properties: this.getProps(),
-                    geometry: {
-                        type: 'Point',
-                        coordinates: (0, utils_1.strArrayToFloat)([this.latLng.lon, this.latLng.lat]),
-                    },
-                }];
-        }
-        return [];
-    }
-    getLatLng() {
-        return this.latLng;
-    }
-}
-exports.Node = Node;

package/dist/node/osm-object.d.ts

@@ -1,25 +0,0 @@
-import type { RefElements } from './ref-elements';
-import type { Feature } from 'geojson';
-export declare abstract class OsmObject {
-    refCount: number;
-    hasTag: boolean;
-    id: string;
-    protected refElems: RefElements;
-    private type;
-    private tags;
-    private props;
-    constructor(type: string, id: string, refElems: RefElements);
-    addTags(tags: {
-        [k: string]: string;
-    }): void;
-    addTag(k: string, v: string): void;
-    addProp(k: string, v: any): void;
-    addProps(props: {
-        [k: string]: string;
-    }): void;
-    getCompositeId(): string;
-    getProps(): {
-        [k: string]: string;
-    };
-    abstract toFeatureArray(): Array<Feature<any, any>>;
-}

package/dist/node/osm-object.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OsmObject = void 0;
-class OsmObject {
-    constructor(type, id, refElems) {
-        this.type = type;
-        this.id = id;
-        this.refElems = refElems;
-        this.tags = {};
-        this.props = { id: this.getCompositeId() };
-        this.refCount = 0;
-        this.hasTag = false;
-        if (refElems) {
-            refElems.add(this.getCompositeId(), this);
-        }
-    }
-    addTags(tags) {
-        this.tags = Object.assign(this.tags, tags);
-        this.hasTag = true;
-    }
-    addTag(k, v) {
-        this.tags[k] = v;
-        this.hasTag = true;
-    }
-    addProp(k, v) {
-        this.props[k] = v;
-    }
-    addProps(props) {
-        this.props = Object.assign(this.props, props);
-    }
-    getCompositeId() {
-        return `${this.type}/${this.id}`;
-    }
-    getProps() {
-        return Object.assign(this.props, this.tags);
-    }
-}
-exports.OsmObject = OsmObject;

package/dist/node/ref-elements.d.ts

@@ -1,9 +0,0 @@
-import { LateBinder } from "./late-binder";
-import type { OsmObject } from "./osm-object";
-export declare class RefElements extends Map<string, OsmObject> {
-    private binders;
-    constructor();
-    add(k: string, v: OsmObject): void;
-    addBinder(binder: LateBinder<any>): void;
-    bindAll(): void;
-}

package/dist/node/ref-elements.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RefElements = void 0;
-class RefElements extends Map {
-    constructor() {
-        super();
-        this.binders = [];
-    }
-    add(k, v) {
-        this.set(k, v);
-    }
-    addBinder(binder) {
-        this.binders.push(binder);
-    }
-    bindAll() {
-        this.binders.forEach((binder) => binder.bind());
-    }
-}
-exports.RefElements = RefElements;

package/dist/node/relation.d.ts

@@ -1,21 +0,0 @@
-import { OsmObject } from "./osm-object";
-import { Way } from "./way";
-import { LateBinder } from "./late-binder";
-import type { RefElements } from "./ref-elements";
-import type { Feature } from "geojson";
-export declare class Relation extends OsmObject {
-    private relations;
-    private nodes;
-    private bounds;
-    ways: (LateBinder<Way> | Way)[];
-    roles: string[];
-    constructor(id: string, refElems: RefElements);
-    setBounds(bounds: any[]): void;
-    addMember(member: {
-        [k: string]: any;
-    }): void;
-    private constructStringGeometry;
-    private constructPolygonGeometry;
-    private collectAllWaysForRelation;
-    toFeatureArray(): Array<Feature<any, any>>;
-}