From c953829667d568c18bba81e89a0ce4dce60a7ba9 Mon Sep 17 00:00:00 2001
From: BRKP5614 <sandrine.gateau@orange.com>
Date: Fri, 25 Jun 2021 15:52:15 +0200
Subject: [PATCH] *** Version 2.6.3 ***

---
 package-lock.json                                    | 6 +++---
 package.json                                         | 2 +-
 src/iotMapManager/css/map.css                        | 2 +-
 src/iotMapManager/css/markers.css                    | 2 +-
 src/iotMapManager/css/popup.css                      | 2 +-
 src/iotMapManager/css/tabs.css                       | 2 +-
 src/iotMapManager/import_png.d.ts                    | 2 +-
 src/iotMapManager/index.ts                           | 2 +-
 src/iotMapManager/iot-map-manager.css                | 2 +-
 src/iotMapManager/package.json                       | 2 +-
 src/iotMapManager/readme.md                          | 3 ++-
 src/iotMapManager/src/iot-map-area-manager.ts        | 2 +-
 src/iotMapManager/src/iot-map-area.ts                | 2 +-
 src/iotMapManager/src/iot-map-cluster-manager.ts     | 2 +-
 src/iotMapManager/src/iot-map-cluster.ts             | 2 +-
 src/iotMapManager/src/iot-map-common-svg.ts          | 2 +-
 src/iotMapManager/src/iot-map-config.ts              | 2 +-
 src/iotMapManager/src/iot-map-icons.ts               | 2 +-
 src/iotMapManager/src/iot-map-manager.ts             | 2 +-
 src/iotMapManager/src/iot-map-marker-manager.ts      | 7 +++++--
 src/iotMapManager/src/iot-map-marker.ts              | 2 +-
 src/iotMapManager/src/iot-map-path-manager.ts        | 2 +-
 src/iotMapManager/src/iot-map-path.ts                | 2 +-
 src/iotMapManager/src/iot-map-types.ts               | 2 +-
 src/iotMapManager/src/iot-map-user-marker-manager.ts | 2 +-
 src/iotMapManager/src/iot-map-user-marker.ts         | 2 +-
 26 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9b53723a..f3cb1efc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10095,9 +10095,9 @@
       }
     },
     "iotmapmanager": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/iotmapmanager/-/iotmapmanager-2.6.2.tgz",
-      "integrity": "sha512-vrQv6YQzLpFd8oyvgja/AJmT1FIOUSfhvK3hllP/QCxihM5v7KsmUO04QuD+9SDh3FcBZxt9R5NGimdM38asqw==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/iotmapmanager/-/iotmapmanager-2.6.3.tgz",
+      "integrity": "sha512-L5okGnnoDyVI531esegewNpie/LN8+Rj/tA7vCBUDEXP4ykEuEH4A3oxU3djj+b+EupPGgOgbEF2BKqms6ihbA==",
       "requires": {
         "@types/leaflet": "^1.5.19",
         "@types/leaflet.markercluster": "^1.4.3",
diff --git a/package.json b/package.json
index 6cada3ed..c495d356 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "@types/leaflet": "^1.5.19",
     "@types/leaflet.markercluster": "^1.4.3",
     "boosted": "^4.6.0",
-    "iotmapmanager": "^2.6.2",
+    "iotmapmanager": "^2.6.3",
     "leaflet": "^1.6.0",
     "leaflet.markercluster": "^1.4.1",
     "zone.js": "^0.11.3"
diff --git a/src/iotMapManager/css/map.css b/src/iotMapManager/css/map.css
index 1527574c..93df6bb6 100644
--- a/src/iotMapManager/css/map.css
+++ b/src/iotMapManager/css/map.css
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/css/markers.css b/src/iotMapManager/css/markers.css
index f5f56ef8..722f5096 100644
--- a/src/iotMapManager/css/markers.css
+++ b/src/iotMapManager/css/markers.css
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/css/popup.css b/src/iotMapManager/css/popup.css
index 6d0f6db9..1dc372ca 100644
--- a/src/iotMapManager/css/popup.css
+++ b/src/iotMapManager/css/popup.css
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/css/tabs.css b/src/iotMapManager/css/tabs.css
index ea1f1b95..5d63d335 100644
--- a/src/iotMapManager/css/tabs.css
+++ b/src/iotMapManager/css/tabs.css
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/import_png.d.ts b/src/iotMapManager/import_png.d.ts
index 2049e003..21dc6277 100644
--- a/src/iotMapManager/import_png.d.ts
+++ b/src/iotMapManager/import_png.d.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/index.ts b/src/iotMapManager/index.ts
index 7d791dde..132190b2 100644
--- a/src/iotMapManager/index.ts
+++ b/src/iotMapManager/index.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/iot-map-manager.css b/src/iotMapManager/iot-map-manager.css
index 149adecc..62829148 100644
--- a/src/iotMapManager/iot-map-manager.css
+++ b/src/iotMapManager/iot-map-manager.css
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/package.json b/src/iotMapManager/package.json
index 1654a6aa..bca5d12d 100644
--- a/src/iotMapManager/package.json
+++ b/src/iotMapManager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iotmapmanager",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "Manage markers, clusters, user marker or paths on IotMaps",
   "main": "dist/index.js",
   "types": "lib/index.d.ts",
diff --git a/src/iotMapManager/readme.md b/src/iotMapManager/readme.md
index f20eb116..e1f43dc1 100644
--- a/src/iotMapManager/readme.md
+++ b/src/iotMapManager/readme.md
@@ -1,4 +1,4 @@
-# IotMapManager V2.6.2
+# IotMapManager V2.6.3
 
 This library provides management of markers dedicated to projects using mapping.
 ## use
@@ -250,6 +250,7 @@ interface Inner {
 }
 ```
 
+Note: the icon has priority over the label. To update a marker having an icon by a label, set `icon` to `null` and define a label.
 
 
 
diff --git a/src/iotMapManager/src/iot-map-area-manager.ts b/src/iotMapManager/src/iot-map-area-manager.ts
index 8a9ce711..c14bba1f 100644
--- a/src/iotMapManager/src/iot-map-area-manager.ts
+++ b/src/iotMapManager/src/iot-map-area-manager.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-area.ts b/src/iotMapManager/src/iot-map-area.ts
index 7ab713cd..99795a59 100644
--- a/src/iotMapManager/src/iot-map-area.ts
+++ b/src/iotMapManager/src/iot-map-area.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-cluster-manager.ts b/src/iotMapManager/src/iot-map-cluster-manager.ts
index 273668cd..960ae697 100644
--- a/src/iotMapManager/src/iot-map-cluster-manager.ts
+++ b/src/iotMapManager/src/iot-map-cluster-manager.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-cluster.ts b/src/iotMapManager/src/iot-map-cluster.ts
index 0159e741..1842e8d4 100644
--- a/src/iotMapManager/src/iot-map-cluster.ts
+++ b/src/iotMapManager/src/iot-map-cluster.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-common-svg.ts b/src/iotMapManager/src/iot-map-common-svg.ts
index d49cd2b2..a5733280 100644
--- a/src/iotMapManager/src/iot-map-common-svg.ts
+++ b/src/iotMapManager/src/iot-map-common-svg.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name: IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-config.ts b/src/iotMapManager/src/iot-map-config.ts
index a5e377d2..75763889 100644
--- a/src/iotMapManager/src/iot-map-config.ts
+++ b/src/iotMapManager/src/iot-map-config.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-icons.ts b/src/iotMapManager/src/iot-map-icons.ts
index c1de91ed..6c167737 100644
--- a/src/iotMapManager/src/iot-map-icons.ts
+++ b/src/iotMapManager/src/iot-map-icons.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-manager.ts b/src/iotMapManager/src/iot-map-manager.ts
index 82f9d287..11464f75 100644
--- a/src/iotMapManager/src/iot-map-manager.ts
+++ b/src/iotMapManager/src/iot-map-manager.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-marker-manager.ts b/src/iotMapManager/src/iot-map-marker-manager.ts
index aed6c94b..d7fe6478 100644
--- a/src/iotMapManager/src/iot-map-marker-manager.ts
+++ b/src/iotMapManager/src/iot-map-marker-manager.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
@@ -154,10 +154,13 @@ export class IotMapMarkerManager {
 
       // inner modified
       if (params.inner !== undefined) {
+        if (params.inner.icon === null) { // cmd to remove icon
+          currentMarkerInfos.inner.icon = undefined
+        }
         currentMarkerInfos.inner = {
           color: params.inner?.color ?? currentMarkerInfos.inner?.color ?? this.config.markers.default.inner.color,
           icon: params.inner?.icon ?? currentMarkerInfos.inner?.icon,
-          label: (params.inner?.icon === undefined) ? (params.inner?.label ?? currentMarkerInfos.inner?.label) : undefined
+          label: params.inner?.label ?? currentMarkerInfos.inner?.label
         }
         htmlModificationNeeded = true
       }
diff --git a/src/iotMapManager/src/iot-map-marker.ts b/src/iotMapManager/src/iot-map-marker.ts
index d7135eef..f53bf83c 100644
--- a/src/iotMapManager/src/iot-map-marker.ts
+++ b/src/iotMapManager/src/iot-map-marker.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-path-manager.ts b/src/iotMapManager/src/iot-map-path-manager.ts
index fcbc1d39..4f2ee957 100644
--- a/src/iotMapManager/src/iot-map-path-manager.ts
+++ b/src/iotMapManager/src/iot-map-path-manager.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-path.ts b/src/iotMapManager/src/iot-map-path.ts
index c6555ea8..9217fcd8 100644
--- a/src/iotMapManager/src/iot-map-path.ts
+++ b/src/iotMapManager/src/iot-map-path.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-types.ts b/src/iotMapManager/src/iot-map-types.ts
index a6dec1fa..70337794 100644
--- a/src/iotMapManager/src/iot-map-types.ts
+++ b/src/iotMapManager/src/iot-map-types.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-user-marker-manager.ts b/src/iotMapManager/src/iot-map-user-marker-manager.ts
index 55ef1a0c..4cdf7db9 100644
--- a/src/iotMapManager/src/iot-map-user-marker-manager.ts
+++ b/src/iotMapManager/src/iot-map-user-marker-manager.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
diff --git a/src/iotMapManager/src/iot-map-user-marker.ts b/src/iotMapManager/src/iot-map-user-marker.ts
index 42dee201..2cb5796a 100644
--- a/src/iotMapManager/src/iot-map-user-marker.ts
+++ b/src/iotMapManager/src/iot-map-user-marker.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.2
+* Version: 2.6.3
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *