@wemap/geo 0.3.5 → 0.3.7

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "0.3.5",
+    "version": "0.3.7",
     "bugs": {
         "url": "https://github.com/wemap/wemap-utils-js/issues"
     },
@@ -31,5 +31,5 @@
         "lodash.isnumber": "^3.0.3",
         "lodash.isstring": "^4.0.1"
     },
-    "gitHead": "8f0c34af735495a9ca59be1f1a2c4b1c2aab9688"
+    "gitHead": "dfef19c363ee76ad4b4e23f9e36912034c10ccca"
 }

package/src/coordinates/WGS84UserPosition.js

@@ -19,16 +19,7 @@ class WGS84UserPosition extends WGS84 {
 
     // Create a WGS84UserPosition with lat, lng, alt from WGS84 coordinates and
     //   other fields from another WGS84UserPosition
-    static fromWGS84(wgs84Coordinates, userPosition) {
-
-        if (userPosition) {
-            return new WGS84UserPosition(
-                wgs84Coordinates.lat, wgs84Coordinates.lng,
-                wgs84Coordinates.alt, wgs84Coordinates.level,
-                userPosition.time, userPosition.accuracy,
-                userPosition.bearing, userPosition.provider);
-        }
-
+    static fromWGS84(wgs84Coordinates) {
         return new WGS84UserPosition(wgs84Coordinates.lat, wgs84Coordinates.lng,
             wgs84Coordinates.alt, wgs84Coordinates.level);
     }

package/src/graph/Itinerary.js

@@ -1,5 +1,5 @@
 /* eslint-disable max-statements */
-import { WGS84 } from '@wemap/geo';
+import { WGS84, Level } from '@wemap/geo';
 
 import Network from './Network';
 import Edge from './Edge';
@@ -288,22 +288,36 @@ class Itinerary extends Network {
     static fromOrderedPointsArray(points, start, end, lngLatFormat) {
         const route = new Itinerary();
         route._length = 0;
-        route.start = new WGS84(start[lngLatFormat ? 1 : 0],
-            start[lngLatFormat ? 0 : 1]);
-        route.end = new WGS84(end[lngLatFormat ? 1 : 0],
-            end[lngLatFormat ? 0 : 1]);
+        route.start = new WGS84(
+            start[lngLatFormat ? 1 : 0],
+            start[lngLatFormat ? 0 : 1],
+            null,
+            start[2]);
+        route.end = new WGS84(
+            end[lngLatFormat ? 1 : 0],
+            end[lngLatFormat ? 0 : 1],
+            null,
+            end[2]);
 
         let lastPoint = null;
 
         for (let i = 0; i < points.length; i++) {
 
             const currentPoint = new Node(
-                new WGS84(points[i][lngLatFormat ? 1 : 0],
-                    points[i][lngLatFormat ? 0 : 1])
+                new WGS84(
+                    points[i][lngLatFormat ? 1 : 0],
+                    points[i][lngLatFormat ? 0 : 1],
+                    null,
+                    points[i][2])
             );
 
             if (lastPoint) {
-                const edge = new Edge(lastPoint, currentPoint);
+                const edge = new Edge(
+                    lastPoint,
+                    currentPoint,
+                    null,
+                    Level.union(lastPoint.coords.level, currentPoint.coords.level)
+                );
                 route._edgesDirectionReversed.push(false);
                 route.edges.push(edge);
                 route._length += edge.length;

package/src/graph/Network.js

@@ -23,7 +23,7 @@ class Network {
         );
     }
 
-    toString(_nodeToStringFn, _edgeToStringFn) {
+    toDetailedString(_nodeToStringFn, _edgeToStringFn) {
 
         let nodeToStringFn = _nodeToStringFn;
         if (!nodeToStringFn) {