From e1da4d64d549639557ebbc019852741ee4f5b954 Mon Sep 17 00:00:00 2001 From: MzHub Date: Sat, 27 Jan 2018 14:06:26 +0200 Subject: [PATCH] Fix nearby markers for new algorithm --- osmcoverer.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/osmcoverer.go b/osmcoverer.go index d5945da..60041ff 100644 --- a/osmcoverer.go +++ b/osmcoverer.go @@ -168,8 +168,8 @@ func main() { containedMarkers, containedHoleMarkers, nearbyMarkers := checkContainedMarkerFeatures(covering, holeCovering, *maxLevel, isHole, feature, markers) if *checkCellCenters { - containedMarkers = checkContainedCellCenters(polygons, isHole, feature, containedMarkers) - containedHoleMarkers = checkContainedCellCenters(holePolygons, true, feature, containedHoleMarkers) + containedMarkers, nearbyMarkers = checkContainedCellCenters(polygons, isHole, feature, containedMarkers, nearbyMarkers) + containedHoleMarkers, nearbyMarkers = checkContainedCellCenters(holePolygons, true, feature, containedHoleMarkers, nearbyMarkers) } if *outputSeparateFiles { @@ -418,7 +418,7 @@ func checkContainedMarkerFeatures( } -func checkContainedCellCenters(polygons []*s2.Polygon, isHole bool, coveringFeature *geojson.Feature, markers []Marker) []Marker { +func checkContainedCellCenters(polygons []*s2.Polygon, isHole bool, coveringFeature *geojson.Feature, markers []Marker, nearbyMarkers []Marker) ([]Marker, []Marker) { containedMarkers := []Marker{} for _, marker := range markers { isWithin := false @@ -436,9 +436,11 @@ func checkContainedCellCenters(polygons []*s2.Polygon, isHole bool, coveringFeat } if isWithin { containedMarkers = append(containedMarkers, marker) + } else { + nearbyMarkers = append(nearbyMarkers, marker) } } - return containedMarkers + return containedMarkers, nearbyMarkers }