# HG changeset patch # User Tom Gottfried # Date 1581354142 -3600 # Node ID bcb8b69e43585f76e9b276b91c104fcbf6588190 # Parent ab184888d58bf8d55ee824c47c81968293629e39 Type specific names for fairway marks import diff -r ab184888d58b -r bcb8b69e4358 pkg/controllers/routes.go --- a/pkg/controllers/routes.go Mon Feb 10 17:07:18 2020 +0100 +++ b/pkg/controllers/routes.go Mon Feb 10 18:02:22 2020 +0100 @@ -241,8 +241,9 @@ kinds := strings.Join([]string{ "bn", "gm", "fa", "wx", "wa", - "wg", "dmv", "fd", "dma", "fm", + "wg", "dmv", "fd", "dma", "sec", "dsec", "dst", "dsr", + "fm_bcnlat", }, "|") api.Handle("/imports/{kind:"+kinds+"}", waterwayAdmin(&mw.JSONHandler{ diff -r ab184888d58b -r bcb8b69e4358 pkg/imports/fm_bcnlat.go --- a/pkg/imports/fm_bcnlat.go Mon Feb 10 17:07:18 2020 +0100 +++ b/pkg/imports/fm_bcnlat.go Mon Feb 10 18:02:22 2020 +0100 @@ -34,13 +34,13 @@ return bcnlat.URL + "|" + bcnlat.FeatureType, nil } -// FMJobKind is the import queue type identifier. -const FMJobKind JobKind = "fm" +// BCNLATJobKind is the import queue type identifier. +const BCNLATJobKind JobKind = "fm_bcnlat" type bcnlatJobCreator struct{} func init() { - RegisterJobCreator(FMJobKind, bcnlatJobCreator{}) + RegisterJobCreator(BCNLATJobKind, bcnlatJobCreator{}) } func (bcnlatJobCreator) Description() string { return "fairway marks bcnlat" } diff -r ab184888d58b -r bcb8b69e4358 pkg/imports/modelconvert.go --- a/pkg/imports/modelconvert.go Mon Feb 10 17:07:18 2020 +0100 +++ b/pkg/imports/modelconvert.go Mon Feb 10 18:02:22 2020 +0100 @@ -18,21 +18,21 @@ ) 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 new(models.WaterwayAxisImport) }, - 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) }, - FMJobKind: func() interface{} { return new(models.FairwayMarksImport) }, - 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) }, + 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 new(models.WaterwayAxisImport) }, + 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) }, + BCNLATJobKind: func() interface{} { return new(models.FairwayMarksImport) }, + 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) }, } // ImportModelForJobKind returns the constructor function to @@ -137,7 +137,7 @@ } }, - FMJobKind: func(input interface{}) interface{} { + BCNLATJobKind: func(input interface{}) interface{} { fmi := input.(*models.FairwayMarksImport) return &FairwayMarks{ URL: fmi.URL,