@wemap/osm 5.8.0 → 6.2.2

package/assets/itinerary-with-duplicate-nodes.json

@@ -1,110 +0,0 @@
-{
-    "code": "Ok",
-    "routes": [
-        {
-            "geometry": {
-                "coordinates": [
-                    [
-                        4.931728,
-                        44.799761
-                    ],
-                    [
-                        4.927543,
-                        44.799052
-                    ],
-                    [
-                        4.927543,
-                        44.799052
-                    ],
-                    [
-                        4.927385,
-                        44.799037
-                    ],
-                    [
-                        4.923283,
-                        44.798721
-                    ]
-                ],
-                "type": "LineString"
-            },
-            "legs": [
-                {
-                    "steps": [
-                        {
-                            "driving_side": "right",
-                            "geometry": {
-                                "coordinates": [
-                                    [
-                                        4.931728,
-                                        44.799761
-                                    ],
-                                    [
-                                        4.927543,
-                                        44.799052
-                                    ],
-                                    [
-                                        4.927543,
-                                        44.799052
-                                    ],
-                                    [
-                                        4.927385,
-                                        44.799037
-                                    ],
-                                    [
-                                        4.923283,
-                                        44.798721
-                                    ]
-                                ],
-                                "type": "LineString"
-                            },
-                            "mode": "walking",
-                            "duration": 496.9,
-                            "maneuver": {
-                                "bearing_after": 264,
-                                "type": "end of road",
-                                "modifier": "left",
-                                "bearing_before": 338,
-                                "location": [
-                                    4.931728,
-                                    44.799761
-                                ]
-                            },
-                            "weight": 496.9,
-                            "distance": 689.7,
-                            "name": "Route d'Ambonil"
-                        },
-                        {
-                            "driving_side": "right",
-                            "geometry": {
-                                "coordinates": [
-                                    [
-                                        4.931728,
-                                        44.799761
-                                    ],
-                                    [
-                                        4.931728,
-                                        44.799761
-                                    ]
-                                ]
-                            },
-                            "maneuver": {
-                                "bearing_after": 0,
-                                "type": "arrive",
-                                "modifier": "left",
-                                "bearing_before": 291,
-                                "location": [
-                                    4.556421,
-                                    44.302754
-                                ]
-                            }
-                        }
-                    ]
-                }
-            ],
-            "distance": 75006.7,
-            "duration": 54016.6,
-            "weight_name": "duration",
-            "weight": 54016.6
-        }
-    ]
-}

package/assets/network-conveying-backward.osm

@@ -1,74 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
-  <node id='-519157' action='modify' visible='true' lat='48.84445412307' lon='2.37216128192'>
-    <tag k='name' v='p6' />
-  </node>
-  <node id='-519158' action='modify' visible='true' lat='48.84456231196' lon='2.37194113366'>
-    <tag k='name' v='p11' />
-  </node>
-  <node id='-519161' action='modify' visible='true' lat='48.84459094139' lon='2.37200629832'>
-    <tag k='name' v='p13' />
-  </node>
-  <node id='-519164' action='modify' visible='true' lat='48.8445706698' lon='2.3719601573'>
-    <tag k='name' v='p12' />
-  </node>
-  <node id='1395307661' action='modify' timestamp='2019-09-19T15:44:48Z' uid='439947' user='StephaneP' visible='true' version='11' changeset='74681133' lat='48.8444657' lon='2.3720493'>
-    <tag k='name' v='p7' />
-  </node>
-  <node id='1395307662' action='modify' timestamp='2019-09-19T15:44:48Z' uid='439947' user='StephaneP' visible='true' version='3' changeset='74681133' lat='48.8445534' lon='2.3719505'>
-    <tag k='name' v='p10' />
-  </node>
-  <node id='4086374112' action='modify' timestamp='2019-09-19T16:18:40Z' uid='439947' user='StephaneP' visible='true' version='3' changeset='74683089' lat='48.8444961' lon='2.3720441'>
-    <tag k='name' v='p8' />
-  </node>
-  <node id='4086374115' action='modify' timestamp='2019-09-19T15:44:48Z' uid='439947' user='StephaneP' visible='true' version='2' changeset='74681133' lat='48.844562' lon='2.3719702'>
-    <tag k='name' v='p9' />
-  </node>
-  <node id='4086374120' action='delete' timestamp='2019-09-19T16:18:40Z' uid='439947' user='StephaneP' visible='true' version='3' changeset='74683089' lat='48.8446803' lon='2.3718155'>
-    <tag k='level' v='-1' />
-    <tag k='name' v='p1' />
-    <tag k='railway' v='subway_entrance' />
-    <tag k='ref' v='13' />
-    <tag k='source' v='cadastre-dgi-fr source : Direction Générale des Impôts - Cadastre. Mise à jour : 2011' />
-    <tag k='wheelchair' v='no' />
-  </node>
-  <way id='-519165' action='modify' visible='true'>
-    <nd ref='-519164' />
-    <nd ref='4086374115' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='0' />
-  </way>
-  <way id='-519168' action='modify' visible='true'>
-    <nd ref='1395307662' />
-    <nd ref='-519158' />
-    <nd ref='-519164' />
-    <nd ref='-519161' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='0' />
-  </way>
-  <way id='-519174' action='modify' visible='true'>
-    <nd ref='-519157' />
-    <nd ref='4086374112' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='-1' />
-  </way>
-  <way id='-519225' action='modify' visible='true'>
-    <nd ref='1395307661' />
-    <nd ref='-519157' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='-1' />
-  </way>
-  <way id='125679471' action='modify' timestamp='2016-04-15T07:37:33Z' uid='1908665' user='naomap' visible='true' version='4' changeset='38579747'>
-    <nd ref='1395307661' />
-    <nd ref='1395307662' />
-    <tag k='highway' v='steps' />
-    <tag k='level' v='-1;0' />
-  </way>
-  <way id='406582305' action='modify' timestamp='2016-04-15T07:37:40Z' uid='1908665' user='naomap' visible='true' version='2' changeset='38579747'>
-    <nd ref='4086374112' />
-    <nd ref='4086374115' />
-    <tag k='conveying' v='backward' />
-    <tag k='highway' v='steps' />
-    <tag k='level' v='-1;0' />
-  </way>
-</osm>

package/assets/network-elevator.osm

@@ -1,48 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6'>
-  <node id='-1' lat='43.60933232537' lon='3.88424831515' version='1'>
-    <tag k='highway' v='elevator' />
-    <tag k='level' v='1;3' />
-    <tag k='name' v='px' />
-  </node>
-  <node id='1' lat='43.60932786117' lon='3.88427765877' version='1'>
-    <tag k='name' v='p1' />
-  </node>
-  <node id='2' lat='43.60932786111' lon='3.8842776591' version='1'>
-    <tag k='name' v='p2' />
-  </node>
-  <node id='3' lat='43.60932198746' lon='3.8843159771' version='1'>
-    <tag k='name' v='p3-1' />
-  </node>
-  <node id='4' lat='43.60932198746' lon='3.8843159771' version='1'>
-    <tag k='name' v='p3-2' />
-  </node>
-  <way id='101' version='1'>
-    <nd ref='-1' />
-    <nd ref='1' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='1' />
-    <tag k='name' v='w1' />
-  </way>
-  <way id='102' version='1'>
-    <nd ref='-1' />
-    <nd ref='2' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='2' />
-    <tag k='name' v='w2' />
-  </way>
-  <way id='103' version='1'>
-    <nd ref='-1' />
-    <nd ref='3' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='3' />
-    <tag k='name' v='w3-1' />
-  </way>
-  <way id='104' version='1'>
-    <nd ref='-1' />
-    <nd ref='4' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='3' />
-    <tag k='name' v='w3-2' />
-  </way>
-</osm>

package/assets/network-simple.osm

@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm>
-  <node id='1' lat='43.6093335' lon='3.88428'>
-    <tag k='name' v='p1' />
-  </node>
-  <node id='2' lat='43.60933232537' lon='3.88424831515'>
-    <tag k='name' v='p2' />
-  </node>
-  <node id='3' lat='43.60932786111' lon='3.8842776591'>
-    <tag k='name' v='p3' />
-  </node>
-  <node id='4' lat='43.60932198746' lon='3.8843159771'>
-    <tag k='name' v='p4' />
-  </node>
-  <way id='101'>
-    <nd ref='1' />
-    <nd ref='2' />
-    <nd ref='3' />
-    <tag k='name' v='w1' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='102'>
-    <nd ref='3' />
-    <nd ref='4' />
-    <tag k='name' v='w2' />
-  </way>
-</osm>

package/assets/network-with-modifiers.osm

@@ -1,39 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
-  <node id='-519658' action='modify' visible='true' lat='48.84421815274' lon='2.37214171465'>
-    <tag k='name' v='start' />
-  </node>
-  <node id='-519659' action='modify' visible='true' lat='48.84493822092' lon='2.37214171465' />
-  <node id='-519661' action='modify' visible='true' lat='48.84431552103' lon='2.37268800579' />
-  <node id='-519663' action='modify' visible='true' lat='48.84395581937' lon='2.37174132231' />
-  <node id='-519665' action='modify' visible='true' lat='48.84395581937' lon='2.37064538259' />
-  <node id='-519667' action='modify' visible='true' lat='48.84395581937' lon='2.36955122674' />
-  <node id='-519669' action='modify' visible='true' lat='48.84359604217' lon='2.36860435126' />
-  <node id='-519671' action='modify' visible='true' lat='48.84297192036' lon='2.36915187515' />
-  <node id='-519673' action='modify' visible='true' lat='48.84368879871' lon='2.36915187515'>
-    <tag k='name' v='end' />
-  </node>
-  <way id='-519660' action='modify' visible='true'>
-    <nd ref='-519658' />
-    <nd ref='-519659' />
-    <nd ref='-519661' />
-    <nd ref='-519663' />
-    <nd ref='-519665' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='0' />
-  </way>
-  <way id='-519746' action='modify' visible='true'>
-    <nd ref='-519665' />
-    <nd ref='-519667' />
-    <tag k='highway' v='steps' />
-    <tag k='level' v='0;1' />
-  </way>
-  <way id='-519747' action='modify' visible='true'>
-    <nd ref='-519667' />
-    <nd ref='-519669' />
-    <nd ref='-519671' />
-    <nd ref='-519673' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='1' />
-  </way>
-</osm>

package/assets/one-way.osm

@@ -1,46 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
-  <node id='-441557' action='modify' visible='true' lat='43.60942861314' lon='3.88420107589'>
-    <tag k='name' v='p1' />
-  </node>
-  <node id='-441558' action='modify' visible='true' lat='43.60938929783' lon='3.8841913836'>
-    <tag k='name' v='p3' />
-  </node>
-  <node id='-441559' action='modify' visible='true' lat='43.60940277907' lon='3.88421907562'>
-    <tag k='name' v='p5' />
-  </node>
-  <node id='-441560' action='modify' visible='true' lat='43.60937924953' lon='3.88418893318' />
-  <node id='-441561' action='modify' visible='true' lat='43.6094255609' lon='3.88422469196'>
-    <tag k='name' v='p4' />
-  </node>
-  <node id='-441562' action='modify' visible='true' lat='43.60945421917' lon='3.88420719584' />
-  <node id='-441563' action='modify' visible='true' lat='43.60940583132' lon='3.88419545955'>
-    <tag k='name' v='p2' />
-  </node>
-  <node id='-441564' action='modify' visible='true' lat='43.60944417022' lon='3.88420491113'>
-    <tag k='name' v='p0' />
-  </node>
-  <way id='-441565' action='modify' visible='true'>
-    <nd ref='-441557' />
-    <nd ref='-441563' />
-    <tag k='highway' v='footway' />
-    <tag k='oneway' v='yes' />
-  </way>
-  <way id='-441566' action='modify' visible='true'>
-    <nd ref='-441563' />
-    <nd ref='-441558' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-441567' action='modify' visible='true'>
-    <nd ref='-441564' />
-    <nd ref='-441557' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-441568' action='modify' visible='true'>
-    <nd ref='-441557' />
-    <nd ref='-441561' />
-    <nd ref='-441559' />
-    <nd ref='-441563' />
-    <tag k='highway' v='footway' />
-  </way>
-</osm>

package/src/routers/Itinerary.js

@@ -1,197 +0,0 @@
-/* eslint-disable max-statements */
-import { Coordinates, Network } from '@wemap/geo';
-import Leg from './Leg.js';
-import Step from './Step.js';
-import OsmRouterOptions from './custom/OsmRouterOptions.js';
-
-/**
- * Main attributes are:
- * nodes: the ordered list of Node
- * edges: the ordered list of Edge
- * start: the start point (Coordinates)
- * end: the end point (Coordinates)
- * length: the route length
- */
-class Itinerary {
-
-    /** @type {!Coordinates} */
-    from;
-
-    /** @type {!Coordinates} */
-    to;
-
-    /** @type {!number} */
-    distance;
-
-    /** @type {!number} */
-    duration;
-
-    /** @type {?number} */
-    startTime = null;
-
-    /** @type {?number} */
-    endTime = null;
-
-    /** @type {!(Leg[])} */
-    legs = [];
-
-    /** @type {?Coordinates[]} */
-    _coords = null;
-
-    set coords(_) {
-        throw new Error('Itinerary.coords cannot be set. They are calculated from Itinerary.legs.');
-    }
-
-    /** @type {!(Coordinates[])} */
-    get coords() {
-        if (!this._coords) {
-            // Returns the coordinates contained in all legs and remove duplicates between array
-            this._coords = this.legs.reduce((acc, val) => {
-                const isDuplicate = acc.length && val.coords.length && acc[acc.length - 1].equalsTo(val.coords[0]);
-                acc.push(...val.coords.slice(isDuplicate ? 1 : 0));
-                return acc;
-            }, []);
-        }
-        return this._coords;
-    }
-
-    set steps(_) {
-        throw new Error('Itinerary.step cannot be set. They are calculated from Itinerary.legs.');
-    }
-
-    /** @type {!(Step[])} */
-    get steps() {
-        return this.legs.map(leg => leg.steps).flat();
-    }
-
-    /**
-     * @returns {Network}
-     */
-    toNetwork() {
-        return Network.fromCoordinates([this.coords]);
-    }
-
-    /**
-     * @param {Itinerary[]} itineraries
-     * @returns {Itinerary}
-     */
-    static fromItineraries(...itineraries) {
-        const itinerary = new Itinerary();
-        itinerary.from = itineraries[0].from;
-        itinerary.to = itineraries[itineraries.length - 1].to;
-        itinerary.distance = 0;
-        itinerary.duration = 0;
-        itinerary.legs = [];
-
-        itineraries.forEach(_itinerary => {
-            itinerary.distance += _itinerary.distance;
-            itinerary.duration += _itinerary.duration;
-            itinerary.legs.push(..._itinerary.legs);
-            itinerary.legs.forEach(leg => {
-                leg.steps[0].firstStep = false;
-                leg.steps[leg.steps.length - 1].lastStep = false;
-            });
-        });
-
-        itinerary.legs[0].steps[0].firstStep = true;
-        const lastLeg = itinerary.legs[itinerary.legs.length - 1];
-        lastLeg.steps[lastLeg.steps.length - 1].lastStep = true;
-
-        return itinerary;
-    }
-
-    /**
-     * Convert lat/lng/level points to Itinerary
-     * @param {number[][]} points 2D points array of lat/lng/level (level is optional)
-     * @param {Coordinates} from
-     * @param {Coordinates} to
-     * @param {string} mode
-     * @returns {Itinerary}
-     */
-    static fromOrderedPointsArray(points, start, end) {
-
-        const pointToCoordinates = point => new Coordinates(point[0], point[1], null, point[2]);
-
-        return this.fromOrderedCoordinates(
-            points.map(pointToCoordinates),
-            pointToCoordinates(start),
-            pointToCoordinates(end)
-        );
-    }
-
-    /**
-     * Convert ordered Coordinates to Itinerary
-     * @param {Coordinates[]} points
-     * @param {Coordinates} from
-     * @param {Coordinates} to
-     * @param {string} mode
-     * @returns {Itinerary}
-     */
-    static fromOrderedCoordinates(points, from, to, mode = 'WALK') {
-
-        const itinerary = new Itinerary();
-        itinerary.from = from;
-        itinerary.to = to;
-
-        const leg = new Leg();
-        leg.mode = mode;
-        leg.from = { name: null, coords: from };
-        leg.to = { name: null, coords: to };
-
-        leg.coords = points;
-        leg.distance = points.reduce((acc, coords, idx, arr) => {
-            if (idx !== 0) {
-                return acc + arr[idx - 1].distanceTo(coords);
-            }
-            return acc;
-        }, 0);
-        leg.duration = OsmRouterOptions.getDurationFromLength(leg.distance);
-        itinerary.legs.push(leg);
-
-        itinerary.distance = leg.distance;
-        itinerary.duration = leg.duration;
-
-        return itinerary;
-    }
-
-    /**
-     * @returns {object}
-     */
-    toJson() {
-        const output = {
-            from: this.from.toCompressedJson(),
-            to: this.to.toCompressedJson(),
-            distance: this.distance,
-            duration: this.duration,
-            legs: this.legs.map(leg => leg.toJson())
-        };
-        if (this.startTime !== null) {
-            output.startTime = this.startTime;
-        }
-        if (this.endTime !== null) {
-            output.endTime = this.endTime;
-        }
-        return output;
-    }
-
-    /**
-     * @param {object} json
-     * @returns {Itinerary}
-     */
-    static fromJson(json) {
-        const itinerary = new Itinerary();
-        itinerary.from = Coordinates.fromCompressedJson(json.from);
-        itinerary.to = Coordinates.fromCompressedJson(json.to);
-        itinerary.distance = json.distance;
-        itinerary.duration = json.duration;
-        itinerary.legs = json.legs.map(Leg.fromJson);
-        if (json.startTime) {
-            itinerary.startTime = json.startTime;
-        }
-        if (json.endTime) {
-            itinerary.endTime = json.endTime;
-        }
-        return itinerary;
-    }
-}
-export default Itinerary;

package/src/routers/Itinerary.type.spec.js

@@ -1,105 +0,0 @@
-import chai from 'chai';
-
-import { Coordinates } from '@wemap/geo';
-
-import LevelChange from './LevelChange.js';
-import Leg from './Leg.js';
-import Itinerary from './Itinerary.js';
-import Step from './Step.js';
-
-const { expect } = chai;
-
-
-const isNullOrNumber = val => val === null || typeof val === 'number';
-const isNullOrString = val => val === null || typeof val === 'string';
-const isNullOrObject = val => val === null || typeof val === 'object';
-const isNullOrArray = val => val === null || Array.isArray(val);
-const isNullOrLevelChange = val => val === null || val instanceof LevelChange;
-
-const isUndefinedOrBoolean = val => typeof val === 'undefined' || typeof val === 'boolean';
-const isUndefinedOrString = val => typeof val === 'undefined' || typeof val === 'string';
-
-const stepExtraProperties = ['subwayEntrance', 'subwayEntranceRef'];
-
-/**
- * @param {Step} step
- */
-export function verifyStepData(step) {
-
-    expect(step).instanceOf(Step);
-    expect(step.firstStep).be.a('boolean');
-    expect(step.lastStep).be.a('boolean');
-    expect(step.number).be.a('number');
-    expect(step.coords).instanceOf(Coordinates);
-    expect(step.angle).be.a('number');
-    expect(step.previousBearing).be.a('number');
-    expect(step.nextBearing).be.a('number');
-    expect(step.distance).be.a('number');
-    expect(step.duration).satisfies(isNullOrNumber);
-    expect(step.name).satisfies(isNullOrString);
-    expect(step.levelChange).satisfies(isNullOrLevelChange);
-    expect(step._idCoordsInLeg).be.a('number');
-
-    expect(step.extras).satisfies(isNullOrObject);
-    if (step.extras !== null) {
-        for (const key of Object.keys(step.extras)) {
-            expect(stepExtraProperties).includes(key);
-        }
-        expect(step.extras.subwayEntrance).satisfies(isUndefinedOrBoolean);
-        expect(step.extras.subwayEntranceRef).satisfies(isUndefinedOrString);
-    }
-}
-
-/**
- * @param {Leg} routerResponse
- */
-export function verifyLegData(leg) {
-
-    expect(leg).instanceOf(Leg);
-    expect(leg.mode).be.a('string');
-    expect(leg.distance).be.a('number');
-    expect(leg.duration).be.a('number');
-    expect(leg.startTime).satisfies(isNullOrNumber);
-    expect(leg.endTime).satisfies(isNullOrNumber);
-    expect(leg.from).be.an('object');
-    expect(leg.from.name).satisfies(isNullOrString);
-    expect(leg.from.coords).instanceOf(Coordinates);
-    expect(leg.to).be.an('object');
-    expect(leg.to.name).satisfies(isNullOrString);
-    expect(leg.to.coords).instanceOf(Coordinates);
-    expect(leg.coords).be.an('array');
-    leg.coords.forEach(coords => expect(coords).instanceOf(Coordinates));
-
-    expect(leg.transportInfo).satisfies(isNullOrObject);
-    if (leg.transportInfo !== null) {
-        expect(leg.transportInfo.name).be.a('string');
-        expect(leg.transportInfo.routeColor).satisfies(isNullOrString);
-        expect(leg.transportInfo.routeTextColor).satisfies(isNullOrString);
-        expect(leg.transportInfo.directionName).satisfies(isNullOrString);
-    }
-    expect(leg.steps).satisfies(isNullOrArray);
-    if (leg.steps !== null) {
-        leg.steps.forEach(verifyStepData);
-    }
-}
-
-
-/**
- * @param {Itinerary} itinerary
- */
-export function verifyItineraryData(itinerary) {
-
-    expect(itinerary).instanceOf(Itinerary);
-    expect(itinerary.from).instanceOf(Coordinates);
-    expect(itinerary.to).instanceOf(Coordinates);
-    expect(itinerary.coords).be.an('array');
-    for (const coords of itinerary.coords) {
-        expect(coords).instanceOf(Coordinates);
-    }
-    expect(itinerary.distance).be.a('number');
-    expect(itinerary.duration).be.a('number');
-    expect(itinerary.startTime).satisfies(isNullOrNumber);
-    expect(itinerary.endTime).satisfies(isNullOrNumber);
-    expect(itinerary.legs).be.an('array');
-    itinerary.legs.forEach(verifyLegData);
-}