Mercurial > gemma
view pkg/models/import.go @ 3678:8f58851927c0
client: make layer factory only return new layer config for individual maps
instead of each time it is invoked. The purpose of the factory was to support multiple maps with individual layers.
But returning a new config each time it is invoked leads to bugs that rely on the layer's state. Now this factory
reuses the same objects it created before, per map.
author | Markus Kottlaender <markus@intevation.de> |
---|---|
date | Mon, 17 Jun 2019 17:31:35 +0200 |
parents | 386ff766dfcd |
children | 80bdcd137a1d |
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 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 ( "encoding/json" "errors" "time" ) const ImportTimeFormat = "2006-01-02T15:04:05.000" type ( ImportTime struct{ time.Time } Import struct { ID int64 `json:"id"` State string `json:"state"` Enqueued ImportTime `json:"enqueued"` Kind string `json:"kind"` User string `json:"user"` Signer string `json:"signer,omitempty"` Summary bool `json:"summary,omitempty"` Warnings bool `json:"warnings,omitempty"` } ImportLogEntry struct { Time ImportTime `json:"time"` Kind string `json:"kind"` Message string `json:"message"` } ReviewState string Review struct { ID int64 `json:"id"` State ReviewState `json:"state"` } ) var errInvalidReviewState = errors.New("state is wether 'accepted' nor 'declined'") func (rs *ReviewState) UnmarshalJSON(data []byte) error { var s string if err := json.Unmarshal(data, &s); err != nil { return err } if s != "accepted" && s != "declined" { return errInvalidReviewState } *rs = ReviewState(s) return nil } func (it ImportTime) MarshalJSON() ([]byte, error) { return json.Marshal(it.Format(ImportTimeFormat)) } func (it *ImportTime) Scan(x interface{}) error { t, ok := x.(time.Time) if !ok { *it = ImportTime{} } else { *it = ImportTime{t} } return nil }