Fixed cached request bug, improved waypoints validity check

Author: CyberAP

directives/directions.js

@@ -61,51 +61,45 @@
     ];
     if (request)
     {
-        for(var key in request)
-        {
-            if (request.hasOwnProperty(key))
-            {
-                (validKeys.indexOf(key) === -1) && (delete request[key]);
-            }
+      for(var key in request) {
+        if (request.hasOwnProperty(key)) {
+          (validKeys.indexOf(key) === -1) && (delete request[key]);
         }
+      }
     }
 
     if(request.waypoints) {
-      // Check fo valid values
-      if(request.waypoints == "[]" || request.waypoints === "") {
+      // Check for acceptable values
+      if(!Array.isArray(request.waypoints)) {
         delete request.waypoints;
       }
     }
 
     var showDirections = function(request) {
       if (requestTimeout && request) {
-        if (!routeRequest)
-        {
+        if (!routeRequest) {
           routeRequest = request;
-        }
-        else
-        {
-          for (var attr in request)
-          {
-            if (request.hasOwnProperty(attr))
-            {
-                routeRequest[attr] = request[attr];
+        } else {
+          for (var attr in request) {
+            if (request.hasOwnProperty(attr)) {
+              routeRequest[attr] = request[attr];
             }
           }
         }
-      }
-      else
-      {
+      } else {
         requestTimeout = $timeout(function() {
-          if (!routeRequest)
-          {
+          if (!routeRequest) {
             routeRequest = request;
           }
           directionsService.route(routeRequest, function(response, status) {
             if (status == google.maps.DirectionsStatus.OK) {
               renderer.setDirections(response);
+              // Unset request for the next call
+              routeRequest = undefined;
             }
           });
+          $timeout.cancel(requestTimeout);
+          // Unset expired timeout for the next call
           requestTimeout = undefined;
         }, routeRenderDelay);
       }