100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Updated or-map-marker-asset to work with latest or-map
Rich Turnerf4d03f85d9e7
diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.javaindex 09b353240..c053c4cd0 100644--- a/manager/src/main/java/org/openremote/manager/map/MapService.java+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java@@ -337,7 +337,7 @@ public class MapService implements ContainerService {return mapSettingsJs.get(realm);}- final ObjectValue settings = mapSettings.computeIfAbsent(realm, r -> Values.createObject());+ final ObjectValue settings = mapSettingsJs.computeIfAbsent(realm, r -> Values.createObject());if (!metadata.isValid() || !mapConfig.hasKeys()) {return settings;diff --git a/ui/component/or-map/src/markers/or-map-marker-asset.ts b/ui/component/or-map/src/markers/or-map-marker-asset.tsindex 04afc3813..64cfc3384 100644--- a/ui/component/or-map/src/markers/or-map-marker-asset.ts+++ b/ui/component/or-map/src/markers/or-map-marker-asset.ts@@ -1,79 +1,83 @@-import {customElement, property} from "lit-element";+import {customElement, property, PropertyValues} from "lit-element";import {OrMapMarker} from "./or-map-marker";import rest from "@openremote/rest";import {Asset, AssetAttribute, GeoJSONPoint} from "@openremote/model";import {GenericAxiosResponse} from "axios";-/**- * `or-map-marker-asset`- * Asset linked map marker- */--@customElement('or-map-marker-asset')+@customElement("or-map-marker-asset")export class OrMapMarkerAsset extends OrMapMarker {@property({type: String})- asset?: string;-- @property({type: Object})- _ele!: HTMLElement;+ public asset?: string;constructor() {super();}- _getMarkerElement(): HTMLElement {- let className = ("or-map-marker " + this.className).trim();- let ele = document.createElement("div");- ele.className = className;- return ele;+ public connectedCallback(): void {+ super.connectedCallback();}- refreshMarker() {- this.getAsset().then((asset) => {- const attrs = <any>asset.attributes;- const attr: AssetAttribute | undefined = attrs.location;+ public disconnectedCallback(): void {+ super.disconnectedCallback();+ }- if (!attr) {- this.visible = false;- return;- }+ protected firstUpdated(_changedProperties: PropertyValues): void {+ if (_changedProperties.has("asset")) {+ this.refreshMarker();+ }+ }- const location: GeoJSONPoint | null = attr.value as GeoJSONPoint;+ protected shouldUpdate(_changedProperties: PropertyValues): boolean {+ if (_changedProperties.has("asset")) {+ this.refreshMarker();- if (!location) {- this.visible = false;- return;+ if (Object.keys(_changedProperties).length === 1) {+ return false;}- this._createAssetMarker();- // Model d.ts is clearly not perfect need to sort out Jackson annotations- this.lat = (<any>location.coordinates)[1] || 0;- this.lng = (<any>location.coordinates)[0] || 0;- this.visible = true;- }).catch(() => {- this.visible = false;- });+ }+ return super.shouldUpdate(_changedProperties);}- async getAsset(): Promise<Asset> {- const response: GenericAxiosResponse<Asset> = await rest.api.AssetResource.get(this.asset!);- return response.data;- }+ protected refreshMarker() {- _assetChanged() {- this.visible = false;+ if (this.asset && this.asset.length > 0) {+ this.getAsset().then((asset) => {+ const attrs = asset.attributes as any;+ const attr: AssetAttribute | undefined = attrs.location;- if (this.asset) {- this.refreshMarker();+ if (!attr) {+ this.visible = false;+ return;+ }++ const location: GeoJSONPoint | null = attr.value as GeoJSONPoint;++ if (!location) {+ this.visible = false;+ return;+ }++ // Model d.ts is clearly not perfect need to sort out Jackson annotations+ this.lat = (location.coordinates as any)[1] || 0;+ this.lng = (location.coordinates as any)[0] || 0;+ if (asset.type) {+ // TODO: Get hold of icon from asset type+ this.icon = "office-building";+ } else {+ this.icon = undefined;+ }+ this.visible = true;+ }).catch(() => {+ this.visible = false;+ });+ } else {+ this.visible = false;}}- private _createAssetMarker() {- // Create basic element of _ele is undefined- if(typeof this._ele === 'undefined') {- this._ele = document.createElement("div");- this._ele.className = "marker";- }+ protected async getAsset(): Promise<Asset> {+ const response: GenericAxiosResponse<Asset> = await rest.api.AssetResource.get(this.asset!);+ return response.data;}}-diff --git a/ui/component/or-map/src/markers/or-map-marker.ts b/ui/component/or-map/src/markers/or-map-marker.tsindex 22a64b0e0..64656a99f 100644--- a/ui/component/or-map/src/markers/or-map-marker.ts+++ b/ui/component/or-map/src/markers/or-map-marker.ts@@ -66,12 +66,12 @@ export class OrMapMarker extends LitElement {}`;- protected static _defaultTemplate = (icon: string | undefined) => litHtml`+ protected static _defaultTemplate = (icon: string | undefined) => `<div class="or-map-marker-default"><or-icon icon="or:marker"></or-icon><or-icon class="marker-icon" icon="${icon || ""}"></or-icon></div>- `+ `;@property({type: Number})public lat: number = 0;@@ -124,7 +124,7 @@ export class OrMapMarker extends LitElement {}protected shouldUpdate(_changedProperties: PropertyValues): boolean {- Object.keys(_changedProperties).forEach((prop) => this._raisePropertyChange(prop));+ _changedProperties.forEach((oldValue, prop) => this._raisePropertyChange(prop as string));return false;}@@ -148,6 +148,6 @@ export class OrMapMarker extends LitElement {}protected addDefaultMarkerContent(markerElement: HTMLElement) {- render(OrMapMarker._defaultTemplate(this.icon), markerElement);+ markerElement.innerHTML = OrMapMarker._defaultTemplate(this.icon);}}diff --git a/ui/demo/demo-core/src/index.ts b/ui/demo/demo-core/src/index.tsindex 27fbaf079..290053aca 100644--- a/ui/demo/demo-core/src/index.ts+++ b/ui/demo/demo-core/src/index.ts@@ -10,8 +10,9 @@ import {AssetQuery,AttributeEvent,BaseAssetQueryInclude,- BaseAssetQueryMatch, StringPredicate+ BaseAssetQueryMatch, StringPredicate, Asset} from "@openremote/model";+import {getApartment1Asset} from "./util";let alarmEnabled = false;@@ -72,33 +73,13 @@ async function subscribeApartmentAttributeEvents(assetId: string) {}async function initApartment1Asset(): Promise<void> {- let query: AssetQuery = {- name: {- predicateType: "string",- match: BaseAssetQueryMatch.EXACT,- value: "Apartment 1"- },- type: {- predicateType: "string",- match: BaseAssetQueryMatch.EXACT,- value: "urn:openremote:asset:residence"- },- select: {- include: BaseAssetQueryInclude.ONLY_ID_AND_NAME- }- };++ const apartment1 = await getApartment1Asset();- let response = await rest.api.AssetResource.queryAssets(query);- let assets = response.data;-- if (assets.length !== 1) {- console.log("Failed to retrieve the 'Apartment 1' asset");- return;+ if (apartment1) {+ console.log("Apartment 1 Asset received: " + JSON.stringify(apartment1, null, 2));+ subscribeApartmentAttributeEvents(apartment1.id!);}-- let apartment1 = assets[0];- console.log("Apartment 1 Asset received: " + JSON.stringify(apartment1, null, 2));- subscribeApartmentAttributeEvents(apartment1.id!);}openremote.addListener((event: OREvent) => {diff --git a/ui/demo/demo-core/src/util.ts b/ui/demo/demo-core/src/util.tsnew file mode 100644index 000000000..427cb4ac9--- /dev/null+++ b/ui/demo/demo-core/src/util.ts@@ -0,0 +1,29 @@+import {Asset, AssetQuery, BaseAssetQueryMatch, BaseAssetQueryInclude} from "@openremote/model";+import rest from "@openremote/rest";++export async function getApartment1Asset(): Promise<Asset | undefined> {+ const query: AssetQuery = {+ name: {+ predicateType: "string",+ match: BaseAssetQueryMatch.EXACT,+ value: "Apartment 1"+ },+ type: {+ predicateType: "string",+ match: BaseAssetQueryMatch.EXACT,+ value: "urn:openremote:asset:residence"+ },+ select: {+ include: BaseAssetQueryInclude.ONLY_ID_AND_NAME+ }+ };++ const response = await rest.api.AssetResource.queryAssets(query);+ const assets = response.data;++ if (assets.length !== 1) {+ console.log("Failed to retrieve the 'Apartment 1' asset");+ return;+ }+ return assets[0];+}\ No newline at end of filediff --git a/ui/demo/demo-or-map/package.json b/ui/demo/demo-or-map/package.jsonindex 8b087fe4b..34b0c4274 100644--- a/ui/demo/demo-or-map/package.json+++ b/ui/demo/demo-or-map/package.json@@ -12,6 +12,7 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {+ "@openremote/demo-core": "^1.0.0","@openremote/or-map": "^1.0.0-alpha","source-map-loader": "^0.2.4"},diff --git a/ui/demo/demo-or-map/src/index.ts b/ui/demo/demo-or-map/src/index.tsindex 2137422c4..2b195c5ba 100644--- a/ui/demo/demo-or-map/src/index.ts+++ b/ui/demo/demo-or-map/src/index.ts@@ -2,9 +2,11 @@ import "@polymer/iron-demo-helpers/demo-pages-shared-styles";import "@polymer/iron-demo-helpers/demo-snippet";import "@openremote/or-map";import "@openremote/or-map/dist/markers/or-map-marker";+import "@openremote/or-map/dist/markers/or-map-marker-asset";import openremote, {Auth} from "@openremote/core";import {OrMapMarkerEvent} from "@openremote/or-map/dist/markers/or-map-marker";import {OrMap} from "@openremote/or-map";+import {getApartment1Asset} from "../../demo-core/src/util";openremote.init({auth: Auth.KEYCLOAK,@@ -12,22 +14,32 @@ openremote.init({keycloakUrl: "http://localhost:8080/auth",managerUrl: "http://localhost:8080",realm: "tenantA"-}).then(() => {+})+ .then(getApartment1Asset)+ .then((apartment1) => {- let maps = document.querySelectorAll("or-map");- let rasterMap = maps[0] as OrMap;- let vectorMap = maps[1] as OrMap;- rasterMap.addEventListener(OrMapMarkerEvent.CLICKED, (evt) => {- console.log("RASTER MAP: Marker clicked: " + JSON.stringify(evt.detail));- });- rasterMap.addEventListener("click", (evt) => {- console.log("RASTER MAP: Map clicked");- });+ const maps = document.querySelectorAll("or-map");+ const rasterMap = maps[0] as OrMap;+ const vectorMap = maps[1] as OrMap;- vectorMap.addEventListener(OrMapMarkerEvent.CLICKED, (evt) => {- console.log("VECTOR MAP: Marker clicked: " + JSON.stringify(evt.detail));- });- vectorMap.addEventListener("click", (evt) => {- console.log("VECTOR MAP: Map clicked");- });+ rasterMap.addEventListener(OrMapMarkerEvent.CLICKED, (evt) => {+ console.log("RASTER MAP: Marker clicked: " + JSON.stringify(evt.detail));+ });+ rasterMap.addEventListener("click", (evt) => {+ console.log("RASTER MAP: Map clicked");+ });++ vectorMap.addEventListener(OrMapMarkerEvent.CLICKED, (evt) => {+ console.log("VECTOR MAP: Marker clicked: " + JSON.stringify(evt.detail));+ });+ vectorMap.addEventListener("click", (evt) => {+ console.log("VECTOR MAP: Map clicked");+ });++ if (apartment1) {+ // Add an or-map-marker-asset to the vector map+ const assetMarker = document.createElement("or-map-marker-asset");+ assetMarker.setAttribute("asset", apartment1.id!);+ vectorMap.appendChild(assetMarker);+ }});diff --git a/ui/demo/demo-or-map/tsconfig.json b/ui/demo/demo-or-map/tsconfig.jsonindex c5a44fb36..fa3009b76 100644--- a/ui/demo/demo-or-map/tsconfig.json+++ b/ui/demo/demo-or-map/tsconfig.json@@ -5,6 +5,7 @@"../../component/or-map/@types"],"references": [+ { "path": "../../demo/demo-core" },{ "path": "../../component/core" },{ "path": "../../component/rest" },{ "path": "../../component/or-map" }