@wemap/osm 0.2.8 → 0.2.10

package/assets/itinerary-osrm.json

@@ -1 +1 @@
-{"code":"Ok","routes":[{"geometry":{"coordinates":[[3.89678,43.600032],[3.896532,43.600216],[3.896247,43.600432],[3.896188,43.600488],[3.896151,43.600523],[3.895937,43.600726],[3.895824,43.600837],[3.89566,43.601048],[3.895605,43.601131],[3.895549,43.601243],[3.895511,43.601337],[3.895492,43.601413],[3.895485,43.601506],[3.89549,43.601585],[3.895549,43.601785],[3.895413,43.60181],[3.895353,43.601826],[3.895305,43.601628],[3.8953,43.60157],[3.89532,43.60143]],"type":"LineString"},"legs":[{"steps":[{"intersections":[{"out":0,"entry":[true],"bearings":[316],"location":[3.89678,43.600032]}],"driving_side":"right","geometry":{"coordinates":[[3.89678,43.600032],[3.896532,43.600216],[3.896247,43.600432],[3.896188,43.600488],[3.896151,43.600523],[3.895937,43.600726],[3.895824,43.600837],[3.89566,43.601048],[3.895605,43.601131],[3.895549,43.601243],[3.895511,43.601337],[3.895492,43.601413],[3.895485,43.601506],[3.89549,43.601585],[3.895549,43.601785]],"type":"LineString"},"mode":"walking","duration":165.6,"maneuver":{"bearing_after":316,"type":"depart","modifier":"right","bearing_before":0,"location":[3.89678,43.600032]},"weight":165.6,"distance":230.1,"name":""},{"intersections":[{"out":2,"location":[3.895549,43.601785],"bearings":[15,195,285],"entry":[true,false,true],"in":1}],"driving_side":"right","geometry":{"coordinates":[[3.895549,43.601785],[3.895413,43.60181],[3.895353,43.601826]],"type":"LineString"},"mode":"walking","duration":11.8,"maneuver":{"bearing_after":284,"type":"turn","modifier":"left","bearing_before":11,"location":[3.895549,43.601785]},"weight":11.8,"distance":16.5,"name":""},{"intersections":[{"out":2,"location":[3.895353,43.601826],"bearings":[15,105,195,285],"entry":[true,false,true,true],"in":1}],"driving_side":"right","geometry":{"coordinates":[[3.895353,43.601826],[3.895305,43.601628],[3.8953,43.60157],[3.89532,43.60143]],"type":"LineString"},"mode":"walking","duration":32.2,"maneuver":{"bearing_after":189,"type":"turn","modifier":"left","bearing_before":286,"location":[3.895353,43.601826]},"weight":32.2,"distance":44.5,"name":""},{"intersections":[{"in":0,"entry":[true],"bearings":[354],"location":[3.89532,43.60143]}],"driving_side":"right","geometry":{"coordinates":[[3.89532,43.60143],[3.89532,43.60143]],"type":"LineString"},"mode":"walking","duration":0,"maneuver":{"bearing_after":0,"location":[3.89532,43.60143],"bearing_before":174,"type":"arrive"},"weight":0,"distance":0,"name":""}],"distance":291,"duration":209.6,"summary":"","weight":209.6}],"distance":291,"duration":209.6,"weight_name":"duration","weight":209.6}],"waypoints":[{"hint":"4dUHgOOrJ4DOAAAAnwAAAKoFAAB5AwAAzgAAAJ8AAACqBQAAeQMAAAIAAADMdTsAoEiZAjd2OwDrSJkCDQB_CA61bn8=","name":"","location":[3.89678,43.600032]},{"hint":"3vZTgejVB4AEAAAAcgAAAF8AAADQAAAABAAAAHIAAABfAAAA0AAAAAIAAAAYcDsAFk6ZAhdwOwAWTpkCAgAvFg61bn8=","name":"","location":[3.89532,43.60143]}]}
+{"code":"Ok","routes":[{"geometry":{"coordinates":[[3.875607,43.600777],[3.875723,43.600109],[3.875766,43.600086],[3.876247,43.599974],[3.876341,43.599956],[3.876396,43.599881],[3.876234,43.599853],[3.875869,43.599787],[3.875829,43.599781],[3.875671,43.599759],[3.875643,43.599755],[3.875606,43.599749],[3.875578,43.599746],[3.875498,43.599734],[3.87536,43.599707],[3.875169,43.599674],[3.874655,43.599577],[3.874623,43.599063],[3.873865,43.59906]],"type":"LineString"},"legs":[{"steps":[{"intersections":[{"out":0,"entry":[true],"bearings":[173],"location":[3.875607,43.600777]}],"driving_side":"right","geometry":{"coordinates":[[3.875607,43.600777],[3.875723,43.600109],[3.875766,43.600086],[3.876247,43.599974],[3.876341,43.599956],[3.876396,43.599881]],"type":"LineString"},"mode":"walking","duration":98.7,"maneuver":{"bearing_after":173,"type":"depart","modifier":"left","bearing_before":0,"location":[3.875607,43.600777]},"weight":98.7,"distance":137.2,"name":""},{"intersections":[{"out":1,"location":[3.876396,43.599881],"bearings":[75,255,330],"entry":[true,true,false],"in":2},{"out":2,"location":[3.876234,43.599853],"bearings":[75,180,255],"entry":[false,true,true],"in":0},{"out":2,"location":[3.875829,43.599781],"bearings":[75,195,255],"entry":[false,true,true],"in":0},{"out":2,"location":[3.875643,43.599755],"bearings":[75,135,255],"entry":[false,true,true],"in":0},{"out":2,"location":[3.875498,43.599734],"bearings":[75,165,255,345],"entry":[false,true,true,true],"in":0},{"out":2,"location":[3.875169,43.599674],"bearings":[75,180,255],"entry":[false,true,true],"in":0}],"driving_side":"right","geometry":{"coordinates":[[3.876396,43.599881],[3.876234,43.599853],[3.875869,43.599787],[3.875829,43.599781],[3.875671,43.599759],[3.875643,43.599755],[3.875606,43.599749],[3.875578,43.599746],[3.875498,43.599734],[3.87536,43.599707],[3.875169,43.599674],[3.874655,43.599577]],"type":"LineString"},"mode":"walking","duration":103.9,"maneuver":{"bearing_after":255,"type":"turn","modifier":"right","bearing_before":149,"location":[3.876396,43.599881]},"weight":103.9,"distance":144.3,"name":"Boulevard Vieussens"},{"intersections":[{"out":1,"location":[3.874655,43.599577],"bearings":[75,180,255],"entry":[false,true,true],"in":0}],"driving_side":"right","geometry":{"coordinates":[[3.874655,43.599577],[3.874623,43.599063]],"type":"LineString"},"mode":"walking","duration":41.2,"maneuver":{"bearing_after":181,"type":"turn","modifier":"left","bearing_before":254,"location":[3.874655,43.599577]},"weight":41.2,"distance":57.2,"name":"Impasse Bizeray"},{"intersections":[{"out":2,"location":[3.874623,43.599063],"bearings":[0,90,270],"entry":[false,true,true],"in":0}],"driving_side":"right","geometry":{"coordinates":[[3.874623,43.599063],[3.873865,43.59906]],"type":"LineString"},"mode":"walking","duration":44,"maneuver":{"bearing_after":268,"type":"turn","modifier":"right","bearing_before":181,"location":[3.874623,43.599063]},"weight":44,"distance":61.1,"name":"Rue du Docteur Louis Perrier"},{"intersections":[{"in":0,"entry":[true],"bearings":[90],"location":[3.873865,43.59906]}],"driving_side":"right","geometry":{"coordinates":[[3.873865,43.59906],[3.873865,43.59906]],"type":"LineString"},"mode":"walking","duration":0,"maneuver":{"bearing_after":0,"type":"arrive","modifier":"left","bearing_before":270,"location":[3.873865,43.59906]},"weight":0,"distance":0,"name":"Rue du Docteur Louis Perrier"}],"distance":399.7,"duration":287.8,"summary":"Boulevard Vieussens, Boulevard Berthelot","weight":287.8}],"distance":399.7,"duration":287.8,"weight_name":"duration","weight":287.8}],"waypoints":[{"hint":"d89TgaHPU4GmAQAAGwIAAB0AAADAAQAApgEAABsCAAAdAAAAwAEAAAIAAAAXIzsAiUuZAoojOwCTS5kCAQDPCg61bn8=","name":"","location":[3.875607,43.600777]},{"hint":"dNRTgZbUU4FHAAAAuAEAAIMAAAAAAAAARwAAALgBAACDAAAAAAAAAAIAAABJHDsA1ESZAkocOwAdRJkCAwCfBQ61bn8=","name":"Rue du Docteur Louis Perrier","location":[3.873865,43.59906]}]}

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "0.2.8",
+    "version": "0.2.10",
     "bugs": {
         "url": "https://github.com/wemap/wemap-utils-js/issues"
     },
@@ -26,10 +26,10 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^0.3.6",
+        "@wemap/geo": "^0.3.8",
         "@wemap/logger": "^0.1.6",
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "32a1062949091aeb9ab107da3e75bc69589538ba"
+    "gitHead": "6e107eebc85ff97f17371feac903ddb53657678b"
 }

package/src/network/OsmNetwork.js

@@ -60,8 +60,8 @@ class OsmNetwork extends Network {
         return this.edges.find(edge => edge.data.id === id);
     }
 
-    toString() {
-        return super.toString(
+    toDetailedString() {
+        return super.toDetailedString(
             node => node.data.tags.name,
             edge => edge.data.id
         );

package/src/osrm/OsrmUtils.js

@@ -175,18 +175,41 @@ class OsrmUtils {
 
         for (let i = 0; i < steps.length; i++) {
             const step = steps[i];
+
+            const nodeData = {};
+            const nextEdgeData = {};
+
             if (step.wemap) {
+                if (step.wemap.nodeTags) {
+                    nodeData.tags = step.wemap.nodeTags;
+                }
+
+                if (step.wemap.nextEdgeTags) {
+                    nextEdgeData.osmTags = step.wemap.nextEdgeTags;
+                    if (nextEdgeData.osmTags.name) {
+                        nextEdgeData.name = nextEdgeData.osmTags.name;
+                    }
+                }
+            }
+
+            if (step.name) {
+                nextEdgeData.name = step.name;
+            }
+
+            const hasNodeData = Object.keys(nodeData).length !== 0;
+            const hasNextEdgeData = Object.keys(nextEdgeData).length !== 0;
+            if (hasNodeData || hasNextEdgeData) {
                 const stepLocation = step.maneuver.location;
                 const location = OsrmUtils.jsonToWgs84(stepLocation);
                 const existingNode = itinerary.getNodeByCoords(location);
 
-                if (step.wemap.nodeTags) {
-                    existingNode.data = { tags: step.wemap.nodeTags };
+                if (hasNodeData) {
+                    existingNode.data = nodeData;
                 }
 
-                if (step.wemap.nextEdgeTags) {
+                if (hasNextEdgeData && i !== steps.length - 1) {
                     const nextEdge = existingNode.edges[i === 0 ? 0 : 1];
-                    nextEdge.data = { tags: step.wemap.nextEdgeTags };
+                    nextEdge.data = nextEdgeData;
                 }
             }
         }

package/src/osrm/OsrmUtils.spec.js

@@ -24,8 +24,8 @@ describe('OsrmUtils', () => {
 
         const json = JSON.parse(fileString);
 
-        const start = [3.8968868999999997, 43.6001066];
-        const end = [3.895319, 43.601430];
+        const start = [3.8757218000000004, 43.6007871];
+        const end = [3.873866, 43.598877];
 
         const itinerary = OsrmUtils.createItineraryFromJson(json, start, end);