@wemap/positioning 2.4.0 → 2.4.2

package/package.json

@@ -8,14 +8,12 @@
     "Guillaume Pannetier <guillaume.pannetier@getwemap.com>"
   ],
   "dependencies": {
-    "@wemap/geo": "^0.2.1",
+    "@wemap/geo": "^0.3.1",
     "@wemap/logger": "^0.1.5",
-    "@wemap/maths": "^0.2.0",
-    "@wemap/osm": "^0.1.1",
+    "@wemap/maths": "^0.2.1",
+    "@wemap/osm": "^0.2.1",
     "@wemap/utils": "^0.1.2",
-    "file-saver": "^2.0.2",
     "geomagnetism": "^0.1.0",
-    "jszip": "^3.2.2",
     "lodash.isempty": "^4.4.0",
     "lodash.isnumber": "^3.0.3",
     "lodash.noop": "^3.0.1"
@@ -82,5 +80,5 @@
     "lint": "eslint --ext .js,.jsx --quiet src",
     "test": "mocha -r esm \"src/**/*.spec.js\""
   },
-  "version": "2.4.0"
+  "version": "2.4.2"
 }

package/src/components/PositioningPoseComponent.jsx

@@ -83,6 +83,12 @@ class PositioningPoseComponent extends React.Component {
       const attitudeRender = Utils.renderAttitude(this.state.attitude);
       const positionRender = Utils.renderPosition(this.state.position);
 
+      const itineraryRender = Utils.renderItineraryInfo(
+          this.state.position && !(this.state.position instanceof Error)
+              ? Utils.ITINERARY.getInfo(this.state.position)
+              : null
+      );
+
       return (
           <div>
               <StartStopComponent
@@ -98,6 +104,8 @@ class PositioningPoseComponent extends React.Component {
               <h3>Map</h3>
               <MapComponent ref={map => (this.map = map)}
                   network={Utils.ITINERARY} />
+              <h3>ItineraryInfo</h3>
+              {itineraryRender}
           </div>
       );
   }

package/src/components/Utils.js

@@ -4,6 +4,7 @@ import {
     Itinerary, WGS84UserPosition
 } from '@wemap/geo';
 import { rad2deg } from '@wemap/maths';
+import { OsrmUtils } from '@wemap/osm';
 
 const NOT_AVAILABLE_STR = 'Not available';
 
@@ -92,6 +93,38 @@ class Utils {
 
     }
 
+    static renderItineraryInfo(info) {
+
+        if (!info) {
+            return <p>Waiting</p>;
+        }
+
+        const step = info.nextStep;
+        let nextStepStr = '[' + step.number + '] ';
+        if (step.firstStep) {
+            nextStepStr += 'Depart';
+        } else if (step.lastStep) {
+            nextStepStr += 'Arrive';
+        } else {
+            nextStepStr += 'Turn '
+                + OsrmUtils.getModifierFromAngle(step.angle);
+        }
+
+
+        return (
+            <p>
+                projection: {info.projection.nearestElement.constructor.name}<br />
+                distanceOfProjection: {info.projection.distanceFromNearestElement.toFixed(1)}m<br />
+                traveledDistance: {info.traveledDistance.toFixed(1)}m
+                    ({(info.traveledPercentage * 100).toFixed(1)}%)<br />
+                remainingDistance: {info.remainingDistance.toFixed(1)}m
+                    ({(info.remainingPercentage * 100).toFixed(1)}%)<br />
+                nextStep: {nextStepStr}
+            </p>
+        );
+
+    }
+
     static renderInclination(inclination) {
         if (inclination === null) {
             return 'Waiting';

package/src/providers/ProvidersLogger.js

@@ -70,7 +70,7 @@ class ProvidersLogger {
     }
 
     static get enabled() {
-        return Logger.LOG_LEVEL === Logger.DEBUG;
+        return Logger.ENABLED && Logger.LOG_LEVEL === Logger.DEBUG;
     }
 
 }

package/src/providers/others/MapMatchingProvider.js

@@ -1,6 +1,6 @@
 import Provider from '../Provider';
 import {
-    Edge, Itinerary, MapMatching, Network, WGS84
+    Itinerary, MapMatching, Network, WGS84
 } from '@wemap/geo';
 
 class MapMatchingProvider extends Provider {
@@ -46,29 +46,6 @@ class MapMatchingProvider extends Provider {
         return this.mapMatching !== null;
     }
 
-    /**
-     * Returns projection of a position on network
-     * @param {WGS84} position if position is null, projection of this.position is used
-     * @returns The projected position {WGS84} or null.
-     * @public
-     */
-    getProjectionOnNetwork(position = null) {
-
-        if (!this.mapMatching) {
-            return null;
-        }
-
-        let positionToProject = position;
-        if (!position) {
-            positionToProject = this.position;
-        }
-        if (!positionToProject) {
-            return null;
-        }
-
-        return this.mapMatching.getProjection(positionToProject, false, false);
-    }
-
 
     /**
      * Itinerary
@@ -87,60 +64,24 @@ class MapMatchingProvider extends Provider {
         this.itinerary = itinerary;
     }
 
-
     /**
      * Returns projection and itinerary info of a position on network
-     * @param {WGS84} position if position is null, projection of this.position is used
+     * @param {WGS84} position if position is null/undefined, projection of this.position is used
      * @returns An object of the projected position and itinerary info or null.
      * @public
      */
-    getItineraryInfo(position = null) {
+    getItineraryInfo(position) {
 
         if (!this.itinerary) {
             throw new Error('No itinerary found');
         }
-        const projection = this.getProjectionOnNetwork(position);
-        if (!projection) {
-            return null;
-        }
-
-        const totalDistance = this.itinerary.distance;
-        let traveledDistance = 0;
-        const edges = this.itinerary.edges;
 
-        if (projection.nearestElement instanceof WGS84) {
-
-            for (let i = 0; i < edges.length; i++) {
-                const edge = edges[i];
-                if (edge.node1.equalsTo(projection.nearestElement)) {
-                    break;
-                }
-                traveledDistance += edge.length;
-            }
-
-
-        } else if (projection.nearestElement instanceof Edge) {
-
-            for (let i = 0; i < edges.length; i++) {
-                const edge = edges[i];
-                if (edge.equalsTo(projection.nearestElement)) {
-                    traveledDistance += edge.node1.distanceTo(projection.projection);
-                    break;
-                }
-                traveledDistance += edge.length;
-            }
-
-        } else {
-            throw new Error('No projection found');
+        const _position = position || this.position;
+        if (!_position) {
+            return null;
         }
 
-        return {
-            projection: projection,
-            traveledDistance,
-            traveledPercentage: traveledDistance / totalDistance,
-            remainingDistance: totalDistance - traveledDistance,
-            remainingPercentage: 1 - traveledDistance / totalDistance
-        };
+        return this.itinerary.getInfo(position || this.position);
     }
 }
 

package/src/providers/pose/GnssWifiPdrProvider.js

@@ -117,7 +117,7 @@ class GnssWifiPdrProvider extends MapMatchingProvider {
             } else {
 
                 this.gnssPosition.bearing = this.attitude.headingDegrees;
-                const projection = this.mapMatching.getProjection(this.gnssPosition);
+                const projection = this.mapMatching.getProjection(this.gnssPosition, true, true);
 
                 if (projection && projection.projection) {
 
@@ -192,13 +192,11 @@ class GnssWifiPdrProvider extends MapMatchingProvider {
                 console.warn('Itinerary has not been calculated from GnssWifiPdrProvider and these is not recommanded');
             }
 
-            let startEdge;
-            if (itinerary.firstEdge.length <= MM_GNSS_DIST) {
-                startEdge = itinerary.firstEdge;
-            } else {
-                startEdge = itinerary.secondEdge;
+            const startEdge = itinerary.getEdgeAt(MM_GNSS_DIST);
+            if (!startEdge) {
+                return;
             }
-            const startPoint = WGS84UserPosition.fromWGS84(startEdge.node1);
+            const startPoint = WGS84UserPosition.fromWGS84(startEdge.node1.coords);
             startPoint.alt = Constants.DEFAULT_ALTITUDE;
             this.pdrProvider.setPosition(startPoint);
             this.pdrProvider.setStepDetectionLockerOrientation(startEdge.bearing);

package/src/providers/pose/pdr/PdrProvider.js

@@ -255,7 +255,7 @@ class PdrProvider extends MapMatchingProvider {
             return newPositionWithoutMM;
         }
 
-        const projection = this.mapMatching.getProjection(newPositionWithoutMM);
+        const projection = this.mapMatching.getProjection(newPositionWithoutMM, true, true);
 
         if (!projection || !projection.projection) {
             return newPositionWithoutMM;