summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Lundblad <ml@update.uu.se>2019-08-27 21:39:24 +0200
committerMarcus Lundblad <ml@update.uu.se>2019-09-10 22:28:41 +0200
commit6290418cde6f6be0506ad5ee91e4bf2edf037569 (patch)
tree7a0b60809aba73b71903c5f1d0fb07345714a77e
parentb3c101d79549501c5eb8972daeab4496842514b8 (diff)
downloadgnome-maps-6290418cde6f6be0506ad5ee91e4bf2edf037569.tar.gz
Move common error messages to TransitPlan
Add methods to flag errors to the TransitPlan module from the OpenTripPlanner plugin to allow re-using them from the transit router and eventual new transit provider plugins.
-rw-r--r--po/POTFILES.in1
-rw-r--r--src/transitPlan.js14
-rw-r--r--src/transitplugins/openTripPlanner.js6
3 files changed, 16 insertions, 5 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 529f5163..33c68c1f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -58,4 +58,3 @@ src/transitOptionsPanel.js
src/transitPlan.js
src/translations.js
src/utils.js
-src/transitplugins/openTripPlanner.js
diff --git a/src/transitPlan.js b/src/transitPlan.js
index 69533945..d30f9db8 100644
--- a/src/transitPlan.js
+++ b/src/transitPlan.js
@@ -137,6 +137,18 @@ var Plan = GObject.registerClass({
this.emit('error', msg);
}
+ noRouteFound() {
+ this.emit('error', _("No route found."));
+ }
+
+ noTimetable() {
+ this.emit('error', _("No timetable data found for this route."));
+ }
+
+ requestFailed() {
+ this.emit('error', _("Route request failed."));
+ }
+
_createBBox() {
let bbox = new Champlain.BoundingBox();
this._itineraries.forEach(function(itinerary) {
@@ -718,4 +730,4 @@ function sortItinerariesByDepartureAsc(first, second) {
function sortItinerariesByArrivalDesc(first, second) {
return first.arrival < second.arrival;
-} \ No newline at end of file
+}
diff --git a/src/transitplugins/openTripPlanner.js b/src/transitplugins/openTripPlanner.js
index 2a467560..d42e71bb 100644
--- a/src/transitplugins/openTripPlanner.js
+++ b/src/transitplugins/openTripPlanner.js
@@ -612,7 +612,7 @@ var OpenTripPlanner = class OpenTripPlanner {
this.plan.noMoreResults();
} else {
this._reset();
- this.plan.error(_("No route found."));
+ this.plan.noRouteFound();
}
}
@@ -645,11 +645,11 @@ var OpenTripPlanner = class OpenTripPlanner {
} else {
this._reset();
- this.plan.error(_("No timetable data found for this route."));
+ this.plan.noTimetable();
}
} else {
this._reset();
- this.plan.error(_("Route request failed."));
+ this.plan.requestFailed();
}
});
}