diff --git a/includes/images/batmobile.png b/includes/images/batmobile.png new file mode 100644 index 0000000..937c5f9 Binary files /dev/null and b/includes/images/batmobile.png differ diff --git a/index.html b/index.html index 57a176b..88af878 100644 --- a/index.html +++ b/index.html @@ -12,8 +12,8 @@
+ {{timeTaken}} --> + add
diff --git a/src/js/app.js b/src/js/app.js index 9545339..06032a8 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -18,8 +18,6 @@ app.controller('myCtrl', function($scope, $http, $timeout, $rootScope, $interval var directionsService = new google.maps.DirectionsService; var directionsDisplay = new google.maps.DirectionsRenderer(); - - initMap(); $scope.timer = 0; $scope.timeTaken = 0; @@ -213,6 +211,7 @@ app.controller('myCtrl', function($scope, $http, $timeout, $rootScope, $interval if (validstops.length == $scope.stops.length) { + //Set Markers as null **** var waypoints = []; if ($scope.stops.length > 2) { waypoints = $scope.stops.slice(1, $scope.stops.length - 1); @@ -242,16 +241,15 @@ app.controller('myCtrl', function($scope, $http, $timeout, $rootScope, $interval directionsDisplay.setOptions({ suppressMarkers: true }); - $scope.timer = response.routes[0].overview_path.length; - follow(response.routes[0].overview_path, start, end); + //$scope.timer = response.routes[0].overview_path.length; + follow(response.routes[0].overview_path); } else { console.log("Need more Stops", start, end, waypoints) } }); } - function follow(overview_path, start, end) { - + function follow(overview_path) { var marker = new SlidingMarker({ position: overview_path[0], icon: { @@ -264,45 +262,42 @@ app.controller('myCtrl', function($scope, $http, $timeout, $rootScope, $interval duration: 0, easing: "linear" }); - // var from; - // var to; - // var heading; - // var arrOfRots = []; - // var pre = [0]; - // var turn; - var j = 0; - //Distances and Measurements - var from; - var to; + var j = 0; var MPH = 50; //Or x miles per 60 minutes - + var rotateTime; function moveDriver() { - - from = new google.maps.LatLng(overview_path[j].lat(), overview_path[j].lng()); - to = new google.maps.LatLng(overview_path[j + 1].lat(), overview_path[j + 1].lng()); - + + map.setZoom(15); + map.panTo(marker.getPosition()); + + var from = new google.maps.LatLng(overview_path[j].lat(), overview_path[j].lng()); + var to = new google.maps.LatLng(overview_path[j + 1].lat(), overview_path[j + 1].lng()); var heading = Math.round(google.maps.geometry.spherical.computeHeading(from, to)); - //if (Math.abs(heading) > 0) { - $('img[src="../includes/images/car3x.png"]').css({ 'transform': 'rotate(' + heading + 'deg)' }); - //} - //Getting Distance to milliseconds - var a = google.maps.geometry.spherical.computeDistanceBetween( from, to );//Metres - var b = a * 0.000621371; //Miles - var c = MPH / b; //Difference - var d = 60 / c; //Work out the minutes based on the difference - var e = d * 60000; // Convert to milliseconds + if (Math.abs(heading) > 75 && Math.abs(heading) < 105) { + console.log('yes', heading); + $('img[src="../includes/images/car3x.png"]').css({ 'transition-duration': '3s' }); + } + + $('img[src="../includes/images/car3x.png"]').css({ 'transform': 'rotate(' + heading + 'deg)' }); + //Getting Distance to milliseconds + var metres = google.maps.geometry.spherical.computeDistanceBetween( from, to );//Metres + var miles = metres * 0.000621371; //Miles + var speed = MPH / miles; //Difference + var speedPerHour = 60 / speed; //Work out the minutes based on the difference + var speedPerMilli = speedPerHour * 60000; // Convert to milliseconds - j++; + j++; - marker.duration = e; - marker.setPosition(overview_path[j]); - if (j < overview_path.length) { - setTimeout(function(){ - moveDriver(); - }, e) - } + marker.duration = speedPerMilli; + marker.setPosition(overview_path[j]); + if (j < overview_path.length) { + setTimeout(function(){ + moveDriver(); + }, speedPerMilli) + } + } moveDriver(); diff --git a/unused b/unused deleted file mode 100644 index aa8f311..0000000 --- a/unused +++ /dev/null @@ -1,80 +0,0 @@ -THIS IS CODE THAT HAS BEEN REMOVED - - - - var line = new google.maps.Polyline({ - path: [{lat: response.routes[0].overview_path[0].lat(), lng: response.routes[0].overview_path[0].lng()}, {lat: response.routes[0].overview_path[1].lat(), lng: response.routes[0].overview_path[1].lng()}], - icons: [{ - icon: lineSymbol, - offset: '100%' - }], - map: map - }); - response.routes[0].overview_path.forEach(function(x, i){ - if (i % 2 == 0){ - curvedLine({LatStart: x.lat(), LngStart: x.lng(), LatEnd: response.routes[0].overview_path[i + 2].lat(), LngEnd: response.routes[0].overview_path[i + 2].lng()}) - } - var line = new google.maps.Polyline({ - path: [{lat: x.lat(), lng: x.lng()}, {lat: response.routes[0].overview_path[i + 1].lat(), lng: response.routes[0].overview_path[i + 1].lng()}], - map: map - }); - }) - function animateCircle(line) { - var count = 0; - window.setInterval(function() { - count = (count + 1) % 200; - - var icons = line.get('icons'); - console.log(icons); - icons[0].offset = (count / 2) + '%'; - line.set('icons', icons); - }, 20); - } - animateCircle(line); - - $scope.stops.forEach(function(x) { - try{ - //Car Sensors in concept - if(x.Latitude.toFixed(3) == overview_path[overview_path.length - 1].lat().toFixed(3) && x.Longitude.toFixed(3) == overview_path[overview_path.length - 1].lng().toFixed(3)){ - var m = x.$marker; - m.setMap(null); - } - } - catch(e){ - console.log(e); - var m = x.$marker; - m.setMap(null); - clearInterval($scope.drive); - } - finally{ - console.log('I am alerted regardless of the outcome above') - } - }); - - - function calcDistance(p1, p2) { - return (google.maps.geometry.spherical.computeDistanceBetween(p1, p2) / 1000).toFixed(2); - } - - var p1 = new google.maps.LatLng(overview_path[counter].lat(), overview_path[counter].lng()); - var p2 = new google.maps.LatLng(overview_path[counter + 1].lat(), overview_path[counter + 1].lng()); - var difference = calcDistance(p1, p2); - - - p1 = new google.maps.LatLng(overview_path[counter].lat(), overview_path[counter].lng()); - p2 = new google.maps.LatLng(overview_path[counter + 1].lat(), overview_path[counter + 1].lng()); - - - - - if (difference < 0.09){ - setTimeout(function(){ - - }, 500) - } else { - setTimeout(function(){ - marker.setPosition(overview_path[counter]); - map.panTo(marker.getPosition()); - counter++; - }, 1000) - } \ No newline at end of file -- libgit2 0.21.0