@wemap/routers 10.0.0-alpha.1 → 10.0.0-alpha.10

package/index.js

@@ -12,7 +12,6 @@ export { default as ItineraryInfo } from './src/model/ItineraryInfo.js';
 export { default as WemapRouter } from './src/wemap/WemapRouter.js';
 export { default as WemapRouterOptions } from './src/wemap/WemapRouterOptions.js';
 export * as WemapRouterUtils from './src/wemap/WemapRouterUtils.js';
-export * as WemapNetworkUtils from './src/wemap/WemapNetworkUtils.js';
 export { default as WemapMetaRouter } from './src/wemap-meta/WemapMetaRouter.js';
 export { default as WemapMetaRouterOptions } from './src/wemap-meta/WemapMetaRouterOptions.js';
 export { default as WemapMetaRouterIOMap } from './src/wemap-meta/IOMap.js';

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "10.0.0-alpha.1",
+    "version": "10.0.0-alpha.10",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -29,10 +29,10 @@
         "@turf/boolean-point-in-polygon": "^6.5.0",
         "@turf/convex": "^6.5.0",
         "@turf/helpers": "^6.5.0",
-        "@wemap/geo": "^10.0.0-alpha.1",
-        "@wemap/logger": "^9.0.0",
-        "@wemap/maths": "^9.0.0",
-        "@wemap/osm": "^10.0.0-alpha.1"
+        "@wemap/geo": "^10.0.0-alpha.10",
+        "@wemap/logger": "^10.0.0-alpha.8",
+        "@wemap/maths": "^10.0.0-alpha.10",
+        "@wemap/osm": "^10.0.0-alpha.10"
     },
-    "gitHead": "21ba33bd03930c68e3f358534ba95936ad965e34"
+    "gitHead": "5970289ef2b1f06f9df382878f72bf48f57c4c00"
 }

package/src/remote/idfm/IdfmRemoteRouter.js

@@ -63,8 +63,7 @@ const TRANSPORT_IDS = [
     'physical_mode:Tramway'
 ];
 
-const clientId = '539eec73-3bb5-4327-bb5e-a52672658592';
-const clientSecret = '899f4bb9-f1d5-45d3-9f67-530827bb6734';
+const apiKey = 'qWHj6ax6DMttG8DX6tH9CQARaiTgQ1Di';
 
 /**
  * Get last item of a given array
@@ -80,10 +79,6 @@ function last(array) {
  */
 class IdfmRemoteRouter extends RemoteRouter {
 
-    isLogged = false;
-    token = null;
-    expiresAt = null;
-
     /**
      * @override
      */
@@ -97,15 +92,11 @@ class IdfmRemoteRouter extends RemoteRouter {
      * @throws {RemoteRouterServerUnreachable}
      */
     async getItineraries(endpointUrl, mode, waypoints) {
-        if (!this.canRequestService()) {
-            await this._connect();
-        }
-
         const url = this.getURL(endpointUrl, mode, waypoints);
 
         const res = await (fetch(url, {
             method: 'GET',
-            headers: { Authorization: 'Bearer ' + this.token }
+            headers: { apiKey }
         }).catch(() => {
             throw new RemoteRouterServerUnreachable(this.rname, url);
         }));
@@ -130,52 +121,6 @@ class IdfmRemoteRouter extends RemoteRouter {
         return this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
     }
 
-    /**
-     * @throws {IdfmRemoteRouterTokenError}
-     */
-    async _connect() {
-
-        const details = {
-            'grant_type': 'client_credentials',
-            'scope': 'read-data',
-            'client_id': clientId,
-            'client_secret': clientSecret
-        };
-
-        const data = new URLSearchParams();
-        for (const property in details) {
-            if (details.hasOwnProperty(property)) {
-                const encodedKey = encodeURIComponent(property);
-                const encodedValue = encodeURIComponent(details[property]);
-                data.append(encodedKey, encodedValue);
-            }
-        }
-
-        const headers = new Headers({
-            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
-        });
-
-        const res = await fetch('https://idfm.getwemap.com/api/oauth/token', {
-            method: 'POST',
-            body: data,
-            headers
-        });
-        if (res.status !== 200) {
-            throw new IdfmRemoteRouterTokenError();
-        }
-        const response = await res.json();
-
-        if (response.access_token) {
-            this.token = response.access_token;
-            this.isLogged = true;
-            this.expiresAt = new Date(new Date().getTime() + response.expires_in * 1000);
-        }
-    }
-
-    canRequestService() {
-        return this.token && this.expiresAt && this.expiresAt - new Date() > 0;
-    }
-
     /**
      * @param {string} endpointUrl
      * @param {string} mode

package/src/wemap/WemapRouter.spec.js

@@ -6,13 +6,11 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 
 import { Coordinates, GraphNode, Network, GraphItinerary } from '@wemap/geo';
-import { OsmElement, OsmParser } from '@wemap/osm';
-
+import { OsmElement, OsmParser, OsmNetworkUtils } from '@wemap/osm';
 
 import WemapRouter from './WemapRouter.js';
 import WemapRouterOptions from './WemapRouterOptions.js';
 import WemapStepsGeneration from './WemapStepsGeneration.js';
-import { createNetworkFromOsmModel, getNodeByName } from './WemapNetworkUtils.js';
 
 import LevelChange from '../model/LevelChange.js';
 
@@ -20,6 +18,7 @@ const { expect } = chai;
 chai.use(chaiAlmost(0.01));
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
+const { createNetworkFromOsmModel, getNodeByName } = OsmNetworkUtils;
 
 /**
  * @param {GraphItinerary<OsmElement>} _itinerary
@@ -39,7 +38,7 @@ const itineraryEnd = new Coordinates(43.6092602, 3.8842669, null, 1);
  * @returns {Network}
  */
 const loadNetwork = fileName => {
-    const filePath = path.resolve(__dirname, '../../assets/' + fileName);
+    const filePath = path.resolve(__dirname, '../../../osm/assets/' + fileName);
     const osmXmlString = fs.readFileSync(filePath, 'utf8');
     const osmModel = OsmParser.parseOsmXmlString(osmXmlString);
     return createNetworkFromOsmModel(osmModel);

package/src/wemap-meta/IOMap.js

@@ -3,8 +3,8 @@ import convexHullFn from '@turf/convex';
 import { polygon as turfPolygon } from '@turf/helpers';
 
 import { Coordinates, GraphNode, GraphRouter, Network, NoRouteFoundError } from '@wemap/geo';
-import { OsmParser } from '@wemap/osm';
-import { Itinerary, WemapNetworkUtils, WemapRouterOptions, WemapRouterUtils } from '@wemap/routers';
+import { OsmParser, OsmNetworkUtils } from '@wemap/osm';
+import { Itinerary, WemapRouterOptions, WemapRouterUtils } from '@wemap/routers';
 
 import Constants from '../Constants.js';
 
@@ -64,7 +64,7 @@ class IOMap {
     static fromOsmXml(osmXmlString, name = null) {
 
         const osmModel = OsmParser.parseOsmXmlString(osmXmlString);
-        const network = WemapNetworkUtils.createNetworkFromOsmModel(osmModel);
+        const network = OsmNetworkUtils.createNetworkFromOsmModel(osmModel);
 
         const entryPoints = osmModel.nodes
             .filter(({ tags }) => tags && tags['wemap:routing-io'])
@@ -103,7 +103,7 @@ class IOMap {
     getOrderedEntryPointsSortedByDistance(start, end) {
         const entryPointsCopy = [...this.entryPoints];
         return entryPointsCopy.sort((ep1, ep2) =>
-            + ep1.coords.distanceTo(start) + ep1.coords.distanceTo(end)
+            Number(ep1.coords.distanceTo(start)) + ep1.coords.distanceTo(end)
             - ep2.coords.distanceTo(start) - ep2.coords.distanceTo(end)
         );
     }

package/src/wemap-meta/WemapMetaRouter.spec.js

@@ -31,7 +31,7 @@ function mockFetchWithJsonAsset(assetName) {
 }
 
 function createIOMapFromAsset(assetName) {
-    const filePath = path.resolve(__dirname, '../../assets/' + assetName);
+    const filePath = path.resolve(__dirname, '../../../osm/assets/' + assetName);
     const osmXmlString = fs.readFileSync(filePath, 'utf8');
     const mapName = path.parse(assetName).name;
     return IOMap.fromOsmXml(osmXmlString, mapName);

package/assets/biocbon-bergere-rdc-network.osm

@@ -1,163 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
-  <node id='-460666' action='modify' visible='true' lat='48.87260236152' lon='2.34329666635' />
-  <node id='-460667' action='modify' visible='true' lat='48.87250549777' lon='2.34328663305' />
-  <node id='-460668' action='modify' visible='true' lat='48.87254375114' lon='2.34328204154' />
-  <node id='-460669' action='modify' visible='true' lat='48.87256254226' lon='2.34328272177' />
-  <node id='-460670' action='modify' visible='true' lat='48.87256546238' lon='2.3433422765' />
-  <node id='-460671' action='modify' visible='true' lat='48.87249229923' lon='2.34346145052' />
-  <node id='-460672' action='modify' visible='true' lat='48.87250820089' lon='2.34335069759' />
-  <node id='-460673' action='modify' visible='true' lat='48.87250633659' lon='2.34330651324' />
-  <node id='-460674' action='modify' visible='true' lat='48.87249106885' lon='2.34330823015' />
-  <node id='-460675' action='modify' visible='true' lat='48.87248804885' lon='2.34333390859' />
-  <node id='-460676' action='modify' visible='true' lat='48.87250347283' lon='2.34338322091' />
-  <node id='-460677' action='modify' visible='true' lat='48.87247865327' lon='2.3433874762' />
-  <node id='-460678' action='modify' visible='true' lat='48.87246936955' lon='2.34345396806' />
-  <node id='-460679' action='modify' visible='true' lat='48.8725047148' lon='2.34346519175' />
-  <node id='-460680' action='modify' visible='true' lat='48.87252014738' lon='2.34328487468' />
-  <node id='-460681' action='modify' visible='true' lat='48.87252306794' lon='2.34334851119' />
-  <node id='-460682' action='modify' visible='true' lat='48.87254679656' lon='2.34334502157' />
-  <node id='-460683' action='modify' visible='true' lat='48.87255583689' lon='2.34334369207' />
-  <node id='-460684' action='modify' visible='true' lat='48.87255247559' lon='2.34338781631' />
-  <node id='-460685' action='modify' visible='true' lat='48.872553574' lon='2.34337339741' />
-  <node id='-460686' action='modify' visible='true' lat='48.87258124098' lon='2.34333589031' />
-  <node id='-460687' action='modify' visible='true' lat='48.8725647793' lon='2.34345056694' />
-  <node id='-460688' action='modify' visible='true' lat='48.87256316665' lon='2.3432954559' />
-  <node id='-460689' action='modify' visible='true' lat='48.87259140004' lon='2.34329003417' />
-  <node id='-460690' action='modify' visible='true' lat='48.87257537018' lon='2.34337678796' />
-  <node id='-460691' action='modify' visible='true' lat='48.87259587423' lon='2.34338390486' />
-  <node id='-460692' action='modify' visible='true' lat='48.87258513645' lon='2.34345736901' />
-  <node id='-460693' action='modify' visible='true' lat='48.87249947934' lon='2.34334343153' />
-  <node id='-460694' action='modify' visible='true' lat='48.87249408198' lon='2.34338483096' />
-  <node id='-460695' action='modify' visible='true' lat='48.8725017692' lon='2.34336624663' />
-  <node id='-460696' action='modify' visible='true' lat='48.87258943336' lon='2.34352007038' />
-  <node id='-460697' action='modify' visible='true' lat='48.87245061393' lon='2.34347443088' />
-  <node id='-460698' action='modify' visible='true' lat='48.8726203618' lon='2.3433075471' />
-  <node id='-460699' action='modify' visible='true' lat='48.87247787613' lon='2.34327167268' />
-  <node id='-460700' action='modify' visible='true' lat='48.87259588375' lon='2.34325390292' />
-  <node id='-460702' action='modify' visible='true' lat='48.87262168252' lon='2.34327125172'>
-    <tag k='wemap:routing-io' v='yes' />
-  </node>
-  <way id='-460630' action='modify' visible='true'>
-    <nd ref='-460666' />
-    <nd ref='-460686' />
-    <nd ref='-460670' />
-    <nd ref='-460683' />
-    <nd ref='-460682' />
-    <nd ref='-460681' />
-    <nd ref='-460672' />
-    <nd ref='-460673' />
-    <nd ref='-460667' />
-    <nd ref='-460680' />
-    <nd ref='-460668' />
-    <nd ref='-460669' />
-    <nd ref='-460688' />
-    <nd ref='-460670' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460631' action='modify' visible='true'>
-    <nd ref='-460671' />
-    <nd ref='-460676' />
-    <nd ref='-460672' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460632' action='modify' visible='true'>
-    <nd ref='-460673' />
-    <nd ref='-460674' />
-    <nd ref='-460675' />
-    <nd ref='-460693' />
-    <nd ref='-460672' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460633' action='modify' visible='true'>
-    <nd ref='-460676' />
-    <nd ref='-460694' />
-    <nd ref='-460677' />
-    <nd ref='-460678' />
-    <nd ref='-460671' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460634' action='modify' visible='true'>
-    <nd ref='-460671' />
-    <nd ref='-460679' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460635' action='modify' visible='true'>
-    <nd ref='-460680' />
-    <nd ref='-460681' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460636' action='modify' visible='true'>
-    <nd ref='-460668' />
-    <nd ref='-460682' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460637' action='modify' visible='true'>
-    <nd ref='-460683' />
-    <nd ref='-460685' />
-    <nd ref='-460684' />
-    <nd ref='-460685' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460638' action='modify' visible='true'>
-    <nd ref='-460685' />
-    <nd ref='-460681' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460639' action='modify' visible='true'>
-    <nd ref='-460685' />
-    <nd ref='-460682' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460640' action='modify' visible='true'>
-    <nd ref='-460691' />
-    <nd ref='-460686' />
-    <nd ref='-460690' />
-    <nd ref='-460687' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460641' action='modify' visible='true'>
-    <nd ref='-460688' />
-    <nd ref='-460689' />
-    <nd ref='-460666' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460642' action='modify' visible='true'>
-    <nd ref='-460690' />
-    <nd ref='-460691' />
-    <nd ref='-460692' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460643' action='modify' visible='true'>
-    <nd ref='-460666' />
-    <nd ref='-460691' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460644' action='modify' visible='true'>
-    <nd ref='-460676' />
-    <nd ref='-460695' />
-    <nd ref='-460693' />
-    <nd ref='-460694' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460645' action='modify' visible='true'>
-    <nd ref='-460672' />
-    <nd ref='-460695' />
-    <nd ref='-460694' />
-    <tag k='highway' v='footway' />
-  </way>
-  <way id='-460646' action='modify' visible='true'>
-    <nd ref='-460700' />
-    <nd ref='-460698' />
-    <nd ref='-460696' />
-    <nd ref='-460697' />
-    <nd ref='-460699' />
-    <nd ref='-460700' />
-    <tag k='wemap:routing-bounds' v='yes' />
-  </way>
-  <way id='-460648' action='modify' visible='true'>
-    <nd ref='-460666' />
-    <nd ref='-460702' />
-    <tag k='highway' v='footway' />
-  </way>
-</osm>

package/assets/bureaux-wemap-montpellier-network.osm

@@ -1,174 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
-  <node id='-440460' action='modify' visible='true' lat='43.60927603206' lon='3.88424673798'>
-    <tag k='name' v='p7' />
-  </node>
-  <node id='-440462' action='modify' visible='true' lat='43.60913609818' lon='3.88411091795'>
-    <tag k='name' v='p3' />
-  </node>
-  <node id='-440464' action='modify' visible='true' lat='43.60929353543' lon='3.88425183223'>
-    <tag k='name' v='p8' />
-  </node>
-  <node id='-440466' action='modify' visible='true' lat='43.60930219142' lon='3.88427017086'>
-    <tag k='name' v='p9' />
-  </node>
-  <node id='-440468' action='modify' visible='true' lat='43.60911942685' lon='3.88422017773'>
-    <tag k='name' v='p4' />
-  </node>
-  <node id='-440470' action='modify' visible='true' lat='43.60935581261' lon='3.88428577699'>
-    <tag k='name' v='p22' />
-  </node>
-  <node id='-440472' action='modify' visible='true' lat='43.60919651074' lon='3.88412853633'>
-    <tag k='name' v='p1' />
-  </node>
-  <node id='-440474' action='modify' visible='true' lat='43.60931199709' lon='3.88413083832'>
-    <tag k='name' v='p25' />
-  </node>
-  <node id='-440476' action='modify' visible='true' lat='43.60917494597' lon='3.88421731753'>
-    <tag k='name' v='p6' />
-  </node>
-  <node id='-440478' action='modify' visible='true' lat='43.60918883875' lon='3.88412626772'>
-    <tag k='name' v='p2' />
-  </node>
-  <node id='-440480' action='modify' visible='true' lat='43.60936726345' lon='3.88427546746'>
-    <tag k='name' v='p23' />
-  </node>
-  <node id='-440482' action='modify' visible='true' lat='43.60917216742' lon='3.8842355275'>
-    <tag k='name' v='p5' />
-  </node>
-  <node id='-440484' action='modify' visible='true' lat='43.60931231268' lon='3.8842731166'>
-    <tag k='name' v='p10' />
-  </node>
-  <node id='-440486' action='modify' visible='true' lat='43.60932336323' lon='3.884200898'>
-    <tag k='name' v='p11' />
-  </node>
-  <node id='-440488' action='modify' visible='true' lat='43.6093629216' lon='3.884212726'>
-    <tag k='name' v='p12' />
-  </node>
-  <node id='-440490' action='modify' visible='true' lat='43.60935965678' lon='3.8842335535'>
-    <tag k='name' v='p13' />
-  </node>
-  <node id='-440492' action='modify' visible='true' lat='43.60932022256' lon='3.88422176261'>
-    <tag k='name' v='p14' />
-  </node>
-  <node id='-440494' action='modify' visible='true' lat='43.60931232238' lon='3.88427309743'>
-    <tag k='name' v='p15' />
-  </node>
-  <node id='-440496' action='modify' visible='true' lat='43.60936673756' lon='3.88428907078'>
-    <tag k='name' v='p24' />
-  </node>
-  <node id='-440498' action='modify' visible='true' lat='43.60926807571' lon='3.884260391'>
-    <tag k='name' v='p16' />
-  </node>
-  <node id='-441184' action='modify' visible='true' lat='43.60932786117' lon='3.88427765877'>
-    <tag k='name' v='p18' />
-  </node>
-  <node id='-441187' action='modify' visible='true' lat='43.60933232537' lon='3.88424831515'>
-    <tag k='highway' v='elevator' />
-    <tag k='level' v='0;2' />
-    <tag k='name' v='p19' />
-  </node>
-  <node id='-441210' action='modify' visible='true' lat='43.60932786111' lon='3.8842776591'>
-    <tag k='name' v='p17' />
-  </node>
-  <node id='-441270' action='modify' visible='true' lat='43.6093032' lon='3.8844388'>
-    <tag k='name' v='p21' />
-  </node>
-  <node id='-441273' action='modify' visible='true' lat='43.6095297' lon='3.8845039'>
-    <tag k='name' v='p22' />
-  </node>
-  <node id='-441286' action='modify' visible='true' lat='43.6095624' lon='3.8845134'>
-    <tag k='name' v='p23' />
-  </node>
-  <way id='-440499' action='modify' visible='true'>
-    <nd ref='-440476' />
-    <nd ref='-440460' />
-    <nd ref='-440464' />
-    <nd ref='-440474' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='2' />
-    <tag k='name' v='w2' />
-  </way>
-  <way id='-440500' action='modify' visible='true'>
-    <nd ref='-440464' />
-    <nd ref='-440466' />
-    <nd ref='-440484' />
-    <nd ref='-441184' />
-    <nd ref='-440470' />
-    <nd ref='-440480' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='2' />
-    <tag k='name' v='w3' />
-  </way>
-  <way id='-440501' action='modify' visible='true'>
-    <nd ref='-440472' />
-    <nd ref='-440478' />
-    <nd ref='-440462' />
-    <nd ref='-440468' />
-    <nd ref='-440482' />
-    <nd ref='-440476' />
-    <nd ref='-440478' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='2' />
-    <tag k='name' v='w1' />
-  </way>
-  <way id='-440502' action='modify' visible='true'>
-    <nd ref='-440486' />
-    <nd ref='-440488' />
-    <nd ref='-440490' />
-    <nd ref='-440492' />
-    <tag k='highway' v='steps' />
-    <tag k='level' v='1;2' />
-    <tag k='name' v='w6' />
-  </way>
-  <way id='-440503' action='modify' visible='true'>
-    <nd ref='-440484' />
-    <nd ref='-440486' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='2' />
-    <tag k='name' v='w5' />
-  </way>
-  <way id='-440504' action='modify' visible='true'>
-    <nd ref='-440492' />
-    <nd ref='-440494' />
-    <nd ref='-441210' />
-    <nd ref='-440496' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='1' />
-    <tag k='name' v='w7' />
-  </way>
-  <way id='-440505' action='modify' visible='true'>
-    <nd ref='-440494' />
-    <nd ref='-440498' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='1' />
-    <tag k='name' v='w9' />
-  </way>
-  <way id='-441188' action='modify' visible='true'>
-    <nd ref='-441184' />
-    <nd ref='-441187' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='2' />
-    <tag k='name' v='w4' />
-  </way>
-  <way id='-441214' action='modify' visible='true'>
-    <nd ref='-441210' />
-    <nd ref='-441187' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='1' />
-    <tag k='name' v='w8' />
-  </way>
-  <way id='-441263' action='modify' visible='true'>
-    <nd ref='-441187' />
-    <nd ref='-441270' />
-    <nd ref='-441273' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='0' />
-    <tag k='name' v='w10' />
-  </way>
-  <way id='-441268' action='modify' visible='true'>
-    <nd ref='-441273' />
-    <nd ref='-441286' />
-    <tag k='highway' v='footway' />
-  </way>
-</osm>