diff --git a/iso-server.js b/iso-server.js index 71ad0a4..6a0ee1d 100755 --- a/iso-server.js +++ b/iso-server.js @@ -17,7 +17,7 @@ const config = { sharedMemory: false, units: defaults.units } - config.osrmPaths = ['data/lts1/data.osrm', 'data/lts2/data.osrm', 'data/lts3/data.osrm', 'data/lts4/data.osrm'] + config.osrmPaths = ['data/lts1/data.osrm', 'data/lts2/data.osrm', 'data/lts3/data.osrm', 'data/lts4/data.osrm', 'data/foot/data.osrm'] let path try { diff --git a/package.json b/package.json index dcba866..64ca4ae 100644 --- a/package.json +++ b/package.json @@ -11,14 +11,15 @@ } ], "dependencies": { + "@turf/bbox": "^6.0.1", + "@turf/turf": "^5.1.6", "isochrone": "^2.0.2", - "osrm": "5.19.0", + "log4js": "^2.5.3", "minimist": "^1.2.0", - "log4js": "^2.5.3" + "osrm": "^5.19.0" }, - "repository": - { - "type": "git", - "url": "git://github.com/BikeOttawa/maps.bikeottawa.ca-backend.git" - } + "repository": { + "type": "git", + "url": "git://github.com/BikeOttawa/maps.bikeottawa.ca-backend.git" + } } diff --git a/restart-maps.sh b/restart-maps.sh index 6ad0f8c..bbdde8e 100755 --- a/restart-maps.sh +++ b/restart-maps.sh @@ -7,7 +7,7 @@ OSRM=./node_modules/osrm/lib/binding/osrm-routed echo "expecting OSRM to be in $OSRM" if ! [ -x "$(command -v $OSRM)" ]; then - echo "Error: Missing OSRM. Install using 'npm install osrm@5.15.1'\n" + echo "Error: Missing OSRM. Install dependencies with 'npm install'\n" exit 1 fi @@ -19,5 +19,6 @@ $OSRM -p 5001 data/lts1/data.osrm & $OSRM -p 5002 data/lts2/data.osrm & $OSRM -p 5003 data/lts3/data.osrm & $OSRM -p 5004 data/lts4/data.osrm & +$OSRM -p 5005 data/foot/data.osrm & node iso-server.js &