From df9075f078cc9328e3a8c8da6e7a2566b91ca922 Mon Sep 17 00:00:00 2001 From: Martin Donnelly Date: Tue, 13 Mar 2018 21:56:17 +0000 Subject: [PATCH] Added traffic component --- server/directions.js | 1 + server/reducers/directions.js | 8 +- src/service-worker.js | 2 +- src/v1/index.html | 5 + src/v1/js/Agenda.js | 2 +- src/v1/js/Location.js | 2 +- src/v1/js/Traffic.js | 166 ++++++++++++++++++++++++++++++++++ src/v1/js/app.js | 3 + 8 files changed, 182 insertions(+), 7 deletions(-) create mode 100644 src/v1/js/Traffic.js diff --git a/server/directions.js b/server/directions.js index b10f247..6b19ec2 100644 --- a/server/directions.js +++ b/server/directions.js @@ -25,6 +25,7 @@ function doGetEstDirections(olat, olon, dlat, dlon) { // Throw err; const output = reduceEstDirections(body); + output.timestamp = new Date().getTime(); console.log(output); return resolve(output); diff --git a/server/reducers/directions.js b/server/reducers/directions.js index 738b211..54f670e 100644 --- a/server/reducers/directions.js +++ b/server/reducers/directions.js @@ -25,19 +25,19 @@ function reduceEstDirections(body = '') { if ( obj.totalTimeWithTraffic > (obj.totalTime * 1.75)) { obj.traffic = 'heavy traffic'; - obj.class = 'trafficHeavy'; + obj.className = 'trafficHeavy'; } else if ( obj.totalTimeWithTraffic > (obj.totalTime * 1.5)) { obj.traffic = 'some traffic'; - obj.class = 'trafficMedium'; + obj.className = 'trafficMedium'; } else if ( obj.totalTimeWithTraffic > (obj.totalTime * 1.25)) { obj.traffic = 'light traffic'; - obj.class = 'trafficLight'; + obj.className = 'trafficLight'; } else { obj.traffic = 'no traffic'; - obj.class = 'trafficNone'; + obj.className = 'trafficNone'; } } diff --git a/src/service-worker.js b/src/service-worker.js index 74950e5..f5cd425 100644 --- a/src/service-worker.js +++ b/src/service-worker.js @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -const CACHE_VERSION = { 'version': '0.0.323' }; +const CACHE_VERSION = { 'version': '0.0.378' }; const dataCacheName = 'jubileeData-v1'; const cacheName = 'jubilee-final-1'; const filesToCache = [ diff --git a/src/v1/index.html b/src/v1/index.html index 4e82ef9..ef68ebc 100644 --- a/src/v1/index.html +++ b/src/v1/index.html @@ -43,6 +43,11 @@
+ +