diff --git a/lib/www/server/lib/db/gis/project/raw.js b/lib/www/server/lib/db/gis/project/raw.js index b05b62e..af6746a 100644 --- a/lib/www/server/lib/db/gis/project/raw.js +++ b/lib/www/server/lib/db/gis/project/raw.js @@ -35,21 +35,6 @@ async function points (projectId, options = {}) { options.limit || 5000 ]; -// const text = ` -// SELECT ST_AsGeoJSON(t.*) geojson -// FROM ( -// SELECT rl.line sailline, rs.line, point, sequence, objref, tstamp, ST_Transform(geometry, 4326) geometry -// FROM raw_lines rl -// INNER JOIN raw_shots rs USING (sequence) -// WHERE -// ($1 IS true -// AND ST_Transform(geometry, 4326) && ST_MakeEnvelope($2, $3, $4, $5, 4326) -// ) -// OR ($1 IS false AND true) -// LIMIT $6 -// ) t -// `; - const text = ` SELECT ST_AsGeoJSON(t.*, 'geometry') geojson, ST_AsGeoJSON(t.delta_geom) delta FROM ( diff --git a/lib/www/server/lib/db/line.js b/lib/www/server/lib/db/line.js index 9b07c13..41bd2e3 100644 --- a/lib/www/server/lib/db/line.js +++ b/lib/www/server/lib/db/line.js @@ -9,17 +9,6 @@ async function list (projectId, opts = {}) { const offset = Math.abs((opts.page-1)*opts.itemsPerPage) || 0; const limit = Math.abs(Number(opts.itemsPerPage)) || null; -// const text = ` -// SELECT line, incr, remarks -// FROM preplot_lines -// WHERE -// class = 'V' -// ORDER BY ${sortKey} ${sortDir} -// OFFSET $1 -// LIMIT $2; -// `; - - const text = ` WITH summary AS ( SELECT DISTINCT @@ -49,18 +38,9 @@ async function list (projectId, opts = {}) { `; const res = await pool.query(text, [offset, limit]); - console.log(text, [offset, limit]); - console.log(opts); return res.rows; } -async function summary (projectId, line) { - // FIXME Refactor this - await pool.query("SELECT set_config('search_path', (SELECT schema||',public' FROM public.projects WHERE pid = $1), false);", [projectId]); - -} - module.exports = { - list, -// summary + list }; diff --git a/lib/www/server/lib/db/sequence.js b/lib/www/server/lib/db/sequence.js index 9490955..4ce1bc1 100644 --- a/lib/www/server/lib/db/sequence.js +++ b/lib/www/server/lib/db/sequence.js @@ -26,13 +26,6 @@ async function list (projectId, opts = {}) { return res.rows; } -async function summary (projectId, line) { - // FIXME Refactor this - await pool.query("SELECT set_config('search_path', (SELECT schema||',public' FROM public.projects WHERE pid = $1), false);", [projectId]); - -} - module.exports = { - list, -// summary + list };