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
UI updates: minor
Rich Turnerf523faabdd5b
diff --git a/ui/component/or-map/src/index.ts b/ui/component/or-map/src/index.tsindex 0adc49493..5c994f099 100644--- a/ui/component/or-map/src/index.ts+++ b/ui/component/or-map/src/index.ts@@ -101,7 +101,7 @@ export class OrMap extends LitElement {constructor() {super();- this.addEventListener(OrMapMarkerEvent.CHANGED, this._onMarkerChangedEvent);+ this.addEventListener(OrMapMarkerChangedEvent.NAME, this._onMarkerChangedEvent);}public get markers(): OrMapMarker[] {diff --git a/ui/component/or-map/src/markers/or-map-marker.ts b/ui/component/or-map/src/markers/or-map-marker.tsindex c01a3d0b6..0be9c1844 100644--- a/ui/component/or-map/src/markers/or-map-marker.ts+++ b/ui/component/or-map/src/markers/or-map-marker.ts@@ -5,17 +5,12 @@ export enum OrMapMarkerEvent {CHANGED = "or-map-marker-changed"}-declare global {- export interface HTMLElementEventMap {- [OrMapMarkerEvent.CHANGED]: OrMapMarkerChangedEvent;- [OrMapMarkerEvent.CLICKED]: OrMapMarkerClickedEvent;- }-}-export class OrMapMarkerChangedEvent extends CustomEvent<MarkerChangedEventDetail> {+ public static readonly NAME = "or-map-marker-changed";+constructor(marker: OrMapMarker, prop: string) {- super(OrMapMarkerEvent.CHANGED, {+ super(OrMapMarkerChangedEvent.NAME, {detail: {marker: marker,property: prop@@ -28,8 +23,10 @@ export class OrMapMarkerChangedEvent extends CustomEvent<MarkerChangedEventDetaiexport class OrMapMarkerClickedEvent extends CustomEvent<MarkerEventDetail> {+ public static readonly NAME = "or-map-marker-clicked";+constructor(marker: OrMapMarker) {- super(OrMapMarkerEvent.CLICKED, {+ super(OrMapMarkerClickedEvent.NAME, {detail: {marker: marker},@@ -47,6 +44,13 @@ export interface MarkerChangedEventDetail extends MarkerEventDetail {property: string;}+declare global {+ export interface HTMLElementEventMap {+ [OrMapMarkerChangedEvent.NAME]: OrMapMarkerChangedEvent;+ [OrMapMarkerClickedEvent.NAME]: OrMapMarkerClickedEvent;+ }+}+export const MarkerStyle = css`.or-map-marker {position: absolute; /* This makes mapboxJS behave like mapboxGL */diff --git a/ui/demo/demo-or-map/src/index.ts b/ui/demo/demo-or-map/src/index.tsindex 2b195c5ba..1d78af46f 100644--- a/ui/demo/demo-or-map/src/index.ts+++ b/ui/demo/demo-or-map/src/index.ts@@ -22,14 +22,14 @@ openremote.init({const rasterMap = maps[0] as OrMap;const vectorMap = maps[1] as OrMap;- rasterMap.addEventListener(OrMapMarkerEvent.CLICKED, (evt) => {+ rasterMap.addEventListener(OrMapMarkerClickedEvent.NAME, (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) => {+ vectorMap.addEventListener(OrMapMarkerClickedEvent.NAME, (evt) => {console.log("VECTOR MAP: Marker clicked: " + JSON.stringify(evt.detail));});vectorMap.addEventListener("click", (evt) => {diff --git a/ui/demo/demo-rest/src/index.ts b/ui/demo/demo-rest/src/index.tsindex da0b692c2..eb7ab24b3 100644--- a/ui/demo/demo-rest/src/index.ts+++ b/ui/demo/demo-rest/src/index.ts@@ -12,7 +12,7 @@ function renderUi() {let queryAssetsTemplate = html`${loggedInTemplate(openremote)}<br />- <button @click=${() => queryAssets()}>Get Assets</button><span> (see console window)</span>+ <button @click="${() => queryAssets()}">Get Assets</button><span> (see console window)</span>`;render(queryAssetsTemplate, document.body);} else {