Skip to content

Commit

Permalink
Merge branch 'develop-2.x' into v2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
hylkevds committed Oct 19, 2023
2 parents 9d6db09 + 7fafa77 commit f99469e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
**New Features**
* Added support for headers in JSON-Batch requets, enabling JSON-Patch requests in JSON-Batch requests.

**Internal changes & Bugfixes**
* Fixed #1754: resultTime/phenomenonTime mixup in MultiDatastream


## Release version 2.2.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public void initProperties(final EntityFactories entityFactories) {
new NFP<>(KEY_TIME_INTERVAL_END, table -> table.colPhenomenonTimeEnd));
pfReg.addEntryMap(ModelRegistry.EP_PROPERTIES, table -> table.colProperties);
pfReg.addEntry(pluginCoreModel.epResultTimeDs,
new PropertyFieldRegistry.ConverterTimeInterval<>(pluginCoreModel.epPhenomenonTimeDs, table -> table.colResultTimeStart, table -> table.colResultTimeEnd),
new PropertyFieldRegistry.ConverterTimeInterval<>(pluginCoreModel.epResultTimeDs, table -> table.colResultTimeStart, table -> table.colResultTimeEnd),
new NFP<>(KEY_TIME_INTERVAL_START, table -> table.colResultTimeStart),
new NFP<>(KEY_TIME_INTERVAL_END, table -> table.colResultTimeEnd));
pfReg.addEntry(pluginMultiDatastream.getEpUnitOfMeasurements(), table -> table.colUnitOfMeasurements,
Expand Down

0 comments on commit f99469e

Please sign in to comment.