Ndbc oot

.gitignore

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

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();
+    }
 }

persistence/sensorhub-storage-h2/src/main/java/org/sensorhub/impl/persistence/h2/MVMultiStorageImpl.java

@@ -28,7 +28,9 @@
 import org.sensorhub.api.persistence.IDataRecord;
 import org.sensorhub.api.persistence.IFoiFilter;
 import org.sensorhub.api.persistence.IMultiSourceStorage;
+import org.sensorhub.api.persistence.IObsFilter;
 import org.sensorhub.api.persistence.IObsStorage;
+import org.sensorhub.api.persistence.ObsPeriod;
 import org.vast.util.Asserts;
 import org.vast.util.Bbox;
 import net.opengis.gml.v32.AbstractFeature;
@@ -490,6 +492,36 @@ public Iterator<AbstractFeature> getFois(final IFoiFilter filter)
 
         return fois.iterator();
     }
+
+
+    @Override
+    public Iterator<ObsPeriod> getFoiTimeRanges(IObsFilter filter)
+    {
+        return new Iterator<ObsPeriod>() {
+            Iterator<MVObsStorageImpl> dataStoresIt = obsStores.values().iterator();
+            Iterator<ObsPeriod> currentIterator;
+
+            @Override
+            public boolean hasNext()
+            {
+                while (currentIterator == null || !currentIterator.hasNext())
+                {
+                    if (!dataStoresIt.hasNext())
+                        return false;
+
+                    currentIterator = dataStoresIt.next().getFoiTimeRanges(filter);
+                }
+
+                return true;
+            }
+
+            @Override
+            public ObsPeriod next()
+            {
+                return currentIterator.next();
+            }
+        };
+    }
 
 
     @Override

persistence/sensorhub-storage-h2/src/main/java/org/sensorhub/impl/persistence/h2/MVObsStorageImpl.java

@@ -34,11 +34,14 @@
 import org.sensorhub.api.persistence.IDataFilter;
 import org.sensorhub.api.persistence.IDataRecord;
 import org.sensorhub.api.persistence.IFoiFilter;
+import org.sensorhub.api.persistence.IObsFilter;
 import org.sensorhub.api.persistence.IObsStorageModule;
 import org.sensorhub.api.persistence.IRecordStoreInfo;
 import org.sensorhub.api.persistence.IStorageModule;
+import org.sensorhub.api.persistence.ObsPeriod;
 import org.sensorhub.api.persistence.StorageException;
 import org.sensorhub.impl.module.AbstractModule;
+import org.sensorhub.utils.DataComponentChecks;
 import org.sensorhub.utils.FileUtils;
 import org.vast.util.Asserts;
 import org.vast.util.Bbox;
@@ -157,12 +160,7 @@ public synchronized void start() throws SensorHubException
 
     private void loadRecordStore(IRecordStoreInfo rsInfo)
     {
-        MVTimeSeriesImpl recordStore;        
-        if (config.indexObsLocation)
-            recordStore = new MVTimeSeriesImpl(this, rsInfo);
-        else
-            recordStore = new MVTimeSeriesImpl(this, rsInfo.getName());
-
+        MVTimeSeriesImpl recordStore = new MVTimeSeriesImpl(this, rsInfo, config.indexObsLocation);
         recordStores.put(rsInfo.getName(), recordStore);
     }
 
@@ -398,6 +396,27 @@ public synchronized void addRecordStore(String name, DataComponent recordStructu
         rsInfoMap.put(name, rsInfo);
         loadRecordStore(rsInfo);
     }
+
+
+    @Override
+    public void updateRecordStore(String name, DataComponent newDataStruct)
+    {
+        checkOpen();
+        Asserts.checkNotNull(name, "name");
+        Asserts.checkNotNull(newDataStruct, DataComponent.class);
+
+        DataStreamInfo oldRsInfo = (DataStreamInfo)rsInfoMap.get(name);
+        if (oldRsInfo == null)
+            throw new IllegalArgumentException("No time series with name " + name);
+
+        // check that new structure is compatible with previous one
+        if (!DataComponentChecks.checkStructCompatible(oldRsInfo.recordDescription, newDataStruct))
+            throw new IllegalStateException("New data structure for record store " + getName() + 
+                    " is not compatible with the one already in storage");
+
+        DataStreamInfo newRsInfo = new DataStreamInfo(name, newDataStruct, oldRsInfo.recommendedEncoding);
+        rsInfoMap.put(name, newRsInfo);
+    }
 
 
     public synchronized void upgradeRecordStore(String name, DataComponent recordStructure, DataEncoding recommendedEncoding, boolean deleteRecords)
@@ -650,6 +669,36 @@ public Iterator<AbstractFeature> getFois(IFoiFilter filter)
     }
 
 
+    @Override
+    public Iterator<ObsPeriod> getFoiTimeRanges(IObsFilter filter)
+    {
+        checkOpen();        
+        filter = (IObsFilter)ensureProducerID(filter);
+
+        MVTimeSeriesImpl recordStore = getRecordStore(filter.getRecordType());
+        Set<ObsTimePeriod> timePeriods = recordStore.getObsTimePeriods(producerID, filter, true);
+        if (timePeriods == null)
+            return Collections.emptyIterator();
+
+        Iterator<ObsTimePeriod> it = timePeriods.iterator();
+        return new Iterator<ObsPeriod>() {
+
+            @Override
+            public boolean hasNext()
+            {
+                return it.hasNext();
+            }
+
+            @Override
+            public ObsPeriod next()
+            {
+                ObsTimePeriod p = it.next();
+                return new ObsPeriod(p.foiID, p.start, p.stop);
+            }
+        };
+    }
+
+
     @Override
     public synchronized void storeFoi(String producerID, AbstractFeature foi)
     {

persistence/sensorhub-storage-h2/src/main/java/org/sensorhub/impl/persistence/h2/MVTimeSeriesImpl.java

@@ -156,30 +156,29 @@ protected IDataRecord process(IDataRecord elt)
     }
 
 
-    public MVTimeSeriesImpl(MVObsStorageImpl parentStore, String seriesName)
+    public MVTimeSeriesImpl(MVObsStorageImpl parentStore, IRecordStoreInfo rsInfo, boolean indexObsLocation)
     {
-        this.name = seriesName;
+        this.name = rsInfo.getName();
         this.parentStore = parentStore;
 
-        String mapName = RECORDS_MAP_NAME + ":" + seriesName;        
+        // create maps
+        String mapName = RECORDS_MAP_NAME + ":" + this.name;        
         this.recordIndex = parentStore.mvStore.openMap(mapName, new MVMap.Builder<ProducerTimeKey, DataBlock>()
                 .keyType(new ProducerKeyDataType())
                 .valueType(new DataBlockDataType()));
 
-        this.foiTimesIndex = new MVFoiTimesStoreImpl(parentStore.mvStore, seriesName);
-    }
-
-
-    public MVTimeSeriesImpl(MVObsStorageImpl parentStore, IRecordStoreInfo rsInfo)
-    {
-        this(parentStore, rsInfo.getName());
-
-        // try to detect sampling location
-        VectorIndexer locationIndexer = SWEDataUtils.getLocationIndexer(rsInfo.getRecordDescription());
+        this.foiTimesIndex = new MVFoiTimesStoreImpl(parentStore.mvStore, this.name);
 
-        // if found, also use sampling lolcation index
-        if (locationIndexer != null)
-            this.samplingLocationIndex = new MVSamplingLocationIndexImpl(parentStore.mvStore, rsInfo.getName(), locationIndexer);
+        // prepare to index location if requested
+        if (indexObsLocation)
+        {
+            // try to detect sampling location
+            VectorIndexer locationIndexer = SWEDataUtils.getLocationIndexer(rsInfo.getRecordDescription());
+
+            // if found, also use sampling lolcation index
+            if (locationIndexer != null)
+                this.samplingLocationIndex = new MVSamplingLocationIndexImpl(parentStore.mvStore, rsInfo.getName(), locationIndexer);
+        }
     }
 
 
@@ -534,7 +533,7 @@ private Iterator<IDataRecord> getEntryIterator(IDataFilter filter, boolean prelo
         String producerID = getProducerID(filter);
 
         // get time periods matching filter
-        Set<ObsTimePeriod> obsTimePeriods = getObsTimePeriods(producerID, filter);
+        Set<ObsTimePeriod> obsTimePeriods = getObsTimePeriods(producerID, filter, false);
 
         // return special iterator to scan through each time range sequentially
         // optionally post-filtering records on their spatial location      
@@ -545,7 +544,7 @@ private Iterator<IDataRecord> getEntryIterator(IDataFilter filter, boolean prelo
     }
 
 
-    private Set<ObsTimePeriod> getObsTimePeriods(String producerID, final IDataFilter filter)
+    Set<ObsTimePeriod> getObsTimePeriods(String producerID, final IDataFilter filter, boolean returnAllIfNoFoiSelected)
     {
         double[] timeRange = getTimeRange(producerID, filter);
 
@@ -641,9 +640,15 @@ public Polygon getRoi()
             obsTimeRanges = samplingTimeRanges;
         }
 
-        // if no time periods selected, just process whole time range
+        // if no foi was selected, return either the whole time range
+        // or the list of all foi time ranges
         if (obsTimeRanges == null)
-            obsTimeRanges = Sets.newHashSet(new ObsTimePeriod(producerID, null, timeRange[0], timeRange[1]));
+        {
+            if (returnAllIfNoFoiSelected)
+                obsTimeRanges = foiTimesIndex.getSortedFoiTimes(producerID, null);
+            else
+                obsTimeRanges = Sets.newHashSet(new ObsTimePeriod(producerID, null, timeRange[0], timeRange[1]));
+        }
 
         // trim periods to time range specified in filter
         Iterator<ObsTimePeriod> it = obsTimeRanges.iterator();
@@ -652,6 +657,9 @@ public Polygon getRoi()
             ObsTimePeriod obsTimePeriod = it.next();
             if (!trimTimeRange(obsTimePeriod, timeRange[0], timeRange[1]))
                 it.remove();
+
+            if (obsTimePeriod.stop == Double.POSITIVE_INFINITY)
+                obsTimePeriod.stop = getDataTimeRange(producerID)[1];
         }
 
         return obsTimeRanges;