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 more stuff for demo purposes
Michael Rademaker52cf7a9389b0
diff --git a/deployment/map/mapsettings.json b/deployment/map/mapsettings.jsonindex 6f65c55d3..1bca08ae2 100644--- a/deployment/map/mapsettings.json+++ b/deployment/map/mapsettings.json@@ -1,15 +1,15 @@{"options": {"default": {- "center": [5.4774, 51.4370],- "bounds": [5.343, 51.378, 5.591, 51.509],+ "center": [ 5.4774, 51.4370 ],+ "bounds": [ 5.343, 51.378, 5.591, 51.509 ],"zoom": 14,"maxZoom": 19,"boxZoom": false},"building": {- "center": [5.4561596, 51.446795],- "bounds": [5.343, 51.378, 5.591, 51.509],+ "center": [ 5.4561596, 51.446795 ],+ "bounds": [ 5.343, 51.378, 5.591, 51.509 ],"zoom": 15,"minZoom": 14,"maxZoom": 19,@@ -30,7 +30,7 @@"id": "background","type": "background","paint": {- "background-color": "#e0e0e0"+ "background-color": "#ecf2ea"}},{@@ -54,7 +54,8 @@"fill-opacity": {"base": 1,"stops": [- [0, 0.9], [10, 0.3]+ [ 0, 0.9 ],+ [ 10, 0.3 ]]}}@@ -73,7 +74,7 @@"residential"],"paint": {- "fill-color": "#e0e0e0"+ "fill-color": "#e1e6e0"}},{@@ -98,7 +99,7 @@]],"paint": {- "fill-color": "#e0e0e0"+ "fill-color": "#e1e6e0"}},{@@ -123,7 +124,7 @@]],"paint": {- "fill-color": "#e0e0e0"+ "fill-color": "#e1e6e0"}},{@@ -144,7 +145,8 @@"fill-opacity": {"base": 1.8,"stops": [- [9, 0.5], [12, 0.2]+ [ 9, 0.5 ],+ [ 12, 0.2 ]]}}@@ -167,7 +169,8 @@"line-color": {"base": 1,"stops": [- [6, "hsla(96, 40%, 49%, 0.36)"], [8, "hsla(96, 40%, 49%, 0.66)"]+ [ 6, "hsla(96, 40%, 49%, 0.36)" ],+ [ 8, "hsla(96, 40%, 49%, 0.66)" ]]},"line-dasharray": [@@ -190,7 +193,7 @@"cemetery"],"paint": {- "fill-color": "#e0e0e0"+ "fill-color": "#e1e6e0"}},{@@ -207,7 +210,7 @@"hospital"],"paint": {- "fill-color": "#e0e0e0"+ "fill-color": "#e1e6e0"}},{@@ -224,7 +227,7 @@"school"],"paint": {- "fill-color": "#e0e0e0"+ "fill-color": "#e1e6e0"}},{@@ -264,7 +267,8 @@"fill-antialias": {"base": 1,"stops": [- [0, false], [9, true]+ [ 0, false ],+ [ 9, true ]]}}@@ -328,7 +332,8 @@"line-width": {"base": 1.3,"stops": [- [13, 0.5], [20, 2]+ [ 13, 0.5 ],+ [ 20, 2 ]]}}@@ -355,7 +360,8 @@"line-width": {"base": 1.3,"stops": [- [13, 0.5], [20, 6]+ [ 13, 0.5 ],+ [ 20, 6 ]]}}@@ -381,7 +387,8 @@"line-width": {"base": 1.2,"stops": [- [10, 0.8], [20, 6]+ [ 10, 0.8 ],+ [ 20, 6 ]]}}@@ -409,7 +416,14 @@"fill-translate": {"base": 1,"stops": [- [6, [2, 0]], [8, [0, 0]]+ [+ 6,+ [ 2, 0 ]+ ],+ [+ 8,+ [ 0, 0 ]+ ]]}}@@ -469,7 +483,8 @@"fill-opacity": {"base": 1,"stops": [- [0, 0.9], [10, 0.3]+ [ 0, 0.9 ],+ [ 10, 0.3 ]]}}@@ -486,7 +501,8 @@"fill-color": {"base": 1,"stops": [- [15.5, "#d0d0d0"], [16, "#d3d3d3"]+ [ 15.5, "#cbd8c5" ],+ [ 16, "#cbd8c5" ]]},"fill-antialias": true@@ -507,15 +523,23 @@"fill-translate": {"base": 1,"stops": [- [14, [0, 0]], [16, [-2, -2]]+ [+ 14,+ [ 0, 0 ]+ ],+ [+ 16,+ [ -2, -2 ]+ ]]},"fill-outline-color": "#aaa",- "fill-color": "#d5d5d5",+ "fill-color": "#cbd8c5","fill-opacity": {"base": 1,"stops": [- [13, 0], [16, 1]+ [ 13, 0 ],+ [ 16, 1 ]]}}@@ -576,7 +600,9 @@"line-width": {"base": 1.2,"stops": [- [15, 1], [16, 4], [20, 11]+ [ 15, 1 ],+ [ 16, 4 ],+ [ 20, 11 ]]}}@@ -1094,7 +1120,11 @@"line-color": "#bbb","line-width": {"base": 1.4,- "stops": [[14, 0.4], [15, 0.75], [20, 2]]+ "stops": [+ [ 14, 0.4 ],+ [ 15, 0.75 ],+ [ 20, 2 ]+ ]},"line-dasharray": [2,@@ -1212,7 +1242,8 @@"fill-opacity": {"base": 1,"stops": [- [13, 0], [14, 1]+ [ 13, 0 ],+ [ 14, 1 ]]},"fill-color": "#f0f0f0"@@ -1250,13 +1281,15 @@"line-width": {"base": 1.5,"stops": [- [11, 1], [17, 10]+ [ 11, 1 ],+ [ 17, 10 ]]},"line-opacity": {"base": 1,"stops": [- [11, 0], [12, 1]+ [ 11, 0 ],+ [ 12, 1 ]]}}@@ -1293,13 +1326,15 @@"line-width": {"base": 1.5,"stops": [- [11, 4], [17, 50]+ [ 11, 4 ],+ [ 17, 50 ]]},"line-opacity": {"base": 1,"stops": [- [11, 0], [12, 1]+ [ 11, 0 ],+ [ 12, 1 ]]}}@@ -1769,7 +1804,7 @@"line-join": "round"},"paint": {- "line-color": "#b0b0b0",+ "line-color": "#ffffff","line-width": {"base": 1.2,"stops": [@@ -1825,7 +1860,7 @@"visibility": "visible"},"paint": {- "line-color": "#b0b0b0",+ "line-color": "#ffffff","line-width": {"base": 1.2,"stops": [@@ -1885,7 +1920,7 @@"line-join": "round"},"paint": {- "line-color": "#d9d9d9",+ "line-color": "#ffffff","line-opacity": 1,"line-width": {"base": 1.2,@@ -1935,7 +1970,7 @@"visibility": "visible"},"paint": {- "line-color": "#b9b9b9",+ "line-color": "#ffffff","line-width": {"base": 1.2,"stops": [@@ -1992,7 +2027,7 @@"visibility": "visible"},"paint": {- "line-color": "#b0b0b0",+ "line-color": "#ffffff","line-width": {"base": 1.2,"stops": [@@ -2049,7 +2084,7 @@"visibility": "visible"},"paint": {- "line-color": "#b0b0b0",+ "line-color": "#ffffff","line-width": {"base": 1.2,"stops": [@@ -2650,7 +2685,7 @@"line-join": "round"},"paint": {- "line-color": "#b0b0b0",+ "line-color": "#ffffff","line-width": {"base": 1.2,"stops": [@@ -2702,7 +2737,7 @@"line-join": "round"},"paint": {- "line-color": "#b0b0b0",+ "line-color": "#ffffff","line-width": {"base": 1.2,"stops": [@@ -2979,12 +3014,16 @@"line-width": {"base": 1,"stops": [- [0, 0.6], [4, 1.4], [5, 2], [12, 8]+ [ 0, 0.6 ],+ [ 4, 1.4 ],+ [ 5, 2 ],+ [ 12, 8 ]]},"line-opacity": {"stops": [- [6, 0.6], [10, 1]+ [ 6, 0.6 ],+ [ 10, 1 ]]}}@@ -3113,7 +3152,8 @@],"text-size": {"stops": [- [0, 10], [6, 14]+ [ 0, 10 ],+ [ 6, 14 ]]},"text-field": "{name}",diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.javaindex a7d8eb6c9..dede9c2b4 100644--- a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java@@ -808,10 +808,10 @@ public class ManagerDemoSetup extends AbstractManagerSetup {});enviroment1Asset = assetStorageService.merge(enviroment1Asset);- Asset light1Asset = createDemoLightAsset("Light 1", assetArea1, new GeoJSONPoint(5.477126, 51.439137));+ Asset light1Asset = createDemoLightAsset("Light 1", assetArea1, new GeoJSONPoint(5.476111, 51.438492));light1Asset = assetStorageService.merge(light1Asset);- Asset light2Asset = createDemoLightAsset("Light 2", assetArea1, new GeoJSONPoint(5.477126, 51.439137));+ Asset light2Asset = createDemoLightAsset("Light 2", assetArea1, new GeoJSONPoint(5.477272, 51.439214));light2Asset = assetStorageService.merge(light2Asset);// ################################ Realm B Area 2 ###################################diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.javaindex df89ca151..6cd39c56c 100644--- a/model/src/main/java/org/openremote/model/asset/AssetType.java+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java@@ -56,9 +56,9 @@ public enum AssetType implements AssetDescriptor {FLOOR(ASSET_NAMESPACE + ":floor", "stairs", null),- RESIDENCE(ASSET_NAMESPACE + ":residence", "home", null),+ RESIDENCE(ASSET_NAMESPACE + ":residence", "home", "4c879b"),- ROOM(ASSET_NAMESPACE + ":room", "door", null),+ ROOM(ASSET_NAMESPACE + ":room", "door", "2eaaa2"),AGENT(ASSET_NAMESPACE + ":agent", "cogs", null),diff --git a/ui/app/main/src/components/my-app.ts b/ui/app/main/src/components/my-app.tsindex 79bbe8ab6..8ace112cf 100644--- a/ui/app/main/src/components/my-app.ts+++ b/ui/app/main/src/components/my-app.ts@@ -82,7 +82,7 @@ class MyApp extends connect(store)(LitElement) {<or-header logo="${logoImage}" logoMobile="${logoMobileImage}"><a slot="desktop-left" ?selected="${this.page === "map"}" @click="${() => router.navigate("map")}"><or-icon icon="map"></or-icon><or-translate value="map"></or-translate></a><a slot="desktop-left" ?selected="${this.page === "assets"}" @click="${() => router.navigate("assets")}"><or-icon icon="sitemap"></or-icon><or-translate value="asset_plural"></or-translate></a>- <a slot="desktop-left" ?selected="${this.page === "rules"}" @click="${() => router.navigate("rules")}"><or-icon icon="cogs"></or-icon><or-translate value="rules"></or-translate></a>+ <a slot="desktop-left" ?selected="${this.page === "rules"}" @click="${() => router.navigate("rules")}"><or-icon icon="cogs"></or-icon><or-translate value="rule_plural"></or-translate></a><a slot="desktop-right"><or-language></or-language></a><a slot="desktop-right" @click="${() => this.logout()}"><or-translate value="logout"></or-translate></a><a slot="mobile-top" ?selected="${this.page === "map"}" @click="${() => router.navigate("map")}"><or-icon icon="map"></or-icon><or-translate value="map"></or-translate></a>diff --git a/ui/app/main/src/components/pages/page-rules.ts b/ui/app/main/src/components/pages/page-rules.tsindex 0e635906d..f708ae702 100644--- a/ui/app/main/src/components/pages/page-rules.ts+++ b/ui/app/main/src/components/pages/page-rules.ts@@ -16,6 +16,8 @@ const rulesConfig: RulesConfig = {AssetType.CITY.type,AssetType.AREA.type,AssetType.FLOOR.type,+ AssetType.AGENT.type,+ AssetType.CONSOLE.type],assets: {"*": {