diff --git a/src/app/auth/login/login.page.ts b/src/app/auth/login/login.page.ts
index 130a489100e569a90e2ee16c0068141cf9479c86..f40332ad9c9892c0f3154b4a420760303a29355f 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 06d49f37c0e6a52d317b2188921dc89a58571371..ede6b535c545b0f10bfe7c1c24438bb5564d9530 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
Binary files /dev/null and b/src/assets/images/0_percent.png differ
diff --git a/src/assets/images/100_percent.png b/src/assets/images/100_percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..e328a4cd6b1503089c98de6d3f6b7a1f67d13804
Binary files /dev/null and b/src/assets/images/100_percent.png differ
diff --git a/src/assets/images/25_percent.png b/src/assets/images/25_percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..a06c74d5edb7d9e2c5bfe9396aa86c6518bc07a9
Binary files /dev/null and b/src/assets/images/25_percent.png differ
diff --git a/src/assets/images/50_percent.png b/src/assets/images/50_percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c3e45ba4143dad575722bd50a5607715b0a9a68
Binary files /dev/null and b/src/assets/images/50_percent.png differ
diff --git a/src/assets/images/75_percent.png b/src/assets/images/75_percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dc53a6e1d829c8b0bb15311080f31dbe0d443c3
Binary files /dev/null and b/src/assets/images/75_percent.png differ
diff --git a/src/assets/images/current_location.png b/src/assets/images/current_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e8d0b05255317762cb6d5577bd6226fd8aa500f
Binary files /dev/null and b/src/assets/images/current_location.png differ