# HG changeset patch # User Sascha Wilde # Date 1702660660 -3600 # Node ID 4bfcbb7477687dd626d0e13934fda6faaa230a3e # Parent b75d0b303328b7ccc35ac20682cdf4a98526d9e2 relenc is now optional in DMV data. diff -r b75d0b303328 -r 4bfcbb747768 pkg/imports/dmv.go --- a/pkg/imports/dmv.go Fri Dec 08 17:29:56 2023 +0100 +++ b/pkg/imports/dmv.go Fri Dec 15 18:17:40 2023 +0100 @@ -4,12 +4,13 @@ // SPDX-License-Identifier: AGPL-3.0-or-later // License-Filename: LICENSES/AGPL-3.0.txt // -// Copyright (C) 2018 by via donau +// Copyright (C) 2018,2023 by via donau // – Österreichische Wasserstraßen-Gesellschaft mbH // Software engineering by Intevation GmbH // // Author(s): // * Sascha L. Teichmann +// * Sascha Wilde package imports @@ -142,13 +143,7 @@ continue } - if dr.Relenc == nil { - feedback.Warn("missing relenc: %s", code) - ignored++ - continue - } - - if len(*dr.Relenc) > 12 { + if dr.Relenc != nil && len(*dr.Relenc) > 12 { feedback.Warn("relenc too long: %s", *dr.Relenc) ignored++ continue @@ -168,7 +163,7 @@ code.Orc, code.Hectometre, float64(*dr.Lon), float64(*dr.Lat), - string(*dr.Relenc), + dr.Relenc, string(*dr.Wwname.Loc), ); err != nil { return nil, err diff -r b75d0b303328 -r 4bfcbb747768 schema/gemma.sql --- a/schema/gemma.sql Fri Dec 08 17:29:56 2023 +0100 +++ b/schema/gemma.sql Fri Dec 15 18:17:40 2023 +0100 @@ -663,7 +663,7 @@ CREATE TABLE distance_marks_virtual ( location_code isrs PRIMARY KEY, geom geography(POINT, 4326) NOT NULL, - related_enc varchar(12) NOT NULL, + related_enc varchar(12), wwname varchar ) diff -r b75d0b303328 -r 4bfcbb747768 schema/updates/1472/01.dmv-relenc-optional.sql --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/updates/1472/01.dmv-relenc-optional.sql Fri Dec 15 18:17:40 2023 +0100 @@ -0,0 +1,2 @@ +ALTER TABLE waterway.distance_marks_virtual + ALTER COLUMN related_enc DROP NOT NULL; diff -r b75d0b303328 -r 4bfcbb747768 schema/version.sql --- a/schema/version.sql Fri Dec 08 17:29:56 2023 +0100 +++ b/schema/version.sql Fri Dec 15 18:17:40 2023 +0100 @@ -1,1 +1,1 @@ -INSERT INTO gemma_schema_version(version) VALUES (1471); +INSERT INTO gemma_schema_version(version) VALUES (1472);