Skip to content

Update resultime operator #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mdhsl wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update resultime operator #196

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a78ca8
Update resultime operator
mdhsl Apr 12, 2026
7230f4c
Check filter bounds
mdhsl Apr 12, 2026
9cd3512
Fix filter bounds
mdhsl Apr 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions ...in/java/org/sensorhub/impl/datastore/postgis/builder/filter/obs/SelectObsFilterQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

package org.sensorhub.impl.datastore.postgis.builder.filter.obs;

import com.google.common.collect.BoundType;
import org.sensorhub.api.common.BigId;
import org.sensorhub.api.datastore.TemporalFilter;
import org.sensorhub.api.datastore.feature.FoiFilter;
Expand Down Expand Up @@ -81,11 +82,13 @@ protected void handlePhenomenonTimeFilter(TemporalFilter temporalFilter) {
filterQueryGenerator.addOrderBy(this.tableName + ".datastreamid");
filterQueryGenerator.addOrderBy(this.tableName + ".phenomenonTime DESC ");
} else {
String lowerBoundEquals = temporalFilter.getRange().lowerBoundType().equals(BoundType.OPEN) ? "":"=";
String upperBoundEquals = temporalFilter.getRange().upperBoundType().equals(BoundType.OPEN) ? "":"=";
addCondition(
this.tableName+".phenomenonTime >= '"+temporalFilter.getMin()+"'"
this.tableName+".phenomenonTime >"+lowerBoundEquals+" '"+temporalFilter.getMin()+"'"
);
addCondition(
this.tableName+".phenomenonTime <= '"+temporalFilter.getMax()+"'"
this.tableName+".phenomenonTime <"+upperBoundEquals+" '"+temporalFilter.getMax()+"'"
);
}
}
Expand All @@ -98,10 +101,19 @@ protected void handleResultTimeFilter(TemporalFilter temporalFilter) {
filterQueryGenerator.addOrderBy(this.tableName + ".datastreamid");
filterQueryGenerator.addOrderBy(this.tableName + ".phenomenonTime DESC ");
} else {
String min = PostgisUtils.checkAndGetValidInstant(temporalFilter.getMin());
String max = PostgisUtils.checkAndGetValidInstant(temporalFilter.getMax());
// String min = PostgisUtils.checkAndGetValidInstant(temporalFilter.getMin());
// String max = PostgisUtils.checkAndGetValidInstant(temporalFilter.getMax());
// addCondition(
// "tsrange('"+min+"','"+max+"', '[]') @> "+this.tableName+".resultTime");
// }
String lowerBoundEquals = temporalFilter.getRange().lowerBoundType().equals(BoundType.OPEN) ? "":"=";
String upperBoundEquals = temporalFilter.getRange().upperBoundType().equals(BoundType.OPEN) ? "":"=";
addCondition(
"tsrange('"+min+"','"+max+"', '[]') @> "+this.tableName+".resultTime");
this.tableName + ".resultTime >"+lowerBoundEquals+" '" + temporalFilter.getMin() + "'"
);
addCondition(
this.tableName + ".resultTime <"+upperBoundEquals+" '" + temporalFilter.getMax() + "'"
);
}
}
}
Expand Down
Loading