Commit 8e05f54e authored by Samuel Schepp's avatar Samuel Schepp

Merge branch...

Merge branch '108-opening-and-closing-add-poi-in-map-view-causes-pins-to-redraw-above-existing-pins' into 'develop'

Resolve "Opening and closing "Add poi" in map view, causes pins to redraw above existing pins"

Closes #108

See merge request !86
parents 95d7c352 aa11eed5
Pipeline #18443 failed with stages
in 6 minutes and 10 seconds
......@@ -72,7 +72,9 @@ export class MapViewComponent implements AfterViewInit {
modalRef.componentInstance.lat = this.mapRendererService.getContextLat();
modalRef.componentInstance.building = this.mapRendererService.selectedBuilding;
modalRef.componentInstance.level = this.mapRendererService.selectedLevel;
modalRef.result.then(() => {}).catch(() => {}).then(() => this.mapRendererService.drawPois());
modalRef.result.then(() => {}).catch(() => {}).then(() => {
this.mapRendererService.drawPois();
});
}
addTag() {
......@@ -81,6 +83,8 @@ export class MapViewComponent implements AfterViewInit {
modalRef.componentInstance.long = this.mapRendererService.getContextLong();
modalRef.componentInstance.lat = this.mapRendererService.getContextLat();
modalRef.componentInstance.level = this.mapRendererService.selectedLevel.level;
modalRef.result.then(() => {}).catch(() => {}).then(() => this.mapRendererService.drawTags());
modalRef.result.then(() => {}).catch(() => {}).then(() => {
this.mapRendererService.drawTags();
});
}
}
......@@ -105,6 +105,7 @@ export class MapRendererService {
}
async drawPois(): Promise<void> {
this.removePois();
this.poisShown = true;
try {
......@@ -123,6 +124,7 @@ export class MapRendererService {
}
async drawTags(): Promise<void> {
this.removeTags();
this.tagsShown = true;
try {
......@@ -185,9 +187,7 @@ export class MapRendererService {
});
this.applyPolygons();
this.removePois();
this.drawPois();
this.removeTags();
this.drawTags();
}
......@@ -195,8 +195,6 @@ export class MapRendererService {
if (this.isBuildingClicked()) {
this.drawBuildings();
}
this.removePois();
this.removeTags();
this.drawPois();
this.drawTags();
}
......@@ -255,7 +253,6 @@ export class MapRendererService {
const modalRef = this.modalService.open(AddEditPoiComponent, {size: 'lg'});
modalRef.componentInstance.id = id;
modalRef.result.then(() => {
this.removePois();
this.drawPois();
});
}
......@@ -264,7 +261,6 @@ export class MapRendererService {
const modalRef = this.modalService.open(AddEditTagComponent, {size: 'lg'});
modalRef.componentInstance.id = id;
modalRef.result.then(() => {
this.removeTags();
this.drawTags();
});
}
......
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