aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nodejs/no1.js38
1 files changed, 33 insertions, 5 deletions
diff --git a/src/nodejs/no1.js b/src/nodejs/no1.js
index e9e57ad..9e59bcf 100644
--- a/src/nodejs/no1.js
+++ b/src/nodejs/no1.js
@@ -25,17 +25,45 @@ log.setLevel('ALL');
log.info("server starting...");
function createWayBboxQuery(key, value, left, bottom, right, top) {
- return "SELECT id,tstamp,version,changeset_id, nodes, user_id, hstore_to_array(tags) as tags FROM ways WHERE (tags @> hstore('" + key + "','" + value + "') AND linestring && st_setsrid(st_makebox2d(st_setsrid(st_makepoint(" +
- left + "," + bottom + "),4326), st_setsrid(st_makepoint(" + right + "," + top + "),4326)),4326));";
+ return {
+ text: 'SELECT id,tstamp,version,changeset_id,nodes,user_id,hstore_to_array(tags) as tags \
+ FROM ways \
+ WHERE ( \
+ tags @> hstore($1, $2) AND \
+ linestring && st_setsrid(st_makebox2d( \
+ st_setsrid(st_makepoint($3, $4), 4326), \
+ st_setsrid(st_makepoint($5, $6), 4326) \
+ ), 4326) \
+ )',
+ values: [key, value, left, bottom, right, top],
+ name: 'way bbox query'
+ };
}
function createNodeBboxQuery(key, value, left, bottom, right, top) {
- return "SELECT id, user_id,tstamp,version,changeset_id, hstore_to_array(tags) as tags, X(geom) as lat, Y(geom) as lon FROM nodes WHERE (tags @> hstore('" + key + "','" + value + "') AND geom && st_setsrid(st_makebox2d(st_setsrid(st_makepoint(" +
- left + "," + bottom + "),4326), st_setsrid(st_makepoint(" + right + "," + top + "),4326)),4326));";
+ return {
+ text: 'SELECT id,user_id,tstamp,version,changeset_id,hstore_to_array(tags) as tags, X(geom) as lat, Y(geom) as lon \
+ FROM nodes \
+ WHERE ( \
+ tags @> hstore($1, $2) AND \
+ geom && st_setsrid(st_makebox2d( \
+ st_setsrid(st_makepoint($3, $4), 4326), \
+ st_setsrid(st_makepoint($5, $6), 4326) \
+ ), 4326) \
+ )',
+ values: [key, value, left, bottom, right, top],
+ name: 'node bbox query'
+ };
}
function createNodesForWayQuery(nodes) {
- return "SELECT id, tstamp, version, changeset_id, hstore_to_array(tags) as tags, X(geom) as lat, Y(geom) as lon FROM nodes WHERE id = ANY('" + nodes + "');";
+ return {
+ text: 'SELECT id,tstamp,version,changeset_id,hstore_to_array(tags) as tags, X(geom) as lat, Y(geom) as lon \
+ FROM nodes \
+ WHERE (id = ANY($1))',
+ values: [nodes],
+ name: 'nodes for way'
+ };
}
function nodeWorldHandler(req, res, key, value) {