Skip to content

Commit

Permalink
fix contributions extraction endpoints for non-final deletions
Browse files Browse the repository at this point in the history 
i.e. when a deletion happens which was reverted later on. these "deletion" contributions are currently missing in the output
  • Loading branch information
@tyrasd
tyrasd committed Feb 23, 2024
1 parent 5456b6c commit 76fa3f6
Showing 1 changed file with 71 additions and 67 deletions.
138 changes: 71 additions & 67 deletions src/main/lombok/org/heigit/ohsome/ohsomeapi/executor/DataExtractionTransformer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,66 +113,85 @@ public DataExtractionTransformer(String startTimestamp, String endTimestamp,
* @return list of GeoJSON features corresponding to the given OSM entity's modifications.
*/
public List<Feature> buildChangedFeatures(List<OSMContribution> contributions) {
if (isContributionsEndpoint) {
return buildChangedFeaturesContributions(contributions);
} else {
return buildChangedFeaturesFullHistory(contributions);
}
}

private List<Feature> buildChangedFeaturesContributions(List<OSMContribution> contributions) {
List<Feature> output = new LinkedList<>();

for (int i = 0; i < contributions.size(); i++) {
if (isContributionsLatestEndpoint && i < contributions.size() - 1) {
// skip to end the loop when using contributions/latest endpoint
continue;
}
var contribution = contributions.get(i);
var currentEntity = contribution.getEntityAfter();
var currentGeom = ExecutionUtils.getGeometry(contribution, clipGeometries, false);
var timestamp = TimestampFormatter.getInstance().isoDateTime(contribution.getTimestamp());

Map<String, Object> properties = new TreeMap<>();

properties.put(TIMESTAMP_PROPERTY, timestamp);
properties.put(CONTRIBUTION_CHANGESET_ID_PROPERTY, contribution.getChangesetId());
output.add(exeUtils.createOSMFeature(currentEntity, currentGeom, properties, keysInt,
includeTags, includeOSMMetadata, includeContributionTypes, isContributionsEndpoint,
outputGeometry, contribution.getContributionTypes()));
}

return output;
}

private List<Feature> buildChangedFeaturesFullHistory(List<OSMContribution> contributions) {
List<Feature> output = new LinkedList<>();
Map<String, Object> properties;
Geometry currentGeom = null;
OSMEntity currentEntity = null;
String validFrom = null;
String validTo;
boolean skipNext = false;
if (!isContributionsLatestEndpoint) {
// first contribution:
OSMContribution firstContribution = contributions.get(0);
if (firstContribution.is(ContributionType.CREATION) && !isContributionsEndpoint) {

// first contribution:
OSMContribution firstContribution = contributions.get(0);
if (firstContribution.is(ContributionType.CREATION)) {
skipNext = true;
} else {
// if not "creation": take "before" as starting "row" (geom, tags), valid_from = t_start
currentEntity = firstContribution.getEntityBefore();
currentGeom = ExecutionUtils.getGeometry(firstContribution, clipGeometries, true);
validFrom = startTimestamp;
}

// then for each contribution:
for (OSMContribution contribution : contributions) {
// set valid_to of previous row
validTo = TimestampFormatter.getInstance().isoDateTime(contribution.getTimestamp());
if (!skipNext && currentGeom != null && !currentGeom.isEmpty()) {
boolean addToOutput = addEntityToOutput(currentEntity, currentGeom);
if (addToOutput) {
properties = new TreeMap<>();
properties.put(VALID_FROM_PROPERTY, validFrom);
properties.put(VALID_TO_PROPERTY, validTo);
output.add(exeUtils.createOSMFeature(currentEntity, currentGeom, properties, keysInt,
includeTags, includeOSMMetadata, includeContributionTypes, isContributionsEndpoint,
outputGeometry, contribution.getContributionTypes()));
}
}
skipNext = false;
if (contribution.is(ContributionType.DELETION)) {
// if deletion: skip output of next row
skipNext = true;
} else {
// if not "creation": take "before" as starting "row" (geom, tags), valid_from = t_start
currentEntity = firstContribution.getEntityBefore();
currentGeom = ExecutionUtils.getGeometry(firstContribution, clipGeometries, true);
validFrom = startTimestamp;
}
// then for each contribution:
for (int i = 0; i < contributions.size(); i++) {
if (i == contributions.size() - 1 && isContributionsEndpoint) {
// end the loop when last contribution is reached as it gets added later on
break;
}
OSMContribution contribution = contributions.get(i);
if (isContributionsEndpoint) {
currentEntity = contribution.getEntityAfter();
currentGeom = ExecutionUtils.getGeometry(contribution, clipGeometries, false);
validFrom = TimestampFormatter.getInstance().isoDateTime(contribution.getTimestamp());
}
// set valid_to of previous row
validTo = TimestampFormatter.getInstance().isoDateTime(contribution.getTimestamp());
if (!skipNext && currentGeom != null && !currentGeom.isEmpty()) {
boolean addToOutput = addEntityToOutput(currentEntity, currentGeom);
if (addToOutput) {
properties = new TreeMap<>();
if (!isContributionsEndpoint) {
properties.put(VALID_FROM_PROPERTY, validFrom);
properties.put(VALID_TO_PROPERTY, validTo);
} else {
properties.put(TIMESTAMP_PROPERTY, validTo);
properties.put(CONTRIBUTION_CHANGESET_ID_PROPERTY, contribution.getChangesetId());
}
output.add(exeUtils.createOSMFeature(currentEntity, currentGeom, properties, keysInt,
includeTags, includeOSMMetadata, includeContributionTypes, isContributionsEndpoint,
outputGeometry, contribution.getContributionTypes()));
}
}
skipNext = false;
if (contribution.is(ContributionType.DELETION)) {
// if deletion: skip output of next row
skipNext = true;
} else if (!isContributionsEndpoint) {
// else: take "after" as next row
currentEntity = contribution.getEntityAfter();
currentGeom = ExecutionUtils.getGeometry(contribution, clipGeometries, false);
validFrom = TimestampFormatter.getInstance().isoDateTime(contribution.getTimestamp());
}
// else: take "after" as next row
currentEntity = contribution.getEntityAfter();
currentGeom = ExecutionUtils.getGeometry(contribution, clipGeometries, false);
validFrom = TimestampFormatter.getInstance().isoDateTime(contribution.getTimestamp());
}
}

// after loop:
OSMContribution lastContribution = contributions.get(contributions.size() - 1);
currentGeom = ExecutionUtils.getGeometry(lastContribution, clipGeometries, false);
Expand All @@ -181,14 +200,8 @@ public List<Feature> buildChangedFeatures(List<OSMContribution> contributions) {
// if last contribution was not "deletion": set valid_to = t_end
validTo = endTimestamp;
properties = new TreeMap<>();
if (!isContributionsEndpoint) {
properties.put(VALID_FROM_PROPERTY, validFrom);
properties.put(VALID_TO_PROPERTY, validTo);
} else {
properties.put(TIMESTAMP_PROPERTY,
TimestampFormatter.getInstance().isoDateTime(lastContribution.getTimestamp()));
properties.put(CONTRIBUTION_CHANGESET_ID_PROPERTY, lastContribution.getChangesetId());
}
properties.put(VALID_FROM_PROPERTY, validFrom);
properties.put(VALID_TO_PROPERTY, validTo);
if (!currentGeom.isEmpty()) {
boolean addToOutput = addEntityToOutput(currentEntity, currentGeom);
if (addToOutput) {
Expand All @@ -197,17 +210,8 @@ public List<Feature> buildChangedFeatures(List<OSMContribution> contributions) {
outputGeometry, lastContribution.getContributionTypes()));
}
}
} else if (isContributionsEndpoint) {
// adds the deletion feature for a /contributions request
currentGeom = ExecutionUtils.getGeometry(lastContribution, clipGeometries, true);
properties = new TreeMap<>();
properties.put(TIMESTAMP_PROPERTY,
TimestampFormatter.getInstance().isoDateTime(lastContribution.getTimestamp()));
properties.put(CONTRIBUTION_CHANGESET_ID_PROPERTY, lastContribution.getChangesetId());
output.add(exeUtils.createOSMFeature(currentEntity, currentGeom, properties, keysInt, false,
includeOSMMetadata, includeContributionTypes, isContributionsEndpoint, outputGeometry,
lastContribution.getContributionTypes()));
}

return output;
}

Expand Down

0 comments on commit 76fa3f6

Please sign in to comment.