',
diff --git a/src/app/scripts/cac/map/cac-map-isochrone.js b/src/app/scripts/cac/map/cac-map-isochrone.js
index 0459f00ce..7716a5da1 100644
--- a/src/app/scripts/cac/map/cac-map-isochrone.js
+++ b/src/app/scripts/cac/map/cac-map-isochrone.js
@@ -132,6 +132,10 @@ CAC.Map.IsochroneControl = (function ($, Handlebars, cartodb, L, turf, _) {
* @return {Object} Promise resolving to JSON with destinations
*/
function getIsochrone(deferred, params, zoomToFit) {
+
+ // remove optimization parameter, if set; causes excessively long isochrone query times
+ delete params.optimize;
+
// Check if there's already an active request. If there is one,
// then we can't make a query yet -- store it as pending.
// If there was already a pending query, immediately resolve it.
diff --git a/src/app/scripts/cac/map/cac-map-overlays.js b/src/app/scripts/cac/map/cac-map-overlays.js
index f2b327f73..3195862cc 100644
--- a/src/app/scripts/cac/map/cac-map-overlays.js
+++ b/src/app/scripts/cac/map/cac-map-overlays.js
@@ -38,14 +38,7 @@ CAC.Map.OverlaysControl = (function ($, cartodb, L, Utils) {
function bikeRoutesOverlay(map) {
var layerGroup = cartodb.L.featureGroup([]);
- var url = 'https://cac-tripplanner.cartodb.com/api/v2/viz/501dbdc8-f4ea-11e4-8c9e-0e018d66dc29/viz.json';
- // TODO: fix attribution
- // cartodb.js does not allow for changing the layer attribution, and has lso somehow
- // broken the setAttribute method on the layer object.
- //var attribution = ['Bike routes data:',
- // '
DVRPC,',
- // '
City of Philadelphia'
- // ].join(' ');
+ var url = 'https://cac-tripplanner.cartodb.com/api/v2/viz/77aa8a63-fd35-4f6e-b5d5-361cbbdb45cb/viz.json';
cartodb.createLayer(map, url).on('done', function(layer) {
layerGroup.addLayer(layer);
// Wait until layer has loaded to bring it to front. Otherwise, it loads behind
diff --git a/src/app/scripts/cac/places/cac-places.js b/src/app/scripts/cac/places/cac-places.js
index 55bf68eb6..79199b3be 100644
--- a/src/app/scripts/cac/places/cac-places.js
+++ b/src/app/scripts/cac/places/cac-places.js
@@ -1,10 +1,10 @@
-CAC.Places.Places = (function(_, $, moment, Routing, UserPreferences) {
+CAC.Places.Places = (function(_, $, UserPreferences, Utils) {
'use strict';
var module = {
getAllPlaces: getAllPlaces,
getOtpOptions: getOtpOptions,
- getTimesToPlaces: getTimesToPlaces
+ getDistancesToPlaces: getDistancesToPlaces
};
return module;
@@ -79,45 +79,41 @@ CAC.Places.Places = (function(_, $, moment, Routing, UserPreferences) {
return otpOptions;
}
- /** Get travel times from the orign to each destination.
+ /** Get distance (as the crow flies) from the orign to each destination.
* Should be called before displaying place list.
*
* @param destinations {Array} Destination and event objects that will be changed in-place
- * @param exploreLatLng {Array} Coordinates of origin point to query with; may be unset
- * @returns {Array} Collection of promises, each of which resolve to a destination
+ * @param exploreLatLng {Array} Coordinates of origin point to start from; may be unset
+ * @returns {Array} Destinations with distance and orign label set
*/
- function getTimesToPlaces(destinations, exploreLatLng) {
- // if origin not set, simply clear the travel times from the destinations
- if (!exploreLatLng) {
- _.each(destinations, function(destination) {
- destination.duration = undefined;
- destination.formattedDuration = undefined;
- destination.originLabel = undefined;
- });
- return;
- }
-
- // make ajax requests to get the travel times to each destination
- var otpOptions = getOtpOptions();
- // only using the first itinerary; let OTP know to not bother finding other options
- $.extend(otpOptions, {numItineraries: 1});
-
- var date = UserPreferences.getPreference('dateTime');
- date = date ? moment.unix(date) : moment(); // default to now
-
+ function getDistancesToPlaces(destinations, exploreLatLng) {
// prefer to label with just the street address, and fall back to full address
// for featured places, use the label in the 'name' attribute instead of the address
var origin = UserPreferences.getPreference('origin');
- var originLabel = origin.name ? origin.name :
- (origin.attributes && origin.attributes.StAddr ? origin.attributes.StAddr :
- UserPreferences.getPreference('originText'));
+ var originLabel;
+
+ if (origin) {
+ originLabel = origin.name ? origin.name :
+ (origin.attributes && origin.attributes.StAddr ? origin.attributes.StAddr :
+ UserPreferences.getPreference('originText'));
+ }
+
+ if (exploreLatLng) {
+ var from = turf.point([exploreLatLng[1], exploreLatLng[0]]);
+ }
+
+ _.each(destinations, function(destination) {
+ // if origin not set, simply clear the travel times from the destinations
+ if (!from) {
+ destination.distance = undefined;
+ destination.formattedDistance = undefined;
+ destination.originLabel = undefined;
+ return;
+ }
- var promises = _.map(destinations, function(destination) {
- var dfd = $.Deferred();
// if already have travel time to destination, skip requerying for it
if (destination.originLabel === originLabel) {
- dfd.resolve(destination);
- return dfd.promise();
+ return;
}
// read out the location of the destination
@@ -125,31 +121,15 @@ CAC.Places.Places = (function(_, $, moment, Routing, UserPreferences) {
var yCoord = destination.location.y;
if (xCoord && yCoord) {
- var placeCoords = [yCoord, xCoord];
- // get travel time to destination and update place card
- Routing.planTrip(exploreLatLng, placeCoords, date, otpOptions, false)
- .then(function (itineraries) {
- if (itineraries && itineraries.length) {
- var itinerary = itineraries[0];
- // set properties for travel time to place and the origin label
- destination.duration = itinerary.duration;
- destination.formattedDuration = itinerary.formattedDuration;
- destination.originLabel = originLabel;
- dfd.resolve(destination);
- }
- }).fail(function(error) {
- console.error('error finding travel time to ' + destination.name);
- console.error(error);
- dfd.reject(error);
- });
- } else {
- // event without a location
- dfd.resolve(destination);
+ var to = turf.point([xCoord, yCoord]);
+ // get travel distance to destination
+ // set properties for travel distnace to place and the origin label
+ destination.distance = turf.distance(from, to, {units: 'meters'});
+ destination.formattedDistance = Utils.getFormattedDistance(destination.distance);
+ destination.originLabel = originLabel;
}
- return dfd.promise();
});
-
- return promises;
+ return destinations;
}
-})(_, jQuery, moment, CAC.Routing.Plans, CAC.User.Preferences);
+})(_, jQuery, CAC.User.Preferences, CAC.Utils);
diff --git a/src/app/scripts/cac/routing/cac-routing-itinerary.js b/src/app/scripts/cac/routing/cac-routing-itinerary.js
index f8fb5d556..9f821366a 100644
--- a/src/app/scripts/cac/routing/cac-routing-itinerary.js
+++ b/src/app/scripts/cac/routing/cac-routing-itinerary.js
@@ -168,7 +168,7 @@ CAC.Routing.Itinerary = (function ($, cartodb, L, _, moment, Geocoder, Utils) {
}
return {distance: dist,
duration: time,
- formattedDistance: getFormattedDistance(dist),
+ formattedDistance: Utils.getFormattedDistance(dist),
formattedDuration: getFormattedDuration(time)
};
}).pickBy(function(summary) {
@@ -184,25 +184,7 @@ CAC.Routing.Itinerary = (function ($, cartodb, L, _, moment, Geocoder, Utils) {
* if less than .2 mile, in feet (rounded to nearest foot); includes unit.
*/
function getFormattedItineraryDistance(legs) {
- return getFormattedDistance(_.sumBy(legs, 'distance'));
- }
-
- /**
- * Helper function to get formatted string in feet or miles for a given distance in meters
- *
- * @param {double} distanceMeters Distance to format
- * @return {string} distance in miles or feet, rounded, with unit
- */
- function getFormattedDistance(distanceMeters) {
- // less than ~0.2 miles
- if (distanceMeters < 322) {
- var feet = Math.round(distanceMeters * 3.28084).toString();
- return feet === '1' ? feet + ' foot' : feet + ' feet';
- }
-
- // return miles
- var miles = (Math.round(((distanceMeters / 1000) * 0.621371) * 10) / 10).toString();
- return miles === '1' ? miles + ' mile' : miles + ' miles';
+ return Utils.getFormattedDistance(_.sumBy(legs, 'distance'));
}
/**
@@ -302,10 +284,10 @@ CAC.Routing.Itinerary = (function ($, cartodb, L, _, moment, Geocoder, Utils) {
// Add some derived data to be used in the template:
// - Format duration on leg and distance on leg and its steps
_.forEach(newLegs, function (leg) {
- leg.formattedDistance = getFormattedDistance(leg.distance);
+ leg.formattedDistance = Utils.getFormattedDistance(leg.distance);
leg.formattedDuration = getFormattedDuration(leg.duration);
_.forEach(leg.steps, function(step) {
- step.formattedDistance = getFormattedDistance(step.distance);
+ step.formattedDistance = Utils.getFormattedDistance(step.distance);
});
});
// - Set a flag on the last leg, so we can avoid diplaying arriving there right above
diff --git a/src/app/scripts/cac/utils.js b/src/app/scripts/cac/utils.js
index 353780d56..2af14e0a8 100644
--- a/src/app/scripts/cac/utils.js
+++ b/src/app/scripts/cac/utils.js
@@ -81,6 +81,7 @@ CAC.Utils = (function (_, moment) {
defaultBackgroundLineColor: defaultBackgroundLineColor,
defaultModeColor: defaultModeColor,
getImageUrl: getImageUrl,
+ getFormattedDistance: getFormattedDistance,
abbrevStreetName: abbrevStreetName,
getBikeOptimizeLabel: getBikeOptimizeLabel,
getUrlParams: getUrlParams,
@@ -172,6 +173,24 @@ CAC.Utils = (function (_, moment) {
bikeOptimizeStrings.GREENWAYS;
}
+ /**
+ * Helper function to get formatted string in feet or miles for a given distance in meters
+ *
+ * @param {double} distanceMeters Distance to format
+ * @return {string} distance in miles or feet, rounded, with unit
+ */
+ function getFormattedDistance(distanceMeters) {
+ // less than ~0.2 miles
+ if (distanceMeters < 322) {
+ var feet = Math.round(distanceMeters * 3.28084).toString();
+ return feet === '1' ? feet + ' foot' : feet + ' feet';
+ }
+
+ // return miles
+ var miles = (Math.round(((distanceMeters / 1000) * 0.621371) * 10) / 10).toString();
+ return miles === '1' ? miles + ' mile' : miles + ' miles';
+ }
+
// Use with images in the app/images folder
function getImageUrl(imageName) {
return '/static/images/' + imageName;
diff --git a/src/app/styles/components/_directions-form.scss b/src/app/styles/components/_directions-form.scss
index 3a89f5a69..66cd09073 100644
--- a/src/app/styles/components/_directions-form.scss
+++ b/src/app/styles/components/_directions-form.scss
@@ -495,30 +495,37 @@
}
.directions-tab-button.isochrone-control {
- &:after {
- background: $gophillygo-blue;
- }
+ &:after {
+ background: $gophillygo-blue;
}
- .directions-to label {
- padding-right: 1em;
- margin-right: .2em;
+ &.disabled {
+ #output-directions-within,
+ #isochrone-slider {
+ opacity: .2;
+ }
}
+ }
- #output-directions-within {
- position: relative;
- min-width: 5em;
- margin: 0 2rem 0 .5rem;
- color: $white;
- font-size: 1.4rem;
- font-weight: $font-weight-medium;
- line-height: 30px;
- text-align: right;
+ .directions-to label {
+ padding-right: 1em;
+ margin-right: .2em;
+ }
- &:after {
- content: ' minutes';
- }
+ #output-directions-within {
+ position: relative;
+ min-width: 5em;
+ margin: 0 2rem 0 .5rem;
+ color: $white;
+ font-size: 1.4rem;
+ font-weight: $font-weight-medium;
+ line-height: 30px;
+ text-align: right;
+
+ &:after {
+ content: ' minutes';
}
+ }
}
@keyframes full-rotation {
diff --git a/src/app/styles/components/_place-card.scss b/src/app/styles/components/_place-card.scss
index fe8204556..2d646c758 100644
--- a/src/app/styles/components/_place-card.scss
+++ b/src/app/styles/components/_place-card.scss
@@ -63,8 +63,9 @@
}
}
- .travel-logistics-duration {
+ .travel-logistics-distance {
font-weight: $font-weight-bold;
+ line-height: 1.4rem;
}
.event-label {
diff --git a/src/gulpfile.js b/src/gulpfile.js
index 8d1906b3d..7d448b9f5 100644
--- a/src/gulpfile.js
+++ b/src/gulpfile.js
@@ -107,16 +107,32 @@ var buildTurfPointOnLine = function() {
'turf-helpers': turfRoot + 'helpers',
'turf-distance': turfRoot + 'distance',
'turf-bearing': turfRoot + 'bearing',
- 'turf-destination': turfRoot + 'destination'
+ 'turf-destination': turfRoot + 'destination',
+ 'turf-invariant': turfRoot + 'invariant',
+ 'turf-line-intersect': turfRoot + 'line-intersect',
+ 'turf-meta': turfRoot + 'meta'
}})
.bundle()
.pipe(vinylSourceStream('turf-point-on-line.js'));
};
+var buildTurfDistance = function() {
+ return browserify(turfRoot + 'distance', {
+ standalone: 'turf.distance',
+ exclude: [turfRoot + 'helpers']
+ })
+ .transform(aliasify, {aliases: {
+ 'turf-helpers': turfRoot + 'helpers',
+ 'turf-invariant': turfRoot + 'invariant'
+ }})
+ .bundle()
+ .pipe(vinylSourceStream('turf-distance.js'));
+};
+
// combine streams from turf and the other vendor dependencies
var copyVendorJS = function(filter, extraFiles) {
var bowerStream = copyBowerFiles(filter, extraFiles);
- var vendorStream = merge(buildTurfHelpers(), buildTurfPointOnLine());
+ var vendorStream = merge(buildTurfHelpers(), buildTurfPointOnLine(), buildTurfDistance());
vendorStream.add(bowerStream);
// do a global search-and-replace for jQuery's ajax in vendor scripts, to fix
// running jQuery in noConflict mode for JotForms.
diff --git a/src/package.json b/src/package.json
index 1d9731372..0412a7531 100644
--- a/src/package.json
+++ b/src/package.json
@@ -4,7 +4,8 @@
"node": ">=0.12.0"
},
"dependencies": {
- "@turf/nearest-point-on-line": "~5.0.4"
+ "@turf/distance": "~5.1.5",
+ "@turf/nearest-point-on-line": "~5.1.5"
},
"devDependencies": {
"phantomjs-prebuilt": "^2.1.16",