Mercurial > gemma
changeset 3778:1b11ff97c1d1
Add wwname to import of virtual distance marks.
author | Sascha Wilde <wilde@intevation.de> |
---|---|
date | Thu, 04 Jul 2019 16:30:19 +0200 |
parents | c373758ca2df |
children | 33180c25bd87 |
files | pkg/imports/dmv.go schema/gemma.sql schema/updates_3.0.1/01.dismar-wwname.sql |
diffstat | 3 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/imports/dmv.go Thu Jul 04 16:16:44 2019 +0200 +++ b/pkg/imports/dmv.go Thu Jul 04 16:30:19 2019 +0200 @@ -66,15 +66,18 @@ INSERT INTO waterway.distance_marks_virtual ( location_code, geom, - related_enc + related_enc, + wwname ) VALUES ( ($1::char(2), $2::char(3), $3::char(5), $4::char(5), $5::int), ST_SetSRID(ST_MakePoint($6, $7), 4326)::geography, - $8 + $8, + $9 ) ON CONFLICT (location_code) DO UPDATE SET geom = ST_SetSRID(ST_MakePoint($6, $7), 4326)::geography, - related_enc = $8 + related_enc = $8, + wwname = $9 ` ) @@ -140,6 +143,12 @@ continue } + if dr.Wwname.Loc == nil { + feedback.Warn("missing wwname: %s", code) + ignored++ + continue + } + if _, err := insertStmt.ExecContext( ctx, code.CountryCode, @@ -149,6 +158,7 @@ code.Hectometre, float64(*dr.Lon), float64(*dr.Lat), string(*dr.Relenc), + string(*dr.Wwname.Loc), ); err != nil { return nil, err }
--- a/schema/gemma.sql Thu Jul 04 16:16:44 2019 +0200 +++ b/schema/gemma.sql Thu Jul 04 16:30:19 2019 +0200 @@ -504,7 +504,8 @@ 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) NOT NULL, + wwname varchar ) CREATE TABLE distance_marks (