Aaltronav/dougal-software
1
0
Fork 0
mirror of https://gitlab.com/wgp/dougal/software.git synced 2025-12-06 12:57:08 +00:00
Code Issues Packages Projects Releases Activity

Make EPSG selection subquery more specific.

Browse Source 
More of a kludge than a fix. See #56 for
a cleaner solution.

Closes #55.
This commit is contained in:
D. Berge
2020-10-04 19:27:16 +02:00
parent afa34867f5
commit d17a2ce463
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/www/server/lib/db/navdata/save.js
View File

@@ -94,14 +94,14 @@ async function saveOnline (dataset, opts = {}) {
await client.query(` await client.query(`
INSERT INTO raw_shots INSERT INTO raw_shots
(sequence, line, point, objref, tstamp, geometry, hash) (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; ON CONFLICT DO NOTHING;
`, [item.sequence, item.line, item.point, 0, item.tstamp, item.easting, item.northing]); `, [item.sequence, item.line, item.point, 0, item.tstamp, item.easting, item.northing]);
} else if (item.latitude && item.longitude) { } else if (item.latitude && item.longitude) {
await client.query(` await client.query(`
INSERT INTO raw_shots INSERT INTO raw_shots
(sequence, line, point, objref, tstamp, geometry, hash) (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; ON CONFLICT DO NOTHING;
`, [item.sequence, item.line, item.point, 0, item.tstamp, item.longitude, item.latitude]); `, [item.sequence, item.line, item.point, 0, item.tstamp, item.longitude, item.latitude]);
} else { } else {