Mercurial > gemma
view pkg/imports/modelconvert.go @ 5520:05db984d3db1
Improve performance of bottleneck area calculation
Avoid buffer calculations by replacing them with simple distance comparisons
and calculate the boundary of the result geometry only once per iteration.
In some edge cases with very large numbers of iterations, this reduced
the runtime of a bottleneck import by a factor of more than twenty.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Thu, 21 Oct 2021 19:50:39 +0200 |
parents | 8e30b926b94d |
children | 1222b777f51f |
line wrap: on
line source
// This is Free Software under GNU Affero General Public License v >= 3.0 // without warranty, see README.md and license for details. // // SPDX-License-Identifier: AGPL-3.0-or-later // License-Filename: LICENSES/AGPL-3.0.txt // // Copyright (C) 2018, 2020, 2021 by via donau // – Österreichische Wasserstraßen-Gesellschaft mbH // Software engineering by Intevation GmbH // // Author(s): // * Sascha L. Teichmann <sascha.teichmann@intevation.de> package imports import ( "gemma.intevation.de/gemma/pkg/models" ) var kindToImportModel = map[JobKind]func() interface{}{ BNJobKind: func() interface{} { return new(models.BottleneckImport) }, GMJobKind: func() interface{} { return new(models.GaugeMeasurementImport) }, FAJobKind: func() interface{} { return new(models.FairwayAvailabilityImport) }, WXJobKind: func() interface{} { return FindJobCreator(WXJobKind).Create() }, WAJobKind: func() interface{} { return new(models.WaterwayAreaImport) }, WGJobKind: func() interface{} { return new(models.WaterwayGaugeImport) }, DMVJobKind: func() interface{} { return new(models.DistanceMarksVirtualImport) }, FDJobKind: func() interface{} { return new(models.FairwayDimensionImport) }, DMAJobKind: func() interface{} { return new(models.DistanceMarksAshoreImport) }, BCNLATHYDROJobKind: func() interface{} { return FindJobCreator(BCNLATHYDROJobKind).Create() }, BCNLATIENCJobKind: func() interface{} { return FindJobCreator(BCNLATIENCJobKind).Create() }, BOYCARJobKind: func() interface{} { return FindJobCreator(BOYCARJobKind).Create() }, BOYLATHYDROJobKind: func() interface{} { return FindJobCreator(BOYLATHYDROJobKind).Create() }, BOYLATIENCJobKind: func() interface{} { return FindJobCreator(BOYLATIENCJobKind).Create() }, BOYSAWJobKind: func() interface{} { return FindJobCreator(BOYSAWJobKind).Create() }, BOYSPPJobKind: func() interface{} { return FindJobCreator(BOYSPPJobKind).Create() }, DAYMARHYDROJobKind: func() interface{} { return FindJobCreator(DAYMARHYDROJobKind).Create() }, DAYMARIENCJobKind: func() interface{} { return FindJobCreator(DAYMARIENCJobKind).Create() }, LIGHTSJobKind: func() interface{} { return FindJobCreator(LIGHTSJobKind).Create() }, RTPBCNJobKind: func() interface{} { return FindJobCreator(RTPBCNJobKind).Create() }, TOPMARJobKind: func() interface{} { return FindJobCreator(TOPMARJobKind).Create() }, NOTMRKJobKind: func() interface{} { return FindJobCreator(NOTMRKJobKind).Create() }, STJobKind: func() interface{} { return new(models.StretchImport) }, SECJobKind: func() interface{} { return new(models.SectionImport) }, DSECJobKind: func() interface{} { return new(models.SectionDelete) }, DSTJobKind: func() interface{} { return new(models.StretchDelete) }, DSRJobKind: func() interface{} { return new(models.SoundingResultDelete) }, ReportJobKind: func() interface{} { return FindJobCreator(ReportJobKind).Create() }, StatsUpdateJobKind: func() interface{} { return FindJobCreator(StatsUpdateJobKind).Create() }, } // ImportModelForJobKind returns the constructor function to // de-serialize an incoming JSON REST represention of an import. func ImportModelForJobKind(kind JobKind) func() interface{} { return kindToImportModel[kind] } var convertModel = map[JobKind]func(interface{}) interface{}{ BNJobKind: func(input interface{}) interface{} { bi := input.(*models.BottleneckImport) return &Bottleneck{ URL: bi.URL, Tolerance: bi.Tolerance, Insecure: bi.Insecure, } }, GMJobKind: func(input interface{}) interface{} { gi := input.(*models.GaugeMeasurementImport) return &GaugeMeasurement{ URL: gi.URL, Insecure: gi.Insecure, } }, FAJobKind: func(input interface{}) interface{} { fai := input.(*models.FairwayAvailabilityImport) return &FairwayAvailability{ URL: fai.URL, Insecure: fai.Insecure, } }, WAJobKind: func(input interface{}) interface{} { wai := input.(*models.WaterwayAreaImport) return &WaterwayArea{ URL: wai.URL, FeatureType: wai.FeatureType, SortBy: nilString(wai.SortBy), User: nilString(wai.User), Password: nilString(wai.Password), } }, WGJobKind: func(input interface{}) interface{} { wgi := input.(*models.WaterwayGaugeImport) return &WaterwayGauge{ URL: wgi.URL, Username: nilString(wgi.User), Password: nilString(wgi.Password), Insecure: wgi.Insecure, } }, DMVJobKind: func(input interface{}) interface{} { dmvi := input.(*models.DistanceMarksVirtualImport) return &DistanceMarksVirtual{ URL: dmvi.URL, Username: nilString(dmvi.User), Password: nilString(dmvi.Password), Insecure: dmvi.Insecure, } }, FDJobKind: func(input interface{}) interface{} { fdi := input.(*models.FairwayDimensionImport) return &FairwayDimension{ URL: fdi.URL, FeatureType: fdi.FeatureType, SortBy: nilString(fdi.SortBy), LOS: fdi.LOS, MinWidth: fdi.MinWidth, MaxWidth: fdi.MaxWidth, Depth: fdi.Depth, SourceOrganization: fdi.SourceOrganization, User: nilString(fdi.User), Password: nilString(fdi.Password), } }, DMAJobKind: func(input interface{}) interface{} { dmai := input.(*models.DistanceMarksAshoreImport) return &DistanceMarksAshore{ URL: dmai.URL, FeatureType: dmai.FeatureType, SortBy: nilString(dmai.SortBy), User: nilString(dmai.User), Password: nilString(dmai.Password), } }, STJobKind: func(input interface{}) interface{} { sti := input.(*models.StretchImport) return &Stretch{ Name: sti.Name, From: sti.From, To: sti.To, Tolerance: sti.Tolerance, ObjNam: sti.ObjNam, NObjNam: sti.NObjNam, Source: sti.Source, Date: sti.Date, Countries: sti.Countries, } }, SECJobKind: func(input interface{}) interface{} { seci := input.(*models.SectionImport) return &Section{ Name: seci.Name, From: seci.From, To: seci.To, Tolerance: seci.Tolerance, ObjNam: seci.ObjNam, NObjNam: seci.NObjNam, Source: seci.Source, Date: seci.Date, } }, DSECJobKind: func(input interface{}) interface{} { dsec := input.(*models.SectionDelete) return &DeleteSection{ID: dsec.ID} }, DSTJobKind: func(input interface{}) interface{} { dst := input.(*models.StretchDelete) return &DeleteStretch{ID: dst.ID} }, DSRJobKind: func(input interface{}) interface{} { dsr := input.(*models.SoundingResultDelete) return &DeleteSoundingResult{ BottleneckID: dsr.BottleneckId, Date: dsr.Date, } }, } func nilString(s *string) string { if s != nil { return *s } return "" } // ConvertToInternal converts an external JSON REST represention // of an import into the internal one store in the import queue. func ConvertToInternal(kind JobKind, src interface{}) interface{} { fn := convertModel[kind] if fn == nil { return src } return fn(src) }