Mercurial > gemma
diff pkg/controllers/diff.go @ 4658:4bbfe3dd2ab5 stree-experiment
Completed usage of STRTrees.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Mon, 14 Oct 2019 14:58:04 +0200 |
| parents | 5ef04ae34872 |
| children | 0ddb308fed37 |
line wrap: on
line diff
--- a/pkg/controllers/diff.go Mon Oct 14 13:18:15 2019 +0200 +++ b/pkg/controllers/diff.go Mon Oct 14 14:58:04 2019 +0200 @@ -134,7 +134,7 @@ ctx, conn, dci.Bottleneck, dci.Minuend.Time) - log.Printf("info: loading minuend octree took %s\n", time.Since(start)) + log.Printf("info: loading minuend mesh took %s\n", time.Since(start)) if err != nil { return } @@ -155,7 +155,7 @@ ctx, conn, dci.Bottleneck, dci.Subtrahend.Time) - log.Printf("info: loading subtrahend octree took %s\n", time.Since(start)) + log.Printf("info: loading subtrahend mesh took %s\n", time.Since(start)) if err != nil { return } @@ -171,12 +171,12 @@ } // We need a slow path implementation for this. - epsg := minuendTree.EPSG - if epsg != subtrahendTree.EPSG { + epsg := minuendTree.EPSG() + if epsg != subtrahendTree.EPSG() { err = mw.JSONError{ Code: http.StatusInternalServerError, Message: "Calculating differences between two different " + - "EPSG code octrees are not supported, yet.", + "EPSG code meshes are not supported, yet.", } return } @@ -254,7 +254,7 @@ tree.BuildWithout(tin, removed) - log.Printf("info: Building final STRTree took: %v\n", time.Since(start)) + log.Printf("info: Building final mesh took: %v\n", time.Since(start)) start = time.Now()