diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2011-01-13 13:58:15 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2011-01-13 13:58:15 +0100 |
| commit | 0f1ae045f0a561be8c42f2fcf41ca25d2b1751af (patch) | |
| tree | 63791b2261c14abf4ea5c1f00492b643a10ecd12 /src/nodejs/start.js | |
| parent | 280179806ad4426480032769f5296d3875044530 (diff) | |
| parent | 7d9e6e0d1bd45bedc030a287330c50cde7769f56 (diff) | |
| download | osm-xapi-0f1ae045f0a561be8c42f2fcf41ca25d2b1751af.tar.gz osm-xapi-0f1ae045f0a561be8c42f2fcf41ca25d2b1751af.tar.xz osm-xapi-0f1ae045f0a561be8c42f2fcf41ca25d2b1751af.zip | |
Merge remote branch 'upstream/master'
Conflicts:
src/nodejs/start.js
Diffstat (limited to 'src/nodejs/start.js')
| -rw-r--r-- | src/nodejs/start.js | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/nodejs/start.js b/src/nodejs/start.js index c664cfe..52c0748 100644 --- a/src/nodejs/start.js +++ b/src/nodejs/start.js @@ -34,24 +34,19 @@ function getDataBaseResult(tag,bbox,res) { function createQuery(tag,bbox){ // FIXME: validate - // var table = tag[0] + "#" + tag[1]; - // var filter = ""; - - // // input validation - // for(i=0;i<bbox.length;i++){ - // bbox[i] = parseFloat(bbox[i]); - // } - - // if(bbox){ - // filter = "WHERE longitude > " + bbox[0] + " AND longitude < " + bbox[1] + - // " AND latitude > " + bbox[2] + " AND latitude < " + bbox[3]; - // } + var table = tag[0] + "#" + tag[1]; + var filter = ""; + // input validation + for(i=0;i<bbox.length;i++){ + bbox[i] = parseFloat(bbox[i]); + } - return "SELECT id, tags, linestring \ - FROM ways \ - WHERE (tags @> '\"amenity\"=>\"pub\"' AND \ - lseg(linestring) @ box('(13.0882097323,52.3418234221)'::point,'(13.7606105539,52.6697240587)'::point));" + if(bbox){ + filter = "WHERE longitude > " + bbox[0] + " AND longitude < " + bbox[1] + + " AND latitude > " + bbox[2] + " AND latitude < " + bbox[3]; + } + return "SELECT * FROM \"" + table + "\" " + filter + ";"; } |