gemma: pkg/imports/sr.go annotate

annotate pkg/imports/sr.go @ 4563:a4042ab02e05 iso-areas

Store geometries in database.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Thu, 03 Oct 2019 10:05:01 +0200
parents	5cc4042cf07c
children	6b107d4e6810

rev	line source
1017 a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	1 // This is Free Software under GNU Affero General Public License v >= 3.0
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	2 // without warranty, see README.md and license for details.
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	3 //
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	4 // SPDX-License-Identifier: AGPL-3.0-or-later
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	5 // License-Filename: LICENSES/AGPL-3.0.txt
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	6 //
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	7 // Copyright (C) 2018 by via donau
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	8 // – Österreichische Wasserstraßen-Gesellschaft mbH
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	9 // Software engineering by Intevation GmbH
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	10 //
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	11 // Author(s):
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	12 // * Sascha L. Teichmann <sascha.teichmann@intevation.de>
1337 53057ab27ff2 add headers for licensing to some middleware files Fadi Abbud <fadi.abbud@intevation.de> parents: 1292 diff changeset	13 // * Tom Gottfried <tom@intevation.de>
1017 a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	14
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	15 package imports
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	16
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	17 import (
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	18 "archive/zip"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	19 "bufio"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	20 "context"
973 b6fec8f85599 Generate TINs and octrees in sounding result importer. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 972 diff changeset	21 "crypto/sha1"
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	22 "database/sql"
973 b6fec8f85599 Generate TINs and octrees in sounding result importer. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 972 diff changeset	23 "encoding/hex"
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	24 "errors"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	25 "fmt"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	26 "io"
1184 064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	27 "math"
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	28 "os"
960 e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	29 "path"
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 977 diff changeset	30 "path/filepath"
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	31 "runtime"
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	32 "strconv"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	33 "strings"
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	34 "sync"
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	35 "time"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	36
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	37 "github.com/fogleman/contourmap"
960 e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	38 shp "github.com/jonas-p/go-shp"
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	39
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	40 "gemma.intevation.de/gemma/pkg/common"
bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	41 "gemma.intevation.de/gemma/pkg/models"
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	42 "gemma.intevation.de/gemma/pkg/octree"
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	43 "gemma.intevation.de/gemma/pkg/wkb"
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	44 )
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	45
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	46 // SoundingResult is a Job to import sounding reults
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	47 // from a ZIP file into the database.
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	48 type SoundingResult struct {
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	49 // Dir is the folder in the file system where the
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	50 // 'sr.zip' is expect to be.
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	51 Dir string `json:"dir"`
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	52
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	53 // Override data
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	54 // Date if given overrides the date value from the meta.json.
1900 6a67cd819e93 To prepare stretch import made some model data types re-usable. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1786 diff changeset	55 Date *models.Date `json:"date,omitempty"`
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	56 // Date if given overrides the name of the bottleneck from the meta.json.
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	57 Bottleneck *string `json:"bottleneck,omitempty"`
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	58 // EPSG if given overrides the EPSG code from the meta.json.
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	59 // Defaults to WGS84.
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	60 EPSG *uint `json:"epsg,omitempty"`
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	61 // DepthReference if given overides the DepthReference value
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	62 // from the meta.json.
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	63 DepthReference *string `json:"depth-reference,omitempty"`
3585 479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3518 diff changeset	64 // SingleBeam indicates that the sounding is a single beam scan.
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3518 diff changeset	65 SingleBeam *bool `json:"single-beam,omitempty"`
3945 3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	66 // NegateZ indicated that the Z values of thy XYZ input should be
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	67 // multiplied by -1.
3946 d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	68 NegateZ *bool `json:"negate-z,omitempty"`
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	69 }
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	70
964 1e2dce348cfb Serialize boundary polygon of sounding result as WKB. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 961 diff changeset	71 const (
1130 42617bba8709 Go from 50cm to 10cm stepwidth in calculating the contorlines. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1017 diff changeset	72 contourStepWidth = 0.1
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	73 contourTolerance = 0.1
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	74 )
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	75
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	76 const (
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	77 // pointsPerSquareMeter is the average number of points
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	78 // when generating a artifical height model for single beam scans.
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	79 pointsPerSquareMeter = 2
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	80 )
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	81
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	82 const (
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	83 // isoCellSize is the side length of a raster cell when tracing
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	84 // iso areas.
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	85 isoCellSize = 0.5
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	86 )
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	87
4182 49012340336c Made 'golint' finally happy with imports package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4177 diff changeset	88 // SRJobKind is the unique name of this import job type.
991 a301d240905f Decoupled import job creation and job execution with a factory function. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 988 diff changeset	89 const SRJobKind JobKind = "sr"
a301d240905f Decoupled import job creation and job execution with a factory function. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 988 diff changeset	90
1136 a5069da2f0b7 Independent imports in terms of affected tables/dependencies are now run concurrently. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1131 diff changeset	91 type srJobCreator struct{}
a5069da2f0b7 Independent imports in terms of affected tables/dependencies are now run concurrently. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1131 diff changeset	92
4214 49564382ffff Added a import queue job to recalculate the contour lines of the sounding results if the heights have changed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4182 diff changeset	93 func init() { RegisterJobCreator(SRJobKind, srJobCreator{}) }
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	94
1754 807569b08513 Import queue: Auto acceptance is now a property of the import kind itself and is not configurable any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1664 diff changeset	95 func (srJobCreator) Description() string { return "sounding results" }
807569b08513 Import queue: Auto acceptance is now a property of the import kind itself and is not configurable any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1664 diff changeset	96
807569b08513 Import queue: Auto acceptance is now a property of the import kind itself and is not configurable any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1664 diff changeset	97 func (srJobCreator) AutoAccept() bool { return false }
1646 a0982c38eac0 Import queue: Implemented email notifications. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1572 diff changeset	98
2187 7c83b5277c1c Import queue: Removed boilerplate code to deserialize jobs from JSON by making it part of the import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2168 diff changeset	99 func (srJobCreator) Create() Job { return new(SoundingResult) }
1136 a5069da2f0b7 Independent imports in terms of affected tables/dependencies are now run concurrently. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1131 diff changeset	100
3219 4acbee65275d Import queue: Split locked dependencies in exclusively and multiple uses. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2963 diff changeset	101 func (srJobCreator) Depends() [2][]string {
4acbee65275d Import queue: Split locked dependencies in exclusively and multiple uses. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2963 diff changeset	102 return [2][]string{
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	103 {"sounding_results",
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	104 "sounding_results_contour_lines",
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	105 "sounding_results_iso_areas",
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	106 },
3219 4acbee65275d Import queue: Split locked dependencies in exclusively and multiple uses. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2963 diff changeset	107 {"bottlenecks"},
1136 a5069da2f0b7 Independent imports in terms of affected tables/dependencies are now run concurrently. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1131 diff changeset	108 }
a5069da2f0b7 Independent imports in terms of affected tables/dependencies are now run concurrently. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1131 diff changeset	109 }
a5069da2f0b7 Independent imports in terms of affected tables/dependencies are now run concurrently. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1131 diff changeset	110
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	111 func (srJobCreator) StageDone(
1328 d753ce6cf588 To make golint happier made context.Context to be the first argument in all calls. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1317 diff changeset	112 ctx context.Context,
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	113 tx *sql.Tx,
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	114 id int64,
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	115 ) error {
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	116 _, err := tx.ExecContext(ctx, srStageDoneSQL, id)
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	117 return err
991 a301d240905f Decoupled import job creation and job execution with a factory function. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 988 diff changeset	118 }
a301d240905f Decoupled import job creation and job execution with a factory function. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 988 diff changeset	119
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	120 const (
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	121 srStageDoneSQL = `
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	122 UPDATE waterway.sounding_results SET staging_done = true
1502 0abcc82ef976 Sounding results: Be a bit more precise when setting stageing_done. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1501 diff changeset	123 WHERE id = (
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1900 diff changeset	124 SELECT key from import.track_imports
1502 0abcc82ef976 Sounding results: Be a bit more precise when setting stageing_done. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1501 diff changeset	125 WHERE import_id = $1 AND
0abcc82ef976 Sounding results: Be a bit more precise when setting stageing_done. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1501 diff changeset	126 relation = 'waterway.sounding_results'::regclass)`
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	127
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	128 insertHullSQL = `
961 a4c92e0ef2e1 Stored point cloud and bounding area of sounding result in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 960 diff changeset	129 INSERT INTO waterway.sounding_results (
a4c92e0ef2e1 Stored point cloud and bounding area of sounding result in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 960 diff changeset	130 bottleneck_id,
a4c92e0ef2e1 Stored point cloud and bounding area of sounding result in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 960 diff changeset	131 date_info,
a4c92e0ef2e1 Stored point cloud and bounding area of sounding result in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 960 diff changeset	132 depth_reference,
a4c92e0ef2e1 Stored point cloud and bounding area of sounding result in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 960 diff changeset	133 area
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	134 ) SELECT
3656 2a079d0a71c1 Ensure sounding results are associated to matching bottleneck version Tom Gottfried <tom@intevation.de> parents: 3645 diff changeset	135 bottleneck_id,
961 a4c92e0ef2e1 Stored point cloud and bounding area of sounding result in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 960 diff changeset	136 $2::date,
a4c92e0ef2e1 Stored point cloud and bounding area of sounding result in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 960 diff changeset	137 $3,
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	138 (SELECT
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	139 CASE WHEN $5::bytea IS NULL THEN
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	140 ST_Transform(ST_ConcaveHull(ST_Force2D(ST_GeomFromWKB($4, $6::integer)), 0.7), 4326)::geography
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	141 ELSE
3652 f415c5ed60f6 Another attempt to fix the ST_IsValid check contstraint problem ... and also failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3651 diff changeset	142 ST_MakeValid(ST_Transform(ST_GeomFromWKB($5, $6::integer), 4326))::geography
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	143 END)
3656 2a079d0a71c1 Ensure sounding results are associated to matching bottleneck version Tom Gottfried <tom@intevation.de> parents: 3645 diff changeset	144 FROM waterway.bottlenecks
2a079d0a71c1 Ensure sounding results are associated to matching bottleneck version Tom Gottfried <tom@intevation.de> parents: 3645 diff changeset	145 WHERE objnam = $1 AND validity @> CAST($2 AS timestamptz)
971 f9fb6c399f3f Moved generating of tins to octree package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 964 diff changeset	146 RETURNING
f9fb6c399f3f Moved generating of tins to octree package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 964 diff changeset	147 id,
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	148 ST_X(ST_Centroid(area::geometry)),
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	149 ST_Y(ST_Centroid(area::geometry)),
2833 1b6840093eac Prevent calculation of wrong UTM zones Tom Gottfried <tom@intevation.de> parents: 2612 diff changeset	150 best_utm(area),
1b6840093eac Prevent calculation of wrong UTM zones Tom Gottfried <tom@intevation.de> parents: 2612 diff changeset	151 ST_AsBinary(ST_Transform(area::geometry, best_utm(area)))
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	152 `
973 b6fec8f85599 Generate TINs and octrees in sounding result importer. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 972 diff changeset	153
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	154 reprojectPointsBufferedSQL = `
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	155 SELECT
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	156 ST_AsBinary(ST_Transform(ST_GeomFromWKB($1, $2::integer), $3::integer)),
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	157 ST_AsBinary(ST_Buffer(ST_Transform(ST_GeomFromWKB($1, $2::integer), $3::integer), 0.1)),
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	158 ST_Area(ST_Transform(ST_GeomFromWKB($1, $2::integer), $3::integer))`
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	159
973 b6fec8f85599 Generate TINs and octrees in sounding result importer. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 972 diff changeset	160 insertOctreeSQL = `
1131 2e6b47cdb2ca Store octrees along with sounding results Tom Gottfried <tom@intevation.de> parents: 1130 diff changeset	161 UPDATE waterway.sounding_results SET
2e6b47cdb2ca Store octrees along with sounding results Tom Gottfried <tom@intevation.de> parents: 1130 diff changeset	162 octree_checksum = $2, octree_index = $3
2e6b47cdb2ca Store octrees along with sounding results Tom Gottfried <tom@intevation.de> parents: 1130 diff changeset	163 WHERE id = $1`
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	164
3651 c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	165 repairBoundarySQL = `
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	166 SELECT
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	167 ST_AsBinary(ST_Buffer(ST_MakeValid(ST_GeomFromWKB($1, $2::integer)), 0.0)),
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	168 ST_AsBinary(ST_Buffer(ST_MakeValid(ST_GeomFromWKB($1, $2::integer)), 0.1))`
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	169
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	170 insertContourSQL = `
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	171 INSERT INTO waterway.sounding_results_contour_lines (
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	172 sounding_result_id,
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	173 height,
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	174 lines
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	175 )
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	176 SELECT
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	177 $1,
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	178 $2,
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	179 ST_Transform(
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	180 ST_Multi(
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	181 ST_CollectionExtract(
1137 2fb6c0a6ec8a Avoid intersection of each isoline with area on insert Tom Gottfried <tom@intevation.de> parents: 1136 diff changeset	182 ST_SimplifyPreserveTopology(
1410 eb82076fdffe Sounding result import: Ensure that the generated iso-lines are valid. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1392 diff changeset	183 ST_Multi(ST_Collectionextract(
eb82076fdffe Sounding result import: Ensure that the generated iso-lines are valid. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1392 diff changeset	184 ST_MakeValid(ST_GeomFromWKB($4, $3::integer)), 2)),
1137 2fb6c0a6ec8a Avoid intersection of each isoline with area on insert Tom Gottfried <tom@intevation.de> parents: 1136 diff changeset	185 $5
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	186 ),
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	187 2
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	188 )
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	189 ),
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	190 4326
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	191 )
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	192 FROM waterway.sounding_results sr
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	193 WHERE id = $1
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	194 `
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	195 insertIsoAreasSQL = `
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	196 INSERT INTO waterway.sounding_results_iso_areas (
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	197 sounding_result_id,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	198 height,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	199 areas
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	200 )
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	201 SELECT
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	202 $1,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	203 $2,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	204 ST_Transform(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	205 ST_Multi(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	206 ST_CollectionExtract(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	207 ST_SimplifyPreserveTopology(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	208 ST_Multi(ST_Collectionextract(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	209 ST_MakeValid(ST_GeomFromWKB($4, $3::integer)), 2)),
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	210 $5
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	211 ),
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	212 3
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	213 )
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	214 ),
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	215 4326
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	216 )
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	217 FROM waterway.sounding_results sr
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	218 WHERE id = $1
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	219 `
3479 83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	220
83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	221 selectGaugeLDCSQL = `
83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	222 SELECT
3518 4cd4375efd5d ZP for sounding result imports: Use precise name of the depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3504 diff changeset	223 grwl.value,
4cd4375efd5d ZP for sounding result imports: Use precise name of the depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3504 diff changeset	224 grwl.depth_reference
3479 83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	225 FROM waterway.gauges_reference_water_levels grwl
83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	226 JOIN waterway.bottlenecks bns
83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	227 ON grwl.location = bns.gauge_location
4055 98e2041c7ebf Adapted sr-import to new historization model. Sascha Wilde <wilde@intevation.de> parents: 3977 diff changeset	228 AND grwl.validity @> CAST($2 AS timestamptz)
3645 02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	229 WHERE bns.objnam = $1
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	230 AND bns.validity @> CAST($2 AS timestamptz)
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	231 AND grwl.depth_reference like 'LDC%'
3479 83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	232 `
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	233
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	234 reprojectPointsSingleBeamSQL = `
3600 6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	235 SELECT
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	236 ST_AsBinary(
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	237 ST_Transform(
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	238 ST_GeomFromWKB($1, $2::integer),
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	239 best_utm(CAST(ST_Transform(ST_GeomFromWKB($1, $2::integer), 4326) AS geography)))),
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	240 best_utm(CAST(ST_Transform(ST_GeomFromWKB($1, $2::integer), 4326) AS geography))
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	241 `
961 a4c92e0ef2e1 Stored point cloud and bounding area of sounding result in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 960 diff changeset	242 )
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	243
3946 d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	244 func (sr *SoundingResult) singleBeam() bool {
3585 479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3518 diff changeset	245 return sr.SingleBeam != nil && *sr.SingleBeam
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3518 diff changeset	246 }
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3518 diff changeset	247
3946 d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	248 func (sr *SoundingResult) negateZ() bool {
d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	249 return sr.NegateZ != nil && *sr.NegateZ
d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	250 }
d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	251
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	252 // Do executes the actual sounding result import.
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	253 func (sr *SoundingResult) Do(
1328 d753ce6cf588 To make golint happier made context.Context to be the first argument in all calls. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1317 diff changeset	254 ctx context.Context,
1168 930fdd8b474f Track successfull imports in a separate table to be able to remove them later. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1138 diff changeset	255 importID int64,
930fdd8b474f Track successfull imports in a separate table to be able to remove them later. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1138 diff changeset	256 conn *sql.Conn,
930fdd8b474f Track successfull imports in a separate table to be able to remove them later. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1138 diff changeset	257 feedback Feedback,
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1384 diff changeset	258 ) (interface{}, error) {
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	259
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	260 start := time.Now()
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	261
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	262 zpath := filepath.Join(sr.Dir, "sr.zip")
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	263
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	264 z, err := zip.OpenReader(zpath)
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	265 if err != nil {
3762 98d5dd2f0ca1 Don't show unnecessary warnings when uploading TXT file for SR. Sascha Wilde <wilde@intevation.de> parents: 3748 diff changeset	266 feedback.Info("%v", err)
98d5dd2f0ca1 Don't show unnecessary warnings when uploading TXT file for SR. Sascha Wilde <wilde@intevation.de> parents: 3748 diff changeset	267 feedback.Info("Falling back to TXT file mode.")
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	268 z = nil
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	269 }
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	270 if z != nil {
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	271 defer z.Close()
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	272 }
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	273
1138 443fc80a315f Don't issue new lines at end of log messages when importing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1137 diff changeset	274 feedback.Info("Looking for 'meta.json'")
3600 6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	275
1225 4d7c44f7044e Factored out som zip lookup code to be reusable in sounding result upload controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1224 diff changeset	276 mf := common.FindInZIP(z, "meta.json")
1292 5aeda02c51b9 Sounding result import: Don't fail if an import ZIP does not contain an meta.json but has a full set of overrides. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	277 if mf == nil && !sr.completeOverride() {
4177 8b75ac5e243e Made 'staticcheck' happy with pgxutils package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4171 diff changeset	278 return nil, errors.New("cannot find 'meta.json'")
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	279 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	280
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	281 m, err := sr.loadMeta(mf)
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	282 if err != nil {
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1384 diff changeset	283 return nil, err
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	284 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	285
2873 b1707f60f241 SR import: Log name of bottleneck and survey date into import log. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2833 diff changeset	286 feedback.Info("Bottleneck: %s", m.Bottleneck)
b1707f60f241 SR import: Log name of bottleneck and survey date into import log. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2833 diff changeset	287 feedback.Info("Survey date: %s", m.Date.Format(common.DateFormat))
b1707f60f241 SR import: Log name of bottleneck and survey date into import log. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2833 diff changeset	288
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	289 var xform vertexTransform
fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	290
3946 d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	291 if sr.negateZ() {
3945 3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	292 xform = negateZTransform
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	293 } else {
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	294 xform = identityTransform
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	295 }
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	296
3479 83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	297 if m.DepthReference == "ZPG" {
83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	298 feedback.Info("Found ZPG as reference system -> translating Z values to LDC")
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	299 var ldc float64
3518 4cd4375efd5d ZP for sounding result imports: Use precise name of the depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3504 diff changeset	300 var depthReference string
3645 02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	301 err := conn.QueryRowContext(ctx,
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	302 selectGaugeLDCSQL,
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	303 m.Bottleneck,
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	304 m.Date.Time,
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	305 ).Scan(
3518 4cd4375efd5d ZP for sounding result imports: Use precise name of the depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3504 diff changeset	306 &ldc,
4cd4375efd5d ZP for sounding result imports: Use precise name of the depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3504 diff changeset	307 &depthReference,
4cd4375efd5d ZP for sounding result imports: Use precise name of the depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3504 diff changeset	308 )
3479 83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	309 switch {
83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	310 case err == sql.ErrNoRows:
4177 8b75ac5e243e Made 'staticcheck' happy with pgxutils package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4171 diff changeset	311 return nil, errors.New("cannot load LDC value")
3479 83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	312 case err != nil:
83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	313 return nil, err
83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	314 }
3904 4b5c4007fc5d SR import: Fixed LDC treatment if depth reference system is ZPG. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3882 diff changeset	315
4b5c4007fc5d SR import: Fixed LDC treatment if depth reference system is ZPG. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3882 diff changeset	316 // LDC is cm. The data is in m.
4b5c4007fc5d SR import: Fixed LDC treatment if depth reference system is ZPG. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3882 diff changeset	317 ldc /= 100
3945 3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	318 xform = chainTransforms(
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	319 xform,
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	320 func(v octree.Vertex) octree.Vertex {
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	321 return octree.Vertex{X: v.X, Y: v.Y, Z: v.Z + ldc}
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	322 })
3518 4cd4375efd5d ZP for sounding result imports: Use precise name of the depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3504 diff changeset	323 m.DepthReference = depthReference
3479 83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	324 }
83b58f6356e7 Translate sounding results Z values import to LDC if ZPG was found as depth reference system. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3219 diff changeset	325
1328 d753ce6cf588 To make golint happier made context.Context to be the first argument in all calls. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1317 diff changeset	326 if err := m.Validate(ctx, conn); err != nil {
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1384 diff changeset	327 return nil, common.ToError(err)
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	328 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	329
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	330 var xyz octree.MultiPointZ
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	331
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	332 if z != nil { // Scanning ZIP file for *.xyz file.
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	333 var xyzf *zip.File
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	334 for _, ext := range []string{".xyz", ".txt"} {
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	335 feedback.Info("Looking for '*%s'", ext)
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	336 if xyzf = common.FindInZIP(z, ext); xyzf != nil {
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	337 break
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	338 }
1528 5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1502 diff changeset	339 }
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	340 if xyzf == nil {
4177 8b75ac5e243e Made 'staticcheck' happy with pgxutils package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4171 diff changeset	341 return nil, errors.New("cannot find any .xyz or .txt file")
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	342 }
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	343 xyz, err = loadXYZ(xyzf, feedback, xform)
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	344 } else { // TXT file mode
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	345 xyz, err = loadXYZFile(zpath, feedback, xform)
1528 5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1502 diff changeset	346 }
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	347 if err != nil {
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1384 diff changeset	348 return nil, err
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	349 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	350
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	351 if len(xyz) == 0 {
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1384 diff changeset	352 return nil, errors.New("XYZ does not contain any vertices")
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	353 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	354
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	355 // Is there a boundary shapefile in the ZIP archive?
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	356 boundary, err := loadBoundary(z)
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	357 if err != nil {
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1384 diff changeset	358 return nil, err
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	359 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	360
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	361 tx, err := conn.BeginTx(ctx, nil)
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	362 if err != nil {
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1384 diff changeset	363 return nil, err
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	364 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	365 defer tx.Rollback()
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	366
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	367 var summary interface{}
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	368
3946 d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	369 if sr.singleBeam() {
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	370 summary, err = sr.processScan(
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	371 ctx,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	372 tx,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	373 feedback,
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	374 true,
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	375 importID,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	376 m,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	377 xyz,
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	378 boundary,
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	379 )
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	380 } else {
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	381 summary, err = sr.processScan(
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	382 ctx,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	383 tx,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	384 feedback,
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	385 false,
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	386 importID,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	387 m,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	388 xyz,
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	389 boundary,
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	390 )
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	391 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	392 if err != nil {
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	393 return nil, err
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	394 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	395
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	396 if err = tx.Commit(); err != nil {
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	397 feedback.Error(
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	398 "Storing sounding result failed after %v.", time.Since(start))
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	399 return nil, err
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	400 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	401
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	402 feedback.Info(
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	403 "Storing sounding result was successful after %v.", time.Since(start))
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	404
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	405 return summary, nil
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	406 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	407
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	408 func (sr *SoundingResult) processScan(
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	409 ctx context.Context,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	410 tx *sql.Tx,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	411 feedback Feedback,
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	412 singleBeam bool,
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	413 importID int64,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	414 m *models.SoundingResultMeta,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	415 xyz octree.MultiPointZ,
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	416 boundary polygonSlice,
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	417 ) (interface{}, error) {
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	418
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	419 if singleBeam {
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	420 feedback.Info("Processing as single beam scan.")
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	421 } else {
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	422 feedback.Info("Processing as multi beam scan.")
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	423 }
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	424
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	425 feedback.Info("Reproject XYZ data.")
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	426
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	427 start := time.Now()
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	428
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	429 xyzWKB := xyz.AsWKB()
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	430 var reproj []byte
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	431 var epsg uint32
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	432
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	433 if err := tx.QueryRowContext(
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	434 ctx,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	435 reprojectPointsSingleBeamSQL,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	436 xyzWKB,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	437 m.EPSG,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	438 ).Scan(&reproj, &epsg); err != nil {
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	439 return nil, err
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	440 }
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	441
3600 6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	442 if err := xyz.FromWKB(reproj); err != nil {
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	443 return nil, err
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	444 }
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	445
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	446 feedback.Info("Reprojecting points to EPSG %d took %v.",
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	447 epsg, time.Since(start))
3600 6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	448 feedback.Info("Number of reprojected points: %d", len(xyz))
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	449 feedback.Info("Triangulate XYZ data.")
3600 6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	450
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	451 start = time.Now()
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	452 tri, err := octree.Triangulate(xyz)
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	453 if err != nil {
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	454 return nil, err
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	455 }
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	456 feedback.Info("Triangulation took %v.", time.Since(start))
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	457 feedback.Info("Number triangles: %d.", len(tri.Triangles)/3)
6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	458
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	459 var (
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	460 clippingPolygon octree.Polygon
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	461 clippingPolygonBuffered octree.Polygon
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	462 removed map[int32]struct{}
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	463 polygonArea float64
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	464 clippingPolygonWKB []byte
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	465 tin *octree.Tin
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	466 )
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	467
3600 6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	468 if boundary == nil {
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	469 feedback.Info("No boundary given. Calulate from XYZ data.")
3733 ec86a7155377 Estimated too large triangles as triangles which have an edge which is at least 3.5 times as long as the standard dev of the longest egde per inner triangle. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3664 diff changeset	470 tooLongEdge := tri.EstimateTooLong()
3655 a6c671abbc35 Started with cleaning up the single beam import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3654 diff changeset	471 feedback.Info("Eliminate triangles with edges longer than %.2f meters.", tooLongEdge)
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	472
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	473 var polygon octree.LineStringZ
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	474 start = time.Now()
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	475 polygon, removed = tri.ConcaveHull(tooLongEdge)
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	476
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	477 polygonArea = polygon.Area()
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	478 if polygonArea < 0.0 { // counter clockwise
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	479 polygonArea = -polygonArea
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	480 polygon.Reverse()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	481 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	482
3651 c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	483 clippingPolygon.FromLineStringZ(polygon)
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	484
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	485 var buffered []byte
3651 c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	486 if err := tx.QueryRowContext(
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	487 ctx,
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	488 repairBoundarySQL,
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	489 clippingPolygon.AsWKB(),
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	490 epsg,
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	491 ).Scan(&clippingPolygonWKB, &buffered); err != nil {
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	492 return nil, err
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	493 }
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	494
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	495 if err := clippingPolygon.FromWKB(clippingPolygonWKB); err != nil {
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	496 return nil, err
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	497 }
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	498 if err := clippingPolygonBuffered.FromWKB(buffered); err != nil {
3651 c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	499 return nil, err
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	500 }
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	501
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	502 feedback.Info("Calculating took %v.", time.Since(start))
3600 6590733e2ebc SR import: If in single beam mode and no boundary is given eliminate triangles which have at least an edge with is longer than 98% of the overall edge lengths. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3596 diff changeset	503
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	504 } else { // has Boundary
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	505 feedback.Info("Using uploaded boundary polygon.")
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	506 var buffered []byte
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	507 if err = tx.QueryRowContext(
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	508 ctx,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	509 reprojectPointsBufferedSQL,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	510 boundary.asWKB(),
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	511 m.EPSG,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	512 epsg,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	513 ).Scan(&clippingPolygonWKB, &buffered, &polygonArea); err != nil {
3651 c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	514 return nil, err
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	515 }
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	516 if err := clippingPolygon.FromWKB(clippingPolygonWKB); err != nil {
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	517 return nil, err
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	518 }
3651 c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	519 if err := clippingPolygonBuffered.FromWKB(buffered); err != nil {
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	520 return nil, err
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	521 }
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	522
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	523 tin := tri.Tin()
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	524 tin.EPSG = epsg
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	525
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	526 var str octree.STRTree
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	527 str.Build(tin)
3655 a6c671abbc35 Started with cleaning up the single beam import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3654 diff changeset	528
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	529 removed = str.Clip(&clippingPolygon)
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	530 }
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	531
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	532 if singleBeam {
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	533
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	534 // Build the first mesh to generate random points on.
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	535
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	536 feedback.Info("Build virtual DEM based on original XYZ data.")
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	537
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	538 start = time.Now()
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	539
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	540 var tree *octree.Tree
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	541 {
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	542 builder := octree.NewBuilder(tri.Tin())
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	543 builder.Build(removed)
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	544 tree = builder.Tree()
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	545 }
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	546
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	547 feedback.Info("Building took %v", time.Since(start))
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	548
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	549 feedback.Info("Boundary area: %.2fm²", polygonArea)
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	550
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	551 numPoints := int(math.Ceil(polygonArea * pointsPerSquareMeter))
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	552
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	553 feedback.Info("Generate %d random points for an average density of ~%d points/m².",
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	554 numPoints, pointsPerSquareMeter)
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	555
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	556 start = time.Now()
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	557
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	558 generated := make(octree.LineStringZ, 0, numPoints+clippingPolygon.NumVertices(0))
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	559
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	560 tree.GenerateRandomVertices(numPoints, func(vertices []octree.Vertex) {
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	561 generated = append(generated, vertices...)
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	562 })
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	563
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	564 feedback.Info("Generating %d points took %v.", len(generated), time.Since(start))
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	565
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	566 // Add the boundary to new point cloud.
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	567 dupes := map[[2]float64]struct{}{}
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	568 clippingPolygon.Vertices(0, func(x, y float64) {
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	569 key := [2]float64{x, y}
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	570 if _, found := dupes[key]; found {
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	571 return
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	572 }
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	573 dupes[key] = struct{}{}
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	574 if z, ok := tree.Value(x, y); ok {
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	575 generated = append(generated, octree.Vertex{X: x, Y: y, Z: z})
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	576 }
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	577 })
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	578
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	579 feedback.Info("Triangulate new point cloud.")
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	580 xyz = octree.MultiPointZ(generated)
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	581 start = time.Now()
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	582
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	583 tri, err = octree.Triangulate(xyz)
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	584 if err != nil {
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	585 return nil, err
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	586 }
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	587 feedback.Info("Second triangulation took %v.", time.Since(start))
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	588 feedback.Info("Number triangles: %d.", len(tri.Triangles)/3)
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	589 feedback.Info("Clipping triangles from new mesh.")
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	590
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	591 }
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	592
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	593 start = time.Now()
3742 879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	594 tin = tri.Tin()
879c297c47e9 SR import: Use home-brew concave hull algorithm in multi-beam scan case, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3733 diff changeset	595 tin.EPSG = epsg
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	596
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	597 var str octree.STRTree
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	598 str.Build(tin)
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	599 feedback.Info("Building STR tree took %v", time.Since(start))
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	600
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	601 start = time.Now()
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	602
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	603 clippingPolygonBuffered.Indexify()
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	604 removed = str.Clip(&clippingPolygonBuffered)
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	605 feedback.Info("Clipping STR tree took %v.", time.Since(start))
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	606 feedback.Info("Number of triangles to clip %d.", len(removed))
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	607
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	608 feedback.Info("Build final octree index")
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	609
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	610 builder := octree.NewBuilder(tin)
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	611 builder.Build(removed)
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	612 octreeIndex, err := builder.Bytes()
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	613 if err != nil {
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	614 return nil, err
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	615 }
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	616 feedback.Info("Building octree took %v.", time.Since(start))
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	617 feedback.Info("Store octree.")
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	618
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	619 start = time.Now()
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	620
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	621 var (
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	622 id int64
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	623 dummy uint32
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	624 lat, lon float64
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	625 )
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	626
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	627 var hull []byte
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	628
3664 58508f50d192 SR import: Made error messages symmetrical to multi beam if no matching bottleneck is found for single beam imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3659 diff changeset	629 err = tx.QueryRowContext(
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	630 ctx,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	631 insertHullSQL,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	632 m.Bottleneck,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	633 m.Date.Time,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	634 m.DepthReference,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	635 nil,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	636 clippingPolygonWKB,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	637 epsg,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	638 ).Scan(
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	639 &id,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	640 &lat,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	641 &lon,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	642 &dummy,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	643 &hull,
3664 58508f50d192 SR import: Made error messages symmetrical to multi beam if no matching bottleneck is found for single beam imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3659 diff changeset	644 )
58508f50d192 SR import: Made error messages symmetrical to multi beam if no matching bottleneck is found for single beam imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3659 diff changeset	645
58508f50d192 SR import: Made error messages symmetrical to multi beam if no matching bottleneck is found for single beam imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3659 diff changeset	646 switch {
58508f50d192 SR import: Made error messages symmetrical to multi beam if no matching bottleneck is found for single beam imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3659 diff changeset	647 case err == sql.ErrNoRows:
58508f50d192 SR import: Made error messages symmetrical to multi beam if no matching bottleneck is found for single beam imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3659 diff changeset	648 return nil, fmt.Errorf(
4177 8b75ac5e243e Made 'staticcheck' happy with pgxutils package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4171 diff changeset	649 "no matching bottleneck of given name or time available: %v", err)
3664 58508f50d192 SR import: Made error messages symmetrical to multi beam if no matching bottleneck is found for single beam imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3659 diff changeset	650 case err != nil:
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	651 return nil, err
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	652 }
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	653
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	654 h := sha1.New()
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	655 h.Write(octreeIndex)
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	656 checksum := hex.EncodeToString(h.Sum(nil))
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	657 _, err = tx.ExecContext(ctx, insertOctreeSQL, id, checksum, octreeIndex)
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	658 if err != nil {
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	659 return nil, err
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	660 }
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	661 feedback.Info("Storing octree index took %s.", time.Since(start))
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	662 err = generateIsos(ctx, tx, feedback, builder.Tree(), id)
3658 1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	663 if err != nil {
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	664 return nil, err
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	665 }
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	666
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	667 // Store for potential later removal.
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	668 if err = track(ctx, tx, importID, "waterway.sounding_results", id); err != nil {
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	669 return nil, err
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	670 }
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	671
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	672 summary := struct {
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	673 Bottleneck string `json:"bottleneck"`
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	674 Date models.Date `json:"date"`
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	675 Lat float64 `json:"lat"`
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	676 Lon float64 `json:"lon"`
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	677 }{
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	678 Bottleneck: m.Bottleneck,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	679 Date: m.Date,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	680 Lat: lat,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	681 Lon: lon,
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	682 }
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	683
1c3df921361d Handle th case that a boundary polygon is uploaded along side with the single beam scan. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3655 diff changeset	684 return &summary, nil
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	685 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	686
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	687 // CleanUp removes the folder containing the ZIP file with the
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	688 // the sounding result import.
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	689 func (sr *SoundingResult) CleanUp() error {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	690 return os.RemoveAll(sr.Dir)
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	691 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	692
1292 5aeda02c51b9 Sounding result import: Don't fail if an import ZIP does not contain an meta.json but has a full set of overrides. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	693 func (sr *SoundingResult) completeOverride() bool {
1384 8d59457a5651 Sounding result import: Consider parameter override as complete even if there is no EPSG code. Use WGS84 in this case as a default. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1338 diff changeset	694 // sr.EPSG == nil -> WGS84
3586 b9adb0ea4c41 SR import: a complete parameter overwrite now includes single beam flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3585 diff changeset	695 return sr.Bottleneck != nil &&
b9adb0ea4c41 SR import: a complete parameter overwrite now includes single beam flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3585 diff changeset	696 sr.Date != nil &&
b9adb0ea4c41 SR import: a complete parameter overwrite now includes single beam flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3585 diff changeset	697 sr.DepthReference != nil &&
3946 d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	698 sr.SingleBeam != nil &&
d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	699 sr.NegateZ != nil
1292 5aeda02c51b9 Sounding result import: Don't fail if an import ZIP does not contain an meta.json but has a full set of overrides. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	700 }
5aeda02c51b9 Sounding result import: Don't fail if an import ZIP does not contain an meta.json but has a full set of overrides. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	701
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	702 func (sr SoundingResult) loadMeta(f zip.File) (*models.SoundingResultMeta, error) {
1292 5aeda02c51b9 Sounding result import: Don't fail if an import ZIP does not contain an meta.json but has a full set of overrides. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	703 if f == nil {
1384 8d59457a5651 Sounding result import: Consider parameter override as complete even if there is no EPSG code. Use WGS84 in this case as a default. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1338 diff changeset	704 var epsg uint
8d59457a5651 Sounding result import: Consider parameter override as complete even if there is no EPSG code. Use WGS84 in this case as a default. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1338 diff changeset	705 if sr.EPSG != nil {
8d59457a5651 Sounding result import: Consider parameter override as complete even if there is no EPSG code. Use WGS84 in this case as a default. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1338 diff changeset	706 epsg = *sr.EPSG
8d59457a5651 Sounding result import: Consider parameter override as complete even if there is no EPSG code. Use WGS84 in this case as a default. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1338 diff changeset	707 } else {
8d59457a5651 Sounding result import: Consider parameter override as complete even if there is no EPSG code. Use WGS84 in this case as a default. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1338 diff changeset	708 epsg = models.WGS84
8d59457a5651 Sounding result import: Consider parameter override as complete even if there is no EPSG code. Use WGS84 in this case as a default. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1338 diff changeset	709 }
1292 5aeda02c51b9 Sounding result import: Don't fail if an import ZIP does not contain an meta.json but has a full set of overrides. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	710 return &models.SoundingResultMeta{
5aeda02c51b9 Sounding result import: Don't fail if an import ZIP does not contain an meta.json but has a full set of overrides. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	711 Date: *sr.Date,
5aeda02c51b9 Sounding result import: Don't fail if an import ZIP does not contain an meta.json but has a full set of overrides. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	712 Bottleneck: *sr.Bottleneck,
1384 8d59457a5651 Sounding result import: Consider parameter override as complete even if there is no EPSG code. Use WGS84 in this case as a default. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1338 diff changeset	713 EPSG: epsg,
1292 5aeda02c51b9 Sounding result import: Don't fail if an import ZIP does not contain an meta.json but has a full set of overrides. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	714 DepthReference: *sr.DepthReference,
3946 d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	715 SingleBeam: sr.singleBeam(),
d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	716 NegateZ: sr.negateZ(),
1292 5aeda02c51b9 Sounding result import: Don't fail if an import ZIP does not contain an meta.json but has a full set of overrides. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	717 }, nil
5aeda02c51b9 Sounding result import: Don't fail if an import ZIP does not contain an meta.json but has a full set of overrides. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	718 }
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	719 r, err := f.Open()
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	720 if err != nil {
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	721 return nil, err
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	722 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	723 defer r.Close()
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	724 var m models.SoundingResultMeta
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	725 if err := m.Decode(r); err != nil {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	726 return nil, err
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	727 }
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	728
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	729 // Apply overrides
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	730 if sr.Date != nil {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	731 m.Date = *sr.Date
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	732 }
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	733 if sr.Bottleneck != nil {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	734 m.Bottleneck = *sr.Bottleneck
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	735 }
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	736 if sr.EPSG != nil {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	737 m.EPSG = *sr.EPSG
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	738 }
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	739 if sr.DepthReference != nil {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	740 m.DepthReference = *sr.DepthReference
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	741 }
3585 479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3518 diff changeset	742 if sr.SingleBeam != nil {
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3518 diff changeset	743 m.SingleBeam = *sr.SingleBeam
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3518 diff changeset	744 }
3946 d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	745 if sr.NegateZ != nil {
d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	746 m.NegateZ = *sr.NegateZ
d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	747 }
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	748
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	749 return &m, nil
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	750 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	751
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	752 type vertexTransform func(octree.Vertex) octree.Vertex
fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	753
3945 3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	754 func identityTransform(v octree.Vertex) octree.Vertex { return v }
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	755
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	756 func negateZTransform(v octree.Vertex) octree.Vertex {
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	757 return octree.Vertex{X: v.X, Y: v.Y, Z: -v.Z}
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	758 }
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	759
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	760 func chainTransforms(a, b vertexTransform) vertexTransform {
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	761 return func(v octree.Vertex) octree.Vertex { return b(a(v)) }
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	762 }
3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	763
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	764 func loadXYZReader(r io.Reader, feedback Feedback, xform vertexTransform) (octree.MultiPointZ, error) {
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	765 mpz := make(octree.MultiPointZ, 0, 250000)
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	766 s := bufio.NewScanner(r)
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	767
4171 5a650cde0574 Move warning limiter to common package to flesh up the misc package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4055 diff changeset	768 warnLimiter := common.WarningLimiter{Log: feedback.Warn, MaxWarnings: 100}
3504 6e748f31777a AGM/SR import. Limit logging of warnings to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3487 diff changeset	769 warn := warnLimiter.Warn
6e748f31777a AGM/SR import. Limit logging of warnings to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3487 diff changeset	770 defer warnLimiter.Close()
2963 27ffd94afcb5 SR import: Limit number of warnings in parsing XYZ files to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2873 diff changeset	771
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	772 for line := 1; s.Scan(); line++ {
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	773 text := s.Text()
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	774 var p octree.Vertex
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	775 // fmt.Sscanf(text, "%f,%f,%f") is 4 times slower.
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	776 idx := strings.IndexByte(text, ',')
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	777 if idx == -1 {
2963 27ffd94afcb5 SR import: Limit number of warnings in parsing XYZ files to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2873 diff changeset	778 warn("format error in line %d", line)
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	779 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	780 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	781 var err error
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	782 if p.X, err = strconv.ParseFloat(text[:idx], 64); err != nil {
2963 27ffd94afcb5 SR import: Limit number of warnings in parsing XYZ files to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2873 diff changeset	783 warn("format error in line %d: %v", line, err)
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	784 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	785 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	786 text = text[idx+1:]
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	787 if idx = strings.IndexByte(text, ','); idx == -1 {
1138 443fc80a315f Don't issue new lines at end of log messages when importing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1137 diff changeset	788 feedback.Warn("format error in line %d", line)
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	789 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	790 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	791 if p.Y, err = strconv.ParseFloat(text[:idx], 64); err != nil {
2963 27ffd94afcb5 SR import: Limit number of warnings in parsing XYZ files to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2873 diff changeset	792 warn("format error in line %d: %v", line, err)
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	793 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	794 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	795 text = text[idx+1:]
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	796 if p.Z, err = strconv.ParseFloat(text, 64); err != nil {
2963 27ffd94afcb5 SR import: Limit number of warnings in parsing XYZ files to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2873 diff changeset	797 warn("format error in line %d: %v", line, err)
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	798 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	799 }
3945 3bdbaf1b282a SR import: Negate the Z values in the XYZ files if the flag `negate-z` is set. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3904 diff changeset	800 p = xform(p)
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	801 mpz = append(mpz, p)
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	802 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	803
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	804 if err := s.Err(); err != nil {
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	805 return nil, err
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	806 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	807
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	808 return mpz, nil
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	809 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	810
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	811 func loadXYZ(f *zip.File, feedback Feedback, xform vertexTransform) (octree.MultiPointZ, error) {
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	812 r, err := f.Open()
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	813 if err != nil {
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	814 return nil, err
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	815 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	816 defer r.Close()
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	817 return loadXYZReader(r, feedback, xform)
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	818 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	819
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	820 func loadXYZFile(f string, feedback Feedback, xform vertexTransform) (octree.MultiPointZ, error) {
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	821 r, err := os.Open(f)
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	822 if err != nil {
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	823 return nil, err
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	824 }
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	825 defer r.Close()
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	826 return loadXYZReader(r, feedback, xform)
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	827 }
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	828
1786 09349ca27dd7 Imports: Removed duplicated code path to store WKB polygons into database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1754 diff changeset	829 func loadBoundary(z *zip.ReadCloser) (polygonSlice, error) {
1225 4d7c44f7044e Factored out som zip lookup code to be reusable in sounding result upload controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1224 diff changeset	830 shpF := common.FindInZIP(z, ".shp")
960 e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	831 if shpF == nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	832 return nil, nil
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	833 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	834 prefix := strings.TrimSuffix(shpF.Name, path.Ext(shpF.Name))
1225 4d7c44f7044e Factored out som zip lookup code to be reusable in sounding result upload controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1224 diff changeset	835 dbfF := common.FindInZIP(z, prefix+".dbf")
960 e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	836 if dbfF == nil {
4177 8b75ac5e243e Made 'staticcheck' happy with pgxutils package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4171 diff changeset	837 return nil, fmt.Errorf("no DBF file found for %s", shpF.Name)
960 e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	838 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	839
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	840 shpR, err := shpF.Open()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	841 if err != nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	842 return nil, err
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	843 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	844
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	845 dbfR, err := dbfF.Open()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	846 if err != nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	847 shpR.Close()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	848 return nil, err
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	849 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	850 sr := shp.SequentialReaderFromExt(shpR, dbfR)
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	851 defer sr.Close()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	852
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	853 if !sr.Next() {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	854 return nil, sr.Err()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	855 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	856
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	857 _, s := sr.Shape()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	858 if s == nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	859 return nil, sr.Err()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	860 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	861
972 17a03a84b0e8 Split out polygon code out of sounding result importer source file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 971 diff changeset	862 return shapeToPolygon(s)
960 e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	863 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	864
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	865 func generateIsos(
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	866 ctx context.Context,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	867 tx *sql.Tx,
3882 37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	868 feedback Feedback,
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	869 tree *octree.Tree,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	870 id int64,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	871 ) error {
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	872
3882 37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	873 heights, err := octree.LoadClassBreaks(
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	874 ctx, tx,
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	875 "morphology_classbreaks",
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	876 )
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	877
3882 37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	878 if err != nil {
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	879 feedback.Warn("Loading class breaks failed: %v", err)
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	880 feedback.Info("Using default class breaks")
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	881 heights = nil
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	882 h := contourStepWidth * math.Ceil(tree.Min.Z/contourStepWidth)
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	883 for ; h <= tree.Max.Z; h += contourStepWidth {
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	884 heights = append(heights, h)
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	885 }
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	886 } else {
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	887 heights = octree.ExtrapolateClassBreaks(heights, tree.Min.Z, tree.Max.Z)
3949 c1be6aacefb1 Don't create extra inbetween class breaks. Sascha Wilde <wilde@intevation.de> parents: 3904 diff changeset	888 // We set steps for InBetweenClassBreaks to 1, so it
c1be6aacefb1 Don't create extra inbetween class breaks. Sascha Wilde <wilde@intevation.de> parents: 3904 diff changeset	889 // becomes a null operation. The extra class breaks
c1be6aacefb1 Don't create extra inbetween class breaks. Sascha Wilde <wilde@intevation.de> parents: 3904 diff changeset	890 // were considered unexpected and confusing by the
c1be6aacefb1 Don't create extra inbetween class breaks. Sascha Wilde <wilde@intevation.de> parents: 3904 diff changeset	891 // users. Once we get filled polygones the visual will
c1be6aacefb1 Don't create extra inbetween class breaks. Sascha Wilde <wilde@intevation.de> parents: 3904 diff changeset	892 // be considerably different anyway. -- sw
3954 cb4fda122321 Completing: Don't create extra inbetween class breaks. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3951 diff changeset	893 // heights = octree.InBetweenClassBreaks(heights, 0.05, 1)
1184 064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	894 }
064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	895
3882 37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	896 /*
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	897 for i, v := range heights {
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	898 fmt.Printf("%d %.2f\n", i, v)
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	899 }
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	900 log.Printf("%.2f - %.2f\n", tree.Min.Z, tree.Max.Z)
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	901 */
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	902
4256 4ca884dfc470 Prevent heights duplicates in iso line calculations. Sascha L. Teichmann <teichmann@intevation.de> parents: 4214 diff changeset	903 heights = common.DedupFloat64s(heights)
4ca884dfc470 Prevent heights duplicates in iso line calculations. Sascha L. Teichmann <teichmann@intevation.de> parents: 4214 diff changeset	904
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	905 if err := generateContours(ctx, tx, feedback, tree, heights, id); err != nil {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	906 return err
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	907 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	908
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	909 return generateIsoAreas(ctx, tx, feedback, tree, heights, id)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	910 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	911
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	912 func generateIsoAreas(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	913 ctx context.Context,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	914 tx *sql.Tx,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	915 feedback Feedback,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	916 tree *octree.Tree,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	917 heights []float64,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	918 id int64,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	919 ) error {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	920 feedback.Info("Generate iso areas")
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	921 total := time.Now()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	922 defer func() {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	923 feedback.Info("Generating iso areas took %s.",
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	924 time.Since(total))
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	925 }()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	926
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	927 min, max := tree.Min, tree.Max
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	928
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	929 width := max.X - min.X
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	930 height := max.Y - min.Y
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	931
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	932 feedback.Info("width/height: %.2f / %.2f", width, height)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	933
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	934 xcells := int(math.Ceil(width / isoCellSize))
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	935 ycells := int(math.Ceil(height / isoCellSize))
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	936
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	937 feedback.Info("raster size: (%d, %d)", xcells, ycells)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	938
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	939 // Add border for closing
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	940 raster := make([]float64, (xcells+2)*(ycells+2))
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	941
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	942 // prefill for no data
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	943 const nodata = -math.MaxFloat64
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	944 for i := range raster {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	945 raster[i] = nodata
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	946 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	947
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	948 // rasterize the height model
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	949
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	950 var wg sync.WaitGroup
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	951
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	952 rows := make(chan int)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	953
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	954 rasterRow := func() {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	955 defer wg.Done()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	956 for i := range rows {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	957 pos := (i+1)*(xcells+2) + 1
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	958 row := raster[pos : pos+xcells]
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	959 py := min.Y + float64(i)*isoCellSize + isoCellSize/2
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	960 px := min.X + isoCellSize/2
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	961 for j := range row {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	962 v, ok := tree.Value(px, py)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	963 if ok {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	964 row[j] = v
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	965 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	966 px += isoCellSize
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	967 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	968 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	969 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	970
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	971 start := time.Now()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	972
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	973 for n := runtime.NumCPU(); n >= 1; n-- {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	974 wg.Add(1)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	975 go rasterRow()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	976 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	977
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	978 for i := 0; i < ycells; i++ {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	979 rows <- i
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	980 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	981 close(rows)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	982
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	983 wg.Wait()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	984
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	985 feedback.Info("Rasterizing took %v", time.Since(start))
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	986
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	987 // TODO: Implement me!
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	988 feedback.Info("Trace iso areas")
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	989
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	990 start = time.Now()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	991
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	992 tracer := contourmap.FromFloat64s(xcells+2, ycells+2, raster)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	993
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	994 areas := make([]wkb.MultiPolygonGeom, len(heights))
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	995
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	996 // TODO: Check if this correct!
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	997 reprojX := common.Linear(1, min.X, float64(xcells+1), max.X)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	998 reprojY := common.Linear(1, min.Y, float64(ycells+1), max.Y)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	999
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1000 cnts := make(chan int)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1001
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1002 doContours := func() {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1003 defer wg.Done()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1004 for hIdx := range cnts {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1005 c := tracer.Contours(heights[hIdx])
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1006
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1007 // We need to bring it back to the
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1008 // none raster coordinate system.
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1009 a := make(wkb.MultiPolygonGeom, len(c))
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1010 for i, pl := range c {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1011 shell := make(wkb.LinearRingGeom, len(pl))
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1012 for j, pt := range pl {
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1013 shell[j] = wkb.PointGeom{
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1014 X: reprojX(pt.X),
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1015 Y: reprojY(pt.Y),
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1016 }
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1017 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1018 a[i] = wkb.PolygonGeom{shell}
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1019 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1020 areas[hIdx] = a
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1021 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1022 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1023
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1024 for n := runtime.NumCPU(); n >= 1; n-- {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1025 wg.Add(1)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1026 go doContours()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1027 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1028
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1029 for i := range heights {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1030 cnts <- i
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1031 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1032 close(cnts)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1033
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1034 wg.Wait()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1035
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1036 feedback.Info("Tracing areas took %v", time.Since(start))
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1037
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1038 // Raster and tracer are not needed any more.
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1039 raster, tracer = nil, nil
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1040
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1041 return storeAreas(
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1042 ctx, tx, feedback,
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1043 areas, tree.EPSG, heights, id)
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1044 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1045
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1046 func storeAreas(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1047 ctx context.Context,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1048 tx *sql.Tx,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1049 feedback Feedback,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1050 areas []wkb.MultiPolygonGeom,
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1051 epsg uint32,
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1052 heights []float64,
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1053 id int64,
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1054 ) error {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1055 feedback.Info("Storing iso areas")
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1056 total := time.Now()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1057 defer func() {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1058 feedback.Info("Storing iso areas took %v",
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1059 time.Since(total))
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1060 }()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1061
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1062 stmt, err := tx.PrepareContext(ctx, insertIsoAreasSQL)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1063 if err != nil {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1064 return err
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1065 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1066 defer stmt.Close()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1067
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1068 for i, a := range areas {
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1069 if len(a) == 0 {
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1070 continue
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1071 }
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1072 if _, err := stmt.ExecContext(
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1073 ctx,
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1074 id, heights[i], epsg,
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1075 a.AsWKB(),
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1076 contourTolerance,
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1077 ); err != nil {
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1078 return err
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1079 }
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	1080 }
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1081
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1082 return nil
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1083 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1084
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1085 func generateContours(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1086 ctx context.Context,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1087 tx *sql.Tx,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1088 feedback Feedback,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1089 tree *octree.Tree,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1090 heights []float64,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1091 id int64,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1092 ) error {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1093 feedback.Info("Generate contour lines")
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1094 start := time.Now()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1095 defer func() {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1096 feedback.Info("Generating contour lines took %v",
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1097 time.Since(start))
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1098 }()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1099
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1100 stmt, err := tx.PrepareContext(ctx, insertContourSQL)
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1101 if err != nil {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1102 return err
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1103 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1104 defer stmt.Close()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	1105
1184 064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	1106 octree.DoContours(tree, heights, func(res *octree.ContourResult) {
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	1107 if err == nil && len(res.Lines) > 0 {
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	1108 _, err = stmt.ExecContext(
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	1109 ctx,
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	1110 id, res.Height, tree.EPSG,
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	1111 res.Lines.AsWKB2D(),
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	1112 contourTolerance)
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	1113 }
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	1114 })
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	1115
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	1116 return err
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	1117 }

Mercurial > gemma

annotate pkg/imports/sr.go @ 4563:a4042ab02e05 iso-areas