diff --git a/package-lock.json b/package-lock.json index 8197c931..760b797d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10095,9 +10095,9 @@ } }, "iotmapmanager": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/iotmapmanager/-/iotmapmanager-2.4.0.tgz", - "integrity": "sha512-SP1gVBdgzEdMXbDg4FnN/Xr4P2IkWdKb60zBhCpnNPbbOD5R2Bqm+CR8ykM2wLp8aTZWcSdU85qtjBUj2tVoPQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/iotmapmanager/-/iotmapmanager-2.5.0.tgz", + "integrity": "sha512-kGURPcWwhLRIuAM6mB64nkk0Mt6LOB2OUn/YGZTjGi1PPkreBUZ2NY6KTzIIYm+zcRUvgWnmowuwqqAOJP36DA==", "requires": { "@types/leaflet": "^1.5.19", "@types/leaflet.markercluster": "^1.4.3", diff --git a/package.json b/package.json index 41133b6a..1bd8d939 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.4.0", + "iotmapmanager": "^2.5.0", "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 3ee29b81..4e80499a 100644 --- a/src/iotMapManager/css/map.css +++ b/src/iotMapManager/css/map.css @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.4.0 +* Version: 2.5.0 * 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 eba149aa..6a524d72 100644 --- a/src/iotMapManager/css/markers.css +++ b/src/iotMapManager/css/markers.css @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.4.0 +* Version: 2.5.0 * 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 f6033009..462ca7d5 100644 --- a/src/iotMapManager/css/popup.css +++ b/src/iotMapManager/css/popup.css @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.4.0 +* Version: 2.5.0 * 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 b861e6b7..ac02405b 100644 --- a/src/iotMapManager/css/tabs.css +++ b/src/iotMapManager/css/tabs.css @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.4.0 +* Version: 2.5.0 * 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 0eebbae7..bfe45049 100644 --- a/src/iotMapManager/import_png.d.ts +++ b/src/iotMapManager/import_png.d.ts @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.4.0 +* Version: 2.5.0 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange * SPDX-License-Identifier: MIT * diff --git a/src/iotMapManager/index.ts b/src/iotMapManager/index.ts index e7e187f3..95d3d43b 100644 --- a/src/iotMapManager/index.ts +++ b/src/iotMapManager/index.ts @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.4.0 +* Version: 2.5.0 * 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 25d4e13a..ac9a89a0 100644 --- a/src/iotMapManager/iot-map-manager.css +++ b/src/iotMapManager/iot-map-manager.css @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.4.0 +* Version: 2.5.0 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange * SPDX-License-Identifier: MIT * diff --git a/src/iotMapManager/package.json b/src/iotMapManager/package.json index f8e7ff14..074e03fd 100644 --- a/src/iotMapManager/package.json +++ b/src/iotMapManager/package.json @@ -1,6 +1,6 @@ { "name": "iotmapmanager", - "version": "2.4.0", + "version": "2.5.0", "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 7f56c155..4d087883 100644 --- a/src/iotMapManager/readme.md +++ b/src/iotMapManager/readme.md @@ -1,4 +1,4 @@ -# IotMapManager V2.4.0 +# IotMapManager V2.5.0 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 index e5bef1cf..9cfb3161 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.4.0 +* Version: 2.5.0 * 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 872be05c..27508daa 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.4.0 +* Version: 2.5.0 * 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 1bc9b5f8..37e3893d 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.4.0 +* Version: 2.5.0 * 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 1ac5fdfd..68b1406b 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.4.0 +* Version: 2.5.0 * 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 8dda0013..f69939d1 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.4.0 +* Version: 2.5.0 * 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 a33261c6..3d9fa81c 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.4.0 +* Version: 2.5.0 * 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 9334c502..8dbc466d 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.4.0 +* Version: 2.5.0 * 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 3f8b11fb..17553899 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.4.0 +* Version: 2.5.0 * 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 7eeb8e44..97aa3584 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.4.0 +* Version: 2.5.0 * 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 index e5d2a2ba..1b395dde 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.4.0 +* Version: 2.5.0 * 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 a9d3a616..a91faf10 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.4.0 +* Version: 2.5.0 * 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 aa02ac82..78e97fc2 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.4.0 +* Version: 2.5.0 * 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 a79b874c..062628c6 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.4.0 +* Version: 2.5.0 * 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 8100d4b6..bc4553c5 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.4.0 +* Version: 2.5.0 * 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 87a33748..5afa9a32 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.4.0 +* Version: 2.5.0 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange * SPDX-License-Identifier: MIT * diff --git a/src/map/map.component.ts b/src/map/map.component.ts index 6cb61aaf..31252784 100644 --- a/src/map/map.component.ts +++ b/src/map/map.component.ts @@ -316,6 +316,65 @@ export class MapComponent implements AfterViewInit { }]; clustersList: IotCluster[] = [ + { + id: 'cluster 3', + location: { + lat: 44.882, + lng: 4.895 + }, + contentLabel: 'interfaces', + colNumber: 2, + childCount: 1230, + aggregation: [ + { + singularState: 'registered', + pluralState: 'registered', + count: 150, + color: '#527EDB', + bullet: ' ◯ ' + }, + { + singularState: 'initializing', + pluralState: 'initializing', + count: 150, + color: '#527EDB', + bullet: ' ◎ ' + }, + { + singularState: 'initialized', + pluralState: 'initialized', + bullet: ' ⦿ ', + count: 330, + color: '#527EDB' + }, + { + singularState: 'activated', + pluralState: 'activated', + count: 300, + color: '#32C832', + url: 'http://www.orange.fr/fdsfsdf', + urlTarget: '_blank' + }, + { + singularState: 'reactivated', + pluralState: 'reactivated', + count: 100, + color: '#32C832', + bullet: '' + }, + { + singularState: 'error', + pluralState: 'errors', + count: 100, + color: '#CD3C14' + }, + { + singularState: 'deactivated', + pluralState: 'deactivated', + count: 100, + color: '#CCCCCC' + }] + }, { id: 'interfaces', location: { @@ -325,19 +384,19 @@ export class MapComponent implements AfterViewInit { // layer: 'autos', contentLabel: 'interfaces', colNumber: 2, - childCount: 100, + childCount: 123000, aggregation: [ { singularState: 'registered', pluralState: 'registered', - count: 15, + count: 18000, color: '#527EDB', bullet: ' ◯ ' }, { singularState: 'initializing', pluralState: 'initializing', - count: 15, + count: 15000, color: '#527EDB', bullet: ' ◎ ' }, @@ -345,13 +404,13 @@ export class MapComponent implements AfterViewInit { singularState: 'initialized', pluralState: 'initialized', bullet: ' ⦿ ', - count: 10, + count: 33000, color: '#527EDB' }, { singularState: 'activated', pluralState: 'activated', - count: 30, + count: 30000, color: '#32C832', url: 'http://www.orange.fr/fdsfsdf', urlTarget: '_blank' @@ -359,20 +418,20 @@ export class MapComponent implements AfterViewInit { { singularState: 'reactivated', pluralState: 'reactivated', - count: 10, + count: 10000, color: '#32C832', bullet: '' }, { singularState: 'error', pluralState: 'errors', - count: 10, + count: 10000, color: '#CD3C14' }, { singularState: 'deactivated', pluralState: 'deactivated', - count: 10, + count: 10000, color: '#CCCCCC' }] }, @@ -384,34 +443,55 @@ export class MapComponent implements AfterViewInit { }, layer: 'vehicles', contentLabel: 'Entertainment', - childCount: 60, - colNumber: 2, + childCount: 12000, aggregation: [ { - singularState: 'food and drink', - pluralState: 'food and drink', - count: 15, - color: '#467e74', - bullet: '' + singularState: 'registered', + pluralState: 'registered', + count: 1500, + color: '#527EDB', + bullet: ' ◯ ' + }, + { + singularState: 'initializing', + pluralState: 'initializing', + count: 1500, + color: '#527EDB', + bullet: ' ◎ ' + }, + { + singularState: 'initialized', + pluralState: 'initialized', + bullet: ' ⦿ ', + count: 3000, + color: '#527EDB' }, { - singularState: 'shopping', - pluralState: 'shopping', - count: 20, - color: '#b8860b', - url: 'http://www.google.fr' + singularState: 'activated', + pluralState: 'activated', + count: 3000, + color: '#32C832', + url: 'http://www.orange.fr/fdsfsdf', + urlTarget: '_blank' }, { - singularState: 'entertainment', - pluralState: 'entertainment', - count: 15, - color: '#886288' + singularState: 'reactivated', + pluralState: 'reactivated', + count: 1000, + color: '#32C832', + bullet: '' + }, + { + singularState: 'error', + pluralState: 'errors', + count: 1000, + color: '#CD3C14' }, { - singularState: 'outdoor', - pluralState: 'outdoor', - count: 10, - color: '#176129' + singularState: 'deactivated', + pluralState: 'deactivated', + count: 1000, + color: '#CCCCCC' }] } ];