Commit cdcb8c57 authored by Ratnadeep Rajendra Kharade's avatar Ratnadeep Rajendra Kharade
Browse files

added close functioality for routes list

parent 9d6856df
...@@ -71,12 +71,13 @@ ...@@ -71,12 +71,13 @@
</div> </div>
<div id="route-selection-container" *ngIf="!isTripStarted"> <div id="route-selection-container" *ngIf="!isTripStarted">
<div class="route-selection-header" *ngIf="gotRouteOptions"> <div class="route-selection-header" *ngIf="gotRouteOptions">
<div class="waypoint-wrapper"> <div class="waypoint-wrapper" style="position: relative;">
<div [innerHTML]="wayPointsInfo"></div> <div [innerHTML]="wayPointsInfo"></div>
<div> Select Route:</div> <div> Select Route:</div>
<ion-icon name="close" (click)="closeRouteOptionsPanel()" style="position: absolute;top: 11px;right: 10px;font-size: 24px;"></ion-icon>
</div> </div>
</div> </div>
<div class="routes-list-wrapper"> <div class="routes-list-wrapper" *ngIf="gotRouteOptions">
<div class="routes-list-inner" style="padding: 8px; padding-bottom: 0;"> <div class="routes-list-inner" style="padding: 8px; padding-bottom: 0;">
<div class="route-option-wrapper" style="margin-bottom: 10px; <div class="route-option-wrapper" style="margin-bottom: 10px;
box-shadow: 0px 0px 3px 0px rgba(15, 22, 33, 0.3); box-shadow: 0px 0px 3px 0px rgba(15, 22, 33, 0.3);
......
...@@ -269,6 +269,7 @@ export class HirebikePage implements OnInit { ...@@ -269,6 +269,7 @@ export class HirebikePage implements OnInit {
// } // }
} }
noGoAreas:any = {};
displayNoGoAreas(resp) { displayNoGoAreas(resp) {
let routes = resp.data.routes; let routes = resp.data.routes;
let allNoGoAreas = []; let allNoGoAreas = [];
...@@ -281,12 +282,12 @@ export class HirebikePage implements OnInit { ...@@ -281,12 +282,12 @@ export class HirebikePage implements OnInit {
//finalNoGoAreas = [...new Set(allNoGoAreas)]; //finalNoGoAreas = [...new Set(allNoGoAreas)];
let x = (allNoGoAreas) => allNoGoAreas.filter((v,i) => allNoGoAreas.indexOf(v) === i) let x = (allNoGoAreas) => allNoGoAreas.filter((v,i) => allNoGoAreas.indexOf(v) === i)
finalNoGoAreas = x(allNoGoAreas); finalNoGoAreas = x(allNoGoAreas);
//let group = new H.map.Group(); this.noGoAreas = new H.map.Group();
//this.addRectangleToMap(); //this.addRectangleToMap();
for (let i = 0; i < finalNoGoAreas.length; i++){ for (let i = 0; i < finalNoGoAreas.length; i++){
let coords = finalNoGoAreas[i].split(" "); let coords = finalNoGoAreas[i].split(" ");
let boundingBox = new H.geo.Rect(Number(coords[0]).toPrecision(15), Number(coords[1]).toPrecision(15), Number(coords[2]).toPrecision(15), Number(coords[3]).toPrecision(15)); let boundingBox = new H.geo.Rect(Number(coords[0]).toPrecision(15), Number(coords[1]).toPrecision(15), Number(coords[2]).toPrecision(15), Number(coords[3]).toPrecision(15));
this.map.addObject( this.noGoAreas.addObject(
new H.map.Rect(boundingBox, { new H.map.Rect(boundingBox, {
style: { style: {
fillColor: 'rgba(255, 0, 0, 0.5)', fillColor: 'rgba(255, 0, 0, 0.5)',
...@@ -296,6 +297,8 @@ export class HirebikePage implements OnInit { ...@@ -296,6 +297,8 @@ export class HirebikePage implements OnInit {
}) })
); );
} }
//this.map.addObject();
this.map.addObject(this.noGoAreas);
} }
/** /**
...@@ -320,8 +323,10 @@ export class HirebikePage implements OnInit { ...@@ -320,8 +323,10 @@ export class HirebikePage implements OnInit {
let route = routeResp.response.route[0]; let route = routeResp.response.route[0];
//console.log(route); //console.log(route);
this.setRouteOptions(route, i, resp.data.routes[i].mode, selectedRouteIndex, resp.data.routes[i].prediction); this.setRouteOptions(route, i, resp.data.routes[i].mode, selectedRouteIndex, resp.data.routes[i].prediction);
let grayscale = 100 + (i * 20);
let routeColor = 'rgba(' + [grayscale, grayscale, grayscale].join(',') +', 0.9)';
if (i !== selectedRouteIndex) { if (i !== selectedRouteIndex) {
this.drawRouteLine(route, i); this.drawRouteLine(route, i, routeColor);
} }
} }
let routeResp = JSON.parse(resp.data.routes[selectedRouteIndex].route); let routeResp = JSON.parse(resp.data.routes[selectedRouteIndex].route);
...@@ -419,6 +424,19 @@ export class HirebikePage implements OnInit { ...@@ -419,6 +424,19 @@ export class HirebikePage implements OnInit {
} }
} }
closeRouteOptionsPanel(){
this.removeRouteLines();
this.removeNoGoAreas();
this.isRouteSelected = false;
this.selectedRoute = {};
this.routeLines = {};
this.gotRouteOptions = false;
}
removeNoGoAreas(){
this.map.removeObject(this.noGoAreas);
}
startTrip() { startTrip() {
this.isBikeHired = true; this.isBikeHired = true;
this.startRideSubject.next('some value'); this.startRideSubject.next('some value');
......
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