diff --git a/python/cac_tripplanner/templates/base.html b/python/cac_tripplanner/templates/base.html index db51fb4c0..5036addd6 100644 --- a/python/cac_tripplanner/templates/base.html +++ b/python/cac_tripplanner/templates/base.html @@ -94,7 +94,7 @@ - + diff --git a/src/gulpfile.js b/src/gulpfile.js index cc967549c..d2f07761c 100644 --- a/src/gulpfile.js +++ b/src/gulpfile.js @@ -73,31 +73,32 @@ gulp.task('collectstatic', function () { }); // turf module needs to be run through browserify to pack it with its dependencies -var turfDistanceRoot = './node_modules/@turf/nearest/node_modules/@turf/distance'; +var turfRoot = './node_modules/@turf/point-on-line'; var buildTurfHelpers = function() { - return browserify(turfDistanceRoot + '/node_modules/@turf/helpers', { + return browserify(turfRoot + '/node_modules/@turf/helpers', { standalone: 'turf', expose: ['helpers'] }) - .require(turfDistanceRoot + '/node_modules/@turf/helpers', + .require(turfRoot + '/node_modules/@turf/helpers', {expose: 'turf-helpers'}) .bundle() .pipe(vinylSourceStream('turf-helpers.js')); }; var buildTurfPointOnLine = function() { - return browserify('./node_modules/@turf/nearest', { - standalone: 'turf.nearest', - exclude: [turfDistanceRoot + '/node_modules/@turf/helpers'] + return browserify('./node_modules/@turf/point-on-line', { + standalone: 'turf.pointOnLine', + exclude: [turfRoot + '/node_modules/@turf/helpers'] }) .transform(aliasify, {aliases: { - 'turf-helpers': turfDistanceRoot + '/node_modules/@turf/helpers', - 'turf-invariant': turfDistanceRoot + '/node_modules/@turf/invariant', - 'turf-distance': turfDistanceRoot + 'turf-helpers': turfRoot + '/node_modules/@turf/helpers', + 'turf-distance': turfRoot + '/node_modules/@turf/distance', + 'turf-bearing': turfRoot + '/node_modules/@turf/bearing', + 'turf-destination': turfRoot + '/node_modules/@turf/destination' }}) .bundle() - .pipe(vinylSourceStream('turf-nearest.js')); + .pipe(vinylSourceStream('turf-point-on-line.js')); }; // combine streams from turf and the other vendor dependencies diff --git a/src/package.json b/src/package.json index 12d0c9223..7fd42c492 100644 --- a/src/package.json +++ b/src/package.json @@ -4,7 +4,7 @@ "node": ">=0.12.0" }, "dependencies": { - "@turf/nearest": "~3.5.2" + "@turf/point-on-line": "~3.5.3" }, "devDependencies": { "aliasify": "^2.0.0",