From d17a2ce463880da17d8778d8df544f4a9d42a896 Mon Sep 17 00:00:00 2001 From: "D. Berge" Date: Sun, 4 Oct 2020 19:27:16 +0200 Subject: [PATCH] Make EPSG selection subquery more specific. More of a kludge than a fix. See #56 for a cleaner solution. Closes #55. --- lib/www/server/lib/db/navdata/save.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/www/server/lib/db/navdata/save.js b/lib/www/server/lib/db/navdata/save.js index 42e53ac..adfe1d6 100644 --- a/lib/www/server/lib/db/navdata/save.js +++ b/lib/www/server/lib/db/navdata/save.js @@ -94,14 +94,14 @@ async function saveOnline (dataset, opts = {}) { await client.query(` INSERT INTO raw_shots (sequence, line, point, objref, tstamp, geometry, hash) - VALUES ($1, $2, $3, $4, $5, ST_SetSRID(ST_MakePoint($6, $7), (SELECT (data->>'epsg')::integer AS epsg FROM file_data)), '*online*') + VALUES ($1, $2, $3, $4, $5, ST_SetSRID(ST_MakePoint($6, $7), (SELECT (data->>'epsg')::integer AS epsg FROM file_data WHERE data ? 'id')), '*online*') ON CONFLICT DO NOTHING; `, [item.sequence, item.line, item.point, 0, item.tstamp, item.easting, item.northing]); } else if (item.latitude && item.longitude) { await client.query(` INSERT INTO raw_shots (sequence, line, point, objref, tstamp, geometry, hash) - VALUES ($1, $2, $3, $4, $5, ST_Transform(ST_SetSRID(ST_MakePoint($6, $7), 4326), (SELECT (data->>'epsg')::integer AS epsg FROM file_data)), '*online*') + VALUES ($1, $2, $3, $4, $5, ST_Transform(ST_SetSRID(ST_MakePoint($6, $7), 4326), (SELECT (data->>'epsg')::integer AS epsg FROM file_data WHERE data ? 'id')), '*online*') ON CONFLICT DO NOTHING; `, [item.sequence, item.line, item.point, 0, item.tstamp, item.longitude, item.latitude]); } else {