Merge commit 'd090578cdf2571b47981725c747fbf4d4a128c32'

www/js/filters.js

@@ -49,11 +49,17 @@ angular.module('filters', [])
             var duration = datetimeService.duration(input);
             var minutes = duration.minutes;
             var displayTime = '';
-            if (duration.hours > 0) {
+            // if time expires and goes negative, hours goes a little screwy
+            if (duration.hours > 0 && duration.hours < 2) {
                 minutes = minutes + duration.hours * 60;
             }
+
             if (duration.minutes > 0) {
                 displayTime = minutes + " min";
+                console.log(input, duration.hours, duration.minutes);
+            }
+            else{
+                displayTime = '';
             }
             return displayTime;
         };

www/js/services.js

@@ -668,7 +668,9 @@ angular.module('atstop.services', ['ionic', 'configuration'])
 
         function getRemainingTime(referenceTime) {
             var now = moment().utc();
-            return moment(referenceTime) - now;
+            time = moment(referenceTime) - now;
+            if (time < 0 ){ time = 0;};
+            return time;
         }
 
         return {

www/lib/leaflet/leaflet.css

@@ -1,12 +1,16 @@
 /* required styles */
 
-.leaflet-pane,
+.leaflet-map-pane,
 .leaflet-tile,
 .leaflet-marker-icon,
 .leaflet-marker-shadow,
+.leaflet-tile-pane,
 .leaflet-tile-container,
-.leaflet-map-pane svg,
-.leaflet-map-pane canvas,
+.leaflet-overlay-pane,
+.leaflet-shadow-pane,
+.leaflet-marker-pane,
+.leaflet-popup-pane,
+.leaflet-overlay-pane svg,
 .leaflet-zoom-box,
 .leaflet-image-layer,
 .leaflet-layer {
@@ -17,34 +21,21 @@
 .leaflet-container {
 	overflow: hidden;
 	-ms-touch-action: none;
-	touch-action: none;
 	}
 .leaflet-tile,
 .leaflet-marker-icon,
 .leaflet-marker-shadow {
 	-webkit-user-select: none;
 	   -moz-user-select: none;
 	        user-select: none;
-	  -webkit-user-drag: none;
-	}
-/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
-.leaflet-safari .leaflet-tile {
-	image-rendering: -webkit-optimize-contrast;
-	}
-/* hack that prevents hw layers "stretching" when loading new tiles */
-.leaflet-safari .leaflet-tile-container {
-	width: 1600px;
-	height: 1600px;
-	-webkit-transform-origin: 0 0;
+	-webkit-user-drag: none;
 	}
 .leaflet-marker-icon,
 .leaflet-marker-shadow {
 	display: block;
 	}
-/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
-/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
-.leaflet-container .leaflet-overlay-pane svg,
-.leaflet-container .leaflet-tile-pane img {
+/* map is broken in FF if you have max-width: 100% on tiles */
+.leaflet-container img {
 	max-width: none !important;
 	}
 /* stupid Android 2 doesn't understand "max-width: none" properly */
@@ -61,25 +52,18 @@
 .leaflet-zoom-box {
 	width: 0;
 	height: 0;
-	-moz-box-sizing: border-box;
-	     box-sizing: border-box;
-	z-index: 8;
 	}
 /* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
 .leaflet-overlay-pane svg {
 	-moz-user-select: none;
 	}
 
-.leaflet-pane         { z-index: 400; }
-
-.leaflet-tile-pane    { z-index: 200; }
-.leaflet-overlay-pane { z-index: 400; }
-.leaflet-shadow-pane  { z-index: 500; }
-.leaflet-marker-pane  { z-index: 600; }
-.leaflet-popup-pane   { z-index: 700; }
-
-.leaflet-map-pane canvas { z-index: 100; }
-.leaflet-map-pane svg    { z-index: 200; }
+.leaflet-tile-pane    { z-index: 2; }
+.leaflet-objects-pane { z-index: 3; }
+.leaflet-overlay-pane { z-index: 4; }
+.leaflet-shadow-pane  { z-index: 5; }
+.leaflet-marker-pane  { z-index: 6; }
+.leaflet-popup-pane   { z-index: 7; }
 
 .leaflet-vml-shape {
 	width: 1px;
@@ -140,35 +124,28 @@
 
 /* zoom and fade animations */
 
-.leaflet-fade-anim .leaflet-tile {
-	will-change: opacity;
-	}
+.leaflet-fade-anim .leaflet-tile,
 .leaflet-fade-anim .leaflet-popup {
 	opacity: 0;
 	-webkit-transition: opacity 0.2s linear;
 	   -moz-transition: opacity 0.2s linear;
 	     -o-transition: opacity 0.2s linear;
 	        transition: opacity 0.2s linear;
 	}
+.leaflet-fade-anim .leaflet-tile-loaded,
 .leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
 	opacity: 1;
 	}
-.leaflet-zoom-animated {
-	-webkit-transform-origin: 0 0;
-	    -ms-transform-origin: 0 0;
-	        transform-origin: 0 0;
-	}
-.leaflet-zoom-anim .leaflet-zoom-animated {
-	will-change: transform;
-	}
+
 .leaflet-zoom-anim .leaflet-zoom-animated {
 	-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
 	   -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
 	     -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);
 	        transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
 	}
 .leaflet-zoom-anim .leaflet-tile,
-.leaflet-pan-anim .leaflet-tile {
+.leaflet-pan-anim .leaflet-tile,
+.leaflet-touching .leaflet-zoom-animated {
 	-webkit-transition: none;
 	   -moz-transition: none;
 	     -o-transition: none;
@@ -182,24 +159,19 @@
 
 /* cursors */
 
-.leaflet-interactive {
+.leaflet-clickable {
 	cursor: pointer;
 	}
-.leaflet-grab {
+.leaflet-container {
 	cursor: -webkit-grab;
 	cursor:    -moz-grab;
 	}
-.leaflet-crosshair,
-.leaflet-crosshair .leaflet-interactive {
-	cursor: crosshair;
-	}
 .leaflet-popup-pane,
 .leaflet-control {
 	cursor: auto;
 	}
-.leaflet-dragging .leaflet-grab,
-.leaflet-dragging .leaflet-grab .leaflet-interactive,
-.leaflet-dragging .leaflet-marker-draggable {
+.leaflet-dragging .leaflet-container,
+.leaflet-dragging .leaflet-clickable {
 	cursor: move;
 	cursor: -webkit-grabbing;
 	cursor:    -moz-grabbing;
@@ -331,10 +303,6 @@
 	color: #333;
 	background: #fff;
 	}
-.leaflet-control-layers-scrollbar {
-	overflow-y: scroll;
-	padding-right: 5px;
-	}
 .leaflet-control-layers-selector {
 	margin-top: 2px;
 	position: relative;
@@ -454,15 +422,14 @@
 .leaflet-popup-content-wrapper,
 .leaflet-popup-tip {
 	background: white;
-	color: #333;
+
 	box-shadow: 0 3px 14px rgba(0,0,0,0.4);
 	}
 .leaflet-container a.leaflet-popup-close-button {
 	position: absolute;
 	top: 0;
 	right: 0;
 	padding: 4px 4px 0 0;
-	border: none;
 	text-align: center;
 	width: 18px;
 	height: 14px;