*** Version 2.6.5 ***

package.json

@@ -59,7 +59,7 @@
     "@types/leaflet": "^1.5.19",
     "@types/leaflet.markercluster": "^1.4.3",
     "boosted": "^4.6.0",
-    "iotmapmanager": "^2.6.4",
+    "iotmapmanager": "^2.6.5",
     "leaflet": "^1.6.0",
     "leaflet.markercluster": "^1.4.1",
     "zone.js": "^0.11.3"

src/iotMapManager/css/map.css

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/css/markers.css

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/css/popup.css

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/css/tabs.css

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/import_png.d.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/index.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/iot-map-manager.css

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iotmapmanager",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "description": "Manage markers, clusters, user marker or paths on IotMaps",
   "main": "dist/index.js",
   "types": "lib/index.d.ts",

src/iotMapManager/readme.md

@@ -1,4 +1,4 @@
-# IotMapManager V2.6.4
+# IotMapManager V2.6.5
 
 This library provides management of markers dedicated to projects using mapping.
 ## use

src/iotMapManager/src/iot-map-area-manager.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/src/iot-map-area.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/src/iot-map-cluster-manager.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/src/iot-map-cluster.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
@@ -95,8 +95,4 @@ export class IotMapCluster extends IotMapDisplay {
       this.map.getIotMap().flyTo(this.getData().location, (zoomLevel !== 18 ? zoomLevel + 1 : 18))
     }
   }
-
-  public isCluster (): boolean {
-    return true
-  }
 }

src/iotMapManager/src/iot-map-common-svg.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name: IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/src/iot-map-config.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/src/iot-map-icons.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/src/iot-map-manager.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
@@ -250,20 +250,15 @@ export class IotMapManager {
    */
   private onElementClick (event) {
     const element: IotMapDisplay = event.layer
-    if (this.config.map.externalClustering === true) {
-      if (element.isCluster()) {
-        element.elementClicked() // inform cluster to open
-      }
+
+    if (this.selectedElement === element) {
+      this.unselectElement(element)
     } else {
-      if (this.selectedElement === element) {
-        this.unselectElement(element)
-      } else {
-        this.selectElement(element)
-        if (element.hasPopup()) {
-          this.shiftMap(element.getData().location)
-        }
-      }
+      this.selectElement(element)
     }
+
+    element.elementClicked() // inform cluster to open
+    element.shiftMap()
   }
 
   /**
@@ -272,7 +267,6 @@ export class IotMapManager {
    */
   private onClusterMouseOver (event) {
     event.layer.setZIndexOffset(100)
-    this.shiftMap(event.latlng)
   }
 
   /**
@@ -289,10 +283,6 @@ export class IotMapManager {
    */
   private onElementMouseOver (event) {
     event.layer.setZIndexOffset(100)
-
-    if (event.layer.isCluster()) {
-      this.shiftMap(event.layer.getData().location)
-    }
   }
 
   /**
@@ -353,36 +343,4 @@ export class IotMapManager {
       elt.updateAccuracyDisplay(this.currentDisplayedLayers, this.accuracyDisplayed)
     }
   }
-
-  private shiftMap (currentPos: L.LatLngExpression): void {
-    const eltPos = this.map.latLngToLayerPoint(currentPos)
-    const mapBounds = this.map.getBounds()
-    const northEastPos = this.map.latLngToLayerPoint(mapBounds.getNorthEast())
-    const southWestPos = this.map.latLngToLayerPoint(mapBounds.getSouthWest())
-
-    // top
-    if (eltPos.y - northEastPos.y < 200) {
-      const shift = 200 - (eltPos.y - northEastPos.y)
-      northEastPos.y -= shift
-      southWestPos.y -= shift
-    }
-
-    // left
-    if (eltPos.x - southWestPos.x < 150) {
-      const shift = 150 - (eltPos.x - southWestPos.x)
-      northEastPos.x -= shift
-      southWestPos.x -= shift
-    }
-
-    // bottom - no need to shift
-    // right
-    if (northEastPos.x - eltPos.x < 150) {
-      const shift = 150 - (northEastPos.x - eltPos.x)
-      northEastPos.x += shift
-      southWestPos.x += shift
-    }
-
-    const newMapBounds = L.latLngBounds(this.map.layerPointToLatLng(southWestPos), this.map.layerPointToLatLng(northEastPos))
-    this.map.flyToBounds(newMapBounds)
-  }
 }

src/iotMapManager/src/iot-map-marker-manager.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/src/iot-map-marker.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
@@ -115,11 +115,37 @@ export class IotMapMarker extends IotMapDisplay {
     }
   }
 
-  public isCluster (): boolean {
-    return false
-  }
+  public shiftMap (): void {
+    if (this.selected && this.data.popup !== undefined) {
+      const eltPos = this.map.getIotMap().latLngToLayerPoint(this.data.location)
+      const mapBounds = this.map.getIotMap().getBounds()
+      const northEastPos = this.map.getIotMap().latLngToLayerPoint(mapBounds.getNorthEast())
+      const southWestPos = this.map.getIotMap().latLngToLayerPoint(mapBounds.getSouthWest())
+
+      // top
+      if (eltPos.y - northEastPos.y < 200) {
+        const shift = 200 - (eltPos.y - northEastPos.y)
+        northEastPos.y -= shift
+        southWestPos.y -= shift
+      }
+
+      // left
+      if (eltPos.x - southWestPos.x < 150) {
+        const shift = 150 - (eltPos.x - southWestPos.x)
+        northEastPos.x -= shift
+        southWestPos.x -= shift
+      }
 
-  public hasPopup (): boolean {
-    return this.data.popup !== undefined
+      // bottom - no need to shift
+      // right
+      if (northEastPos.x - eltPos.x < 150) {
+        const shift = 150 - (northEastPos.x - eltPos.x)
+        northEastPos.x += shift
+        southWestPos.x += shift
+      }
+
+      const newMapBounds = L.latLngBounds(this.map.getIotMap().layerPointToLatLng(southWestPos), this.map.getIotMap().layerPointToLatLng(northEastPos))
+      this.map.getIotMap().flyToBounds(newMapBounds)
+    }
   }
 }

src/iotMapManager/src/iot-map-path-manager.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/src/iot-map-path.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/src/iot-map-types.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
@@ -48,16 +48,14 @@ export abstract class IotMapDisplay extends L.Marker {
     // By default: Nothing to do
   }
 
+  // By default: Nothing to do
   elementClicked (): void {
-    // By default: Nothing to do
   }
 
-  hasPopup (): boolean {
-    return false
+  shiftMap (): void {
+    // By default: Nothing to do
   }
 
-  abstract isCluster (): boolean
-
   updateAccuracyDisplay (selectedLayers: string[], display: boolean): void { // eslint-disable-line @typescript-eslint/no-unused-vars
     // By default: Nothing to do
   }

src/iotMapManager/src/iot-map-user-marker-manager.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

src/iotMapManager/src/iot-map-user-marker.ts

@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.6.4
+* Version: 2.6.5
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
@@ -68,10 +68,6 @@ export class IotMapUserMarker extends IotMapDisplay {
     this.accuracyCircle.setLatLng(newLatLng)
   }
 
-  public isCluster (): boolean {
-    return false
-  }
-
   public updateAccuracyDisplay (selectedLayers: string[], display: boolean): void {
     this.layerDisplayed = selectedLayers.includes(this.config.userMarker.layerName)
     this.accuracityDisplayed = display