Merge branch 'CreateTripPlannerScreen' into RefactorTripPlanner

Author: Castyr

package-lock.json

@@ -34,7 +34,6 @@
     "@angular/cli": "1.1.1",
     "@angular/compiler-cli": "^4.0.0",
     "@angular/language-service": "^4.0.0",
-    "@types/googlemaps": "^3.29.2",
     "@types/jasmine": "2.5.45",
     "@types/node": "~6.0.60",
     "codelyzer": "~3.0.1",

package.json

@@ -22,15 +22,15 @@ export class GMapsDirectionsService {
 
   updateDirections() {
     this.gmapsApi.getNativeMap().then(map => {
-      //Prepare Map and Display Settings
+      // Prepare Map and Display Settings
       if (!this.originPlaceId || !this.destinationPlaceId) {
         return;
       }
 
-      var directionsService = new google.maps.DirectionsService;
-      var service = this;
-      var origin = new google.maps.LatLng({ lat: this.origin.latitude, lng: this.origin.longitude });
-      var destination = new google.maps.LatLng({ lat: this.destination.latitude, lng: this.destination.longitude });
+      const directionsService = new google.maps.DirectionsService;
+      const service = this;
+      const origin = new google.maps.LatLng({ lat: this.origin.latitude, lng: this.origin.longitude });
+      const destination = new google.maps.LatLng({ lat: this.destination.latitude, lng: this.destination.longitude });
 
       this.directionsDisplay.setMap(map);
       this.directionsDisplay.setOptions({
@@ -41,31 +41,30 @@ export class GMapsDirectionsService {
         }
       });
 
-      //Update Display
+      // Update Display
       this.directionsDisplay.setDirections({ routes: [] });
 
-      //Determine Directions
-      //Request
+      // Determine Directions
+      // Request
       directionsService.route({
         origin: { placeId: this.originPlaceId },
         destination: { placeId: this.destinationPlaceId },
         avoidHighways: true,
         travelMode: google.maps.DirectionsTravelMode.DRIVING
-      }, 
-      //Response
+      },
+      // Response
       function (response: any, status: any) {
         if (status === 'OK') {
           service.directionsDisplay.setDirections(response);
           map.setZoom(30);
-          var point = response.routes[0].legs[0];
+          const point = response.routes[0].legs[0];
           service.estimatedTime = point.duration.text;
           service.estimatedDistance = point.distance.text;
           console.log('Estimated travel time: ' + point.duration.text + ' (' + point.distance.text + ')');
         } else {
           console.log('Directions request failed due to ' + status);
         }
       });
-      
     });
   }
 

src/app/common/states/gmaps.service.ts

@@ -26,18 +26,18 @@ export class TripPlannerComponent implements OnInit {
   @Input() private initialLat: number;
   @Input() private initialLng: number;
 
-  @ViewChild("pickupInput")
+  @ViewChild('pickupInput')
   public pickupInputElementRef: ElementRef;
 
-  @ViewChild("pickupOutput")
+  @ViewChild('pickupOutput')
   public pickupOutputElementRef: ElementRef;
 
   @ViewChild(GMapsDirectionsService) service: GMapsDirectionsService;
 
   constructor(
-    private ngZone: NgZone, 
-    private mapsAPILoader: MapsAPILoader, 
-    private gmapsApi: GoogleMapsAPIWrapper, 
+    private ngZone: NgZone,
+    private mapsAPILoader: MapsAPILoader,
+    private gmapsApi: GoogleMapsAPIWrapper,
     private _elementRef: ElementRef) {
   }
 
@@ -58,25 +58,25 @@ export class TripPlannerComponent implements OnInit {
     this.destinationInput = new FormControl();
     this.destinationOutput = new FormControl();
 
-    //Update Map View
+    // Update Map View
     this.setCurrentPosition();
-    
-    //Load Autocomplete for Inputs
+
+    // Load Autocomplete for Inputs
     this.mapsAPILoader.load().then(() => {
-      let autocompleteInput = new google.maps.places.Autocomplete(this.pickupInputElementRef.nativeElement, {
-        types: ["address"]
+      const autocompleteInput = new google.maps.places.Autocomplete(this.pickupInputElementRef.nativeElement, {
+        types: ['address']
       });
 
-      let autocompleteOutput = new google.maps.places.Autocomplete(this.pickupOutputElementRef.nativeElement, {
-        types: ["address"]
+      const autocompleteOutput = new google.maps.places.Autocomplete(this.pickupOutputElementRef.nativeElement, {
+        types: ['address']
       });
       this.setupPlaceChangedListener(autocompleteInput, 'pickup');
       this.setupPlaceChangedListener(autocompleteOutput, 'destination');
     });
   }
 
   setCurrentPosition() {
-    if ("geolocation" in navigator) {
+    if ('geolocation' in navigator) {
       navigator.geolocation.getCurrentPosition((position) => {
         this.latitude = position.coords.latitude;
         this.longitude = position.coords.longitude;
@@ -85,9 +85,9 @@ export class TripPlannerComponent implements OnInit {
   }
 
   private setupPlaceChangedListener(autocomplete:any, inputType:string) {
-    autocomplete.addListener("place_changed", () => {
+    autocomplete.addListener('place_changed', () => {
       this.ngZone.run(() => {
-        let place: google.maps.places.PlaceResult = autocomplete.getPlace();
+        const place: google.maps.places.PlaceResult = autocomplete.getPlace();
         if (place.geometry === undefined) {
           return;
         }