From 89a0fb13a5902db784c47be3a983427d13f9821e Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Thu, 19 Aug 2021 15:25:22 +0200
Subject: [PATCH] AW-2757

---
 .../components/aol/layer-values/layer-values.component.html     | 2 +-
 projects/common-map/src/fm-map/effects/map.effects.ts           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.html b/projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.html
index 58cdfca..726d7e7 100644
--- a/projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.html
+++ b/projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.html
@@ -7,7 +7,7 @@
                <li class="border-top pt-1 pb-1 value" *ngFor="let layerValue of layers">
                    <div>{{layerValue.layerName}}</div>
                    <div>{{layerValue.date|date}}</div>
-                   <div><span class="mr-1">{{layerValue.quantity}}</span> <span class="mr-1 font-weight-bold">{{layerValue.value}}</span><span>{{layerValue.unit}}</span></div>
+                   <div><span *ngIf="layerValue.quantity"><span class="mr-1">{{layerValue.quantity}}</span> </span><span class="mr-1 font-weight-bold">{{layerValue.value}}</span><span>{{layerValue.unit}}</span></div>
                </li>
            </ul>
            <ng-template #no_data>
diff --git a/projects/common-map/src/fm-map/effects/map.effects.ts b/projects/common-map/src/fm-map/effects/map.effects.ts
index ee7622a..ff2290f 100644
--- a/projects/common-map/src/fm-map/effects/map.effects.ts
+++ b/projects/common-map/src/fm-map/effects/map.effects.ts
@@ -317,7 +317,7 @@ export class MapEffects {
           if(v !== null) {
             if(l.renderer && l.renderer.colorMap && l.renderer.colorMap.colormapType == "manual") {
               l.renderer.colorMap.entries.forEach((e) => {
-                  if(e.value == v) {
+                  if(e.value == v && e.label) {
                     v=e.label;
                     return;
                   }