From fc40047a5e1b20e1074b490276b7546cba161211 Mon Sep 17 00:00:00 2001
From: ponvalavan annamalai <ponv@yahoo.com>
Date: Tue, 26 Jan 2021 18:01:55 +0000
Subject: [PATCH] Dynamic color for data points

---
 .../modules/home/components/widget/lib/maps/leaflet-map.ts | 4 ++--
 .../modules/home/components/widget/lib/maps/map-models.ts  | 2 +-
 .../modules/home/components/widget/lib/maps/map-widget2.ts | 2 +-
 .../widget/trip-animation/trip-animation.component.ts      | 7 ++-----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
index ea3a24e0c5..d9f8b055c8 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
@@ -626,10 +626,10 @@ export default abstract class LeafletMap {
       }
       this.points = new FeatureGroup();
     }
+	let pointColor = this.options.pointColor;
     for (const pointsList of pointsData) {
       pointsList.filter(pdata => !!this.convertPosition(pdata)).forEach(data => {
-		let pointColor = this.options.pointColor;
-		if (this.options.useColorPointFunction) {
+        if (this.options.useColorPointFunction) {
           pointColor = safeExecute(this.options.colorPointFunction,[data, pointsData, data.dsIndex]);
         }
         const point = L.circleMarker(this.convertPosition(data), {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-models.ts
index 664ba2ec6d..d5c7be4497 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-models.ts
@@ -201,7 +201,7 @@ export type TripAnimationSettings = {
     pointAsAnchorFunction: GenericFunction;
     tooltipFunction: GenericFunction;
     labelFunction: GenericFunction;
-	useColorPointFunction: boolean;
+	   useColorPointFunction: boolean;
     colorPointFunction: GenericFunction;
 };
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
index c543593db5..ed83323d6c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
@@ -301,7 +301,7 @@ export class MapWidgetController implements MapWidgetInterface {
             labelFunction: parseFunction(settings.labelFunction, functionParams),
             tooltipFunction: parseFunction(settings.tooltipFunction, functionParams),
             colorFunction: parseFunction(settings.colorFunction, functionParams),
-			colorPointFunction: parseFunction(settings.colorPointFunction, functionParams),
+			     colorPointFunction: parseFunction(settings.colorPointFunction, functionParams),
             polygonColorFunction: parseFunction(settings.polygonColorFunction, functionParams),
             polygonTooltipFunction: parseFunction(settings.polygonTooltipFunction, functionParams),
             markerImageFunction: parseFunction(settings.markerImageFunction, ['data', 'images', 'dsData', 'dsIndex']),
diff --git a/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts b/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts
index ab616a144c..319a1139ed 100644
--- a/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts
@@ -112,7 +112,7 @@ export class TripAnimationComponent implements OnInit, AfterViewInit, OnDestroy
     this.settings.pointAsAnchorFunction = parseFunction(this.settings.pointAsAnchorFunction, ['data', 'dsData', 'dsIndex']);
     this.settings.tooltipFunction = parseFunction(this.settings.tooltipFunction, ['data', 'dsData', 'dsIndex']);
     this.settings.labelFunction = parseFunction(this.settings.labelFunction, ['data', 'dsData', 'dsIndex']);
-	this.settings.colorPointFunction = parseFunction(this.settings.colorPointFunction, ['data', 'dsData', 'dsIndex']);
+	  this.settings.colorPointFunction = parseFunction(this.settings.colorPointFunction, ['data', 'dsData', 'dsIndex']);
     this.normalizationStep = this.settings.normalizationStep;
     const subscription = this.ctx.defaultSubscription;
     subscription.callbacks.onDataUpdated = () => {
@@ -179,11 +179,8 @@ export class TripAnimationComponent implements OnInit, AfterViewInit, OnDestroy
       if (this.settings.showPolygon) {
         this.mapWidget.map.updatePolygons(this.interpolatedTimeData);
       }
-      if (this.settings.showPoints) {
+      if (this.settings.showPoints || this.settings.useColorPointFunction) {
         this.mapWidget.map.updatePoints(formattedInterpolatedTimeData.map(ds => _.union(ds)), this.calcTooltip);
-      }
-	  if (this.settings.useColorPointFunction) {
-        this.mapWidget.map.updatePoints(_.values(_.union(this.interpolatedTimeData)[0]), this.calcTooltip);
       }
       this.mapWidget.map.updateMarkers(currentPosition, true, (trip) => {
         this.activeTrip = trip;