From a9ca3ae3d0d745af0f2bc5c28a57b8b4d29551ec Mon Sep 17 00:00:00 2001 From: BRKP5614 Date: Wed, 22 Sep 2021 09:05:28 +0200 Subject: [PATCH] *** Version V2.6.6 *** Can display images in inner --- 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 | 6 ++++-- 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 | 2 +- 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 +- src/map/map.component.ts | 8 ++++---- 27 files changed, 35 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9b53723a..e706442f 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.6", + "resolved": "https://registry.npmjs.org/iotmapmanager/-/iotmapmanager-2.6.6.tgz", + "integrity": "sha512-gfVhR0DCSqNPHyoKfNhslGTzC2CAEcrYDU41OR9fR/wGy16FHlGD+4cnOdnqi3BvCq790hgaeSZyTlclg4tC4g==", "requires": { "@types/leaflet": "^1.5.19", "@types/leaflet.markercluster": "^1.4.3", diff --git a/package.json b/package.json index 6cada3ed..171d1068 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.6", "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 62feb499..1cfec312 100644 --- a/src/iotMapManager/css/map.css +++ b/src/iotMapManager/css/map.css @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.6.5 +* Version: 2.6.6 * 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 2f5976c3..cde50eb4 100644 --- a/src/iotMapManager/css/markers.css +++ b/src/iotMapManager/css/markers.css @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.6.5 +* Version: 2.6.6 * 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 a26e8e26..4b128753 100644 --- a/src/iotMapManager/css/popup.css +++ b/src/iotMapManager/css/popup.css @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.6.5 +* Version: 2.6.6 * 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 6c56c3f3..ee52b8a6 100644 --- a/src/iotMapManager/css/tabs.css +++ b/src/iotMapManager/css/tabs.css @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.6.5 +* Version: 2.6.6 * 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 a8518147..e9b4b8ba 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.5 +* Version: 2.6.6 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange * SPDX-License-Identifier: MIT * diff --git a/src/iotMapManager/index.ts b/src/iotMapManager/index.ts index 135c75cc..f85d47c3 100644 --- a/src/iotMapManager/index.ts +++ b/src/iotMapManager/index.ts @@ -1,6 +1,6 @@ /* * Software Name : IotMapManager -* Version: 2.6.5 +* Version: 2.6.6 * 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 b49320e4..1ad0c08e 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.5 +* Version: 2.6.6 * SPDX-FileCopyrightText: Copyright (c) 2020 Orange * SPDX-License-Identifier: MIT * diff --git a/src/iotMapManager/package.json b/src/iotMapManager/package.json index 3a2a0405..a1f1a7ab 100644 --- a/src/iotMapManager/package.json +++ b/src/iotMapManager/package.json @@ -1,6 +1,6 @@ { "name": "iotmapmanager", - "version": "2.6.5", + "version": "2.6.6", "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 76ecb27a..06f59876 100644 --- a/src/iotMapManager/readme.md +++ b/src/iotMapManager/readme.md @@ -1,4 +1,4 @@ -# IotMapManager V2.6.5 +# IotMapManager V2.6.6 This library provides management of markers dedicated to projects using mapping. ## use @@ -244,13 +244,15 @@ interface Shape { interface Inner { color?: string + img?: string + // *** OR *** icon?: string // *** OR *** label?: string } ``` -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. +Note: the img has priority over icon, that has priority over the label. To update a marker having an img or an icon by a label, set `img` or `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 c2607e47..e016b903 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.5 +* Version: 2.6.6 * 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 efb0b63b..ed0aed45 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.5 +* Version: 2.6.6 * 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 f4be166d..9c96b01b 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.5 +* Version: 2.6.6 * 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 36359aa3..620778cb 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.5 +* Version: 2.6.6 * 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 844670b2..c7a9e9f1 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.5 +* Version: 2.6.6 * 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 af4245e3..ed2880c9 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.5 +* Version: 2.6.6 * 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 4bb6afbc..ad5d5b21 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.5 +* Version: 2.6.6 * 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 5163f459..25658822 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.5 +* Version: 2.6.6 * 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 9ac648af..7f72d528 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.5 +* Version: 2.6.6 * 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 3013143a..b82428e0 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.5 +* Version: 2.6.6 * 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 18934cdc..ad1ce6de 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.5 +* Version: 2.6.6 * 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 ecdd4737..d1838d25 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.5 +* Version: 2.6.6 * 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 d85a16e4..fba0c9d9 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.5 +* Version: 2.6.6 * 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 d922b6b8..a03e8a37 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.5 +* Version: 2.6.6 * 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 c0fdab46..7cfcbbbc 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.5 +* Version: 2.6.6 * 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 6b75e1d7..da1d0b3d 100644 --- a/src/map/map.component.ts +++ b/src/map/map.component.ts @@ -119,17 +119,17 @@ export class MapComponent implements AfterViewInit { { id: 's7', location: { - lat: 40.895, - lng: 6.890 + lat: 44.895, + lng: 4.885 }, shape: { type: ShapeType.square, anchored: true, - plain: false, + plain: false // , // accuracy: 200 }, inner: { - img: 'https://img.icons8.com/ios/452/apple-phone.png', + img: 'https://c.woopic.com/logo-orange.png', color: 'green' }, layer: 'etablissements',