Merge branch 'master' into '20-ride-history-2'

# Conflicts:
#   src/app/hirebike/hirebike.page.ts

angular.json

@@ -37,9 +37,15 @@
               },
               {
                 "input": "src/global.scss"
-              }
+              },
+              "src/assets/js/mapsjs-ui.css"
             ],
-            "scripts": []
+            "scripts": [
+              "./src/assets/js/mapsjs-core.js",
+              "./src/assets/js/mapsjs-mapevents.js",
+              "./src/assets/js/mapsjs-service.js",
+              "./src/assets/js/mapsjs-ui.js"
+            ]
           },
           "configurations": {
             "production": {

config.xml

 <?xml version='1.0' encoding='utf-8'?>
 <widget id="io.ionic.starter" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>MyApp</name>
+    <name>AWADO</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
     <content src="index.html" />

src/app/auth/login/login.page.ts

 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { Router, LoadChildrenCallback } from '@angular/router';
 
 import { Observable } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
 
 import { RestService } from '../../rest.service';
 import { UserService } from 'src/app/services/user.service';
+import { LocationService } from 'src/app/services/location.service';
+import { LoadingService } from 'src/app/services/loading.service';
 
 @Component({
   selector: 'app-login',
@@ -15,12 +17,15 @@ import { UserService } from 'src/app/services/user.service';
 export class LoginPage implements OnInit {
   username = "";
   password = "";
-  //username = "";
-  //password = "";
   correctCredentials = false;
   loginApi: Observable<any>;
 
-  constructor(private router: Router, public httpClient: HttpClient, public restService: RestService,public userService: UserService) {
+  constructor(private router: Router,
+    public httpClient: HttpClient,
+    public restService: RestService,
+    public userService: UserService,
+    public locationService: LocationService,
+    public loadingService: LoadingService) {
 
   }
 
@@ -37,6 +42,7 @@ export class LoginPage implements OnInit {
       "email": this.username,
       "password": this.password
     });
+    this.loadingService.showLoader();
     this.loginApi
       .subscribe((data) => {
         //console.log('my data: ', data);
@@ -44,9 +50,11 @@ export class LoginPage implements OnInit {
         this.restService.isLoginPage = false;
         this.userService.setUsername(this.username);
         this.router.navigateByUrl('/home');
+        this.loadingService.hideLoader();
       }, (error) => {
         console.log(JSON.stringify(error));
         this.correctCredentials = true;
+        this.loadingService.hideLoader();
       });
   }
   register() {

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
+<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.ts

@@ -104,7 +104,7 @@ export class HereMapComponent implements OnInit {
     // 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();
+    //this.startRideSubject.unsubscribe();
   }
 
   onSuccess(result) {

src/app/hirebike/hirebike.page.html

@@ -19,7 +19,13 @@
     </ion-item>
   </div-->
   <!--div #mapElement style="width: 100%; height: 100%" id="mapContainer"></div-->
-  <app-here-map [startRideSubject]="startRideSubject" [gotReservedBikeSubject]="gotReservedBikeSubject"></app-here-map>
+  <!--app-here-map [startRideSubject]="startRideSubject" [gotReservedBikeSubject]="gotReservedBikeSubject"></app-here-map-->
+  <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>
 </ion-content>
 <ion-footer>
   <div class="bike-details-container">

src/app/hirebike/hirebike.page.ts

-import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
+import { Component, OnInit, ViewChild, ElementRef, Input } from '@angular/core';
 
 import { Geolocation } from '@ionic-native/geolocation/ngx';
 import { RestService } from '../rest.service';
@@ -8,6 +8,8 @@ import { Storage } from '@ionic/storage';
 import { ToastService } from '../services/toast.service';
 import { Router } from '@angular/router';
 import { MapDataService } from '../services/map-data.service';
+import { LocationService } from '../services/location.service';
+import { LoadingService } from '../services/loading.service';
 declare var H: any;
 
 @Component({
@@ -33,16 +35,71 @@ export class HirebikePage implements OnInit {
   gotReservedBikeSubject: Subject<any> = new Subject();
   maneuverList: any = [];
 
+  @ViewChild("mapElement", { static: false })
+  public mapElement: ElementRef;
+
+  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,
     private router: Router,
-    private mapDataService: MapDataService) {
+    private mapDataService: MapDataService,
+    public locationService: LocationService,
+    public loadingService: LoadingService) {
+      
     this.platform = new H.service.Platform({
       'apikey': 'tiVTgBnPbgV1spie5U2MSy-obhD9r2sGiOCbBzFY2_k'
     });
+  }
+
+  ngOnInit() {
+    
+  }
+
+  ngAfterViewInit() {
+    window.addEventListener('resize', () => this.map.getViewPort().resize());
+  }
+
+  ionViewWillEnter() {
+    this.currentUserPosition.lat = this.locationService.currentUserPosition.lat;
+    this.currentUserPosition.lng = this.locationService.currentUserPosition.lng;
+
+    this.initializeMap();
+
+    //get user location
+    if (this.currentLocationMarker) {
+      this.currentLocationMarker.setGeometry({ lat: this.currentUserPosition.lat, lng: this.currentUserPosition.lng })
+    } else {
+      this.showUserLocationOnMap(this.currentUserPosition.lat, this.currentUserPosition.lng);
+    }
+
+    this.locationService.liveLocationSubject.subscribe((position) => {
+      console.log('got location inside home subscription');
+      this.currentUserPosition.lat = position.lat;
+      this.currentUserPosition.lng = position.lng;
+      if (this.currentLocationMarker) {
+        this.currentLocationMarker.setGeometry({ lat: this.currentUserPosition.lat, lng: this.currentUserPosition.lng })
+      } else {
+        this.showUserLocationOnMap(this.currentUserPosition.lat, this.currentUserPosition.lng);
+      }
+    });
+    this.getReservedBike();
+
     this.mapDataService.mapDataSubject.subscribe(receiveddata => {
       console.log('data received ');
       console.log(receiveddata);
@@ -58,14 +115,34 @@ export class HirebikePage implements OnInit {
       }
       this.wayPointsInfo = waypointLabels.join(' - ');
     });
-  }
 
-  ngOnInit() {
-    this.getReservedBike();
-  }
+    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]);
+      }
 
-  ngAfterViewInit() {
+      this.setZoomLevelToPointersGroup();
+    });
 
+    this.startRideSubject.subscribe(event => {
+      console.log('start ride');
+      //remove event listener
+      this.rideStarted = true;
+      this.calculateRoute();
+    });
   }
 
   showRouteInfoPanel(route) {
@@ -76,17 +153,6 @@ export class HirebikePage implements OnInit {
         // Get the next maneuver.
         let maneuver = route.leg[i].maneuver[j];
         maneuverList.push(maneuver);
-
-        // var li = document.createElement('li'),
-        //   spanArrow = document.createElement('span'),
-        //   spanInstruction = document.createElement('span');
-
-        // spanArrow.className = 'arrow ' + maneuver.action;
-        // spanInstruction.innerHTML = maneuver.instruction;
-        // li.appendChild(spanArrow);
-        // li.appendChild(spanInstruction);
-
-        // nodeOL.appendChild(li);
       }
     }
 
@@ -94,6 +160,7 @@ export class HirebikePage implements OnInit {
   }
 
   getReservedBike() {
+    this.loadingService.showLoader();
     this.storage.get('token').then((token) => {
       const headers = new HttpHeaders().set("Authorization", "Bearer " + token);
       //call reserved bike api
@@ -115,9 +182,16 @@ export class HirebikePage implements OnInit {
 
             //pass reserved bike subject here map
             this.gotReservedBikeSubject.next(resp.data);
-          }, (reservedBikeError) => console.log(reservedBikeError));
+            this.loadingService.hideLoader();
+          }, (reservedBikeError) => {
+            console.log(reservedBikeError);
+            this.loadingService.hideLoader();
+          });
         }
-      }, (bikeDetailsError) => console.log(bikeDetailsError));
+      }, (bikeDetailsError) => {
+        console.log(bikeDetailsError);
+        this.loadingService.hideLoader();
+      });
     });
   }
 
@@ -128,11 +202,13 @@ export class HirebikePage implements OnInit {
       let bikeApi = this.httpClient.get(url, { headers });
       bikeApi.subscribe((resp) => {
         console.log('my data: ', resp);
+        this.loadingService.hideLoader();
         this.toastService.showToast("Trip Started");
         this.isBikeHired = true;
       }, (error) => {
-        console.log(error)
-        this.toastService.showToast("This is ongoing Trip")
+        console.log(error);
+        this.loadingService.hideLoader();
+        this.toastService.showToast("This is ongoing Trip");
       });
     });
 
@@ -144,19 +220,307 @@ export class HirebikePage implements OnInit {
   }
 
   CancelTrip() {
+    this.loadingService.showLoader();
     this.storage.get('token').then((token) => {
       let url = 'http://193.196.52.237:8081/rent' + '?bikeId=' + this.bikeDetails.id;
       const headers = new HttpHeaders().set("Authorization", "Bearer " + token);
       let bikeApi = this.httpClient.delete(url, { headers });
       bikeApi.subscribe((resp) => {
         console.log('my data: ', resp);
+        this.loadingService.hideLoader();
         this.toastService.showToast("Trip Ended!");
       }, (error) => {
-        console.log(error)
+        console.log(error);
+        this.loadingService.hideLoader();
         this.toastService.showToast("No Ongong Trip to End")
       });
     });
   }
+
+  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);
+    this.mapDataService.mapDataSubject.next(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,
+      {
+        center: { lat: this.locationService.preiousUserPosition.lat, lng: this.locationService.preiousUserPosition.lng },
+        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() {
+    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()
+    });
+  }
+
+  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);