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
Add ship as assettype and to the demo
Dondc529218d597
diff --git a/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java b/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.javaindex 670bf3629..9afe941a0 100644--- a/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java@@ -765,4 +765,12 @@ public abstract class AbstractManagerSetup implements Setup {return parkingAsset;}++ protected Asset createDemoShipAsset(String name, Asset area, GeoJSON location) {+ Asset shipAsset = new Asset(name, SHIP, area).addAttributes(+ new AssetAttribute(AttributeType.LOCATION, location.toValue())+ );++ return shipAsset;+ }}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 0895c5b02..3fedd3849 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@@ -1436,6 +1436,255 @@ public class ManagerDemoSetup extends AbstractManagerSetup {lightOP6Asset.setId(UniqueIdentifierGenerator.generateId(lightOP6Asset.getName()));lightOP6Asset = assetStorageService.merge(lightOP6Asset);+ // ### Ships ###++ Asset shipGroupAsset = new Asset("Ship group", GROUP, mobilityAndSafety);+ shipGroupAsset.getAttribute("childAssetType").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create("urn:openremote:asset:ship")));+ shipGroupAsset.setId(UniqueIdentifierGenerator.generateId(shipGroupAsset.getName()));+ shipGroupAsset = assetStorageService.merge(shipGroupAsset);++ Asset ship1Asset = createDemoShipAsset("Hotel New York", shipGroupAsset, new GeoJSONPoint(4.48527, 51.91984));+ ship1Asset.getAttribute("shipLength").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(12)));+ ship1Asset.getAttribute("shipType").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create("Passenger")));+ ship1Asset.getAttribute("shipImoNumber").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(9183527)));+ ship1Asset.getAttribute("shipMssiNumber").ifPresent(assetAttribute -> assetAttribute.setValue(Values.create(244650537)));+ ship1Asset.getAttribute("location").ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem(+ AGENT_LINK,+ new AttributeRef(smartcitySimulatorAgentId, "replaySimulator").toArrayValue()+ ),+ new MetaItem(+ SimulatorProtocol.SIMULATOR_ELEMENT, Values.create(ReplaySimulatorElement.ELEMENT_NAME)+ ),+ new MetaItem(+ SimulatorProtocol.REPLAY_ATTRIBUTE_LINK_DATA,+ Values.createArray().addAll(+ Values.createObject().put("timestamp", midnight.plusHours(6).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(6).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(6).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(6).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(6).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(6).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(6).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(6).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(6).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(6).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(6).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(6).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(7).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(8).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(9).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(10).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(11).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(12).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(13).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(14).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(15).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(16).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(17).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(18).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(19).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(20).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(21).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(22).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).plusMinutes(5).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).plusMinutes(10).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).plusMinutes(15).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).plusMinutes(20).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).plusMinutes(25).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).plusMinutes(30).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.484374, 51.903518).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).plusMinutes(35).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.479779, 51.904404).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).plusMinutes(40).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482914, 51.906769).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).plusMinutes(45).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.486156, 51.908570).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).plusMinutes(50).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.483362, 51.911897).toValue()),+ Values.createObject().put("timestamp", midnight.plusHours(23).plusMinutes(55).get(SECOND_OF_DAY)).put("value", new GeoJSONPoint(4.482669, 51.916436).toValue())+ )+ )+ );+ });+ ship1Asset.setId(UniqueIdentifierGenerator.generateId(ship1Asset.getName()));+ ship1Asset = assetStorageService.merge(ship1Asset);++ // ### Mobile app config ###+persistenceService.doTransaction(entityManager ->entityManager.merge(new ConsoleAppConfig(realmCityTenant,diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.javaindex 9e56c313e..35a4ae664 100644--- a/model/src/main/java/org/openremote/model/asset/AssetType.java+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java@@ -759,6 +759,37 @@ public enum AssetType implements AssetDescriptor {READ_ONLY,RULE_STATE,STORE_DATA_POINTS)+ ),++ SHIP(ASSET_NAMESPACE + ":ship", "ferry", "000080",+ new AttributeDescriptorImpl("shipMssiNumber", NUMBER, null,+ LABEL.withInitialValue("MSSI number"),+ READ_ONLY,+ RULE_STATE),+ new AttributeDescriptorImpl("shipImoNumber", NUMBER, null,+ LABEL.withInitialValue("IMO number"),+ READ_ONLY,+ RULE_STATE),+ new AttributeDescriptorImpl("shipHeading", DIRECTION, null,+ LABEL.withInitialValue("Heading"),+ READ_ONLY,+ STORE_DATA_POINTS,+ RULE_STATE),+ new AttributeDescriptorImpl("shipSpeed", SPEED, null,+ LABEL.withInitialValue("Speed"),+ STORE_DATA_POINTS,+ RULE_STATE,+ READ_ONLY,+ UNIT_TYPE.withInitialValue(UNITS_SPEED_KNOTS)),+ new AttributeDescriptorImpl("shipLength", NUMBER, null,+ LABEL.withInitialValue("Ship length"),+ UNIT_TYPE.withInitialValue(UNITS_DISTANCE_METRES),+ READ_ONLY,+ RULE_STATE),+ new AttributeDescriptorImpl("shipType", STRING, null,+ LABEL.withInitialValue("Type of ship"),+ READ_ONLY,+ RULE_STATE));final protected String type;