Commit 142375db authored by Ratnadeep Rajendra Kharade's avatar Ratnadeep Rajendra Kharade
Browse files

Optimized code related to map functionality

parent ba5ad93f
...@@ -18,7 +18,7 @@ declare var H: any; ...@@ -18,7 +18,7 @@ declare var H: any;
export class HomePage { export class HomePage {
private platform: any; private platform: any;
private map: any; private map: any;
private defaultLayers:any; private defaultLayers: any;
bikes = []; bikes = [];
bikeApi: Observable<any>; bikeApi: Observable<any>;
...@@ -70,22 +70,18 @@ export class HomePage { ...@@ -70,22 +70,18 @@ export class HomePage {
const headers = new HttpHeaders().set("Authorization", "Bearer " + token); const headers = new HttpHeaders().set("Authorization", "Bearer " + token);
this.bikeApi = this.httpClient.get(url, { headers }); this.bikeApi = this.httpClient.get(url, { headers });
this.bikeApi.subscribe((resp) => { this.bikeApi.subscribe((resp) => {
console.log('my data: ', resp); console.log("bikes response", resp);
this.bikes = resp; this.bikes = resp;
for (let i = 0; i < this.bikes.length; i++) { for (let i = 0; i < this.bikes.length; i++) {
var beforeDotStr = '' + this.bikes[i].distance; this.bikes[i].distance = this.bikes[i].distance.toFixed(2);;
var beforeDot = beforeDotStr.split('.')[0];
var afterDotArr = beforeDotStr.split('.')[1].split('');
var afterDot = afterDotArr[0] + afterDotArr[1];
this.bikes[i].distance = beforeDot + '.' + afterDot;
this.reverseGeocode(this.platform, this.bikes[i].lat, this.bikes[i].lon, i); this.reverseGeocode(this.platform, this.bikes[i].lat, this.bikes[i].lon, i);
} }
}, (error) => console.log(error)); }, (error) => console.log(error));
}); });
}, er => { }, er => {
alert('Can not retrieve Location') alert('Can not retrieve location');
}).catch((error) => { }).catch((error) => {
alert('Error getting location - ' + JSON.stringify(error)) alert('Error getting location - ' + JSON.stringify(error));
}); });
} }
...@@ -106,31 +102,31 @@ export class HomePage { ...@@ -106,31 +102,31 @@ export class HomePage {
ui.removeControl("mapsettings"); ui.removeControl("mapsettings");
// create custom map settings (icons on map) // create custom map settings (icons on map)
var customMapSettings = new H.ui.MapSettingsControl({ var customMapSettings = new H.ui.MapSettingsControl({
baseLayers: [{ baseLayers: [
label: "3D", layer: this.defaultLayers.vector.normal.map {
}, { label: "3D", layer: this.defaultLayers.vector.normal.map
label: "Normal", layer: this.defaultLayers.raster.normal.map }, {
}, { label: "Normal", layer: this.defaultLayers.raster.normal.map
label: "Satellite", layer: this.defaultLayers.raster.satellite.map }, {
}, { label: "Satellite", layer: this.defaultLayers.raster.satellite.map
label: "Terrain", layer: this.defaultLayers.raster.terrain.map }, {
} label: "Terrain", layer: this.defaultLayers.raster.terrain.map
}
], ],
layers: [{ layers: [
label: "layer.traffic", layer: this.defaultLayers.vector.normal.traffic {
}, label: "layer.traffic", layer: this.defaultLayers.vector.normal.traffic
{ },
label: "layer.incidents", layer: this.defaultLayers.vector.normal.trafficincidents {
} label: "layer.incidents", layer: this.defaultLayers.vector.normal.trafficincidents
}
] ]
}); });
ui.addControl("custom-mapsettings", customMapSettings); ui.addControl("custom-mapsettings", customMapSettings);
var mapSettings = ui.getControl('custom-mapsettings'); var mapSettings = ui.getControl('custom-mapsettings');
var zoom = ui.getControl('zoom'); var zoom = ui.getControl('zoom');
mapSettings.setAlignment('top-right'); mapSettings.setAlignment('top-right');
zoom.setAlignment('right-top'); zoom.setAlignment('right-top');
this.map.addEventListener('baselayerchange', (data) => { this.map.addEventListener('baselayerchange', (data) => {
let mapConfig = this.map.getBaseLayer().getProvider().getStyleInternal().getConfig(); let mapConfig = this.map.getBaseLayer().getProvider().getStyleInternal().getConfig();
...@@ -142,7 +138,6 @@ export class HomePage { ...@@ -142,7 +138,6 @@ export class HomePage {
}); });
this.getLocation(this.map); this.getLocation(this.map);
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']; 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++) { for (let i = 0; i < this.bikes.length; i++) {
if (this.bikes[i].batteryPercentage < 100 && this.bikes[i].batteryPercentage >= 75) { if (this.bikes[i].batteryPercentage < 100 && this.bikes[i].batteryPercentage >= 75) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment