From 56ca146dfa52d30fe33c2d8102803f068ffc7217 Mon Sep 17 00:00:00 2001
From: Frank Sauerburger <frank@sauerburger.com>
Date: Tue, 26 Mar 2019 11:24:41 +0100
Subject: [PATCH] Remove empty trailing routes
---
app/helpers/index.js | 7 +++++++
app/reducers/index.js | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/app/helpers/index.js b/app/helpers/index.js
index 2ba3434..c1b0986 100644
--- a/app/helpers/index.js
+++ b/app/helpers/index.js
@@ -25,3 +25,10 @@ export const buildUrl = (stops) => {
}
return "https://www.google.com/maps/dir/" + stops.join("/") + "/"
}
+
+export const dropTail = (array) => {
+ while (array.length > 0 && array.slice(-1)[0].length == 0) {
+ array.pop()
+ }
+ return array
+}
diff --git a/app/reducers/index.js b/app/reducers/index.js
index a5a227d..ce6d723 100644
--- a/app/reducers/index.js
+++ b/app/reducers/index.js
@@ -1,5 +1,5 @@
import * as at from '../actions/actionTypes'
-import { extractStops } from '../helpers'
+import { extractStops, dropTail } from '../helpers'
const initialState = {
@@ -12,13 +12,13 @@ const reducer = (state = initialState, action) => {
return {routes: state.routes.concat([extractStops(action.payload)])}
case at.DELETE_ROUTE:
- return {routes: state.routes.filter((v, i) => i != action.payload)}
+ return {routes: dropTail(state.routes.filter((v, i) => i != action.payload))}
case at.CLEAR_ROUTE:
- return {routes: state.routes.map((v, i) => i == action.payload ? [] : v)}
+ return {routes: dropTail(state.routes.map((v, i) => i == action.payload ? [] : v))}
case at.UPDATE_URL:
- return {routes: state.routes.map((v, i) => i == action.payload.index ? extractStops(action.payload.url) : v)}
+ return {routes: dropTail(state.routes.map((v, i) => i == action.payload.index ? extractStops(action.payload.url) : v))}
default:
return state
--
GitLab