Skip to content

Commit

Permalink
fix indent styling of CellIterator
Browse files Browse the repository at this point in the history
  • Loading branch information
joker234 committed Nov 5, 2020
1 parent 4d817d5 commit af07cc0
Showing 1 changed file with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,8 @@ public Stream<IterateByTimestampEntry> iterateByTimestamps(GridOSHEntity cell) {
geom = constructClippedGeometry(osmEntity, timestamp, fullyInside);
} else {
// old style multipolygons: return only the inner holes of the geometry -> this is then
// used to "fix" the
// results obtained from calculating the geometry on the object's outer way which
// doesn't know about the
// inner members of the multipolygon relation
// used to "fix" the results obtained from calculating the geometry on the object's
// outer way which doesn't know about the inner members of the multipolygon relation
// todo: check if this is all valid?
GeometryFactory gf = new GeometryFactory();
geom = new LazyEvaluatedObject<>(() -> {
Expand Down Expand Up @@ -557,7 +555,7 @@ public Stream<IterateAllEntry> iterateByContribution(GridOSHEntity cell) {
if (!oshEntityPreFilter.test(oshEntity)
|| !allFullyInside && (
!oshEntity.getBoundingBox().intersects(boundingBox)
|| (isBoundByPolygon && bboxOutsidePolygon.test(oshEntity.getBoundingBox()))
|| (isBoundByPolygon && bboxOutsidePolygon.test(oshEntity.getBoundingBox()))
)) {
// this osh entity doesn't match the prefilter or is fully outside the requested
// area of interest -> skip it
Expand All @@ -570,7 +568,7 @@ public Stream<IterateAllEntry> iterateByContribution(GridOSHEntity cell) {

boolean fullyInside = allFullyInside || (
oshEntity.getBoundingBox().isInside(boundingBox)
&& (!isBoundByPolygon || bboxInPolygon.test(oshEntity.getBoundingBox()))
&& (!isBoundByPolygon || bboxInPolygon.test(oshEntity.getBoundingBox()))
);

Map<OSHDBTimestamp, Long> changesetTs = OSHEntities.getChangesetTimestamps(oshEntity);
Expand Down

0 comments on commit af07cc0

Please sign in to comment.