Mercurial > gemma
changeset 2020:491084efd15c unify_imports
Moved waterway(area|axis|gauge) import to imports file.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 24 Jan 2019 17:30:45 +0100 |
| parents | aeff01c6edec |
| children | aa74466feaa8 |
| files | pkg/models/imports.go pkg/models/waterway.go |
| diffstat | 2 files changed, 65 insertions(+), 81 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/models/imports.go Thu Jan 24 17:26:30 2019 +0100 +++ b/pkg/models/imports.go Thu Jan 24 17:30:45 2019 +0100 @@ -14,27 +14,70 @@ import "gemma.intevation.de/gemma/pkg/common" -type BottleneckImport struct { - URL string `json:"url"` - Insecure bool `json:"insecure"` - SendEmail bool `json:"send-email"` - Attributes common.Attributes `json:"attributes,omitempty"` -} +type ( + BottleneckImport struct { + URL string `json:"url"` + Insecure bool `json:"insecure"` + SendEmail bool `json:"send-email"` + Attributes common.Attributes `json:"attributes,omitempty"` + } + + // GaugeMeasurementImport contains data used to define the endpoint + GaugeMeasurementImport struct { + URL string `json:"url"` + Insecure bool `json:"insecure"` + SendEmail bool `json:"send-email"` + // Attributes are optional attributes. + Attributes common.Attributes `json:"attributes,omitempty"` + } + + // FairwayAvailabilityImport contains data used to define the endpoint + FairwayAvailabilityImport struct { + URL string `json:"url"` + Insecure bool `json:"insecure"` + SendEmail bool `json:"send-email"` + // Attributes are optional attributes. + Attributes common.Attributes `json:"attributes,omitempty"` + } -// GaugeMeasurementImport contains data used to define the endpoint -type GaugeMeasurementImport struct { - URL string `json:"url"` - Insecure bool `json:"insecure"` - SendEmail bool `json:"send-email"` - // Attributes are optional attributes. - Attributes common.Attributes `json:"attributes,omitempty"` -} + // WaterwayAxisImport specifies an import of the waterway axis. + WaterwayAxisImport struct { + // URL is the capabilities URL of the WFS. + URL string `json:"url"` + // FeatureType is the layer to use. + FeatureType string `json:"feature-type"` + // SortBy sorts the feature by this key. + SortBy string `json:"sort-by"` + // SendEmail is set to true if an email should be send after + // importing the axis. + SendEmail bool `json:"send-email"` + // Attributes are optional attributes. + Attributes common.Attributes `json:"attributes,omitempty"` + } -// FairwayAvailabilityImport contains data used to define the endpoint -type FairwayAvailabilityImport struct { - URL string `json:"url"` - Insecure bool `json:"insecure"` - SendEmail bool `json:"send-email"` - // Attributes are optional attributes. - Attributes common.Attributes `json:"attributes,omitempty"` -} + // WaterwayAreaImport specifies an import of the waterway area. + WaterwayAreaImport struct { + // URL is the capabilities URL of the WFS. + URL string `json:"url"` + // FeatureType is the layer to use. + FeatureType string `json:"feature-type"` + // SortBy sorts the feature by this key. + SortBy string `json:"sort-by"` + // SendEmail is set to true if an email should be send after + // importing the axis. + SendEmail bool `json:"send-email"` + // Attributes are optional attributes. + Attributes common.Attributes `json:"attributes,omitempty"` + } + + // WaterwayAxisImport specifies an import of waterway gauges. + WaterwayGaugeImport struct { + // URL is the SOAP service URL. + URL string `json:"url"` + // SendEmail is set to true if an email should be send after + // importing the waterway gauges. + SendEmail bool `json:"send-email"` + // Attributes are optional attributes. + Attributes common.Attributes `json:"attributes,omitempty"` + } +)
--- a/pkg/models/waterway.go Thu Jan 24 17:26:30 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -// 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 by via donau -// – Österreichische Wasserstraßen-Gesellschaft mbH -// Software engineering by Intevation GmbH -// -// Author(s): -// * Sascha L. Teichmann <sascha.teichmann@intevation.de> - -package models - -import "gemma.intevation.de/gemma/pkg/common" - -type ( - // WaterwayAxisImport specifies an import of the waterway axis. - WaterwayAxisImport struct { - // URL is the capabilities URL of the WFS. - URL string `json:"url"` - // FeatureType is the layer to use. - FeatureType string `json:"feature-type"` - // SortBy sorts the feature by this key. - SortBy string `json:"sort-by"` - // SendEmail is set to true if an email should be send after - // importing the axis. - SendEmail bool `json:"send-email"` - // Attributes are optional attributes. - Attributes common.Attributes `json:"attributes,omitempty"` - } - - // WaterwayAreaImport specifies an import of the waterway area. - WaterwayAreaImport struct { - // URL is the capabilities URL of the WFS. - URL string `json:"url"` - // FeatureType is the layer to use. - FeatureType string `json:"feature-type"` - // SortBy sorts the feature by this key. - SortBy string `json:"sort-by"` - // SendEmail is set to true if an email should be send after - // importing the axis. - SendEmail bool `json:"send-email"` - // Attributes are optional attributes. - Attributes common.Attributes `json:"attributes,omitempty"` - } - - // WaterwayAxisImport specifies an import of waterway gauges. - WaterwayGaugeImport struct { - // URL is the SOAP service URL. - URL string `json:"url"` - // SendEmail is set to true if an email should be send after - // importing the waterway gauges. - SendEmail bool `json:"send-email"` - // Attributes are optional attributes. - Attributes common.Attributes `json:"attributes,omitempty"` - } -)