Add keeppointsandlines flag

README.md

@@ -60,25 +60,48 @@ Close thin polygons can turn into lines:
 ## Usage
 
 ```sh
-go build .
-
-go run . -s=[source GPKG] -t=[target GPKG] \
+./texel -s=[source GPKG] -t=[target GPKG] \
    -tms=[tile matrix set for filtering] -z=[tile matrix ids] \
-   -p=[pagesize for writing to target GPKG] -o=[overwrite target GPKG]
+   -p=[pagesize for writing to target GPKG] -o=[overwrite target GPKG] \
+   -pl=[keep points and lines]
+
+./texel --help
+```
+
+### Docker
+
+```docker
+docker run \
+  --name texel \
+  --rm \
+  -u $(id -u):$(id -g) \
+  -v `pwd`/example:/example \
+  pdok/texel \
+    -s=./example/example.gpkg \
+    -t=./example/example-processed.gpkg \
+    -tms="NetherlandsRDNewQuad" \
+    -z '[5]' \
+    -p=10 \
+    -o=false \
+    -pl=true
+```
+
+## Build
 
+```sh
 go test ./... -covermode=atomic
+
+go build .
 ```
 
-## Docker
+### Docker
 
 ```docker
 docker build -t pdok/texel .
-docker run --rm --name texel -v `pwd`/example:/example pdok/texel ./texel \
-   -s=./example/example.gpkg -t=./example/example-processed.gpkg \
-   -tms="NetherlandsRDNewQuad" -z '[5]' \
-   -p=10 -o=false
 ```
 
+
+
 ## References
 
 * [sieve](https://github.com/pdok/sieve) is the predecessor of this tool

main.go

@@ -28,6 +28,7 @@ const OVERWRITE string = `overwrite`
 const TILEMATRIXSET string = `tilematrixset`
 const TILEMATRICES string = `tilematrices`
 const PAGESIZE string = `pagesize`
+const KEEPPOINTSANDLINES string = `keeppointsandlines`
 
 //nolint:funlen
 func main() {
@@ -80,6 +81,14 @@ func main() {
 			Required: false,
 			EnvVars:  []string{strcase.ToScreamingSnake(PAGESIZE)},
 		},
+		&cli.BoolFlag{
+			Name:     KEEPPOINTSANDLINES,
+			Aliases:  []string{"pl"},
+			Usage:    "Parts of polygons are reduced to points and lines after texel, keep these details or not.",
+			Value:    true,
+			Required: false,
+			EnvVars:  []string{strcase.ToScreamingSnake(KEEPPOINTSANDLINES)},
+		},
 	}
 
 	app.Action = func(c *cli.Context) error {
@@ -107,6 +116,7 @@ func main() {
 		gpkgTargets := make(map[int]*gpkg.TargetGeopackage, len(tileMatrixIDs))
 		overwrite := c.Bool(OVERWRITE)
 		pagesize := c.Int(PAGESIZE) // TODO divide by tile matrices count
+		keepPointsAndLines := c.Bool(KEEPPOINTSANDLINES)
 		for _, tmID := range tileMatrixIDs {
 			gpkgTargets[tmID] = initGPKGTarget(targetPathFmt, tmID, overwrite, pagesize)
 			defer gpkgTargets[tmID].Close() // yes, supposed to go here, want to close all at end of func
@@ -134,7 +144,7 @@ func main() {
 				source.Table = table
 				target.Table = table
 			}
-			processBySnapping(source, targets, tileMatrixSet)
+			processBySnapping(source, targets, tileMatrixSet, keepPointsAndLines)
 			log.Printf("  finished %s", table.Name)
 		}
 
@@ -171,8 +181,8 @@ func injectSuffixIntoPath(p string) string {
 	return path.Join(dir, name+"_%v"+ext)
 }
 
-func processBySnapping(source processing.Source, targets map[tms20.TMID]processing.Target, tileMatrixSet tms20.TileMatrixSet) {
+func processBySnapping(source processing.Source, targets map[tms20.TMID]processing.Target, tileMatrixSet tms20.TileMatrixSet, keepPointsAndLines bool) {
 	processing.ProcessFeatures(source, targets, func(p geom.Polygon, tmIDs []tms20.TMID) map[tms20.TMID][]geom.Polygon {
-		return snap.SnapPolygon(p, tileMatrixSet, tmIDs)
+		return snap.SnapPolygon(p, tileMatrixSet, tmIDs, keepPointsAndLines)
 	})
 }

snap/snap.go

@@ -23,9 +23,8 @@ import (
 )
 
 const (
-	xAx                = 0
-	yAx                = 1
-	keepPointsAndLines = true // TODO do something with polys that collapsed into points and lines
+	xAx = 0
+	yAx = 1
 )
 
 type IsOuter = bool
@@ -34,7 +33,7 @@ type IsOuter = bool
 // and adds points to lines to prevent intersections.
 //
 //nolint:revive
-func SnapPolygon(polygon geom.Polygon, tileMatrixSet tms20.TileMatrixSet, tmIDs []tms20.TMID) map[tms20.TMID][]geom.Polygon {
+func SnapPolygon(polygon geom.Polygon, tileMatrixSet tms20.TileMatrixSet, tmIDs []tms20.TMID, keepPointsAndLines bool) map[tms20.TMID][]geom.Polygon {
 	deepestID := slices.Max(tmIDs)
 	ix := pointindex.FromTileMatrixSet(tileMatrixSet, deepestID)
 	tmIDsByLevels := tileMatrixIDsByLevels(tileMatrixSet, tmIDs)
@@ -44,7 +43,7 @@ func SnapPolygon(polygon geom.Polygon, tileMatrixSet tms20.TileMatrixSet, tmIDs
 	}
 
 	ix.InsertPolygon(polygon)
-	newPolygonsPerLevel := addPointsAndSnap(ix, polygon, levels)
+	newPolygonsPerLevel := addPointsAndSnap(ix, polygon, levels, keepPointsAndLines)
 
 	newPolygonsPerTileMatrixID := make(map[tms20.TMID][]geom.Polygon, len(newPolygonsPerLevel))
 	for level, newPolygons := range newPolygonsPerLevel {
@@ -67,7 +66,7 @@ func tileMatrixIDsByLevels(tms tms20.TileMatrixSet, tmIDs []tms20.TMID) map[poin
 }
 
 //nolint:cyclop
-func addPointsAndSnap(ix *pointindex.PointIndex, polygon geom.Polygon, levels []pointindex.Level) map[pointindex.Level][]geom.Polygon {
+func addPointsAndSnap(ix *pointindex.PointIndex, polygon geom.Polygon, levels []pointindex.Level, keepPointsAndLines bool) map[pointindex.Level][]geom.Polygon {
 	levelMap := mapslicehelp.AsKeys(levels)
 	newOuters := make(map[pointindex.Level][][][2]float64, len(levels))
 	newInners := make(map[pointindex.Level][][][2]float64, len(levels))