Added location dependent data

features/lib/osm.js

@@ -61,8 +61,13 @@ class DB {
             });
 
             w.nodes.forEach((k) => {
-                way.ele('nd')
+
+                let nd = way.ele('nd')
                     .att('ref', k.id);
+                if (w.add_locations) {
+                    nd.att('lon', k.lon);
+                    nd.att('lat', k.lat);
+                }
             });
 
             for (var k in w.tags) {
@@ -120,13 +125,14 @@ class Node {
 }
 
 class Way {
-    constructor (id, OSM_USER, OSM_TIMESTAMP, OSM_UID) {
+    constructor (id, OSM_USER, OSM_TIMESTAMP, OSM_UID, add_locations) {
         this.id = id;
         this.OSM_USER = OSM_USER;
         this.OSM_TIMESTAMP = OSM_TIMESTAMP;
         this.OSM_UID = OSM_UID;
         this.tags = {};
         this.nodes = [];
+        this.add_locations = add_locations;
     }
 
     addNode (node) {

features/options/extract/lua.feature

@@ -6,10 +6,6 @@ Feature: osrm-extract lua ways:get_nodes()
             """
             a b
             """
-        And the ways
-            | nodes |
-            | ab    |
-        And the data has been saved to disk
 
     Scenario: osrm-extract - Passing base file
         Given the profile file
@@ -27,7 +23,50 @@ Feature: osrm-extract lua ways:get_nodes()
         functions.process_way = way_function
         return functions
         """
+        And the ways
+            | nodes |
+            | ab    |
+        And the data has been saved to disk
+
         When I run "osrm-extract --profile {profile_file} {osm_file}"
         Then it should exit successfully
         And stdout should contain "node id 1"
         And stdout should contain "node id 2"
+
+
+    Scenario: osrm-extract location-dependent data without add-locations-to-ways preprocessing
+        Given the profile "testbot"
+        And the ways
+            | nodes |
+            | ab    |
+        And the data has been saved to disk
+
+        When I try to run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson"
+        Then it should exit with an error
+        And stderr should contain "invalid location"
+
+
+    Scenario: osrm-extract location-dependent data
+        Given the profile file
+        """
+        functions = require('testbot')
+
+        function way_function(profile, way, result, location_data)
+           assert(location_data)
+           for k, v in pairs(location_data) do print (k .. ' ' .. tostring(v)) end
+           result.forward_mode = mode.driving
+           result.forward_speed = 1
+        end
+
+        functions.process_way = way_function
+        return functions
+        """
+        And the ways with locations
+            | nodes |
+            | ab    |
+        And the data has been saved to disk
+
+        When I run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson"
+        Then it should exit successfully
+        And stdout should contain "answer 42"
+        And stdout should not contain "array"

features/step_definitions/data.js

@@ -129,13 +129,13 @@ module.exports = function () {
         q.awaitAll(callback);
     });
 
-    this.Given(/^the ways$/, (table, callback) => {
+    this.Given(/^the ways( with locations)?$/, (add_locations, table, callback) => {
         if (this.osm_str) throw new Error('*** Map data already defined - did you pass an input file in this scenario?');
 
         let q = d3.queue();
 
         let addWay = (row, cb) => {
-            let way = new OSM.Way(this.makeOSMId(), this.OSM_USER, this.OSM_TIMESTAMP, this.OSM_UID);
+            let way = new OSM.Way(this.makeOSMId(), this.OSM_USER, this.OSM_TIMESTAMP, this.OSM_UID, !!add_locations);
 
             let nodes = row.nodes;
             if (this.nameWayHash.nodes) throw new Error(util.format('*** duplicate way %s', nodes));