ApiGatewayService- added service and updated trip planner

Author: mhelmstadter

src/app/app.module.ts

@@ -2,11 +2,13 @@ import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { Routes, RouterModule } from '@angular/router';
+import { HttpModule } from '@angular/http';
 import { FeCommonModule } from './common/common.module';
 import { AppComponent } from './app.component';
 import { LoginComponent } from 'app/common/components/smart/login/login.component';
 import { TripPlannerComponent } from 'app/passengers/components/smart/trip-planner/trip-planner.component';
 import { AgmCoreModule, GoogleMapsAPIWrapper } from '@agm/core';
+import { APIGatewayService } from 'app/common/services/api-gateway.service';
 
 const routes:Routes = [ 
     {path: '', redirectTo: 'login', pathMatch: 'full'},
@@ -26,10 +28,11 @@ const routes:Routes = [
     AgmCoreModule.forRoot({
       apiKey: 'AIzaSyDPs_IyBxZNsYKEh8JplMe8a91URajuqic',
       libraries: ['places']
-    })
+    }),
+    HttpModule
   ],
   providers: [
-    GoogleMapsAPIWrapper
+    GoogleMapsAPIWrapper, APIGatewayService
   ],
   bootstrap: [AppComponent]
 })

src/app/common/common.module.ts

@@ -10,7 +10,7 @@ import { ToolbarComponent } from './components/presentation/toolbar/toolbar.comp
 import { RaisedButtonComponent } from './components/presentation/raised-button/raised-button.component';
 import { BasicButtonComponent } from './components/presentation/basic-button/basic-button.component';
 import { IconButtonComponent } from './components/presentation/icon-button/icon-button.component';
-import { GMapsDirectionsService} from './states/gmaps.service';
+import { GMapsDirectionsService} from './services/gmaps.service';
 import { MatToolbarModule, MatCheckboxModule, MatButtonModule, MatFormFieldModule, MatFormFieldControl, MatInputModule, MatIconModule, MatCardModule, MatAutocompleteModule } from '@angular/material';
 import { HeaderComponent } from './components/presentation/header/header.component';
 
@@ -48,7 +48,9 @@ import { HeaderComponent } from './components/presentation/header/header.compone
     ReactiveFormsModule, 
     MatAutocompleteModule, 
     GMapsDirectionsService, 
-    HeaderComponent
+    HeaderComponent,
+    TextBoxComponent,
+    FormsModule
   ],
 })
 

src/app/common/services/api-gateway.service.ts

@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core'; 
+import { Http } from '@angular/http'; 
+ 
+@Injectable() 
+export class APIGatewayService { 
+ 
+  private http:Http; 
+  private apiUrl = "http://10.55.13.61:8081/api/"; 
+ 
+  constructor(http:Http) { 
+    this.http = http; 
+   } 
+ 
+  // Trip Management  
+ 
+  getDirections(originAddress:string, destinationAddress:string, directionsDisplay:any) { 
+    let postUrl = this.apiUrl.concat("trips/directions"); 
+    this.http.post(postUrl, { 
+      "origin": originAddress, 
+      "destination": destinationAddress 
+    }).subscribe(result => { 
+      let body = result.json(); 
+      //directionsDisplay.set(body["routes"]); 
+      console.log("Result of getDirections: ");
+      console.log(body); 
+      return result; 
+    }) 
+  } 
+   
+  getTrip(passenger:string, driver:string, car:string, originAddress:string, destinationAddress:string) { 
+    let postUrl = this.apiUrl.concat(passenger, "/", driver, "/", car, "/", originAddress, "/", destinationAddress); 
+    this.http.post(postUrl, {}).subscribe(result => { 
+      console.log("Result of getTrip: ");
+      console.log(result); 
+    }) 
+  } 
+ 
+} 

src/app/common/states/gmaps.directive.spec.ts renamed to src/app/common/services/gmaps.directive.spec.ts

@@ -5,11 +5,26 @@ <h1>{{ title }}</h1>
       <directions-service></directions-service>
     </agm-map>
   </div>
+  <div class="material-trip-inputs">
+    <app-text-box placeholder="Enter your pickup location." 
+    icon="my_location" 
+    ngDefaultControl 
+    [(ngModel)]="pickupTextboxValue"
+    (ngModelChange)="onPickupTextChange($event)">
+    </app-text-box>
+    <app-text-box placeholder="Enter your destination." 
+    icon="place"
+    ngDefaultControl 
+    [(ngModel)]="destinationTextboxValue"
+    (ngModelChange)="onDestinationTextChange($event)">>
+    </app-text-box>
+  </div>
+
   <div class="trip-inputs">
     <input placeholder="Enter your pickup location." autocorrect="off" autocapitalize="off" spellcheck="off" type="text" class="form-control"
       #pickupInput [formControl]="destinationInput" size="55">
     <input placeholder="Enter your destination." autocorrect="off" autocapitalize="off" spellcheck="off" type="text" class="form-control"
       #pickupOutput [formControl]="destinationOutput" size="55">
   </div>
-  <app-raised-button label="Find Your Ride" color="primary"></app-raised-button>
+  <app-raised-button label="Find Your Ride" color="primary" (click)="onFindRideClick($event)"></app-raised-button>
 </mat-card>

src/app/common/states/gmaps.service.ts renamed to src/app/common/services/gmaps.service.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit, Input, ElementRef, NgZone, ViewChild } from '@angular/core';
 import { FormControl, ReactiveFormsModule } from '@angular/forms';
-import { GMapsDirectionsService } from 'app/common/states/gmaps.service';
+import { GMapsDirectionsService } from 'app/common/services/gmaps.service';
+import { APIGatewayService } from 'app/common/services/api-gateway.service';
 import { } from '@types/googlemaps';
 import { GoogleMapsAPIWrapper, MapsAPILoader } from '@agm/core';
 import { error } from 'util';
@@ -25,6 +26,9 @@ export class TripPlannerComponent implements OnInit {
   @Input() private estimatedDistance: any;
   @Input() private initialLat: number;
   @Input() private initialLng: number;
+  @Input() private pickupTextboxValue: any;
+  @Input() private destinationTextboxValue: any;
+  private directionsDisplay;
 
   @ViewChild('pickupInput')
   public pickupInputElementRef: ElementRef;
@@ -38,7 +42,8 @@ export class TripPlannerComponent implements OnInit {
     private ngZone: NgZone,
     private mapsAPILoader: MapsAPILoader,
     private gmapsApi: GoogleMapsAPIWrapper,
-    private _elementRef: ElementRef) {
+    private _elementRef: ElementRef,
+    private apiGatewayService: APIGatewayService) {
   }
 
   ngOnInit() {
@@ -72,6 +77,14 @@ export class TripPlannerComponent implements OnInit {
     });
   }
 
+  onFindRideClick(event) {
+    this.apiGatewayService.getDirections(this.pickupTextboxValue, this.destinationTextboxValue, this.directionsDisplay);
+  }
+
+  onPickupTextChange(event) {}
+  
+  onDestinationTextChange(event) {}
+
   setCurrentPosition() {
     if ('geolocation' in navigator) {
       navigator.geolocation.getCurrentPosition((position) => {

src/app/passengers/components/smart/trip-planner/trip-planner.component.html

@@ -1,9 +1,10 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { FeCommonModule } from 'app/common/common.module';
 
 @NgModule({
   imports: [
-    CommonModule
+    CommonModule, FeCommonModule
   ],
   declarations: []
 })