From 200d579e924fe430d49d0846c90471e1edb28f94 Mon Sep 17 00:00:00 2001
From: Rron Jahja <rronjahja@gmail.com>
Date: Wed, 27 Nov 2019 20:58:46 +0100
Subject: [PATCH 1/4] Get Current Position feature completed with custom icon
 on map.

---
 src/app/home/home.page.html       |   9 ++++++++-
 src/app/home/home.page.scss       |   4 ++++
 src/app/home/home.page.ts         |   6 ++++--
 src/assets/images/ic_position.png | Bin 11638 -> 4061 bytes
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 1f9fafd..6681bae 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -13,14 +13,21 @@
   </ion-toolbar>
 </ion-header>
 <ion-content>
+    
   <div #mapElement2d style="width: 100%; height: 100%" id="mapContainer" *ngIf="!is3DChecked"></div>
   <div #mapElement3d style="width: 100%; height: 100%" id="mapContainer" *ngIf="is3DChecked"></div>
   <!--div #mapElement style="width: 100%; height: 100%" id="mapContainer"></div-->
+  <ion-fab 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-list-container">
-    <ion-icon class="bike-list-expander" name="arrow-dropup-circle" (click)="expandBikeList()"></ion-icon>
+    
     <div class="bike-container" *ngFor="let bike of bikes">
       <div class="bike-name">
         {{bike.name}}
diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss
index 1dc9216..ad23a37 100644
--- a/src/app/home/home.page.scss
+++ b/src/app/home/home.page.scss
@@ -96,3 +96,7 @@ ion-footer{
 .mapContainer{
   background-color: white;
 }
+.get-position{
+  margin-bottom:10px;
+  
+}
\ No newline at end of file
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index d9111a7..06d49f3 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -137,7 +137,9 @@ export class HomePage {
       this.addMarker(this.locationArr[i].lat, this.locationArr[i].lng, img[i % 3]);
     }
   }
-
+  getCurrentPosition(){
+    this.getLocation(this.map);
+  }
   getLocation(map) {
     this.geolocation.getCurrentPosition(
       {
@@ -159,7 +161,7 @@ export class HomePage {
 
   moveMapToGiven(map, lat, lng) {
 
-    var icon = new H.map.Icon('../../../assets/images/icon_map_currentLocation.png');
+    var icon = new H.map.Icon('../../../assets/images/ic_position.png');
     // Create a marker using the previously instantiated icon:
     var marker = new H.map.Marker({ lat: lat, lng: lng }, { icon: icon });
 
diff --git a/src/assets/images/ic_position.png b/src/assets/images/ic_position.png
index dd808a0d7cdd7c362e5834522edb9855f2b4f03c..def14a9f93e8dc50cd0acb9c4b5cf9aa734d8232 100644
GIT binary patch
literal 4061
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
P00000NkvXXu0mjfOR<zf

literal 11638
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

-- 
GitLab


From 58c2be10f2c512a11ae1406fa87259e5c50e3e4e Mon Sep 17 00:00:00 2001
From: Rron Jahja <rronjahja@gmail.com>
Date: Thu, 28 Nov 2019 01:48:34 +0100
Subject: [PATCH 2/4] Map shows the real position of the bikes. Added new icons
 that shows current battery level of each bike.

---
 src/app/auth/login/login.page.ts       |   4 +--
 src/app/home/home.page.ts              |  38 +++++++++++++++++++------
 src/assets/images/0_percent.png        | Bin 0 -> 5153 bytes
 src/assets/images/100_percent.png      | Bin 0 -> 5589 bytes
 src/assets/images/25_percent.png       | Bin 0 -> 5310 bytes
 src/assets/images/50_percent.png       | Bin 0 -> 5376 bytes
 src/assets/images/75_percent.png       | Bin 0 -> 5413 bytes
 src/assets/images/current_location.png | Bin 0 -> 2239 bytes
 8 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/images/0_percent.png
 create mode 100644 src/assets/images/100_percent.png
 create mode 100644 src/assets/images/25_percent.png
 create mode 100644 src/assets/images/50_percent.png
 create mode 100644 src/assets/images/75_percent.png
 create mode 100644 src/assets/images/current_location.png

diff --git a/src/app/auth/login/login.page.ts b/src/app/auth/login/login.page.ts
index 130a489..f40332a 100644
--- a/src/app/auth/login/login.page.ts
+++ b/src/app/auth/login/login.page.ts
@@ -12,8 +12,8 @@ import { RestService } from '../../rest.service';
   styleUrls: ['./login.page.scss'],
 })
 export class LoginPage implements OnInit {
-  username = "";
-  password = "";
+  username = "Bob@mail.com";
+  password = "BobPassword";
   correctCredentials = false;
   loginApi: Observable<any>;
 
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 06d49f3..ede6b53 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -26,7 +26,7 @@ export class HomePage {
   { lat: 48.780926, lng: 9.173456 },
   { lat: 48.775174, lng: 9.175459 },
   { lat: 48.793704, lng: 9.191112 }]
-
+  public arrayLanLon = { lat: 0, lng: 0 };
   @ViewChild("mapElement2d", { static: false })
   public mapElement2d: ElementRef;
 
@@ -68,12 +68,15 @@ export class HomePage {
       this.currentLocation.lat = resp.coords.latitude;
       this.currentLocation.lng = resp.coords.longitude;
       let url = 'http://193.196.52.237:8081/admin/bikes' + '?lat=' + this.currentLocation.lat + '&lng=' + this.currentLocation.lng;
-      const  headers = new  HttpHeaders().set("Authorization", "Bearer " + this.restService.getToken());
-      this.bikeApi = this.httpClient.get(url, {headers});
+      const headers = new HttpHeaders().set("Authorization", "Bearer " + this.restService.getToken());
+      this.bikeApi = this.httpClient.get(url, { headers });
       this.bikeApi
         .subscribe((resp) => {
           console.log('my data: ', resp);
           this.bikes = resp.data;
+          //  console.log("rronjahja",this.bikes[0].lat);
+
+
         }, (error) => console.log(error));
     }, er => {
       alert('Can not retrieve Location')
@@ -82,6 +85,10 @@ export class HomePage {
     });
   }
 
+
+
+
+
   loadmap(style) {
     // Obtain the default map types from the platform object
     var mapStyle = "raster";
@@ -99,6 +106,7 @@ export class HomePage {
         pixelRatio: window.devicePixelRatio || 1
       }
     );
+
     var behavior = new H.mapevents.Behavior(new H.mapevents.MapEvents(this.map));
     var ui = H.ui.UI.createDefault(this.map, defaultLayers);
     ui.removeControl("mapsettings");
@@ -132,12 +140,26 @@ export class HomePage {
       this.map.getViewModel().setLookAtData({ tilt: 60 });
     }
     this.getLocation(this.map);
-    var img = ['../../../assets/images/ic_high.png', '../../../assets/images/ic_medium.png', '../../../assets/images/ic_low.png'];
-    for (let i = 0; i < this.locationArr.length; i++) {
-      this.addMarker(this.locationArr[i].lat, this.locationArr[i].lng, img[i % 3]);
+    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'];
+    for (let i = 0; i < this.bikes.length; i++) {
+      if(this.bikes[i].batteryPercentage<100 &&this.bikes[i].batteryPercentage>=75){
+        this.addMarker(Number(this.bikes[i].lat), Number(this.bikes[i].lon), img[0]);
+      }
+      else if(this.bikes[i].batteryPercentage<75 &&this.bikes[i].batteryPercentage>=50){
+        this.addMarker(Number(this.bikes[i].lat), Number(this.bikes[i].lon), img[1]);
+      }
+      else if(this.bikes[i].batteryPercentage<50 &&this.bikes[i].batteryPercentage>=25){
+        this.addMarker(Number(this.bikes[i].lat), Number(this.bikes[i].lon), img[2]);
+      }else if(this.bikes[i].batteryPercentage<25 &&this.bikes[i].batteryPercentage>=0){
+        this.addMarker(Number(this.bikes[i].lat), Number(this.bikes[i].lon), img[3]);
+      }
+      //console.log("rroni", this.bikes[i].lat);
+     // this.addMarker(Number(this.bikes[i].lat), Number(this.bikes[i].lon), img[0]);
+      // this.addMarker(Number(48.78077362), 9.17782398, img[i % 3]);
+      //alert(this.bikes[i].lat);
     }
   }
-  getCurrentPosition(){
+  getCurrentPosition() {
     this.getLocation(this.map);
   }
   getLocation(map) {
@@ -161,7 +183,7 @@ export class HomePage {
 
   moveMapToGiven(map, lat, lng) {
 
-    var icon = new H.map.Icon('../../../assets/images/ic_position.png');
+    var icon = new H.map.Icon('../../../assets/images/current_location.png');
     // Create a marker using the previously instantiated icon:
     var marker = new H.map.Marker({ lat: lat, lng: lng }, { icon: icon });
 
diff --git a/src/assets/images/0_percent.png b/src/assets/images/0_percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..80e4bdcedb70807184d88f92fa9649183cd76ec4
GIT binary patch
literal 5153
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
P00000NkvXXu0mjfWys5t

literal 0
HcmV?d00001

diff --git a/src/assets/images/100_percent.png b/src/assets/images/100_percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..e328a4cd6b1503089c98de6d3f6b7a1f67d13804
GIT binary patch
literal 5589
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/25_percent.png b/src/assets/images/25_percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..a06c74d5edb7d9e2c5bfe9396aa86c6518bc07a9
GIT binary patch
literal 5310
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
QApigX07*qoM6N<$g65$Ls{jB1

literal 0
HcmV?d00001

diff --git a/src/assets/images/50_percent.png b/src/assets/images/50_percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c3e45ba4143dad575722bd50a5607715b0a9a68
GIT binary patch
literal 5376
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/75_percent.png b/src/assets/images/75_percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dc53a6e1d829c8b0bb15311080f31dbe0d443c3
GIT binary patch
literal 5413
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
P00000NkvXXu0mjf>Yq};

literal 0
HcmV?d00001

diff --git a/src/assets/images/current_location.png b/src/assets/images/current_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e8d0b05255317762cb6d5577bd6226fd8aa500f
GIT binary patch
literal 2239
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
N002ovPDHLkV1h5N6W9O%

literal 0
HcmV?d00001

-- 
GitLab


From ac078fa607216f1e52846dd7b8e5256f8d591d0b Mon Sep 17 00:00:00 2001
From: Rron Jahja <rronjahja@gmail.com>
Date: Thu, 28 Nov 2019 11:35:18 +0100
Subject: [PATCH 3/4] Resolved PR comments.

---
 src/app/auth/login/login.page.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/auth/login/login.page.ts b/src/app/auth/login/login.page.ts
index f40332a..e1c8ce2 100644
--- a/src/app/auth/login/login.page.ts
+++ b/src/app/auth/login/login.page.ts
@@ -12,8 +12,10 @@ import { RestService } from '../../rest.service';
   styleUrls: ['./login.page.scss'],
 })
 export class LoginPage implements OnInit {
-  username = "Bob@mail.com";
-  password = "BobPassword";
+  // username = "Bob@mail.com";
+  // password = "BobPassword";
+  username = "";
+  password = "";
   correctCredentials = false;
   loginApi: Observable<any>;
 
@@ -39,7 +41,7 @@ export class LoginPage implements OnInit {
         console.log('my data: ', data);
         this.restService.setToken(data.token);
         this.router.navigateByUrl('/home');
-      }, (error) =>  {
+      }, (error) => {
         console.log(error);
         this.correctCredentials = true;
       });
-- 
GitLab


From c406aea1f46dd3e299d6ecc7168c2ee502548ca6 Mon Sep 17 00:00:00 2001
From: Rron Jahja <rronjahja@gmail.com>
Date: Thu, 28 Nov 2019 11:40:48 +0100
Subject: [PATCH 4/4] removed comments

---
 src/app/auth/login/login.page.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/auth/login/login.page.ts b/src/app/auth/login/login.page.ts
index e1c8ce2..668dc64 100644
--- a/src/app/auth/login/login.page.ts
+++ b/src/app/auth/login/login.page.ts
@@ -12,8 +12,6 @@ import { RestService } from '../../rest.service';
   styleUrls: ['./login.page.scss'],
 })
 export class LoginPage implements OnInit {
-  // username = "Bob@mail.com";
-  // password = "BobPassword";
   username = "";
   password = "";
   correctCredentials = false;
-- 
GitLab