Merge branch '46-show-bicycle-route-between-bike-and-user-s-destination' into 'master'

Resolve "Show bicycle route between bike and user's destination"

Closes #46

See merge request 92khra1mst/hft_awado_app!28

src/app/app.module.ts

@@ -17,6 +17,7 @@ import { AppRoutingModule } from './app-routing.module';
 import { RestService } from './rest.service';
 import { ToastService } from './services/toast.service';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { HereMapComponent } from './components/here-map/here-map.component';
 
 @NgModule({
   declarations: [AppComponent],
@@ -37,6 +38,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
     RestService,
     NativeGeocoder,
     ToastService,
+    HereMapComponent,
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }
   ],
   bootstrap: [AppComponent]

src/app/components/here-map/here-map.component.html

+<div #mapElement style="width: 100%; height: 100%" id="mapContainer" *ngIf="!is3DChecked"></div>
+  <ion-fab class="get-position" vertical="bottom" horizontal="end" (click)="getCurrentPosition()" slot="fixed">
+    <ion-fab-button>
+      <ion-icon name="locate"></ion-icon>
+    </ion-fab-button>
+  </ion-fab>
\ No newline at end of file

src/app/components/here-map/here-map.component.spec.ts

+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { HereMapComponent } from './here-map.component';
+
+describe('HereMapComponent', () => {
+  let component: HereMapComponent;
+  let fixture: ComponentFixture<HereMapComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HereMapComponent ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(HereMapComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/here-map/here-map.component.ts

+import { Component, OnInit, ViewChild, ElementRef, Input } from '@angular/core';
+import { Geolocation } from '@ionic-native/geolocation/ngx';
+import { RestService } from '../../rest.service';
+import { Observable, Subject } from 'rxjs';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Storage } from '@ionic/storage';
+import { ToastService } from '../../services/toast.service';
+
+declare var H: any;
+
+@Component({
+  selector: 'app-here-map',
+  templateUrl: './here-map.component.html',
+  styleUrls: ['./here-map.component.scss'],
+})
+export class HereMapComponent implements OnInit {
+  @ViewChild("mapElement", { static: false })
+  public mapElement: ElementRef;
+
+  @Input()
+  startRideSubject: Subject<any>;
+
+  @Input()
+  gotReservedBikeSubject: Subject<any>;
+
+  private platform: any;
+  private map: any;
+  private ui: any;
+  private defaultLayers: any;
+  private locationsGroup: any;
+
+  private currentUserPosition = { lat: 48.783480, lng: 9.180319 };
+  private bikePosition = { lat: 48.783480, lng: 9.180319 };
+  private destinationPosition = { lat: 48.783480, lng: 9.180319 };
+
+  public currentLocationMarker: any;
+  public destinationMarker: any;
+
+  public rideStarted = false;
+
+  constructor(private geolocation: Geolocation,
+    public restService: RestService,
+    public httpClient: HttpClient,
+    private storage: Storage,
+    private toastService: ToastService) {
+
+    this.platform = new H.service.Platform({
+      'apikey': 'tiVTgBnPbgV1spie5U2MSy-obhD9r2sGiOCbBzFY2_k'
+    });
+
+    let watch = this.geolocation.watchPosition({ enableHighAccuracy: true, maximumAge: 10000 });
+    watch.subscribe((position) => {
+      console.log(position.coords.latitude);
+      console.log(position.coords.longitude);
+      this.currentUserPosition.lat = position.coords.latitude;
+      this.currentUserPosition.lng = position.coords.longitude;
+      if (this.currentLocationMarker) {
+        this.currentLocationMarker.setGeometry({ lat: position.coords.latitude, lng: position.coords.longitude });
+      }
+    }, (errorObj) => {
+      console.log(errorObj.code + ": " + errorObj.message);
+    });
+  }
+
+  ngOnInit() {
+    this.gotReservedBikeSubject.subscribe(bikeDetails => {
+      console.log('Got Bike in map');
+      console.log(bikeDetails);
+      this.bikePosition.lat = bikeDetails.lat;
+      this.bikePosition.lng = bikeDetails.lon;
+      var img = ['../../../assets/images/100_percent.png', '../../../assets/images/75_percent.png', '../../../assets/images/50_percent.png', '../../../assets/images/25_percent.png', '../../../assets/images/0_percent.png'];
+      if (bikeDetails.batteryPercentage < 100 && bikeDetails.batteryPercentage >= 75) {
+        this.addMarker(Number(bikeDetails.lat), Number(bikeDetails.lon), img[0]);
+      }
+      else if (bikeDetails.batteryPercentage < 75 && bikeDetails.batteryPercentage >= 50) {
+        this.addMarker(Number(bikeDetails.lat), Number(bikeDetails.lon), img[1]);
+      }
+      else if (bikeDetails.batteryPercentage < 50 && bikeDetails.batteryPercentage >= 25) {
+        this.addMarker(Number(bikeDetails.lat), Number(bikeDetails.lon), img[2]);
+      } else if (bikeDetails.batteryPercentage < 25 && bikeDetails.batteryPercentage >= 0) {
+        this.addMarker(Number(bikeDetails.lat), Number(bikeDetails.lon), img[3]);
+      }
+    });
+
+    this.startRideSubject.subscribe(event => {
+      console.log('start ride');
+      //remove event listener
+      this.rideStarted = true;
+      this.calculateRoute();
+    });
+  }
+
+  ngAfterViewInit() {
+    setTimeout(() => {
+      this.initializeMap();
+      this.getUserLocation();
+    }, 500);
+    window.addEventListener('resize', () => this.map.getViewPort().resize());
+  }
+
+  ngOnDestroy() {
+    // needed if child gets re-created (eg on some model changes)
+    // note that subsequent subscriptions on the same subject will fail
+    // so the parent has to re-create parentSubject on changes
+    this.startRideSubject.unsubscribe();
+  }
+
+  onSuccess(result) {
+    var route = result.response.route[0];
+    /*
+     * The styling of the route response on the map is entirely under the developer's control.
+     * A representitive styling can be found the full JS + HTML code of this example
+     * in the functions below:
+     */
+    this.addRouteShapeToMap(route);
+    this.addManueversToMap(route);
+
+    //addWaypointsToPanel(route.waypoint);
+    //addManueversToPanel(route);
+    //addSummaryToPanel(route.summary);
+  }
+
+  /**
+     * This function will be called if a communication error occurs during the JSON-P request
+     * @param  {Object} error  The error message received.
+     */
+  onError(error) {
+    alert('Can\'t reach the remote server');
+  }
+
+  bubble;
+
+  /**
+   * Opens/Closes a infobubble
+   * @param  {H.geo.Point} position     The location on the map.
+   * @param  {String} text              The contents of the infobubble.
+   */
+  openBubble(position, text) {
+    if (!this.bubble) {
+      this.bubble = new H.ui.InfoBubble(
+        position,
+        // The FO property holds the province name.
+        { content: text });
+      this.ui.addBubble(this.bubble);
+    } else {
+      this.bubble.setPosition(position);
+      this.bubble.setContent(text);
+      this.bubble.open();
+    }
+  }
+
+  /**
+   * Creates a H.map.Polyline from the shape of the route and adds it to the map.
+   * @param {Object} route A route as received from the H.service.RoutingService
+   */
+  addRouteShapeToMap(route) {
+    var lineString = new H.geo.LineString(),
+      routeShape = route.shape,
+      polyline;
+
+    routeShape.forEach(function (point) {
+      var parts = point.split(',');
+      lineString.pushLatLngAlt(parts[0], parts[1]);
+    });
+
+    polyline = new H.map.Polyline(lineString, {
+      style: {
+        lineWidth: 4,
+        strokeColor: 'rgba(0, 128, 255, 0.7)'
+      }
+    });
+    // Add the polyline to the map
+    this.map.addObject(polyline);
+    // And zoom to its bounding rectangle
+    this.map.getViewModel().setLookAtData({
+      bounds: polyline.getBoundingBox()
+    });
+  }
+
+  /**
+  * Creates a series of H.map.Marker points from the route and adds them to the map.
+  * @param {Object} route  A route as received from the H.service.RoutingService
+  */
+  addManueversToMap(route) {
+    var svgMarkup = '<svg width="18" height="18" ' +
+      'xmlns="http://www.w3.org/2000/svg">' +
+      '<circle cx="8" cy="8" r="8" ' +
+      'fill="#1b468d" stroke="white" stroke-width="1"  />' +
+      '</svg>',
+      dotIcon = new H.map.Icon(svgMarkup, { anchor: { x: 8, y: 8 } }),
+      group = new H.map.Group()
+    var group = new H.map.Group();
+
+    // Add a marker for each maneuver
+    for (let i = 0; i < route.leg.length; i += 1) {
+      for (let j = 0; j < route.leg[i].maneuver.length; j += 1) {
+        // Get the next maneuver.
+        var maneuver = route.leg[i].maneuver[j];
+        // Add a marker to the maneuvers group
+        var marker = new H.map.Marker({
+          lat: maneuver.position.latitude,
+          lng: maneuver.position.longitude
+        },
+          { icon: dotIcon });
+        marker.instruction = maneuver.instruction;
+        group.addObject(marker);
+      }
+    }
+
+    group.addEventListener('tap', (evt) => {
+      this.map.setCenter(evt.target.getGeometry());
+      this.openBubble(
+        evt.target.getGeometry(), evt.target.instruction);
+    }, false);
+
+    // Add the maneuvers group to the map
+    this.map.addObject(group);
+  }
+
+  calculateRoute() {
+    var waypoint0 = this.bikePosition.lat + ',' + this.bikePosition.lng;
+    var waypoint1 = this.destinationPosition.lat + ',' + this.destinationPosition.lng;
+    var router = this.platform.getRoutingService(),
+      routeRequestParams = {
+        mode: 'fastest;bicycle',
+        representation: 'display',
+        routeattributes: 'waypoints,summary,shape,legs',
+        maneuverattributes: 'direction,action',
+        waypoint0: waypoint0, // Brandenburg Gate
+        waypoint1: waypoint1  // Friedrichstraße Railway Station
+      };
+
+    router.calculateRoute(
+      routeRequestParams,
+      this.onSuccess.bind(this),
+      this.onError.bind(this)
+    );
+  }
+
+
+  initializeMap() {
+    // Obtain the default map types from the platform object
+    this.defaultLayers = this.platform.createDefaultLayers();
+    this.map = new H.Map(
+      this.mapElement.nativeElement,
+      this.defaultLayers.raster.normal.map,
+      {
+        zoom: 17,
+        pixelRatio: window.devicePixelRatio || 1
+      }
+    );
+
+    var behavior = new H.mapevents.Behavior(new H.mapevents.MapEvents(this.map));
+    this.ui = H.ui.UI.createDefault(this.map, this.defaultLayers);
+    this.ui.removeControl("mapsettings");
+    // create custom map settings (icons on map)
+    var customMapSettings = new H.ui.MapSettingsControl({
+      baseLayers: [
+        {
+          label: "3D", layer: this.defaultLayers.vector.normal.map
+        }, {
+          label: "Normal", layer: this.defaultLayers.raster.normal.map
+        }, {
+          label: "Satellite", layer: this.defaultLayers.raster.satellite.map
+        }, {
+          label: "Terrain", layer: this.defaultLayers.raster.terrain.map
+        }
+      ],
+      layers: [
+        {
+          label: "layer.traffic", layer: this.defaultLayers.vector.normal.traffic
+        },
+        {
+          label: "layer.incidents", layer: this.defaultLayers.vector.normal.trafficincidents
+        }
+      ]
+    });
+    this.ui.addControl("custom-mapsettings", customMapSettings);
+    var mapSettings = this.ui.getControl('custom-mapsettings');
+    var zoom = this.ui.getControl('zoom');
+    mapSettings.setAlignment('top-right');
+    zoom.setAlignment('right-top');
+
+    this.map.getViewPort().setPadding(30, 30, 30, 30);
+
+    // Listen for base layer change event (eg. from satellite to 3D)
+    this.map.addEventListener('baselayerchange', (evt) => {
+      let mapConfig = this.map.getBaseLayer().getProvider().getStyleInternal().getConfig();
+      if (mapConfig === null || (mapConfig && mapConfig.sources && mapConfig.sources.omv)) {
+        this.map.getViewModel().setLookAtData({ tilt: 60 });
+      } else {
+        this.map.getViewModel().setLookAtData({ tilt: 0 });
+      }
+    });
+
+    // listen for map click event
+    this.map.addEventListener('tap', this.mapClickedEvent.bind(this));
+
+    if(!this.locationsGroup) {
+      this.locationsGroup = new H.map.Group();
+    }
+    this.map.addObject(this.locationsGroup);
+  }
+
+  mapClickedEvent(event) {
+    if(this.rideStarted) {
+      return;
+    }
+    //console.log(event.type, event.currentPointer.type);
+    var coord = this.map.screenToGeo(event.currentPointer.viewportX,
+      event.currentPointer.viewportY);
+    console.log(coord.lat + ', ' + coord.lng);
+
+    this.destinationPosition = { lat: coord.lat, lng: coord.lng };
+
+    if (this.destinationMarker) {
+      this.destinationMarker.setGeometry({ lat: coord.lat, lng: coord.lng })
+    } else {
+      let icon = new H.map.Icon('../../../assets/images/current_location.png');
+      // Create a marker using the previously instantiated icon:
+      this.destinationMarker = new H.map.Marker({ lat: coord.lat, lng: coord.lng }, { icon: icon });
+      // Add the marker to the map:
+      if(!this.locationsGroup) {
+        this.locationsGroup = new H.map.Group();
+      }
+      this.locationsGroup.addObjects([this.destinationMarker]);
+      this.setZoomLevelToPointersGroup();
+    }
+  }
+
+  //TODO change this logic
+  getCurrentPosition() {
+    console.log(this.currentLocationMarker);
+    if (!this.currentLocationMarker) {
+      this.showUserLocationOnMap(this.currentUserPosition.lat, this.currentUserPosition.lng);
+    }
+    this.map.setZoom(17);
+    this.map.setCenter({ lat: this.currentUserPosition.lat, lng: this.currentUserPosition.lng });
+  }
+
+  setZoomLevelToPointersGroup() {
+    this.map.getViewModel().setLookAtData({
+      bounds: this.locationsGroup.getBoundingBox()
+    });
+  }
+
+  getUserLocation() {
+    this.geolocation.getCurrentPosition().then((resp) => {
+      let lat = resp.coords.latitude;
+      let lng = resp.coords.longitude;
+      this.currentUserPosition.lat = resp.coords.latitude;
+      this.currentUserPosition.lng = resp.coords.longitude;
+      this.showUserLocationOnMap(lat, lng);
+    }, er => {
+      //alert('Can not retrieve Location')
+      this.showUserLocationOnMap(this.currentUserPosition.lat, this.currentUserPosition.lng);
+    }).catch((error) => {
+      this.showUserLocationOnMap(this.currentUserPosition.lat, this.currentUserPosition.lng);
+      //alert('Error getting location - ' + JSON.stringify(error))
+    });
+  }
+
+  showUserLocationOnMap(lat, lng) {
+    let svgMarkup = '<svg width="24" height="24" ' +
+      'xmlns="http://www.w3.org/2000/svg">' +
+      '<circle cx="10" cy="10" r="10" ' +
+      'fill="#007cff" stroke="white" stroke-width="2"  />' +
+      '</svg>';
+    let icon = new H.map.Icon(svgMarkup);
+    //let icon = new H.map.Icon('../../../assets/images/current_location.png');
+    // Create a marker using the previously instantiated icon:
+    this.currentLocationMarker = new H.map.Marker({ lat: lat, lng: lng }, { icon: icon });
+    // Add the marker to the map:
+    if(!this.locationsGroup) {
+      this.locationsGroup = new H.map.Group();
+    }
+    this.locationsGroup.addObjects([this.currentLocationMarker]);
+    this.setZoomLevelToPointersGroup();
+
+    //this.map.addObject(marker);
+    //this.map.setCenter({ lat: lat, lng: lng });
+  }
+
+  addMarker(lat, lng, img) {
+    var icon = new H.map.Icon(img);
+    // Create a marker using the previously instantiated icon:
+    var marker = new H.map.Marker({ lat: lat, lng: lng }, { icon: icon });
+    // Add the marker to the map:
+    //this.map.addObject(marker);
+    if(!this.locationsGroup) {
+      this.locationsGroup = new H.map.Group();
+    }
+    this.locationsGroup.addObjects([marker]);
+  }
+
+  enable3DMaps() {
+    this.map.setBaseLayer(this.defaultLayers.vector.normal.map);
+  }
+
+  reverseGeocode(platform, lat, lng, index) {
+    var prox = lat + ',' + lng + ',56';
+    var geocoder = platform.getGeocodingService(),
+      parameters = {
+        prox: prox,
+        mode: 'retrieveAddresses',
+        maxresults: '1',
+        gen: '9'
+      };
+
+    geocoder.reverseGeocode(parameters, result => {
+      var streets = result.Response.View[0].Result[0].Location.Address.Street;
+      var houseNumber = result.Response.View[0].Result[0].Location.Address.HouseNumber;
+      var zipcode = result.Response.View[0].Result[0].Location.Address.PostalCode;
+
+      return streets + houseNumber + zipcode;
+    }, (error) => {
+      alert(error);
+    });
+  }
+}

src/app/hirebike/hirebike.module.ts

@@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular';
 import { HirebikePageRoutingModule } from './hirebike-routing.module';
 
 import { HirebikePage } from './hirebike.page';
+import { HereMapComponent } from '../components/here-map/here-map.component';
 
 @NgModule({
   imports: [
@@ -15,6 +16,7 @@ import { HirebikePage } from './hirebike.page';
     IonicModule,
     HirebikePageRoutingModule
   ],
-  declarations: [HirebikePage]
+  declarations: [HirebikePage,
+    HereMapComponent]
 })
 export class HirebikePageModule {}

src/app/hirebike/hirebike.page.html

@@ -10,15 +10,16 @@
 </ion-header>
 
 <ion-content>
-  <div>
+  <!--div>
     <ion-item *ngIf="!isBikeHired">
       <ion-input type="text" [(ngModel)]="Destination" placeholder="Enter Destination"></ion-input>
     </ion-item>
     <ion-item *ngIf="isBikeHired">
       <ion-input type="text" [(ngModel)]="Destination" placeholder="Ongoing Trip" readonly></ion-input>
     </ion-item>
-  </div>
-  <div #mapElement style="width: 100%; height: 100%" id="mapContainer"></div>
+  </div-->
+  <!--div #mapElement style="width: 100%; height: 100%" id="mapContainer"></div-->
+  <app-here-map [startRideSubject]="startRideSubject" [gotReservedBikeSubject]="gotReservedBikeSubject"></app-here-map>
 </ion-content>
 <ion-footer>
   <div class="bike-details-container">
@@ -48,5 +49,4 @@
       </div>
     </div>
   </div>
-  
 </ion-footer>
\ No newline at end of file

src/app/hirebike/hirebike.page.ts

@@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
 
 import { Geolocation } from '@ionic-native/geolocation/ngx';
 import { RestService } from '../rest.service';
-import { Observable } from 'rxjs';
+import { Observable, Subject } from 'rxjs';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Storage } from '@ionic/storage';
 import { ToastService } from '../services/toast.service';
@@ -16,34 +16,15 @@ declare var H: any;
 export class HirebikePage implements OnInit {
 
   private platform: any;
-  private map: any;
-  // Get an instance of the routing service:
-  private mapRouter: any;
 
   reservedBike: any = {};
   bikeDetails: any = {};
-  address="sample";
-  isBikeHired=false;
-
+  address = "sample";
+  isBikeHired = false;
   noReservation = true;
 
-  private currentLocation = { lat: 0, lng: 0 };
-
-  // Create the parameters for the routing request:
-  private routingParameters = {
-    // The routing mode:
-    mode: 'shortest;pedestrian',
-    // The start point of the route:
-    waypoint0: 'geo!50.1120423728813,8.68340740740811',
-    // The end point of the route:
-    waypoint1: 'geo!52.5309916298853,13.3846220493377',
-    // To retrieve the shape of the route we choose the route
-    // representation mode 'display'
-    representation: 'display'
-  };
-
-  @ViewChild("mapElement", { static: false })
-  public mapElement: ElementRef;
+  startRideSubject: Subject<any> = new Subject();
+  gotReservedBikeSubject: Subject<any> = new Subject();
 
   constructor(private geolocation: Geolocation,
     public restService: RestService,
@@ -51,10 +32,9 @@ export class HirebikePage implements OnInit {
     private storage: Storage,
     private toastService: ToastService,
     private router: Router) {
-    this.platform = new H.service.Platform({
-      'apikey': 'tiVTgBnPbgV1spie5U2MSy-obhD9r2sGiOCbBzFY2_k'
-    });
-    this.mapRouter = this.platform.getRoutingService();
+      this.platform = new H.service.Platform({
+        'apikey': 'tiVTgBnPbgV1spie5U2MSy-obhD9r2sGiOCbBzFY2_k'
+      });
   }
 
   ngOnInit() {
@@ -75,7 +55,7 @@ export class HirebikePage implements OnInit {
         console.log('Reserved Bike', resp);
         if (resp.data) {
           this.reservedBike = resp.data;
-          this.isBikeHired=this.reservedBike.rented;
+          this.isBikeHired = this.reservedBike.rented;