gemma: pkg/imports/sr.go annotate

annotate pkg/imports/sr.go @ 4686:1d6f28e45696

morphology: Doing ST_SimplifyPreserveTopology before ST_MakeValid when storing geometries to database speeds things up ... a lot.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Wed, 16 Oct 2019 11:51:53 +0200
parents	0ddb308fed37
children	56bd9ba0354c

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"
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	31 "strconv"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	32 "strings"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	33 "time"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	34
960 e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	35 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	36
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	37 "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	38 "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	39 "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	40 "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	41 )
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	42
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	43 // 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	44 // 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	45 type SoundingResult struct {
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	46 // 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	47 // '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	48 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	49
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	50 // Override data
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	51 // 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	52 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	53 // 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	54 Bottleneck *string `json:"bottleneck,omitempty"`
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	55 // 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	56 // Defaults to WGS84.
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	57 EPSG *uint `json:"epsg,omitempty"`
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	58 // 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	59 // from the meta.json.
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	60 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	61 // 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	62 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	63 // 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	64 // 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	65 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	66 }
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	67
964 1e2dce348cfb Serialize boundary polygon of sounding result as WKB. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 961 diff changeset	68 const (
1130 42617bba8709 Go from 50cm to 10cm stepwidth in calculating the contorlines. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1017 diff changeset	69 contourStepWidth = 0.1
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	70 contourTolerance = 0.1
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	71 )
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	72
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	73 const (
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	74 // 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	75 // 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	76 pointsPerSquareMeter = 2
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	77 )
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	78
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	79 const (
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	80 // 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	81 // iso areas.
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	82 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	83 )
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	84
4182 49012340336c Made 'golint' finally happy with imports package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4177 diff changeset	85 // 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	86 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	87
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	88 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	89
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	90 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	91
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	92 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	93
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	94 func (srJobCreator) AutoAccept() bool { return false }
1646 a0982c38eac0 Import queue: Implemented email notifications. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1572 diff changeset	95
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	96 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	97
3219 4acbee65275d Import queue: Split locked dependencies in exclusively and multiple uses. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2963 diff changeset	98 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	99 return [2][]string{
4578 c657dec6b0fa Removed old contours from backend and database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4570 diff changeset	100 {"sounding_results", "sounding_results_iso_areas"},
3219 4acbee65275d Import queue: Split locked dependencies in exclusively and multiple uses. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2963 diff changeset	101 {"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	102 }
a5069da2f0b7 Independent imports in terms of affected tables/dependencies are now run concurrently. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1131 diff changeset	103 }
a5069da2f0b7 Independent imports in terms of affected tables/dependencies are now run concurrently. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1131 diff changeset	104
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	105 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	106 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	107 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	108 id int64,
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	109 ) error {
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	110 _, 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	111 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	112 }
a301d240905f Decoupled import job creation and job execution with a factory function. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 988 diff changeset	113
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	114 const (
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	115 srStageDoneSQL = `
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	116 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	117 WHERE id = (
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1900 diff changeset	118 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	119 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	120 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	121
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	122 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	123 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	124 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	125 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	126 depth_reference,
4629 7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	127 area,
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	128 surtyp
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	129 ) SELECT
3656 2a079d0a71c1 Ensure sounding results are associated to matching bottleneck version Tom Gottfried <tom@intevation.de> parents: 3645 diff changeset	130 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	131 $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	132 $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	133 (SELECT
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	134 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	135 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	136 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	137 ST_MakeValid(ST_Transform(ST_GeomFromWKB($5, $6::integer), 4326))::geography
4629 7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	138 END),
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	139 $7
3656 2a079d0a71c1 Ensure sounding results are associated to matching bottleneck version Tom Gottfried <tom@intevation.de> parents: 3645 diff changeset	140 FROM waterway.bottlenecks
2a079d0a71c1 Ensure sounding results are associated to matching bottleneck version Tom Gottfried <tom@intevation.de> parents: 3645 diff changeset	141 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	142 RETURNING
f9fb6c399f3f Moved generating of tins to octree package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 964 diff changeset	143 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	144 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	145 ST_Y(ST_Centroid(area::geometry)),
2833 1b6840093eac Prevent calculation of wrong UTM zones Tom Gottfried <tom@intevation.de> parents: 2612 diff changeset	146 best_utm(area),
1b6840093eac Prevent calculation of wrong UTM zones Tom Gottfried <tom@intevation.de> parents: 2612 diff changeset	147 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	148 `
973 b6fec8f85599 Generate TINs and octrees in sounding result importer. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 972 diff changeset	149
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	150 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	151 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	152 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	153 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	154 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	155
4660 6eab3ac0e849 Speak of meshes instead od octrees as they are not longer used. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4654 diff changeset	156 insertMeshSQL = `
1131 2e6b47cdb2ca Store octrees along with sounding results Tom Gottfried <tom@intevation.de> parents: 1130 diff changeset	157 UPDATE waterway.sounding_results SET
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	158 mesh_checksum = $2, mesh_index = $3
1131 2e6b47cdb2ca Store octrees along with sounding results Tom Gottfried <tom@intevation.de> parents: 1130 diff changeset	159 WHERE id = $1`
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	160
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	161 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	162 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	163 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	164 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	165
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	166 insertIsoAreasSQL = `
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	167 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	168 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	169 height,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	170 areas
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	171 )
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	172 SELECT
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	173 $1,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	174 $2,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	175 ST_Transform(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	176 ST_Multi(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	177 ST_CollectionExtract(
4686 1d6f28e45696 morphology: Doing ST_SimplifyPreserveTopology before ST_MakeValid when storing geometries to database speeds things up ... a lot. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4667 diff changeset	178 ST_MakeValid(
1d6f28e45696 morphology: Doing ST_SimplifyPreserveTopology before ST_MakeValid when storing geometries to database speeds things up ... a lot. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4667 diff changeset	179 ST_Multi(
1d6f28e45696 morphology: Doing ST_SimplifyPreserveTopology before ST_MakeValid when storing geometries to database speeds things up ... a lot. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4667 diff changeset	180 ST_Collectionextract(
1d6f28e45696 morphology: Doing ST_SimplifyPreserveTopology before ST_MakeValid when storing geometries to database speeds things up ... a lot. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4667 diff changeset	181 ST_SimplifyPreserveTopology(ST_GeomFromWKB($4, $3::integer), $5),
1d6f28e45696 morphology: Doing ST_SimplifyPreserveTopology before ST_MakeValid when storing geometries to database speeds things up ... a lot. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4667 diff changeset	182 3
1d6f28e45696 morphology: Doing ST_SimplifyPreserveTopology before ST_MakeValid when storing geometries to database speeds things up ... a lot. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4667 diff changeset	183 )
1d6f28e45696 morphology: Doing ST_SimplifyPreserveTopology before ST_MakeValid when storing geometries to database speeds things up ... a lot. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4667 diff changeset	184 )
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	185 ),
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	186 3
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	187 )
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	188 ),
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	189 4326
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	190 )
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	191 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	192 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	193 `
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	194
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	195 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	196 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	197 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	198 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	199 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	200 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	201 ON grwl.location = bns.gauge_location
4055 98e2041c7ebf Adapted sr-import to new historization model. Sascha Wilde <wilde@intevation.de> parents: 3977 diff changeset	202 AND grwl.validity @> CAST($2 AS timestamptz)
3645 02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	203 WHERE bns.objnam = $1
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	204 AND bns.validity @> CAST($2 AS timestamptz)
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	205 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	206 `
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	207
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	208 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	209 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	210 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	211 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	212 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	213 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	214 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	215 `
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	216 )
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	217
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	218 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	219 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	220 }
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	221
4629 7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	222 func (sr *SoundingResult) surtype() string {
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	223 if sr.singleBeam() {
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	224 return "single"
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	225 }
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	226 return "multi"
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	227 }
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	228
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	229 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	230 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	231 }
d668742c8978 SR import: Made `negate-z` flag more symmetrical to `single-beam` flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3945 diff changeset	232
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	233 // 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	234 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	235 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	236 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	237 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	238 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	239 ) (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	240
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	241 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	242
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	243 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	244
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	245 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	246 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	247 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	248 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	249 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	250 }
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	251 if z != nil {
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	252 defer z.Close()
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	253 }
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	254
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	255 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	256
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	257 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	258 if mf == nil && !sr.completeOverride() {
4177 8b75ac5e243e Made 'staticcheck' happy with pgxutils package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4171 diff changeset	259 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	260 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	261
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	262 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	263 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	264 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	265 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	266
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	267 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	268 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	269
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	270 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	271
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	272 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	273 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	274 } 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	275 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	276 }
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	277
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	278 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	279 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	280 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	281 var depthReference string
3645 02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	282 err := conn.QueryRowContext(ctx,
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	283 selectGaugeLDCSQL,
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	284 m.Bottleneck,
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	285 m.Date.Time,
02951a62e8c6 'Historicise' bottlenecks on import Tom Gottfried <tom@intevation.de> parents: 3609 diff changeset	286 ).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	287 &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	288 &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	289 )
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	290 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	291 case err == sql.ErrNoRows:
4177 8b75ac5e243e Made 'staticcheck' happy with pgxutils package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4171 diff changeset	292 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	293 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	294 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	295 }
3904 4b5c4007fc5d SR import: Fixed LDC treatment if depth reference system is ZPG. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3882 diff changeset	296
4b5c4007fc5d SR import: Fixed LDC treatment if depth reference system is ZPG. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3882 diff changeset	297 // 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	298 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	299 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	300 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	301 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	302 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	303 })
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	304 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	305 }
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	306
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	307 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	308 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	309 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	310
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	311 var xyz octree.MultiPointZ
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	312
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	313 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	314 var xyzf *zip.File
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	315 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	316 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	317 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	318 break
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	319 }
1528 5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1502 diff changeset	320 }
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	321 if xyzf == nil {
4177 8b75ac5e243e Made 'staticcheck' happy with pgxutils package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4171 diff changeset	322 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	323 }
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	324 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	325 } else { // TXT file mode
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	326 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	327 }
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 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	329 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	330 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	331
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	332 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	333 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	334 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	335
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	336 // 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	337 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	338 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	339 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	340 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	341
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	342 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	343 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	344 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	345 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	346 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	347
4629 7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	348 summary, err := sr.processScan(
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	349 ctx,
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	350 tx,
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	351 feedback,
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	352 importID,
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	353 m,
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	354 xyz,
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	355 boundary,
7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	356 )
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	357 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	358 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	359 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	360
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	361 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	362 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	363 "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	364 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	365 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	366
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 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	368 "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	369
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	370 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	371 }
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
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	373 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	374 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	375 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	376 feedback Feedback,
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 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	378 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	379 xyz octree.MultiPointZ,
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	380 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	381 ) (interface{}, error) {
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	382
4629 7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	383 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	384 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	385 } 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	386 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	387 }
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	388
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	389 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	390
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	391 start := time.Now()
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	392
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	393 xyzWKB := xyz.AsWKB()
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	394 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	395 var epsg uint32
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	396
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	397 if err := tx.QueryRowContext(
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	398 ctx,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	399 reprojectPointsSingleBeamSQL,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	400 xyzWKB,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	401 m.EPSG,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	402 ).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	403 return nil, err
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	404 }
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	405
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	406 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	407 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	408 }
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	409
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	410 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	411 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	412 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	413 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	414
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	415 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	416 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	417 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	418 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	419 }
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	420 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	421 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	422
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	423 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	424 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	425 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	426 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	427 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	428 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	429 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	430 )
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	431
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	432 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	433 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	434 tooLongEdge := tri.EstimateTooLong()
3655 a6c671abbc35 Started with cleaning up the single beam import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3654 diff changeset	435 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	436
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	437 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	438 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	439 polygon, removed = tri.ConcaveHull(tooLongEdge)
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	440
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	441 polygonArea = polygon.Area()
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	442 if polygonArea < 0.0 { // counter clockwise
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	443 polygonArea = -polygonArea
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	444 polygon.Reverse()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	445 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	446
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	447 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	448
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 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	450 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	451 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	452 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	453 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	454 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	455 ).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	456 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	457 }
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	458
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 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	460 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	461 }
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 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	463 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	464 }
c368a9a20478 Tried to fix invalid new boundary polygon with ST_MakeValid() ... and failed. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3650 diff changeset	465
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 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	467
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	468 } 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	469 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	470 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	471 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	472 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	473 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	474 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	475 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	476 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	477 ).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	478 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	479 }
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	480 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	481 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	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 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	484 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	485 }
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
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	487 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	488 tin.EPSG = epsg
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	489
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	490 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	491 str.Build(tin)
3655 a6c671abbc35 Started with cleaning up the single beam import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3654 diff changeset	492
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	493 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	494 }
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	495
4629 7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	496 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	497
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	498 // 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	499
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	500 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	501
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	502 start = time.Now()
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	503
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	504 tin := tri.Tin()
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	505 var virtual octree.STRTree
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	506 virtual.BuildWithout(tin, removed)
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	507
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	508 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	509
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	510 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	511
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	512 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	513
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	514 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	515 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	516
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	517 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	518
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	519 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	520
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	521 octree.GenerateRandomVertices(
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	522 numPoints,
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	523 tin.Min, tin.Max,
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	524 virtual.Value,
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	525 func(vertices []octree.Vertex) {
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	526 generated = append(generated, vertices...)
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	527 })
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	528
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	529 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	530
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	531 // 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	532 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	533 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	534 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	535 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	536 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	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 dupes[key] = struct{}{}
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	539 if z, ok := virtual.Value(x, y); ok {
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 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	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 })
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	543
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	544 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	545 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	546 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	547
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	548 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	549 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	550 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	551 }
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 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	553 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	554 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	555 }
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	556
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	557 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	558 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	559 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	560
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	561 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	562 str.Build(tin)
4660 6eab3ac0e849 Speak of meshes instead od octrees as they are not longer used. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4654 diff changeset	563 feedback.Info("Building clipping index took %v", time.Since(start))
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	564
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	565 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	566
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	567 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	568 removed = str.Clip(&clippingPolygonBuffered)
4660 6eab3ac0e849 Speak of meshes instead od octrees as they are not longer used. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4654 diff changeset	569 feedback.Info("Clipping took %v.", time.Since(start))
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	570 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	571
4646 89a72e0e2f9b Add a method to serialize an STRTree. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4640 diff changeset	572 start = time.Now()
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	573 final := octree.STRTree{Entries: 16}
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	574 final.BuildWithout(tin, removed)
4646 89a72e0e2f9b Add a method to serialize an STRTree. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4640 diff changeset	575
4660 6eab3ac0e849 Speak of meshes instead od octrees as they are not longer used. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4654 diff changeset	576 feedback.Info("Building final mesh took %v.", time.Since(start))
6eab3ac0e849 Speak of meshes instead od octrees as they are not longer used. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4654 diff changeset	577 feedback.Info("Store mesh.")
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
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	579 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	580
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	581 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	582 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	583 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	584 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	585 )
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	586
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	587 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	588
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	589 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	590 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	591 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	592 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	593 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	594 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	595 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	596 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	597 epsg,
4629 7acb03e8a737 SR import: Store in sounding_result table if import is single or multi beam. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4578 diff changeset	598 sr.surtype(),
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	599 ).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	600 &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	601 &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	602 &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	603 &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	604 &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	605 )
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	606
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	607 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	608 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	609 return nil, fmt.Errorf(
4177 8b75ac5e243e Made 'staticcheck' happy with pgxutils package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4171 diff changeset	610 "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	611 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	612 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	613 }
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
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	615 index, err := final.Bytes()
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	616 if err != nil {
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	617 return nil, err
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	618 }
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	619
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	620 h := sha1.New()
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	621 h.Write(index)
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	622 checksum := hex.EncodeToString(h.Sum(nil))
4660 6eab3ac0e849 Speak of meshes instead od octrees as they are not longer used. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4654 diff changeset	623 _, err = tx.ExecContext(ctx, insertMeshSQL, id, checksum, index)
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	624 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	625 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	626 }
4660 6eab3ac0e849 Speak of meshes instead od octrees as they are not longer used. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4654 diff changeset	627 feedback.Info("Storing mesh index took %s.", time.Since(start))
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	628 err = generateIsos(ctx, tx, feedback, &final, 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	629 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	630 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	631 }
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
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 // 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	634 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	635 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	636 }
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
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 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	639 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	640 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	641 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	642 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	643 }{
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	644 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	645 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	646 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	647 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	648 }
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	649
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	650 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	651 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	652
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	653 // 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	654 // 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	655 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	656 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	657 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	658
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	659 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	660 // 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	661 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	662 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	663 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	664 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	665 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	666 }
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	667
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	668 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	669 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	670 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	671 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	672 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	673 } 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	674 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	675 }
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	676 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	677 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	678 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	679 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	680 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	681 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	682 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	683 }, 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	684 }
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	685 r, err := f.Open()
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	686 if err != nil {
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	687 return nil, err
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	688 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	689 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	690 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	691 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	692 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	693 }
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	694
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	695 // 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	696 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	697 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	698 }
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	699 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	700 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	701 }
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 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	703 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	704 }
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	705 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	706 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	707 }
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	708 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	709 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	710 }
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	711 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	712 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	713 }
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	714
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	715 return &m, nil
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	716 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	717
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	718 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	719
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	720 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	721
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	722 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	723 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	724 }
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	725
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	726 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	727 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	728 }
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	729
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	730 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	731 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	732 s := bufio.NewScanner(r)
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	733
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	734 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	735 warn := warnLimiter.Warn
6e748f31777a AGM/SR import. Limit logging of warnings to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3487 diff changeset	736 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	737
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	738 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	739 text := s.Text()
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	740 var p octree.Vertex
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	741 // 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	742 idx := strings.IndexByte(text, ',')
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	743 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	744 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	745 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	746 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	747 var err error
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	748 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	749 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	750 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	751 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	752 text = text[idx+1:]
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	753 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	754 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	755 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	756 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	757 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	758 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	759 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	760 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	761 text = text[idx+1:]
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	762 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	763 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	764 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	765 }
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	766 p = xform(p)
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	767 mpz = append(mpz, p)
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	768 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	769
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	770 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	771 return nil, err
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	772 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	773
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	774 return mpz, nil
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	775 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	776
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	777 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	778 r, err := f.Open()
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	779 if err != nil {
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	780 return nil, err
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	781 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	782 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	783 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	784 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	785
3748 4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	786 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	787 r, err := os.Open(f)
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	788 if err != nil {
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	789 return nil, err
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	790 }
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	791 defer r.Close()
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	792 return loadXYZReader(r, feedback, xform)
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	793 }
4bb5dfa0b7e3 SR import: Accept TXT file for uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3742 diff changeset	794
1786 09349ca27dd7 Imports: Removed duplicated code path to store WKB polygons into database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1754 diff changeset	795 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	796 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	797 if shpF == nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	798 return nil, nil
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	799 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	800 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	801 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	802 if dbfF == nil {
4177 8b75ac5e243e Made 'staticcheck' happy with pgxutils package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4171 diff changeset	803 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	804 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	805
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	806 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	807 if err != nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	808 return nil, err
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	809 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	810
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	811 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	812 if err != nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	813 shpR.Close()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	814 return nil, err
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	815 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	816 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	817 defer sr.Close()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	818
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	819 if !sr.Next() {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	820 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	821 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	822
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	823 _, s := sr.Shape()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	824 if s == nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	825 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	826 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	827
972 17a03a84b0e8 Split out polygon code out of sounding result importer source file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 971 diff changeset	828 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	829 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	830
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	831 func generateIsos(
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	832 ctx context.Context,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	833 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	834 feedback Feedback,
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	835 tree *octree.STRTree,
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	836 id int64,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	837 ) error {
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	838
3882 37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	839 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	840 ctx, tx,
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	841 "morphology_classbreaks",
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	842 )
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	843
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	844 minZ, maxZ := tree.Min().Z, tree.Max().Z
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	845
3882 37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	846 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	847 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	848 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	849 heights = nil
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	850 h := contourStepWidth * math.Ceil(minZ/contourStepWidth)
3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	851 for ; h <= maxZ; h += contourStepWidth {
3882 37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	852 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	853 }
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	854 } else {
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	855 heights = octree.ExtrapolateClassBreaks(heights, minZ, maxZ)
3949 c1be6aacefb1 Don't create extra inbetween class breaks. Sascha Wilde <wilde@intevation.de> parents: 3904 diff changeset	856 // 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	857 // 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	858 // were considered unexpected and confusing by the
c1be6aacefb1 Don't create extra inbetween class breaks. Sascha Wilde <wilde@intevation.de> parents: 3904 diff changeset	859 // 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	860 // 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	861 // 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	862 }
064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	863
3882 37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	864 /*
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	865 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	866 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	867 }
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	868 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	869 */
37d5c4441c70 Use custom morpho class breaks in sounding result contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3762 diff changeset	870
4256 4ca884dfc470 Prevent heights duplicates in iso line calculations. Sascha L. Teichmann <teichmann@intevation.de> parents: 4214 diff changeset	871 heights = common.DedupFloat64s(heights)
4ca884dfc470 Prevent heights duplicates in iso line calculations. Sascha L. Teichmann <teichmann@intevation.de> parents: 4214 diff changeset	872
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	873 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	874 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	875
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	876 func generateIsoAreas(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	877 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	878 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	879 feedback Feedback,
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	880 tree *octree.STRTree,
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	881 heights []float64,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	882 id int64,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	883 ) error {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	884 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	885 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	886 defer func() {
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	887 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	888 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	889 }()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	890
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	891 areas := octree.TraceAreas(heights, isoCellSize, tree.Min(), tree.Max(), tree.Value)
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	892
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	893 return storeAreas(
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	894 ctx, tx, feedback,
4654 3eda5a7215ab Generate STRTrees instaead of Octree during sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4646 diff changeset	895 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	896 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	897
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	898 func storeAreas(
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	899 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	900 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	901 feedback Feedback,
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	902 areas []wkb.MultiPolygonGeom,
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	903 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	904 heights []float64,
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	905 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	906 ) error {
4564 6b107d4e6810 Add more debug output to trace problem why reprojected iso areas are not in expected bounds. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4563 diff changeset	907 feedback.Info("Store iso areas.")
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	908 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	909 defer func() {
4564 6b107d4e6810 Add more debug output to trace problem why reprojected iso areas are not in expected bounds. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4563 diff changeset	910 feedback.Info("Storing iso areas took %v.",
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	911 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	912 }()
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	913
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	914 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	915 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	916 return err
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	917 }
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	918 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	919
4637 0ed1489af8b6 Removed ST_MakeValid from inserting sounding results and differences ... in hope that they are not broken. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4629 diff changeset	920 var size int
0ed1489af8b6 Removed ST_MakeValid from inserting sounding results and differences ... in hope that they are not broken. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4629 diff changeset	921
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	922 for i, a := range areas {
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	923 if len(a) == 0 {
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	924 continue
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	925 }
4637 0ed1489af8b6 Removed ST_MakeValid from inserting sounding results and differences ... in hope that they are not broken. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4629 diff changeset	926 wkb := a.AsWKB()
0ed1489af8b6 Removed ST_MakeValid from inserting sounding results and differences ... in hope that they are not broken. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4629 diff changeset	927 size += len(wkb)
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	928 if _, err := stmt.ExecContext(
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	929 ctx,
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	930 id, heights[i], epsg,
4637 0ed1489af8b6 Removed ST_MakeValid from inserting sounding results and differences ... in hope that they are not broken. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4629 diff changeset	931 wkb,
4563 a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	932 contourTolerance,
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	933 ); err != nil {
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	934 return err
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	935 }
a4042ab02e05 Store geometries in database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4562 diff changeset	936 }
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	937
4639 4380f5483c03 Log the size of the transferred WKB to database for differences, too. Sascha L. Teichmann <teichmann@intevation.de> parents: 4637 diff changeset	938 feedback.Info("Transferred WKB size: %.2fMB.",
4637 0ed1489af8b6 Removed ST_MakeValid from inserting sounding results and differences ... in hope that they are not broken. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4629 diff changeset	939 float64(size)/(1024*1024))
0ed1489af8b6 Removed ST_MakeValid from inserting sounding results and differences ... in hope that they are not broken. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4629 diff changeset	940
4562 5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	941 return nil
5cc4042cf07c Started with integrating iso area generation into gemma server. WIP Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4256 diff changeset	942 }

Mercurial > gemma

annotate pkg/imports/sr.go @ 4686:1d6f28e45696