gemma: pkg/imports/sr.go annotate

annotate pkg/imports/sr.go @ 3650:01ce3ba9b0d0 single-beam

Fixed generating of random points.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Thu, 13 Jun 2019 13:14:40 +0200
parents	810b28f59b8b
children	c368a9a20478

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"
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	27 "log"
1184 064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	28 "math"
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	29 "os"
960 e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	30 "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	31 "path/filepath"
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	32 "runtime"
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	33 "strconv"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	34 "strings"
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	35 "sync"
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	36 "time"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	37
960 e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	38 shp "github.com/jonas-p/go-shp"
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	39
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	40 "gemma.intevation.de/gemma/pkg/common"
3504 6e748f31777a AGM/SR import. Limit logging of warnings to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3487 diff changeset	41 "gemma.intevation.de/gemma/pkg/misc"
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	42 "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	43 "gemma.intevation.de/gemma/pkg/octree"
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	44 )
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	45
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	46 // SoundingResult is a Job to import sounding reults
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	47 // from a ZIP file into the database.
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	48 type SoundingResult struct {
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	49 // Dir is the folder in the file system where the
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	50 // 'sr.zip' is expect to be.
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	51 Dir string `json:"dir"`
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	52
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	53 // Override data
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	54 // Date if given overrides the date value from the meta.json.
1900 6a67cd819e93 To prepare stretch import made some model data types re-usable. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1786 diff changeset	55 Date *models.Date `json:"date,omitempty"`
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	56 // Date if given overrides the name of the bottleneck from the meta.json.
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	57 Bottleneck *string `json:"bottleneck,omitempty"`
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	58 // EPSG if given overrides the EPSG code from the meta.json.
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	59 // Defaults to WGS84.
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	60 EPSG *uint `json:"epsg,omitempty"`
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	61 // DepthReference if given overides the DepthReference value
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	62 // from the meta.json.
5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	63 DepthReference *string `json:"depth-reference,omitempty"`
3585 479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3518 diff changeset	64 // SingleBeam indicates that the sounding is a single beam scan.
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3518 diff changeset	65 SingleBeam *bool `json:"single-beam,omitempty"`
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 (
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	74 tooLongEdge = 50.0
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	75 pointsPerSquareMeter = 2
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	76 )
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	77
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	78 // SRJobKind is the unique name of a SoundingResult import job.
991 a301d240905f Decoupled import job creation and job execution with a factory function. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 988 diff changeset	79 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	80
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	81 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	82
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	83 func init() {
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	84 RegisterJobCreator(SRJobKind, srJobCreator{})
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	85 }
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	86
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	87 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	88
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	89 func (srJobCreator) AutoAccept() bool { return false }
1646 a0982c38eac0 Import queue: Implemented email notifications. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1572 diff changeset	90
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	91 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	92
3219 4acbee65275d Import queue: Split locked dependencies in exclusively and multiple uses. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2963 diff changeset	93 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	94 return [2][]string{
4acbee65275d Import queue: Split locked dependencies in exclusively and multiple uses. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2963 diff changeset	95 {"sounding_results", "sounding_results_contour_lines"},
4acbee65275d Import queue: Split locked dependencies in exclusively and multiple uses. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2963 diff changeset	96 {"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	97 }
a5069da2f0b7 Independent imports in terms of affected tables/dependencies are now run concurrently. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1131 diff changeset	98 }
a5069da2f0b7 Independent imports in terms of affected tables/dependencies are now run concurrently. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1131 diff changeset	99
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	100 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	101 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	102 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	103 id int64,
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	104 ) error {
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	105 _, 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	106 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	107 }
a301d240905f Decoupled import job creation and job execution with a factory function. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 988 diff changeset	108
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	109 const (
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	110 srStageDoneSQL = `
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1184 diff changeset	111 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	112 WHERE id = (
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1900 diff changeset	113 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	114 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	115 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	116
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	117 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	118 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	119 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	120 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	121 depth_reference,
a4c92e0ef2e1 Stored point cloud and bounding area of sounding result in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 960 diff changeset	122 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	123 ) SELECT
1572 056a86b24be2 Made bottleneck primary key an int. Attention: This may break something! Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1531 diff changeset	124 (SELECT id from waterway.bottlenecks where objnam = $1),
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	125 $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	126 $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	127 (SELECT
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	128 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	129 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	130 ELSE
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	131 ST_Transform(ST_MakeValid(ST_GeomFromWKB($5, $6::integer)), 4326)::geography
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	132 END)
971 f9fb6c399f3f Moved generating of tins to octree package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 964 diff changeset	133 RETURNING
f9fb6c399f3f Moved generating of tins to octree package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 964 diff changeset	134 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	135 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	136 ST_Y(ST_Centroid(area::geometry)),
2833 1b6840093eac Prevent calculation of wrong UTM zones Tom Gottfried <tom@intevation.de> parents: 2612 diff changeset	137 best_utm(area),
1b6840093eac Prevent calculation of wrong UTM zones Tom Gottfried <tom@intevation.de> parents: 2612 diff changeset	138 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	139 `
973 b6fec8f85599 Generate TINs and octrees in sounding result importer. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 972 diff changeset	140
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	141 reprojectPointsSQL = `
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	142 SELECT ST_AsBinary(ST_Transform(ST_GeomFromWKB($1, $2::integer), $3::integer))
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	143 `
973 b6fec8f85599 Generate TINs and octrees in sounding result importer. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 972 diff changeset	144 insertOctreeSQL = `
1131 2e6b47cdb2ca Store octrees along with sounding results Tom Gottfried <tom@intevation.de> parents: 1130 diff changeset	145 UPDATE waterway.sounding_results SET
2e6b47cdb2ca Store octrees along with sounding results Tom Gottfried <tom@intevation.de> parents: 1130 diff changeset	146 octree_checksum = $2, octree_index = $3
2e6b47cdb2ca Store octrees along with sounding results Tom Gottfried <tom@intevation.de> parents: 1130 diff changeset	147 WHERE id = $1`
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	148
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	149 insertContourSQL = `
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	150 INSERT INTO waterway.sounding_results_contour_lines (
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	151 sounding_result_id,
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	152 height,
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	153 lines
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	154 )
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	155 SELECT
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	156 $1,
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	157 $2,
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	158 ST_Transform(
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	159 ST_Multi(
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	160 ST_CollectionExtract(
1137 2fb6c0a6ec8a Avoid intersection of each isoline with area on insert Tom Gottfried <tom@intevation.de> parents: 1136 diff changeset	161 ST_SimplifyPreserveTopology(
1410 eb82076fdffe Sounding result import: Ensure that the generated iso-lines are valid. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1392 diff changeset	162 ST_Multi(ST_Collectionextract(
eb82076fdffe Sounding result import: Ensure that the generated iso-lines are valid. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1392 diff changeset	163 ST_MakeValid(ST_GeomFromWKB($4, $3::integer)), 2)),
1137 2fb6c0a6ec8a Avoid intersection of each isoline with area on insert Tom Gottfried <tom@intevation.de> parents: 1136 diff changeset	164 $5
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	165 ),
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	166 2
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	167 )
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	168 ),
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	169 4326
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	170 )
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	171 FROM waterway.sounding_results sr
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	172 WHERE id = $1
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	173 `
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	174
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	175 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	176 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	177 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	178 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	179 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	180 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	181 ON grwl.location = bns.gauge_location
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	182 AND grwl.validity = bns.gauge_validity
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	183 WHERE bns.objnam = $1 AND grwl.depth_reference like 'LDC%'
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	184 `
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	185
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	186 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	187 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	188 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	189 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	190 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	191 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	192 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	193 `
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	194 )
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	195
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	196 func (sr *SoundingResult) isSingleBeam() bool {
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	197 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	198 }
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	199
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	200 // 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	201 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	202 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	203 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	204 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	205 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	206 ) (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	207
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	208 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	209
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	210 z, err := zip.OpenReader(filepath.Join(sr.Dir, "sr.zip"))
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	211 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	212 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	213 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	214 defer z.Close()
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	215
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	216 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	217
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	218 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	219 if mf == nil && !sr.completeOverride() {
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	220 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	221 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	222
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	223 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	224 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	225 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	226 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	227
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	228 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	229 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	230
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	231 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	232
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	233 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	234 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	235 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	236 var depthReference string
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	237 err := conn.QueryRowContext(ctx, selectGaugeLDCSQL, m.Bottleneck).Scan(
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	238 &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	239 &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	240 )
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	241 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	242 case err == sql.ErrNoRows:
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	243 return nil, errors.New("Cannot load LDC value")
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	244 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	245 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	246 }
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	247 xform = func(v 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	248 return octree.Vertex{X: v.X, Y: v.Y, Z: ldc - v.Z}
fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	249 }
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	250 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	251 }
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	252
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	253 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	254 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	255 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	256
1528 5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1502 diff changeset	257 var xyzf *zip.File
5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1502 diff changeset	258 for _, ext := range []string{".xyz", ".txt"} {
5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1502 diff changeset	259 feedback.Info("Looking for '*%s'", ext)
5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1502 diff changeset	260 if xyzf = common.FindInZIP(z, ext); xyzf != nil {
5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1502 diff changeset	261 break
5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1502 diff changeset	262 }
5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1502 diff changeset	263 }
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	264 if xyzf == nil {
1528 5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1502 diff changeset	265 return nil, errors.New("Cannot find any .xyz or .txt file")
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	266 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	267
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	268 xyz, err := loadXYZ(xyzf, feedback, xform)
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	269 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	270 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	271 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	272
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	273 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	274 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	275 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	276
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	277 // 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	278 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	279 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	280 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	281 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	282
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	283 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	284 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	285 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	286 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	287 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	288
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	289 var summary interface{}
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	290
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	291 if sr.isSingleBeam() {
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	292 summary, err = sr.singleBeamScan(
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	293 ctx,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	294 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	295 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	296 importID,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	297 m,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	298 xyz,
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	299 boundary,
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	300 )
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	301 } else {
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	302 summary, err = sr.multiBeamScan(
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	303 ctx,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	304 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	305 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	306 importID,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	307 m,
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	308 xyz,
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	309 boundary,
3587 a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	310 )
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	311 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	312 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	313 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	314 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	315
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	316 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	317 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	318 "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	319 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	320 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	321
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	322 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	323 "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	324
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	325 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	326 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	327
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	328 func (sr *SoundingResult) singleBeamScan(
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	329 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	330 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	331 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	332 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	333 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	334 xyz octree.MultiPointZ,
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	335 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	336 ) (interface{}, error) {
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	337
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	338 feedback.Info("Processing as single beam scan.")
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	339
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	340 start := time.Now()
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	341
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	342 xyzWKB := xyz.AsWKB()
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	343 var reproj []byte
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	344 var epsg uint
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	345
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	346 if err := tx.QueryRowContext(
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	347 ctx,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	348 reprojectPointsSingleBeamSQL,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	349 xyzWKB,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	350 m.EPSG,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	351 ).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	352 return nil, err
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	353 }
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	354
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	355 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	356 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	357 }
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	358
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	359 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	360 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	361 feedback.Info("Number of reprojected points: %d", len(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	362
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	363 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	364 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	365 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	366 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	367 }
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	368 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	369 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	370
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	371 var clippingPolygon octree.Polygon
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	372
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	373 if boundary == 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	374 feedback.Info("No boundary given.")
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	375
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	376 polygon, removed := tri.ConcaveHull(tooLongEdge)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	377
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	378 polygonArea := polygon.Area()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	379 if polygonArea < 0.0 { // counter clockwise
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	380 polygonArea = -polygonArea
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	381 polygon.Reverse()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	382 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	383
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	384 firstTin := tri.Tin()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	385 builder := octree.NewBuilder(firstTin)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	386 builder.Build(removed)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	387
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	388 firstTree := builder.Tree()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	389
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	390 bbox := polygon.BBox()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	391 bboxArea := bbox.Area()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	392
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	393 log.Printf("bbox area: %.2f\n", bboxArea)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	394 log.Printf("polygon area: %.2f\n", polygonArea)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	395
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	396 numPoints := int(math.Ceil(polygonArea * pointsPerSquareMeter))
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	397
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	398 log.Printf("random points for density of ~%d points/m²: %d\n",
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	399 pointsPerSquareMeter, numPoints)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	400
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	401 start := time.Now()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	402
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	403 var wg sync.WaitGroup
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	404
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	405 jobs := make(chan int)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	406 out := make(chan []octree.Vertex)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	407 done := make(chan struct{})
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	408
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	409 cpus := runtime.NumCPU()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	410
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	411 free := make(chan []octree.Vertex, cpus)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	412
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	413 for i, n := 0, cpus; i < n; i++ {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	414 wg.Add(1)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	415 go func() {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	416 defer wg.Done()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	417 xRange := common.Random(bbox.X1, bbox.X2)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	418 yRange := common.Random(bbox.Y1, bbox.Y2)
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	419
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	420 for size := range jobs {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	421 var vertices []octree.Vertex
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	422 select {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	423 case vertices = <-free:
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	424 default:
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	425 vertices = make([]octree.Vertex, 0, 1000)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	426 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	427 for len(vertices) < size {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	428 x, y := xRange(), yRange()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	429 if z, ok := firstTree.Value(x, y); ok {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	430 vertices = append(vertices, octree.Vertex{X: x, Y: y, Z: z})
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	431 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	432 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	433 out <- vertices
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	434 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	435 }()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	436 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	437
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	438 generated := make(octree.LineStringZ, 0, numPoints+len(polygon)-1)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	439
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	440 go func() {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	441 defer close(done)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	442 for vertices := range out {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	443 generated = append(generated, vertices...)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	444 select {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	445 case free <- vertices[:0]:
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	446 default:
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	447 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	448 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	449 }()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	450
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	451 for remain := numPoints; remain > 0; {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	452 if remain > 1000 {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	453 jobs <- 1000
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	454 remain -= 1000
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	455 } else {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	456 jobs <- remain
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	457 remain = 0
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	458 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	459 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	460 close(jobs)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	461 wg.Wait()
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	462 close(out)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	463 <-done
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	464
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	465 log.Printf("Generating %d points took %v\n", len(generated), time.Since(start))
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	466
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	467 // Add the boundary to new point cloud.
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	468 generated = append(generated, polygon[:len(polygon)-1]...)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	469
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	470 xyz = octree.MultiPointZ(generated)
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	471
3650 01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	472 start = time.Now()
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	473 tri, err := octree.Triangulate(xyz)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	474 if err != nil {
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	475 return nil, err
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	476 }
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	477 log.Printf("Second triangulation took %v.", time.Since(start))
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	478 log.Printf("Number triangles: %d.", len(tri.Triangles)/3)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	479
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	480 secondTin := tri.Tin()
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	481
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	482 //polygon.Buffer(1.0)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	483
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	484 clippingPolygon.FromLineStringZ(polygon)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	485 clippingPolygon.Indexify()
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	486
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	487 var str octree.STRTree
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	488 str.Build(secondTin)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	489 log.Printf("Building STR tree took %v", time.Since(start))
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	490
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	491 start = time.Now()
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	492
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	493 removed = str.Clip(&clippingPolygon)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	494 log.Printf("Clipping STR tree took %v.", time.Since(start))
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	495 log.Printf("Number of triangles to clip %d.", len(removed))
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	496
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	497 start = time.Now()
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	498
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	499 secondTin.EPSG = uint32(epsg)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	500
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	501 builder = octree.NewBuilder(secondTin)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	502 builder.Build(removed)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	503 octreeIndex, err := builder.Bytes()
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	504 if err != nil {
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	505 return nil, err
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	506 }
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	507 feedback.Info("Building octree took %v.", time.Since(start))
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	508
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	509 var (
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	510 id int64
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	511 epsg uint32
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	512 lat, lon float64
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	513 )
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	514
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	515 var hull []byte
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	516
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	517 if err := tx.QueryRowContext(
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	518 ctx,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	519 insertHullSQL,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	520 m.Bottleneck,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	521 m.Date.Time,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	522 m.DepthReference,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	523 nil,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	524 clippingPolygon.AsWKB(),
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	525 m.EPSG,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	526 ).Scan(
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	527 &id,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	528 &lat,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	529 &lon,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	530 &epsg,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	531 &hull,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	532 ); err != nil {
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	533 return nil, err
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	534 }
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	535
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	536 start = time.Now()
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	537 h := sha1.New()
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	538 h.Write(octreeIndex)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	539 checksum := hex.EncodeToString(h.Sum(nil))
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	540 _, err = tx.ExecContext(ctx, insertOctreeSQL, id, checksum, octreeIndex)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	541 if err != nil {
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	542 return nil, err
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	543 }
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	544 feedback.Info("Storing octree index took %s.", time.Since(start))
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	545
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	546 tree := builder.Tree()
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	547
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	548 start = time.Now()
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	549 err = generateContours(ctx, tx, tree, id)
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	550 if err != nil {
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	551 return nil, err
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	552 }
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	553 feedback.Info("Generating and storing contour lines took %s.",
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	554 time.Since(start))
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	555
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	556 // Store for potential later removal.
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	557 if err = track(ctx, tx, importID, "waterway.sounding_results", id); err != nil {
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	558 return nil, err
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	559 }
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	560
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	561 summary := struct {
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	562 Bottleneck string `json:"bottleneck"`
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	563 Date models.Date `json:"date"`
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	564 Lat float64 `json:"lat"`
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	565 Lon float64 `json:"lon"`
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	566 }{
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	567 Bottleneck: m.Bottleneck,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	568 Date: m.Date,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	569 Lat: lat,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	570 Lon: lon,
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	571 }
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	572
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	573 return &summary, nil
01ce3ba9b0d0 Fixed generating of random points. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3646 diff changeset	574
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	575 } else {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	576 var hull []byte
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	577 if err = tx.QueryRowContext(
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	578 ctx,
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	579 reprojectPointsSQL,
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	580 boundary.asWKB(),
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	581 m.EPSG,
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	582 epsg,
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	583 ).Scan(&hull); err != nil {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	584 return nil, err
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	585 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	586 if err := clippingPolygon.FromWKB(hull); err != nil {
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	587 return nil, err
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	588 }
810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	589 clippingPolygon.Indexify()
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	590 }
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	591
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	592 // TODO: Implement me!
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	593 return nil, errors.New("Not implemented, yet!")
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	594 }
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	595
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	596 func (sr *SoundingResult) multiBeamScan(
a9d140c7db8d SR import: Prepare the separate code paths for single and multibeam scans. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3586 diff changeset	597 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	598 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	599 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	600 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	601 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	602 xyz octree.MultiPointZ,
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	603 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	604 ) (interface{}, error) {
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	605
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	606 feedback.Info("Processing as multi beam scan.")
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	607 var (
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	608 id int64
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	609 epsg uint32
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	610 lat, lon float64
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	611 )
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	612 start := time.Now()
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	613
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	614 var hull []byte
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	615
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	616 xyzWKB := xyz.AsWKB()
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	617
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	618 err := tx.QueryRowContext(
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	619 ctx,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	620 insertHullSQL,
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	621 m.Bottleneck,
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	622 m.Date.Time,
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	623 m.DepthReference,
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	624 xyzWKB,
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	625 boundary.asWKB(),
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	626 m.EPSG,
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	627 ).Scan(
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	628 &id,
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	629 &lat,
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	630 &lon,
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	631 &epsg,
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	632 &hull,
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	633 )
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	634 xyz, boundary = nil, nil // not need from now on.
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	635 feedback.Info("Calculating hull took %s.", time.Since(start))
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	636 if err != nil {
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	637 return nil, err
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	638 }
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	639 feedback.Info("Best suited UTM EPSG: %d", epsg)
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	640
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	641 start = time.Now()
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	642
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	643 var clippingPolygon octree.Polygon
3646 810b28f59b8b Generate random points for second mesh. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3609 diff changeset	644
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	645 if err := clippingPolygon.FromWKB(hull); err != nil {
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	646 return nil, err
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	647 }
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	648 clippingPolygon.Indexify()
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	649 feedback.Info("Building clipping polygon took %v.", time.Since(start))
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	650
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	651 start = time.Now()
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	652
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	653 var reproj []byte
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	654
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	655 if err = tx.QueryRowContext(
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	656 ctx,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	657 reprojectPointsSQL,
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	658 xyzWKB,
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	659 m.EPSG,
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	660 epsg,
2530 3f61b84ae7a6 SR import: Set missing EPSG code to TIN. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2529 diff changeset	661 ).Scan(&reproj); 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	662 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	663 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	664
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	665 if err := xyz.FromWKB(reproj); err != nil {
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	666 return nil, err
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	667 }
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	668
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	669 feedback.Info("Reprojecting points took %v.", time.Since(start))
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	670 feedback.Info("Number of reprojected points: %d", len(xyz))
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	671
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	672 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	673
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	674 tri, err := octree.Triangulate(xyz)
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	675 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	676 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	677 }
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	678 feedback.Info("Triangulation took %v.", time.Since(start))
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	679
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	680 start = time.Now()
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	681
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	682 tin := tri.Tin()
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	683
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	684 var str octree.STRTree
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	685 str.Build(tin)
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	686 feedback.Info("Building STR tree took %v", time.Since(start))
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	687
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	688 start = time.Now()
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	689
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	690 removed := str.Clip(&clippingPolygon)
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	691 feedback.Info("Clipping STR tree took %v.", time.Since(start))
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	692 feedback.Info("Number of triangles to clip %d.", len(removed))
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	693
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	694 start = time.Now()
45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	695
2530 3f61b84ae7a6 SR import: Set missing EPSG code to TIN. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2529 diff changeset	696 tin.EPSG = epsg
3f61b84ae7a6 SR import: Set missing EPSG code to TIN. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2529 diff changeset	697
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	698 builder := octree.NewBuilder(tin)
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	699 builder.Build(removed)
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	700 octreeIndex, err := builder.Bytes()
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	701 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	702 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	703 }
2530 3f61b84ae7a6 SR import: Set missing EPSG code to TIN. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2529 diff changeset	704 feedback.Info("Building octree took %v.", time.Since(start))
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	705
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	706 start = time.Now()
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	707 h := sha1.New()
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	708 h.Write(octreeIndex)
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	709 checksum := hex.EncodeToString(h.Sum(nil))
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	710 _, err = tx.ExecContext(ctx, insertOctreeSQL, id, checksum, octreeIndex)
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	711 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	712 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	713 }
2530 3f61b84ae7a6 SR import: Set missing EPSG code to TIN. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2529 diff changeset	714 feedback.Info("Storing octree index took %s.", time.Since(start))
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	715
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	716 tree := builder.Tree()
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	717
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	718 start = time.Now()
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	719 err = generateContours(ctx, tx, tree, id)
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	720 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	721 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	722 }
2530 3f61b84ae7a6 SR import: Set missing EPSG code to TIN. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2529 diff changeset	723 feedback.Info("Generating and storing contour lines took %s.",
3f61b84ae7a6 SR import: Set missing EPSG code to TIN. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2529 diff changeset	724 time.Since(start))
988 7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	725
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	726 // Store for potential later removal.
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	727 if err = track(ctx, tx, importID, "waterway.sounding_results", id); 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	728 return nil, err
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	729 }
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	730
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	731 summary := struct {
1900 6a67cd819e93 To prepare stretch import made some model data types re-usable. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1786 diff changeset	732 Bottleneck string `json:"bottleneck"`
6a67cd819e93 To prepare stretch import made some model data types re-usable. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1786 diff changeset	733 Date models.Date `json:"date"`
6a67cd819e93 To prepare stretch import made some model data types re-usable. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1786 diff changeset	734 Lat float64 `json:"lat"`
6a67cd819e93 To prepare stretch import made some model data types re-usable. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1786 diff changeset	735 Lon float64 `json:"lon"`
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	736 }{
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	737 Bottleneck: m.Bottleneck,
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	738 Date: m.Date,
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	739 Lat: lat,
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	740 Lon: lon,
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	741 }
2530 3f61b84ae7a6 SR import: Set missing EPSG code to TIN. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2529 diff changeset	742
3f61b84ae7a6 SR import: Set missing EPSG code to TIN. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2529 diff changeset	743 return &summary, 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	744 }
7dfd3db94e6d In preparation of persisting import jobs logging is done through an interface. Sascha L. Teichmann <teichmann@intevation.de> parents: 984 diff changeset	745
1498 5df748916fcf Finished API docs for sounding result imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1496 diff changeset	746 // 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	747 // 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	748 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	749 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	750 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	751
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	752 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	753 // 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	754 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	755 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	756 sr.DepthReference != nil &&
b9adb0ea4c41 SR import: a complete parameter overwrite now includes single beam flag. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3585 diff changeset	757 sr.SingleBeam != 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	758 }
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	759
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	760 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	761 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	762 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	763 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	764 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	765 } 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	766 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	767 }
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	768 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	769 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	770 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	771 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	772 DepthReference: *sr.DepthReference,
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	773 }, 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	774 }
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	775 r, err := f.Open()
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	776 if err != nil {
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	777 return nil, err
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	778 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	779 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	780 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	781 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	782 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	783 }
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	784
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	785 // 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	786 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	787 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	788 }
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	789 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	790 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	791 }
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	792 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	793 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	794 }
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	795 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	796 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	797 }
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	798 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	799 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	800 }
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	801
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	802 return &m, nil
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	803 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	804
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	805 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	806
fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	807 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	808 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	809 s := bufio.NewScanner(r)
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	810
2612 c7ce8b011bcb SR import: Negate negative Z values and issue a warning if a negative Z value is found. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2530 diff changeset	811 var hasNegZ bool
c7ce8b011bcb SR import: Negate negative Z values and issue a warning if a negative Z value is found. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2530 diff changeset	812
3504 6e748f31777a AGM/SR import. Limit logging of warnings to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3487 diff changeset	813 warnLimiter := misc.WarningLimiter{Log: feedback.Warn, MaxWarnings: 100}
6e748f31777a AGM/SR import. Limit logging of warnings to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3487 diff changeset	814 warn := warnLimiter.Warn
6e748f31777a AGM/SR import. Limit logging of warnings to 100. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3487 diff changeset	815 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	816
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	817 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	818 text := s.Text()
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	819 var p octree.Vertex
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	820 // 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	821 idx := strings.IndexByte(text, ',')
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	822 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	823 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	824 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	825 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	826 var err error
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	827 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	828 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	829 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	830 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	831 text = text[idx+1:]
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	832 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	833 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	834 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	835 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	836 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	837 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	838 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	839 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	840 text = text[idx+1:]
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	841 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	842 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	843 continue
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	844 }
2612 c7ce8b011bcb SR import: Negate negative Z values and issue a warning if a negative Z value is found. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2530 diff changeset	845 if p.Z < 0 {
c7ce8b011bcb SR import: Negate negative Z values and issue a warning if a negative Z value is found. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2530 diff changeset	846 p.Z = -p.Z
c7ce8b011bcb SR import: Negate negative Z values and issue a warning if a negative Z value is found. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2530 diff changeset	847 if !hasNegZ {
c7ce8b011bcb SR import: Negate negative Z values and issue a warning if a negative Z value is found. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2530 diff changeset	848 hasNegZ = true
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	849 warn("Negative Z value found: Using -Z")
2612 c7ce8b011bcb SR import: Negate negative Z values and issue a warning if a negative Z value is found. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2530 diff changeset	850 }
c7ce8b011bcb SR import: Negate negative Z values and issue a warning if a negative Z value is found. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2530 diff changeset	851 }
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	852 if xform != nil {
fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	853 p = xform(p)
fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	854 }
959 6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	855 mpz = append(mpz, p)
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	856 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	857
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	858 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	859 return nil, err
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	860 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	861
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	862 return mpz, nil
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	863 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	864
3487 fdb0439850d5 Generalized transformation of vertices during sounding result import a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3479 diff changeset	865 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	866 r, err := f.Open()
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	867 if err != nil {
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	868 return nil, err
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	869 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	870 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	871 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	872 }
6ab012d0f0c2 Started with writing an importer job for sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	873
1786 09349ca27dd7 Imports: Removed duplicated code path to store WKB polygons into database. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1754 diff changeset	874 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	875 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	876 if shpF == nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	877 return nil, nil
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	878 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	879 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	880 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	881 if dbfF == nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	882 return nil, fmt.Errorf("No DBF file found for %s", shpF.Name)
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	883 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	884
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	885 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	886 if err != nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	887 return nil, err
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	888 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	889
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	890 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	891 if err != nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	892 shpR.Close()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	893 return nil, err
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	894 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	895 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	896 defer sr.Close()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	897
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	898 if !sr.Next() {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	899 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	900 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	901
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	902 _, s := sr.Shape()
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	903 if s == nil {
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	904 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	905 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	906
972 17a03a84b0e8 Split out polygon code out of sounding result importer source file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 971 diff changeset	907 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	908 }
e23ae2c83427 Load boundary polygon of sounding result from ZIP file. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 959 diff changeset	909
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	910 func generateContours(
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	911 ctx context.Context,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	912 tx *sql.Tx,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	913 tree *octree.Tree,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	914 id int64,
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	915 ) error {
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	916 stmt, err := tx.PrepareContext(ctx, insertContourSQL)
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	917 if err != nil {
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	918 return err
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	919 }
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	920 defer stmt.Close()
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	921
1184 064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	922 // Adjust contour lines heights to multiples of contourStepWidth
2530 3f61b84ae7a6 SR import: Set missing EPSG code to TIN. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2529 diff changeset	923 var heights []float64
1184 064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	924 h := contourStepWidth * math.Ceil(tree.Min.Z/contourStepWidth)
064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	925 for ; h <= tree.Max.Z; h += contourStepWidth {
064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	926 heights = append(heights, h)
064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	927 }
064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	928
064d44ccc6f2 Adjust contour lines heights to multiples of step width Tom Gottfried <tom@intevation.de> parents: 1168 diff changeset	929 octree.DoContours(tree, heights, func(res *octree.ContourResult) {
2529 45d51a49f191 SR import: Use own triangulation and clipping when importing sounding results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2516 diff changeset	930 if err == nil && len(res.Lines) > 0 {
3591 062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	931 _, err = stmt.ExecContext(
062dc9b54b86 SR import: Using context.Context aware SQL statements. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3587 diff changeset	932 ctx,
977 4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	933 id, res.Height, tree.EPSG,
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	934 res.Lines.AsWKB2D(),
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	935 contourTolerance)
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	936 }
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	937 })
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	938
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	939 return err
4a2ca0e20006 Fixed build error. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 976 diff changeset	940 }

Mercurial > gemma

annotate pkg/imports/sr.go @ 3650:01ce3ba9b0d0 single-beam