@wemap/providers 3.1.23 → 3.2.2

package/debug/stores/ItineraryStore.js

@@ -1,11 +1,11 @@
-import { Coordinates } from '@wemap/geo';
+import { Coordinates, Level } from '@wemap/geo';
 import { Itinerary } from '@wemap/graph';
 import { OsrmUtils } from '@wemap/osm';
 import { Evented } from '@wemap/utils';
 
 import {
     ProvidersInterface, EventType
-} from '../..';
+} from '../../index.js';
 
 const Events = {
     StartChanged: 'itinerary.start.changed',
@@ -13,32 +13,20 @@ const Events = {
     ItineraryChanged: 'itinerary.changed',
     ItineraryNotFound: 'itinerary.not.found',
     ItineraryComputing: 'itinerary.computing',
-    ItineraryServerChanged: 'itinerary.server.changed',
     ServerError: 'itinerary.server.error',
     UseStairsChanged: 'itinerary.use.stairs.changed'
 };
 
-const Servers = {
-    Indoor: {
-        name: 'Indoor',
-        routingUrl: 'https://osmrouter.getwemap.com'
-    },
-    Outdoor: {
-        name: 'Outdoor',
-        routingUrl: 'https://routingdev.maaap.it'
-    }
-};
+const SERVER_URL = 'https://routingindoor.maaap.it';
 
 class ItineraryStore extends Evented {
 
     _start = null;
     _end = null;
     _itinerary = null;
-    _itineraryServer = Servers.Outdoor;
     _useStairs = true;
 
     static Events = Events;
-    static Servers = Servers;
 
     static instance = new ItineraryStore();
 
@@ -48,10 +36,6 @@ class ItineraryStore extends Evented {
     set start(start) {
         this._start = start;
         this.fire(Events.StartChanged, start);
-
-        if (start !== null && start.level !== null && this.itineraryServer !== Servers.Indoor) {
-            this.itineraryServer = Servers.Indoor;
-        }
     }
 
     /**
@@ -99,10 +83,6 @@ class ItineraryStore extends Evented {
     set end(end) {
         this._end = end;
         this.fire(Events.EndChanged, end);
-
-        if (end !== null && end.level !== null && this.itineraryServer !== Servers.Indoor) {
-            this.itineraryServer = Servers.Indoor;
-        }
     }
 
     /**
@@ -126,21 +106,6 @@ class ItineraryStore extends Evented {
         return this.itineraryComputing;
     }
 
-    /**
-     * @param {Object}
-     */
-    set itineraryServer(itineraryServer) {
-        this._itineraryServer = itineraryServer;
-        this.fire(Events.ItineraryServerChanged, itineraryServer);
-    }
-
-    /**
-     * @return {Object}
-     */
-    get itineraryServer() {
-        return this._itineraryServer;
-    }
-
     /**
      * @param {Boolean}
      */
@@ -172,19 +137,14 @@ class ItineraryStore extends Evented {
 
         computingFn(true);
 
-        const isIndoor = this._itineraryServer === Servers.Indoor;
-        const useStartLevel = isIndoor && start.level !== null;
-        const useEndLevel = isIndoor && end.level !== null;
-        const useStairs = !isIndoor || this.useStairs;
-
-        const url = this._itineraryServer.routingUrl
+        const url = SERVER_URL
             + '/route/v1/walking/'
-            + start.lng + ',' + start.lat + (useStartLevel ? ',' + start.level : '')
+            + start.lng + ',' + start.lat + (start.level !== null ? ',' + start.level.toString() : '')
             + ';'
-            + end.lng + ',' + end.lat + (useEndLevel ? ',' + end.level : '')
+            + end.lng + ',' + end.lat + (end.level !== null ? ',' + end.level.toString() : '')
             + '?geometries=geojson&overview=full'
-            + (isIndoor ? '&useAltitude=false' : '')
-            + (!useStairs ? '&useStairs=false' : '');
+            + '&useAltitude=false'
+            + (!this.useStairs ? '&useStairs=false' : '');
 
 
         fetch(url)
@@ -205,6 +165,21 @@ class ItineraryStore extends Evented {
                 this.itineraryComputing = false;
                 this.fire(Events.ItineraryComputing, false);
 
+                if (itinerary.nodes.length > 0) {
+                    const firstCoords = itinerary.nodes[0].coords;
+                    const lastCoords = itinerary.nodes[itinerary.nodes.length - 1].coords;
+
+                    if (!Level.equalsTo(firstCoords.level, start.level)) {
+                        this.start.level = firstCoords.level;
+                        this.fire(Events.StartChanged, start);
+                    }
+
+                    if (!Level.equalsTo(lastCoords.level, end.level)) {
+                        this.end.level = lastCoords.level;
+                        this.fire(Events.EndChanged, end);
+                    }
+                }
+
                 this._itinerary = itinerary;
                 this.fire(Events.ItineraryChanged, itinerary);