[gnome-maps/wip/mlundblad/transit-routing: 5/9] WIP: Add module to query an OpenTripPlanner instance
- From: Marcus Lundblad <mlundblad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps/wip/mlundblad/transit-routing: 5/9] WIP: Add module to query an OpenTripPlanner instance
- Date: Thu, 12 May 2016 20:32:02 +0000 (UTC)
commit 3c422127a6242b0f49ffdcb57357ddb2e00cf391
Author: Marcus Lundblad <ml update uu se>
Date: Mon Feb 15 23:18:14 2016 +0100
WIP: Add module to query an OpenTripPlanner instance
Adds an openTripPlanner module, containing functionallity for interfacing against
an OpenTripPlanner service. Also has functionallity to augment itineraries obtained
with walk routing from GraphHopper (as used by the other routing modes).
Furthermore, the transitPlan module contains interfacing classes modelling transit data
Plan:
Populated by a list of itineraries when performing a transit query.
Itinerary:
Represents one particular trip option in a search result. Contains one or more transit legs.
Leg:
Represents one distinct part of a trip, such as
"take tram #5 departuring at 10:00 from Foo Street, get off at Bar Street, arrival at 10:12".
po/POTFILES.in | 1 +
src/openTripPlanner.js | 665 ++++++++++++++++++++++++++++++++++
src/org.gnome.Maps.src.gresource.xml | 2 +
src/transitPlan.js | 254 +++++++++++++
4 files changed, 922 insertions(+), 0 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d8dd351..76e6a86 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -37,6 +37,7 @@ src/geoclue.js
src/geoJSONSource.js
src/mainWindow.js
src/mapView.js
+src/openTripPlanner.js
src/osmConnection.js
src/osmEditDialog.js
src/placeBubble.js
diff --git a/src/openTripPlanner.js b/src/openTripPlanner.js
new file mode 100644
index 0000000..b8f5da9
--- /dev/null
+++ b/src/openTripPlanner.js
@@ -0,0 +1,665 @@
+/* -*- Mode: JS2; indent-tabs-mode: nil; js2-basic-offset: 4 -*- */
+/* vim: set et ts=4 sw=4: */
+/*
+ * Copyright (c) 2016 Marcus Lundblad
+ *
+ * GNOME Maps is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * GNOME Maps is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with GNOME Maps; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author: Marcus Lundblad <ml update uu se>
+ */
+
+const Lang = imports.lang;
+
+const Soup = imports.gi.Soup;
+
+const Application = imports.application;
+const EPAF = imports.epaf;
+const HTTP = imports.http;
+const Location = imports.location;
+const Place = imports.place;
+const RouteQuery = imports.routeQuery;
+const TransitPlan = imports.transitPlan;
+const Utils = imports.utils;
+
+/* base URL used for testing against a local OTP instance for now */
+const BASE_URL = 'http://localhost:8080/otp';
+
+/* timeout after which the routers data is considered stale and we will force
+ * a reload (24 hours) */
+const ROUTERS_TIMEOUT = 24 * 60 * 60 * 1000;
+
+/* minimum distance when an explicit walk route will be requested to suppliment
+ * the transit route */
+const MIN_WALK_ROUTING_DISTANCE = 100;
+
+/* minimum distance of a transit leg, below which we would replace the leg with
+ * walking if the leg is the first or last */
+const MIN_TRANSIT_LEG_DISTANCE = 300;
+
+/* maximum walking distance for a potential replacement of a beginning or ending
+ * transit leg */
+const MAX_WALK_OPTIMIZATION_DISTANCE = 1000;
+
+/* maximum distance difference for performing a replacement of a beginning or
+ * ending transit leg with a walking leg */
+const MAX_WALK_OPTIMIZATION_DISTANCE_DIFFERENCE = 300;
+
+/* minimum acceptable time margin when recalculating walking legs in the middle
+ * of an itinerary */
+const MIN_INTERMEDIATE_WALKING_SLACK = 180;
+
+const OpenTripPlanner = new Lang.Class({
+ Name: 'OpenTripPlanner',
+
+ _init: function() {
+ this._session = new Soup.Session();
+ /* initially set routers as updated far back in the past to force
+ * a download when first request */
+ this._routersUpdatedTimestamp = 0;
+ this._query = Application.routeQuery;
+ this._plan = new TransitPlan.Plan();
+ },
+
+ get plan() {
+ return this._plan;
+ },
+
+ connect: function() {
+ this._signalHandler = this._query.connect('notify::points', (function() {
+ if (this._query.isValid())
+ this.fetchRoute();
+ }).bind(this));
+ },
+
+ disconnect: function() {
+ if (this._signalHandler !== 0) {
+ this._query.disconnect(this._signalHandler);
+ this._signalHandler = 0;
+ }
+ },
+
+ _fetchRouters: function(callback) {
+ let currentTime = (new Date()).getTime();
+
+ if (currentTime - this._routersUpdatedTimestamp < ROUTERS_TIMEOUT) {
+ callback(true);
+ } else {
+ let uri = new Soup.URI(BASE_URL + '/routers');
+ let request = new Soup.Message({ method: 'GET', uri: uri });
+
+ request.request_headers.append('Accept', 'application/json');
+ this._session.queue_message(request, (function(obj, message) {
+ if (message.status_code !== Soup.Status.OK) {
+ callback(false);
+ return;
+ }
+
+ Utils.debug('routers: ' + message.response_body.data);
+ try {
+ this._routers = JSON.parse(message.response_body.data);
+ this._routersUpdatedTimestamp = (new Date()).getTime();
+ callback(true);
+ } catch (e) {
+ Utils.debug('Failed to parse router information');
+ callback(false);
+ }
+ }).bind(this));
+ }
+ },
+
+ _getRoutersForPlace: function(place) {
+ let routers = [];
+
+ Utils.debug('_getRotersForPlace');
+ Utils.debug('place coords: ' + place.location.latitude + ', ' + place.location.longitude);
+
+ this._routers.routerInfo.forEach((function(routerInfo) {
+ Utils.debug('checking router: ' + routerInfo.routerId);
+
+ /* TODO: only check bounding rectangle for now
+ * should we try to do a finer-grained check using the bounding
+ * polygon (if OTP gives one for the routers).
+ * And should we add some margins to allow routing from just outside
+ * a network (walking distance)? */
+ if (place.location.latitude >= routerInfo.lowerLeftLatitude &&
+ place.location.latitude <= routerInfo.upperRightLatitude &&
+ place.location.longitude >= routerInfo.lowerLeftLongitude &&
+ place.location.longitude <= routerInfo.upperRightLongitude)
+ routers.push(routerInfo.routerId);
+ }));
+
+ return routers;
+ },
+
+ /* Note: this is theoretically slow (O(n*m)), but we will have filtered
+ * possible routers for the starting and ending query point, so they should
+ * be short (in many cases just one element) */
+ _routerIntersection: function(routers1, routers2) {
+ return routers1.filter(function(n) {
+ return routers2.indexOf(n) != -1;
+ });
+ },
+
+ _formatPlaceQueryParam: function(place) {
+ return '%s,%s'.format(place.location.latitude, place.location.longitude);
+ },
+
+ _fetchRoutesRecursive: function(routers, index, result, callback) {
+ let points = this._query.filledPoints;
+ let params = {fromPlace: this._formatPlaceQueryParam(points[0].place),
+ toPlace: this._formatPlaceQueryParam(points[points.length - 1].place)
+ };
+
+ Utils.debug('fetching plans for router with index ' + index);
+ Utils.debug('number of points: ' + points.length);
+
+ let intermediatePlaces = [];
+ for (let i = 1; i < points.length - 1; i++) {
+ Utils.debug('intermediatePlace: ' + this._formatPlaceQueryParam(points[i].place));
+ intermediatePlaces.push(this._formatPlaceQueryParam(points[i].place));
+ }
+ if (intermediatePlaces.length > 0)
+ params.intermediatePlaces = intermediatePlaces;
+
+ Utils.debug('intermediatePlaces: ' + intermediatePlaces);
+
+ //params.numItineraries = 10;
+
+ let query = new HTTP.Query(params);
+ let uri = new Soup.URI(BASE_URL + '/routers/' + routers[index] +
+ '/plan?' + query.toString());
+ let request = new Soup.Message({ method: 'GET', uri: uri });
+
+ Utils.debug('URI: ' + uri.to_string(true));
+
+ request.request_headers.append('Accept', 'application/json');
+ this._session.queue_message(request, (function(obj, message) {
+ Utils.debug('callback: ' + callback);
+ if (message.status_code !== Soup.Status.OK)
+ Utils.debug('Failed to get route plan from router ' +
+ routers[index]);
+ else
+ result.push(JSON.parse(message.response_body.data))
+
+ if (index < routers.length - 1)
+ this._fetchRoutesRecursive(routers, index + 1, result,
+ callback);
+ else {
+ Utils.debug('calling callback at index ' + index);
+ callback(result);
+ }
+ }).bind(this));
+ },
+
+ _fetchRoutes: function(routers, callback) {
+ Utils.debug('_fetchRoutes with length: ' + routers.length);
+ this._fetchRoutesRecursive(routers, 0, [], callback);
+ },
+
+ _reset: function() {
+ if (this._query.latest)
+ this._query.latest.place = null;
+ else
+ this.plan.reset();
+ },
+
+ fetchRoute: function() {
+ this._fetchRouters((function(success) {
+ if (success) {
+ let points = this._query.filledPoints;
+ let routers = this._getRoutersForPoints(points);
+
+ if (routers.length > 0) {
+ Utils.debug('about to fetch routes');
+ this._fetchRoutes(routers, (function(routes) {
+ let itineraries = [];
+ routes.forEach((function(plan) {
+ Utils.debug('plan: ' + JSON.stringify(plan, null, 2));
+ Utils.debug('itineraries: ' + itineraries);
+ if (plan.plan && plan.plan.itineraries) {
+ Utils.debug('creating itineraries');
+ itineraries =
+ itineraries.concat(
+ this._createItineraries(plan.plan.itineraries));
+ Utils.debug('itineraries.length: ' + itineraries.length);
+ }
+ }).bind(this));
+ Utils.debug('found ' + itineraries.length + ' itineraries');
+ if (itineraries.length === 0) {
+ Application.notificationManager.showMessage(_("No route found."));
+ this._reset();
+ } else {
+ this._recalculateItineraries(itineraries);
+ }
+ }).bind(this));
+
+ } else {
+ Application.notificationManager.showMessage(_("No timetable data found for this
route."));
+ this._reset();
+ }
+ } else {
+ Application.notificationManager.showMessage(_("Route request failed."));
+ this._reset();
+ }
+ }).bind(this));
+ },
+
+ _isOnlyWalkingItinerary: function(itinerary) {
+ return itinerary.legs.length === 1 && !itinerary.legs[0].isTransit;
+ },
+
+ _recalculateItineraries: function(itineraries) {
+ /* when the only found option is a walking route, OTP seems to return
+ * back multiple identical itineraries (as many as the requested number
+ * of itineraries), so to avoid duplicates (and saving extanous queries
+ * to GraphHopper when recalculating walking legs) prune it down to just
+ * one itiner in this case. */
+ let onlyWalking = false;
+
+ itineraries.forEach((function(itinerary) {
+ onlyWalking = this._isOnlyWalkingItinerary(itinerary);
+ }).bind(this));
+
+ if (onlyWalking) {
+ itineraries = [itineraries[0]];
+ }
+
+ this._recalculateItinerariesRecursive(itineraries, 0);
+ },
+
+ _isItineraryRealistic: function(itinerary) {
+ let realistic = true;
+
+ /* check walking legs "inside" the itinerary */
+ for (let i = 1; i < itinerary.legs.length - 1; i++) {
+ let leg = itinerary.legs[i];
+
+ if (!leg.transit) {
+ let previousLeg = itinerary.legs[i - 1];
+ let nextLeg = itinerary.legs[i + 1];
+
+ let availableTime =
+ (nextLeg.departure - previousLeg.arrival) / 1000;
+
+ Utils.debug('checking if waking leg is realistic');
+ Utils.debug('available time: ' + availableTime);
+ Utils.debug('duration of walking leg: ' + leg.duration);
+
+ realistic = availableTime >= leg.duration +
+ MIN_INTERMEDIATE_WALKING_SLACK;
+ }
+ }
+
+ return realistic;
+ },
+
+ _recalculateItinerariesRecursive: function(itineraries, index) {
+ if (index < itineraries.length) {
+ Utils.debug('recalculating itinerary ' + index);
+ this._recalculateItinerary(itineraries[index], (function(itinerary) {
+ itineraries[index] = itinerary;
+ Utils.debug('about to recalculate itinerary for index ' + (index + 1));
+ this._recalculateItinerariesRecursive(itineraries, index + 1);
+ }).bind(this));
+ } else {
+ /* filter out itineraries where there are intermediate walking legs
+ * that are too narrow time-wise, this is nessesary since running
+ * OTP with only transit data can result in some over-optimistic
+ * walking itinerary legs, since it will use "line-of-sight"
+ * distances */
+ let filteredItineraries = [];
+
+ itineraries.forEach((function(itinerary) {
+ if (this._isItineraryRealistic(itinerary))
+ filteredItineraries.push(itinerary);
+ }).bind(this));
+
+ Utils.debug('found itineraries: ');
+ filteredItineraries.forEach((function(itinerary) {
+ Utils.debug(itinerary.toString());
+ }));
+
+ if (filteredItineraries.length > 0) {
+ this.plan.update(filteredItineraries);
+ } else {
+ Application.notificationManager.showMessage(_("No route found."));
+ this._reset();
+ }
+ }
+ },
+
+ _createWalkingLeg: function(from, to, route) {
+ let polyline = EPAF.decode(route.paths[0].points);
+
+ return new TransitPlan.Leg({fromCoordinate: [from.place.location.latitude,
+ from.place.location.longitude],
+ toCoordinate: [to.place.location.latitude,
+ to.place.location.longitude],
+ isTransit: false,
+ polyline: polyline,
+ duration: route.paths[0].time / 1000,
+ walkingInstructions: route.paths[0]});
+ },
+
+ _recalculateItinerary: function(itinerary, callback) {
+ let from = this._query.filledPoints[0];
+ let to = this._query.filledPoints[this._query.filledPoints.length - 1];
+
+ if (itinerary.legs.length === 1 && !itinerary.legs[0].transit) {
+ /* special case, if there's just one leg of an itinerary, and that leg
+ * leg is a non-transit (walking), recalculate the route in its entire
+ * using walking */
+ Application.routeService.fetchRouteAsync(this._query.filledPoints,
+ RouteQuery.Transportation.PEDESTRIAN,
+ (function(route) {
+ Utils.debug('Walking route: ' + JSON.stringify(route, '', 2));
+ let leg = this._createWalkingLeg(from, to, route);
+ let newItinerary =
+ new TransitPlan.Itinerary({departure: itinerary.departure,
+ duration: route.paths[0].time / 1000,
+ legs: [leg]});
+ callback(newItinerary);
+ }).bind(this));
+ } else if (itinerary.legs.length === 1 && itinerary.legs[0].transit) {
+ /* special case if there is extactly one transit leg */
+ let startLeg =
+ this._createQueryPointForCoord(itinerary.legs[0].fromCoordinate);
+ let endLeg =
+ this._createQueryPointForCoord(itinerary.legs[0].toCoordinate);
+ let fromLoc = from.place.location;
+ let startLoc = startLeg.place.location;
+ let endLoc = endLeg.place.location;
+ let toLoc = to.place.location;
+ let startWalkDistance = fromLoc.get_distance_from(startLoc) * 1000;
+ let endWalkDistance = endLoc.get_distance_from(toLoc) * 1000;
+
+ Utils.debug('startWalkDistance: ' + startWalkDistance);
+ Utils.debug('endWalkDistance: ' + endWalkDistance);
+
+ if (startWalkDistance >= MIN_WALK_ROUTING_DISTANCE &&
+ endWalkDistance >= MIN_WALK_ROUTING_DISTANCE) {
+ /* add an extra walking leg to both the beginning and end of the
+ * itinerary */
+ Application.routeService.fetchRouteAsync([from, startLeg],
+ RouteQuery.Transportation.PEDESTRIAN,
+ (function(firstRoute) {
+ let firstLeg =
+ this._createWalkingLeg(from, startLeg, firstRoute);
+ Application.routeService.fetchRouteAsync([endLeg, to],
+ RouteQuery.Transportation.PEDESTRIAN,
+ (function(lastRoute) {
+ Utils.debug('lastRoute: ' + lastRoute);
+ let lastLeg =
+ this._createWalkingLeg(endLeg, to, lastRoute);
+ itinerary.legs.unshift(firstLeg);
+ itinerary.legs.push(lastLeg);
+ callback(itinerary);
+ }).bind(this));
+ }).bind(this));
+ } else if (endWalkDistance >= MIN_WALK_ROUTING_DISTANCE) {
+ /* add an extra walking leg to the end of the itinerary */
+ Application.routeService.fetchRouteAsync([endLeg, to],
+ RouteQuery.Transportation.PEDESTRIAN,
+ (function(lastRoute) {
+ let lastLeg =
+ this._createWalkingLeg(endLeg, to, lastRoute);
+ itinerary.legs.push(lastLeg);
+ callback(itinerary);
+ }).bind(this));
+ } else {
+ /* if only there's only a walking leg to be added to the start
+ * let the recursive routine dealing with multi-leg itineraries
+ * handle it */
+ this._recalculateItineraryRecursive(itinerary, 0, callback);
+ }
+ } else {
+ /* replace walk legs with GraphHopper-generated paths (hence the
+ * callback nature of this. Filter out unrealistic itineraries (having
+ * walking segments not possible in reasonable time, due to our running
+ * of OTP with only transit data). */
+ this._recalculateItineraryRecursive(itinerary, 0, callback);
+ }
+ },
+
+ _createQueryPointForCoord: function(coord) {
+ let location = new Location.Location({ latitude: coord[0],
+ longitude: coord[1],
+ accuracy: 0 });
+ let place = new Place.Place({ location: location });
+ let point = new RouteQuery.QueryPoint();
+
+ point.place = place;
+ return point;
+ },
+
+ _recalculateItineraryRecursive: function(itinerary, index, callback) {
+ if (index < itinerary.legs.length) {
+ let leg = itinerary.legs[index];
+ if (index === 0) {
+ Utils.debug('recalculate first leg');
+ let from = this._query.filledPoints[0];
+ let startLeg =
+ this._createQueryPointForCoord(leg.fromCoordinate);
+ let endLeg =
+ this._createQueryPointForCoord(leg.toCoordinate);
+ let fromLoc = from.place.location;
+ let startLegLoc = startLeg.place.location;
+ let endLegLoc = endLeg.place.location;
+ let distanceToEndLeg =
+ fromLoc.get_distance_from(endLegLoc) * 1000;
+ let distanceToStartLeg =
+ fromLoc.get_distance_from(startLegLoc) * 1000;
+
+ if (!leg.transit ||
+ (leg.distance <= MIN_TRANSIT_LEG_DISTANCE ||
+ (distanceToEndLeg <= MAX_WALK_OPTIMIZATION_DISTANCE &&
+ distanceToEndLeg - distanceToStartLeg <=
+ MAX_WALK_OPTIMIZATION_DISTANCE_DIFFERENCE))) {
+ /* if the first leg of the intinerary returned by OTP is a
+ * walking one, recalculate it with GH using the actual
+ * starting coordinate from the input query,
+ * also replace a transit leg at the start with walking if
+ * its distance is below a threashhold, to avoid suboptimal
+ * routes due to only running OTP with transit data,
+ * also optimize away cases where the routing would make one
+ * "pass by" a stop at the next step in the itinerary due to
+ * similar reasons */
+ Utils.debug('query point coords: ' +
+ leg.toCoordinate[0] + ', ' + leg.toCoordinate[1]);
+ let to = this._createQueryPointForCoord(leg.toCoordinate);
+ Application.routeService.fetchRouteAsync([from, to],
+ RouteQuery.Transportation.PEDESTRIAN,
+ (function(route) {
+ let newLeg = this._createWalkingLeg(from, to, route);
+ itinerary.legs[index] = newLeg;
+ this._recalculateItineraryRecursive(itinerary, index + 1,
+ callback);
+ }).bind(this));
+ } else {
+ /* introduce an additional walking leg calculated
+ * by GH in case the OTP starting point as far enough from
+ * the original starting point */
+ let to = this._createQueryPointForCoord(leg.fromCoordinate);
+ let fromLoc = from.place.location;
+ let toLoc = to.place.location;
+ let distance = fromLoc.get_distance_from(toLoc) * 1000;
+ Utils.debug('distance from original starting point to start of transit route: ' +
distance);
+
+ if (distance >= MIN_WALK_ROUTING_DISTANCE) {
+ Application.routeService.fetchRouteAsync([from, to],
+ RouteQuery.Transportation.PEDESTRIAN,
+ (function(route) {
+ let newLeg = this._createWalkingLeg(from, to, route);
+ itinerary.legs.unshift(newLeg);
+ /* now, next index will be two steps up, since we
+ * inserted a new leg */
+ this._recalculateItineraryRecursive(itinerary,
+ index + 2,
+ callback);
+ }).bind(this));
+ } else {
+ this._recalculateItineraryRecursive(itinerary, index + 1,
+ callback);
+ }
+ }
+ } else if (index === itinerary.legs.length - 1) {
+ Utils.debug('recalculate final leg');
+ let to = this._query.filledPoints[this._query.filledPoints.length - 1];
+ let startLeg =
+ this._createQueryPointForCoord(leg.fromCoordinate);
+ let endLeg = this._createQueryPointForCoord(leg.toCoordinate);
+ let toLoc = to.place.location;
+ let startLegLoc = startLeg.place.location;
+ let endLegLoc = endLeg.place.location;
+ let distanceFromEndLeg =
+ toLoc.get_distance_from(endLegLoc) * 1000;
+ let distanceFromStartLeg =
+ toLoc.get_distance_from(startLegLoc) * 1000;
+
+ if (!leg.transit ||
+ (leg.distance <= MIN_TRANSIT_LEG_DISTANCE ||
+ (distanceFromStartLeg <= MAX_WALK_OPTIMIZATION_DISTANCE &&
+ distanceFromStartLeg - distanceFromEndLeg <=
+ MAX_WALK_OPTIMIZATION_DISTANCE_DIFFERENCE))) {
+ /* if the final leg of the itinerary returned by OTP is a
+ * walking one, recalculate it with GH using the actual
+ * ending coordinate from the input query
+ * also replace a transit leg at the end with walking if
+ * its distance is below a threashhold, to avoid suboptimal
+ * routes due to only running OTP with transit data,
+ * also optimize away cases where the routing would make one
+ * "pass by" a stop at the previous step in the itinerary
+ * due to similar reasons */
+ Utils.debug('non-transit leg');
+ let from = this._createQueryPointForCoord(leg.fromCoordinate);
+ Application.routeService.fetchRouteAsync([from, to],
+ RouteQuery.Transportation.PEDESTRIAN,
+ (function(route) {
+ let newLeg = this._createWalkingLeg(from, to, route);
+ Utils.debug('Created walking leg');
+ itinerary.legs[index] = newLeg;
+ this._recalculateItineraryRecursive(itinerary, index + 1,
+ callback);
+ }).bind(this));
+ } else {
+ /* introduce an additional walking leg calculated by GH in
+ * case the OTP end point as far enough from the original
+ * end point */
+ let from = this._createQueryPointForCoord(leg.toCoordinate);
+ let fromLoc = from.place.location;
+ let toLoc = to.place.location;
+ let distance = fromLoc.get_distance_from(toLoc) * 1000;
+
+ Utils.debug('distance: ' + distance);
+
+ if (distance >= MIN_WALK_ROUTING_DISTANCE) {
+ Application.routeService.fetchRouteAsync([from, to],
+ RouteQuery.Transportation.PEDESTRIAN,
+ (function(route) {
+ let newLeg = this._createWalkingLeg(from, to, route);
+ itinerary.legs.push(newLeg);
+ /* now, next index will be two steps up, since we
+ * inserted a new leg */
+ this._recalculateItineraryRecursive(itinerary,
+ index + 2,
+ callback);
+ }).bind(this));
+ } else {
+ this._recalculateItineraryRecursive(itinerary, index + 1,
+ callback);
+ }
+ }
+ } else {
+ /* if an intermediate leg is a walking one, and it's distance is
+ * above the threashhold distance, calculate an exact route */
+ Utils.debug('recalculate in-between leg');
+ if (!leg.transit && leg.distance >= MIN_WALK_ROUTING_DISTANCE) {
+ let from = this._createQueryPointForCoord(leg.fromCoordinate);
+ let to = this._createQueryPointForCoord(leg.toCoordinate);
+ Application.routeService.fetchRouteAsync([from, to],
+ RouteQuery.Transportation.PEDESTRIAN,
+ (function(route) {
+ let newLeg = this._createWalkingLeg(from, to, route);
+ itinerary.legs[index] = newLeg;
+ this._recalculateItineraryRecursive(itinerary,
+ index + 1,
+ callback);
+ }).bind(this));
+ } else {
+ this._recalculateItineraryRecursive(itinerary, index + 1,
+ callback);
+ }
+ }
+ } else {
+ Utils.debug('Finished recursive recalculation of itinerary');
+ callback(itinerary);
+ }
+ },
+
+ _getRoutersForPoints: function(points) {
+ Utils.debug('sucessfully fetched routers list, points.length ' + points.length);
+ let startRouters = this._getRoutersForPlace(points[0].place);
+ let endRouters =
+ this._getRoutersForPlace(points[points.length - 1].place);
+
+ Utils.debug('routers at start point: ' + startRouters);
+ Utils.debug('routers at end point: ' + endRouters);
+ let intersectingRouters =
+ this._routerIntersection(startRouters, endRouters);
+
+ Utils.debug('intersecting routers: ' + intersectingRouters);
+
+ return intersectingRouters;
+ },
+
+ _createItineraries: function(itineraries) {
+ return itineraries.map((function(itinerary) {
+ return this._createItinerary(itinerary);
+ }).bind(this));
+ },
+
+ _createItinerary: function(itinerary) {
+ let legs = this._createLegs(itinerary.legs);
+ return new TransitPlan.Itinerary({ duration: itinerary.duration,
+ transfers: itinerary.transfers,
+ departure: itinerary.startTime,
+ arrival: itinerary.endTime,
+ legs: legs});
+ },
+
+ _createLegs: function(legs) {
+ return legs.map((function(leg) {
+ return this._createLeg(leg);
+ }).bind(this));
+ },
+
+ _createLeg: function(leg) {
+ let polyline = EPAF.decode(leg.legGeometry.points);
+ return new TransitPlan.Leg({ departure: leg.from.departure,
+ arrival: leg.to.arrival,
+ from: leg.from.name,
+ to: leg.to.name,
+ fromCoordinate: [leg.from.lat,
+ leg.from.lon],
+ toCoordinate: [leg.to.lat,
+ leg.to.lon],
+ route: leg.route,
+ routeType: leg.routeType,
+ polyline: polyline,
+ isTransit: leg.transitLeg,
+ distance: leg.distance,
+ duration: leg.duration });
+ }
+})
diff --git a/src/org.gnome.Maps.src.gresource.xml b/src/org.gnome.Maps.src.gresource.xml
index ecd8ef4..6acd706 100644
--- a/src/org.gnome.Maps.src.gresource.xml
+++ b/src/org.gnome.Maps.src.gresource.xml
@@ -34,6 +34,7 @@
<file>mapView.js</file>
<file>mapWalker.js</file>
<file>notification.js</file>
+ <file>openTripPlanner.js</file>
<file>notificationManager.js</file>
<file>osmAccountDialog.js</file>
<file>osmConnection.js</file>
@@ -71,6 +72,7 @@
<file>socialPlaceMatcher.js</file>
<file>storedRoute.js</file>
<file>togeojson/togeojson.js</file>
+ <file>transitPlan.js</file>
<file>translations.js</file>
<file>turnPointMarker.js</file>
<file>userLocationBubble.js</file>
diff --git a/src/transitPlan.js b/src/transitPlan.js
new file mode 100644
index 0000000..d6060a5
--- /dev/null
+++ b/src/transitPlan.js
@@ -0,0 +1,254 @@
+/* -*- Mode: JS2; indent-tabs-mode: nil; js2-basic-offset: 4 -*- */
+/* vim: set et ts=4 sw=4: */
+/*
+ * Copyright (c) 2016 Marcus Lundblad
+ *
+ * GNOME Maps is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * GNOME Maps is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with GNOME Maps; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author: Marcus Lundblad <ml update uu se>
+ */
+
+const Lang = imports.lang;
+
+const Champlain = imports.gi.Champlain;
+const GObject = imports.gi.GObject;
+
+/*
+ * These constants corresponds to the routeType attribute of transit legs
+ * in the OpenTripPlanner API.
+ */
+const RouteType = {
+ NON_TRANSIT: -1,
+ TRAM: 0,
+ SUBWAY: 1,
+ TRAIN: 2,
+ BUS: 3,
+ FERRY: 4,
+ /* Cable car referres to street-level cabel cars, where the propulsive
+ * cable runs in a slot between the tracks beneeth the car
+ * https://en.wikipedia.org/wiki/Cable_car_%28railway%29
+ * For example the cable cars in San Fransisco
+ * https://en.wikipedia.org/wiki/San_Francisco_cable_car_system
+ */
+ CABLE_CAR: 5,
+ /* Gondola referres to a suspended cable car, typically aerial cable cars
+ * where the car is suspended from the cable
+ * https://en.wikipedia.org/wiki/Gondola_lift
+ * For example the "Emirates Air Line" in London
+ * https://en.wikipedia.org/wiki/Emirates_Air_Line_%28cable_car%29
+ */
+ GONDOLA: 6,
+ /* Funicular referres to a railway system designed for steep inclines,
+ * https://en.wikipedia.org/wiki/Funicular
+ */
+ FUNICULAR: 7
+};
+
+const Plan = new Lang.Class({
+ Name: 'Plan',
+ Extends: GObject.Object,
+ Signals: {
+ 'update': {},
+ 'reset': {}
+ },
+
+ _init: function(params) {
+ this.parent(params);
+ this.reset();
+ },
+
+ get itineraries() {
+ return this._itineraries;
+ },
+
+ update: function(itineraries) {
+ this._itineraries = itineraries;
+ this.bbox = this._createBBox();
+ this.emit('update');
+ },
+
+ reset: function() {
+ this._itineraries = [];
+ this.bbox = null;
+ this.emit('reset');
+ },
+
+ _createBBox: function() {
+ let bbox = new Champlain.BoundingBox();
+ this._itineraries.forEach(function(itinerary) {
+ itinerary.legs.forEach(function(leg) {
+ bbox.extend(leg.fromCoordinate[0],
+ leg.fromCoordinate[1]);
+ bbox.extend(leg.toCoordinate[0],
+ leg.toCoordinate[1]);
+ });
+ });
+ return bbox;
+ }
+});
+
+const Itinerary = new Lang.Class({
+ Name: 'Itinerary',
+
+ _init: function(params) {
+ this._duration = params.duration;
+ delete params.duration;
+
+ this._departure = params.departure;
+ delete params.departure;
+
+ this._arrival = params.arrival;
+ delete params.arrival;
+
+ this._transfers = params.transfers;
+ delete params.transfers;
+
+ this._legs = params.legs;
+ delete params.legs;
+ },
+
+ get duration() {
+ return this._duration;
+ },
+
+ get departure() {
+ return this._departure;
+ },
+
+ get arrival() {
+ return this._arrival;
+ },
+
+ get transfers() {
+ return this._transfers;
+ },
+
+ get legs() {
+ return this._legs;
+ },
+
+ toString: function() {
+ let start = new Date();
+ let end = new Date();
+ let durationString =
+ this.duration >= 60 * 60 ? '%d h %d min'.format(this.duration / (60 * 60),
+ this.duration % (60 * 60) / 60) :
+ '%d min'.format(this.duration / 60);
+ start.setTime(this.departure);
+ end.setTime(this.arrival);
+ return 'Itinerary: \nDeparture: ' + start + '\nArrival: ' + end +
+ '\nduration: ' + durationString + ', ' + this.transfers + ' transfers';
+ }
+});
+
+const Leg = new Lang.Class({
+ Name: 'Leg',
+
+ _init: function(params) {
+ this._route = params.route;
+ delete params.route;
+
+ this._routeType = params.routeType;
+ delete params.routeType;
+
+ this._departure = params.departure;
+ delete params.departure;
+
+ this._arrival = params.arrival;
+ delete params.arrival;
+
+ this._polyline = params.polyline;
+ delete params.polyline;
+
+ this._fromCoordinate = params.fromCoordinate;
+ delete params.fromCoordinate;
+
+ this._toCoordinate = params.toCoordinate;
+ delete params.toCoordinate;
+
+ this._from = params.from;
+ delete params.from;
+
+ this._to = params.to;
+ delete params.to;
+
+ this._headSign = params.headSign;
+ delete params.headSign;
+
+ this._isTransit = params.isTransit;
+ delete params.isTransit;
+
+ this._walkingInstructions = params.walkingInstructions;
+ delete params.walkingInstructions;
+
+ this._distance = params.distance;
+ delete params.distance;
+
+ this._duration = params.duration;
+ delete params.duration;
+ },
+
+ get route() {
+ return this._route;
+ },
+
+ get routeType() {
+ return this._routeType;
+ },
+
+ get departure() {
+ return this._departure;
+ },
+
+ get arrival() {
+ return this._arrival;
+ },
+
+ get polyline() {
+ return this._polyline;
+ },
+
+ get fromCoordinate() {
+ return this._fromCoordinate;
+ },
+
+ get toCoordinate() {
+ return this._toCoordinate;
+ },
+
+ get from() {
+ return this._fromName;
+ },
+
+ get to() {
+ return this._toName;
+ },
+
+ get headSign() {
+ return this._headSign;
+ },
+
+ get transit() {
+ return this._isTransit;
+ },
+
+ get distance() {
+ return this._distance;
+ },
+
+ get duration() {
+ return this._duration;
+ }
+});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
