*** Version V2.5.1 ***

Orange-OpenSource · Jun 4, 2021 · f433602 · f433602
1 parent 5dfb598
commit f433602
Show file tree

Hide file tree

Showing 27 changed files with 45 additions and 45 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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.5.0",
+    "iotmapmanager": "^2.5.1",
     "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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

diff --git a/src/iotMapManager/css/markers.css b/src/iotMapManager/css/markers.css
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

diff --git a/src/iotMapManager/css/popup.css b/src/iotMapManager/css/popup.css
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

diff --git a/src/iotMapManager/css/tabs.css b/src/iotMapManager/css/tabs.css
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

diff --git a/src/iotMapManager/index.ts b/src/iotMapManager/index.ts
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

diff --git a/src/iotMapManager/package.json b/src/iotMapManager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iotmapmanager",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "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
@@ -1,4 +1,4 @@
-# IotMapManager V2.5.0
+# IotMapManager V2.5.1
 
 This library provides management of markers dedicated to projects using mapping.
 ## use

diff --git 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.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
@@ -158,7 +158,6 @@ export class IotMapClusterManager {
           // add marker to new layer
           this.map.getLayer(currentClusterInfos.layer).addLayer(currentClusterObject)
         }
-
       }
     }
   }

diff --git 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.5.0
+* Version: 2.5.1
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
@@ -32,7 +32,7 @@ export class IotMapCluster extends IotMapDisplay {
    * @param config - configuration to use to display cluster
    */
   constructor (cluster: IotCluster, map: IotMapManager, config: IotMapConfig) {
-    super(cluster.location, { icon: getManualClusterIcon(cluster, config, false, false) })
+    super(cluster.location, { icon: getManualClusterIcon(cluster, config) })
     this.data = cluster
     this.map = map
     this.config = config
@@ -55,7 +55,7 @@ export class IotMapCluster extends IotMapDisplay {
    */
   public select (selected: boolean): void {
     this.selected = selected
-    this.setIcon(getManualClusterIcon(this.data, this.config, this.selected, false))
+    this.setIcon(getManualClusterIcon(this.data, this.config))
     this.setZIndexOffset((selected) ? 100 : 0)
   }
 
@@ -78,7 +78,7 @@ export class IotMapCluster extends IotMapDisplay {
    * Force cluster redrawing
    */
   public redraw (): void {
-    this.setIcon(getManualClusterIcon(this.data, this.config, this.selected, false))
+    this.setIcon(getManualClusterIcon(this.data, this.config))
   }
 
   /**

diff --git 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.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *
@@ -51,7 +51,7 @@ export function getMarkerIcon (marker: IotMarker, config: IotMapConfig, selected
  *
  * @remarks use this function for manual clustering purpose
  */
-export function getManualClusterIcon (cluster: IotCluster, config: IotMapConfig, selected = false, automatic: boolean): L.DivIcon {
+export function getManualClusterIcon (cluster: IotCluster, config: IotMapConfig): L.DivIcon {
   const svgGauge = computeClusterGauge(cluster, config)
 
   // shadow
@@ -163,7 +163,7 @@ export function getManualClusterIcon (cluster: IotCluster, config: IotMapConfig,
  */
 export function getAutomaticClusterIcon (leafletCluster: L.MarkerCluster, config: IotMapConfig): L.DivIcon {
   const iotCluster: IotCluster = leafletClusterToIotCluster(leafletCluster, config)
-  return getManualClusterIcon(iotCluster, config, false, true) // automatic cluster
+  return getManualClusterIcon(iotCluster, config) // automatic cluster
 }
 
 /**

diff --git 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.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

diff --git 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.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * 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
@@ -1,6 +1,6 @@
 /*
 * Software Name : IotMapManager
-* Version: 2.5.0
+* Version: 2.5.1
 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange
 * SPDX-License-Identifier: MIT
 *

diff --git a/src/map/map.component.ts b/src/map/map.component.ts
@@ -60,7 +60,7 @@ export class MapComponent implements AfterViewInit {
         lng: 4.875
       },
       popup: {
-        title: 'Ecole Jean Rostand : ',
+        title: 'Ecole Jean Rostand : <a href="http://www.google.fr"> test </a>',
         body: '<a href="https://bv.ac-grenoble.fr/carteforpub/uai/0260969M">ici</a>'
       },
       template: 'square',
@@ -317,14 +317,14 @@ export class MapComponent implements AfterViewInit {
 
   clustersList: IotCluster[] = [
     {
-      id: 'cluster 3',
+      id: 'cluster 1',
       location: {
         lat: 44.882,
         lng: 4.895
       },
       contentLabel: 'interfaces',
       colNumber: 2,
-      childCount: 1230,
+      childCount: 4860,
       aggregation: [
         {
           singularState: 'registered',
@@ -376,7 +376,7 @@ export class MapComponent implements AfterViewInit {
         }]
     },
     {
-      id: 'interfaces',
+      id: 'cluster 2',
       location: {
         lat: 44.882,
         lng: 4.89
@@ -436,7 +436,7 @@ export class MapComponent implements AfterViewInit {
         }]
     },
     {
-      id: 'entertainments',
+      id: 'cluster 3',
       location: {
         lat: 44.882,
         lng: 4.885
@@ -647,7 +647,7 @@ export class MapComponent implements AfterViewInit {
           content: '<img width=16 src="../assets/icons/check_your_balance.svg">'
         },
         'autos': {
-          content: 'Cars',
+          content: '<span class="iotmap-icons-4g"></span>',
           type: TabType.large
         }
       },
@@ -675,11 +675,12 @@ export class MapComponent implements AfterViewInit {
 
     this.iotMapAreaManager.addArea(this.zone)
 
-    setTimeout(() => { this.iotMapClusterManager.updateCluster('entertainments', { layer: 'meters' }) }, 3000)
-    setTimeout(() => { this.iotMapClusterManager.updateCluster('services', { layer: 'autos' }) }, 3000)
+    setTimeout(() => { this.iotMapClusterManager.redrawAll() }, 3000)
+    setTimeout(() => { this.iotMapClusterManager.updateCluster('cluster 1', { layer: 'autos' }) }, 6000)
+    setTimeout(() => { this.iotMapClusterManager.updateCluster('cluster 3', { layer: 'etablissements' }) }, 6000)
 
-    setTimeout(() => { this.iotMapMarkerManager.updateMarker('s1', { shape: { accuracy: 600 } }) }, 5000)
-    // setTimeout(() => { this.iotMapMarkerManager.removeMarker('s1')}, 5000)
-    setTimeout(() => { this.iotMapMarkerManager.updateMarker('s5', { shape: { accuracy: undefined } }) }, 5000)
+    // setTimeout(() => { this.iotMapMarkerManager.updateMarker('s1', { shape: { accuracy: 600 } }) }, 5000)
+    // // setTimeout(() => { this.iotMapMarkerManager.removeMarker('s1')}, 5000)
+    // setTimeout(() => { this.iotMapMarkerManager.updateMarker('s5', { shape: { accuracy: undefined } }) }, 5000)
   }
 }