@wemap/osm 1.0.0 → 1.0.2

package/package.json

@@ -7,15 +7,15 @@
     "main": "index.js",
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/wemap/wemap-utils-js.git",
+        "url": "git+https://github.com/wemap/wemap-modules-js.git",
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "bugs": {
-        "url": "https://github.com/wemap/wemap-utils-js/issues"
+        "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
-    "homepage": "https://github.com/wemap/wemap-utils-js#readme",
+    "homepage": "https://github.com/wemap/wemap-modules-js#readme",
     "scripts": {
         "test": "mocha -r esm \"src/**/*.spec.js\""
     },
@@ -26,11 +26,11 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^1.0.4",
-        "@wemap/graph": "^1.0.5",
-        "@wemap/logger": "^0.1.7",
+        "@wemap/geo": "^1.0.5",
+        "@wemap/graph": "^1.0.6",
+        "@wemap/logger": "^0.1.8",
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "cab48c01923850987968f072a8f7075a34b3cc32"
+    "gitHead": "80a8bdd92acfffd6ca612ec56e882ad54aa115e1"
 }

package/src/osrm/OsrmUtils.js

@@ -151,14 +151,14 @@ class OsrmUtils {
     /**
      * Generate Itinerary from OSRM JSON, start and end.
      * @param {Object} json JSON file provided by OSRM.
-     * @param {Array} start Array of <lng, lat[, level]>
-     * @param {Array} end Array of <lng, lat[, level]>
+     * @param {WGS84} start itinerary start
+     * @param {WGS84} end itinerary end
      */
     static createItineraryFromJson(json, start, end) {
         const itinerary = new Itinerary();
 
-        itinerary.start = OsrmUtils.jsonToWgs84(start);
-        itinerary.end = OsrmUtils.jsonToWgs84(end);
+        itinerary.start = start;
+        itinerary.end = end;
 
         const {
             legs, geometry

package/src/osrm/OsrmUtils.spec.js

@@ -26,8 +26,8 @@ describe('OsrmUtils', () => {
 
         const json = JSON.parse(fileString);
 
-        const start = [3.8757218000000004, 43.6007871];
-        const end = [3.873866, 43.598877];
+        const start = new WGS84(43.6007871, 3.8757218000000004);
+        const end = new WGS84(43.598877, 3.873866);
 
         const itinerary = OsrmUtils.createItineraryFromJson(json, start, end);
 
@@ -142,14 +142,14 @@ describe('OsrmUtils', () => {
 
             let expectedType;
             switch (i) {
-                case 0:
-                    expectedType = 'depart';
-                    break;
-                case steps.length - 1:
-                    expectedType = 'arrive';
-                    break;
-                default:
-                    expectedType = 'turn';
+            case 0:
+                expectedType = 'depart';
+                break;
+            case steps.length - 1:
+                expectedType = 'arrive';
+                break;
+            default:
+                expectedType = 'turn';
             }
             expect(type).equals(expectedType);
         }
@@ -202,10 +202,7 @@ describe('OsrmUtils', () => {
 
         const json = osrmWemapJson;
 
-        const start = OsrmUtils.wgs84ToJson(itineraryStart);
-        const end = OsrmUtils.wgs84ToJson(itineraryEnd);
-
-        const itinerary = OsrmUtils.createItineraryFromJson(json, start, end);
+        const itinerary = OsrmUtils.createItineraryFromJson(json, itineraryStart, itineraryEnd);
 
         expect(itinerary.nodes.length).equal(wemapItinerary.nodes.length);
         for (let i = 0; i < itinerary.nodes.length; i++) {