28 invert dahua tilt

.gitignore

@@ -9,3 +9,4 @@
 **/.classpath
 **/.idea
 **/*.iml
+**/*.deleted

dist/osh-sensiasoft/build.gradle

@@ -1,6 +1,10 @@
 apply from: gradle.oshCoreDir + '/common.gradle'
 version = oshCoreVersion
 
+apply plugin: 'java'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
 dependencies {
   compile 'org.sensorhub:sensorhub-core:' + oshCoreVersion
   compile 'org.sensorhub:sensorhub-service-swe:' + oshCoreVersion

dist/osh-sensiasoft/config/config.json

@@ -98,7 +98,7 @@
       "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
       "memoryCacheSize": 4096,
       "objectCacheSize": 100,
-      "storagePath": "gps_obs.dat",
+      "storagePath": "/var/osh/data/gps_obs.dat",
       "moduleClass": "org.sensorhub.impl.persistence.perst.BasicStorageImpl",
       "autoStart": false
     },
@@ -131,7 +131,7 @@
       "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
       "memoryCacheSize": 4096,
       "objectCacheSize": 100,
-      "storagePath": "weather_obs.dat",
+      "storagePath": "/var/osh/data/weather_obs.dat",
       "moduleClass": "org.sensorhub.impl.persistence.perst.ObsStorageImpl",
       "autoStart": false
     },
@@ -149,7 +149,7 @@
     "agencyName": "Huntsville Fire Department",
     "commSettings": {
       "objClass": "org.sensorhub.impl.sensor.avl.MultipleFilesProviderConfig",
-      "dataFolder": "/home/ubuntu/data",
+      "dataFolder": "/var/osh/data/avl",
       "moduleClass": "org.sensorhub.impl.sensor.avl.MultipleFilesProvider",
       "autoStart": false
     },
@@ -164,7 +164,7 @@
       "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
       "memoryCacheSize": 4096,
       "objectCacheSize": 100,
-      "storagePath": "avl.dat",
+      "storagePath": "/var/osh/data/avl.dat",
       "moduleClass": "org.sensorhub.impl.persistence.perst.MultiEntityStorageImpl",
       "autoStart": false
     },
@@ -445,7 +445,7 @@
       "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
       "memoryCacheSize": 1024,
       "objectCacheSize": 100,
-      "storagePath": "avl-police.dat",
+      "storagePath": "/var/osh/data/avl-police.dat",
       "moduleClass": "org.sensorhub.impl.persistence.perst.MultiEntityStorageImpl",
       "autoStart": false
     },
@@ -463,7 +463,7 @@
       "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
       "memoryCacheSize": 1024,
       "objectCacheSize": 100,
-      "storagePath": "avl-fire.dat",
+      "storagePath": "/var/osh/data/avl-fire.dat",
       "moduleClass": "org.sensorhub.impl.persistence.perst.MultiEntityStorageImpl",
       "autoStart": false
     },
@@ -481,7 +481,7 @@
       "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
       "memoryCacheSize": 1024,
       "objectCacheSize": 100,
-      "storagePath": "avl-rescue.dat",
+      "storagePath": "/var/osh/data/avl-rescue.dat",
       "moduleClass": "org.sensorhub.impl.persistence.perst.MultiEntityStorageImpl",
       "autoStart": false
     },
@@ -518,7 +518,7 @@
   },
   {
     "objClass": "org.sensorhub.impl.sensor.plume.PlumeConfig",
-    "dataPath": "/home/ubuntu/data/plume/PARTICLE.OUT_12Zrel_350m",
+    "dataPath": "/var/osh/data/plume/PARTICLE.OUT_12Zrel_350m",
     "id": "d136b6ea-3950-4691-bf56-ac893e5fcc44",
     "moduleClass": "org.sensorhub.impl.sensor.plume.PlumeSensor",
     "name": "Plume Data Stream",
@@ -530,7 +530,7 @@
       "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
       "memoryCacheSize": 1024,
       "objectCacheSize": 100,
-      "storagePath": "plume.dat",
+      "storagePath": "/var/osh/data/plume.dat",
       "moduleClass": "org.sensorhub.impl.persistence.perst.BasicStorageImpl",
       "autoStart": false
     },
@@ -558,7 +558,7 @@
       "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
       "memoryCacheSize": 4096,
       "objectCacheSize": 100,
-      "storagePath": "sat_nav.dat",
+      "storagePath": "/var/osh/data/sat_nav.dat",
       "moduleClass": "org.sensorhub.impl.persistence.perst.BasicStorageImpl",
       "autoStart": false
     },
@@ -578,7 +578,7 @@
     "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
     "memoryCacheSize": 1024,
     "objectCacheSize": 100,
-    "storagePath": "urn_android_device_060693280a28e015.dat",
+    "storagePath": "/var/osh/data/urn_android_device_060693280a28e015.dat",
     "id": "5cb4569c-9e08-4fa1-1458-000000000000",
     "moduleClass": "org.sensorhub.impl.persistence.perst.BasicStorageImpl",
     "name": "Android Data Storage for Toulouse Drive",
@@ -588,7 +588,7 @@
     "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
     "memoryCacheSize": 1024,
     "objectCacheSize": 100,
-    "storagePath": "solo-nav.dat",
+    "storagePath": "/var/osh/data/solo-nav.dat",
     "id": "f5ab10ad-9e12-4257-dddd-ed7d721b26e2",
     "moduleClass": "org.sensorhub.impl.persistence.perst.ObsStorageImpl",
     "name": "Solo MAVLink Storage (Airport Road 2)",
@@ -598,7 +598,7 @@
     "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
     "memoryCacheSize": 1024,
     "objectCacheSize": 100,
-    "storagePath": "solo-video.dat",
+    "storagePath": "/var/osh/data/solo-video.dat",
     "id": "f5ab10ad-9e12-4257-dddd-ed7d721b26e3",
     "moduleClass": "org.sensorhub.impl.persistence.perst.ObsStorageImpl",
     "name": "Solo Video Storage (Airport Road 2)",
@@ -810,7 +810,7 @@
       "objClass": "org.sensorhub.impl.persistence.perst.BasicStorageConfig",
       "memoryCacheSize": 4096,
       "objectCacheSize": 100,
-      "storagePath": "urn_android_device_a0e0eac2fea3f614.dat",
+      "storagePath": "/var/osh/data/urn_android_device_a0e0eac2fea3f614.dat",
       "moduleClass": "org.sensorhub.impl.persistence.perst.BasicStorageImpl",
       "autoStart": true
     },
@@ -822,4 +822,4 @@
     "name": "Alex's Nexus5 Sensors Storage",
     "autoStart": true
   }
-]
+]

dist/osh-sensiasoft/config/logback.xml

@@ -8,6 +8,18 @@
     </encoder>
   </appender>
 
+  <!-- main rolling log file -->
+  <appender name="MAIN_LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>osh_%d{yyyyMMdd}.log</fileNamePattern>
+      <maxHistory>30</maxHistory>
+      <totalSizeCap>10GB</totalSizeCap>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{0} [%thread] - %msg%n</pattern>
+    </encoder>
+  </appender>
+
   <!-- individual module log files -->
   <property name="MODULE_ID" value="${MODULE_ID:-.}" />
   <appender name="MODULE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -24,12 +36,12 @@
   </appender>
 
   <root level="warn">
-    <appender-ref ref="STDOUT" />
+    <appender-ref ref="MAIN_LOG_FILE" />
   </root>
   <logger name="org.sensorhub" level="debug">
     <appender-ref ref="MODULE_FILE" />
   </logger>
   <logger name="org.eclipse.jetty" level="warn" />
   <logger name="org.vast" level="warn"/>
 
-</configuration>
+</configuration>

dist/osh-sensiasoft/scripts/launch.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-java -Xmx128m -Dlogback.configurationFile=./logback.xml -cp "lib/*" org.sensorhub.impl.SensorHub config.json db
+java -Xmx512m -Dlogback.configurationFile=./logback.xml -cp "lib/*" org.sensorhub.impl.SensorHub config.json db

dist/osh-sensiasoft/src/main/java/org/sensorhub/impl/persistence/perst/PatchSoloNavDb.java

@@ -0,0 +1,72 @@
+package org.sensorhub.impl.persistence.perst;
+import org.sensorhub.api.persistence.IRecordStoreInfo;
+import org.sensorhub.impl.persistence.perst.BasicStorageConfig;
+import org.sensorhub.impl.persistence.perst.BasicStorageImpl;
+import org.vast.swe.SWEUtils;
+import net.opengis.swe.v20.DataComponent;
+import net.opengis.swe.v20.Vector;
+
+
+public class PatchSoloNavDb
+{
+
+    public static void main(String[] args) throws Exception
+    {
+        SWEUtils sweUtils = new SWEUtils(SWEUtils.V2_0);
+
+        // create simple storage config
+        BasicStorageConfig dbConf = new BasicStorageConfig();
+        dbConf.name = "DB";
+        dbConf.autoStart = true;
+        dbConf.memoryCacheSize = 1024;
+
+        // open storage
+        dbConf.storagePath = "solo-nav.dat";
+        BasicStorageImpl db = new BasicStorageImpl();
+        db.init(dbConf);
+        db.start();
+
+        for (IRecordStoreInfo rs: db.getRecordStores().values())
+        {
+            System.out.println(rs.getName());
+            System.out.println("*******************");
+            sweUtils.writeComponent(System.out, rs.getRecordDescription(), false, true);
+            System.out.println("\n");
+            sweUtils.writeEncoding(System.out, rs.getRecommendedEncoding(), true);
+            System.out.println("\n");
+        }
+
+        // update record descriptions
+        DataComponent platformAttRec = db.getRecordStores().get("platformAtt").getRecordDescription().copy();
+        Vector att = (Vector)platformAttRec.getComponent("attitude");
+        att.setReferenceFrame("http://www.opengis.net/def/cs/OGC/0/NED");
+        att.getComponent(0).setDefinition("http://sensorml.com/ont/swe/property/TrueHeading");
+        att.getComponent(1).setDefinition("http://sensorml.com/ont/swe/property/PitchAngle");
+        att.getComponent(2).setDefinition("http://sensorml.com/ont/swe/property/RollAngle");
+        sweUtils.writeComponent(System.out, platformAttRec, false, true);
+        System.out.println("\n");        
+        //db.updateRecordStore("platformAtt", platformAttRec);
+
+        DataComponent gimbalAttRec = db.getRecordStores().get("gimbalAtt").getRecordDescription().copy();
+        att = (Vector)gimbalAttRec.getComponent("attitude");
+        att.getComponent(0).setDefinition("http://sensorml.com/ont/swe/property/YawAngle");
+        att.getComponent(1).setDefinition("http://sensorml.com/ont/swe/property/PitchAngle");
+        att.getComponent(2).setDefinition("http://sensorml.com/ont/swe/property/RollAngle");
+        sweUtils.writeComponent(System.out, gimbalAttRec, false, true);
+        System.out.println("\n");        
+        //db.updateRecordStore("gimbalAtt", gimbalAttRec);
+
+        DataComponent platformLocRec = db.getRecordStores().get("platformLoc").getRecordDescription().copy();
+        att = (Vector)platformLocRec.getComponent("loc");
+        att.getComponent(0).setDefinition("http://sensorml.com/ont/swe/property/GeodeticLatitude");
+        att.getComponent(1).setDefinition("http://sensorml.com/ont/swe/property/Longitude");
+        att.getComponent(2).setDefinition("http://sensorml.com/ont/swe/property/HeightAboveMSL");
+        sweUtils.writeComponent(System.out, platformLocRec, false, true);
+        System.out.println("\n");        
+        //db.updateRecordStore("platformLoc", platformLocRec);      
+
+        db.commit();
+        db.stop();
+    }
+
+}

dist/osh-sensiasoft/src/main/java/org/sensorhub/impl/persistence/perst/PatchSoloVideoDb.java

@@ -0,0 +1,61 @@
+package org.sensorhub.impl.persistence.perst;
+import org.sensorhub.api.persistence.IRecordStoreInfo;
+import org.sensorhub.impl.persistence.perst.BasicStorageConfig;
+import org.sensorhub.impl.persistence.perst.BasicStorageImpl;
+import org.vast.swe.SWEUtils;
+import net.opengis.swe.v20.BinaryEncoding;
+import net.opengis.swe.v20.ByteOrder;
+import net.opengis.swe.v20.DataArray;
+import net.opengis.swe.v20.DataComponent;
+
+
+public class PatchSoloVideoDb
+{
+
+    public static void main(String[] args) throws Exception
+    {
+        SWEUtils sweUtils = new SWEUtils(SWEUtils.V2_0);
+
+        // create simple storage config
+        BasicStorageConfig dbConf = new BasicStorageConfig();
+        dbConf.name = "DB";
+        dbConf.autoStart = true;
+        dbConf.memoryCacheSize = 1024;
+
+        // open storage
+        dbConf.storagePath = "solo-video.dat";
+        BasicStorageImpl db = new BasicStorageImpl();
+        db.init(dbConf);
+        db.start();
+
+        for (IRecordStoreInfo rs: db.getRecordStores().values())
+        {
+            System.out.println(rs.getName());
+            System.out.println("*******************");
+            sweUtils.writeComponent(System.out, rs.getRecordDescription(), false, true);
+            System.out.println("\n");
+            sweUtils.writeEncoding(System.out, rs.getRecommendedEncoding(), true);
+            System.out.println("\n");
+        }
+
+        // update record descriptions
+        DataComponent camOutputRec = db.getRecordStores().get("camOutput").getRecordDescription().copy();
+        DataArray frame = (DataArray) ((DataArray)camOutputRec.getComponent("videoFrame")).getElementType();
+        frame.getElementType().getComponent(0).setDefinition("http://sensorml.com/ont/swe/property/RedChannel");
+        frame.getElementType().getComponent(1).setDefinition("http://sensorml.com/ont/swe/property/GreenChannel");
+        frame.getElementType().getComponent(2).setDefinition("http://sensorml.com/ont/swe/property/BlueChannel");
+        sweUtils.writeComponent(System.out, camOutputRec, false, true);
+        System.out.println("\n");        
+        //db.updateRecordStore("camOutput", camOutputRec);
+
+        TimeSeriesImpl videoStore = (TimeSeriesImpl)db.getRecordStores().get("camOutput");
+        BinaryEncoding dataEncoding = (BinaryEncoding)videoStore.getRecommendedEncoding().copy();
+        dataEncoding.setByteOrder(ByteOrder.BIG_ENDIAN);
+        //videoStore.recommendedEncoding = dataEncoding;
+        //videoStore.modify();
+
+        db.commit();
+        db.stop();
+    }
+
+}

persistence/sensorhub-storage-es/src/main/java/org/sensorhub/impl/persistence/es/ESBasicStorageImpl.java

@@ -470,6 +470,12 @@ public void addRecordStore(String name, DataComponent recordStructure, DataEncod
 		// do nothing 
 	}
 
+    @Override
+    public void updateRecordStore(String name, DataComponent recordStructure)
+    {
+        // TODO implement updating the record description        
+    }
+
 	@Override
 	public int getNumRecords(String recordType) {
 		SearchResponse response = client.prepareSearch(indexName).setTypes(RS_DATA_IDX_NAME)

persistence/sensorhub-storage-es/src/main/java/org/sensorhub/impl/persistence/es/ESObsStorageImpl.java

@@ -48,6 +48,7 @@
 import org.sensorhub.api.persistence.IObsStorageModule;
 import org.sensorhub.api.persistence.ObsFilter;
 import org.sensorhub.api.persistence.ObsKey;
+import org.sensorhub.api.persistence.ObsPeriod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.vast.ogc.gml.GMLUtils;
@@ -917,4 +918,11 @@ protected synchronized QueryBuilder getPolygonGeoQuery(Polygon polygon) throws I
 		return QueryBuilders.geoIntersectionQuery(SHAPE_FIELD_NAME, 
 				ShapeBuilders.newPolygon(Arrays.asList(polygon.getCoordinates())));
 	}
+
+    @Override
+    public Iterator<ObsPeriod> getFoiTimeRanges(IObsFilter filter) {
+        // TODO implement getFoiTimeRanges()
+        ObsPeriod unknownPeriod = new ObsPeriod("NONE", Double.NaN, Double.NaN);
+        return Arrays.asList(unknownPeriod).iterator();
+    }
 }