Browse Source

trip animation update fix

pull/2808/head
Artem Halushko 6 years ago
parent
commit
690784c0e6
  1. 17
      ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts

17
ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts

@ -140,7 +140,7 @@ export class TripAnimationComponent implements OnInit, AfterViewInit {
} }
} }
this.calcLabel(); this.calcLabel();
this.calcTooltip(); this.calcTooltip(currentPosition.find(position => position.entityName === this.activeTrip.entityName));
if (this.mapWidget) { if (this.mapWidget) {
this.mapWidget.map.updatePolylines(this.interpolatedTimeData.map(ds => _.values(ds)), this.activeTrip); this.mapWidget.map.updatePolylines(this.interpolatedTimeData.map(ds => _.values(ds)), this.activeTrip);
if (this.settings.showPolygon) { if (this.settings.showPolygon) {
@ -175,19 +175,14 @@ export class TripAnimationComponent implements OnInit, AfterViewInit {
} }
} }
calcTooltip = (point?: FormattedData, setTooltip = true) => { calcTooltip = (point?: FormattedData) => {
if (!point) { const data = point ? point : this.activeTrip;
point = this.activeTrip;
}
const data = this.activeTrip;
const tooltipPattern: string = this.settings.useTooltipFunction ? const tooltipPattern: string = this.settings.useTooltipFunction ?
safeExecute(this.settings.tooolTipFunction, [data, this.historicalData, point.dsIndex]) : this.settings.tooltipPattern; safeExecute(this.settings.tooolTipFunction, [data, this.historicalData, point.dsIndex]) : this.settings.tooltipPattern;
const tooltipText = parseWithTranslation.parseTemplate(tooltipPattern, data, true); const tooltipText = parseWithTranslation.parseTemplate(tooltipPattern, data, true);
if (setTooltip) { this.mainTooltip = this.sanitizer.sanitize(
this.mainTooltip = this.sanitizer.sanitize( SecurityContext.HTML, tooltipText);
SecurityContext.HTML, tooltipText); this.cd.detectChanges();
this.cd.detectChanges();
}
this.activeTrip = point; this.activeTrip = point;
return tooltipText; return tooltipText;
} }

Loading…
Cancel
Save