diff options
| author | slomo <steve.harrison@gmx.net> | 2011-01-21 17:19:41 +0100 |
|---|---|---|
| committer | slomo <steve.harrison@gmx.net> | 2011-01-21 17:19:41 +0100 |
| commit | 9dd34b97d5e1bdcb0f1b08b5590f55c222630c94 (patch) | |
| tree | 99c77901ddb84b4a4711c106999fe77a1f2e240e | |
| parent | d9f64fb77cb2e07f558fa587d708a8278475dac4 (diff) | |
| download | osm-xapi-9dd34b97d5e1bdcb0f1b08b5590f55c222630c94.tar.gz osm-xapi-9dd34b97d5e1bdcb0f1b08b5590f55c222630c94.tar.xz osm-xapi-9dd34b97d5e1bdcb0f1b08b5590f55c222630c94.zip | |
removed remainings of old merge
| -rw-r--r-- | src/nodejs/no1.js | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/nodejs/no1.js b/src/nodejs/no1.js index 104966f..1c959d0 100644 --- a/src/nodejs/no1.js +++ b/src/nodejs/no1.js @@ -197,26 +197,7 @@ function wayBboxHandler(req, res, key, value, left, bottom, right, top) { res.end(); }); subquery.on('row', function(row) { -<<<<<<< HEAD - log.debug(row); - var node = builder.begin('node') - .att('id', row.id) - .att('timetamp', toISO8601(row.tstamp)) - .att('version', row.version) - .att('changeset', row.changeset_id) - .att('lat', row.lat) - .att('lon', row.lon); - if(row.tags != '{}') { - var temp = row.tags.replace("{","").replace("}","").split(","); - for(var x=0;x<temp.length;x=x+2) - node.ele('tag') - .att('k',escape(temp[x])) - .att('v',escape(temp[x+1])); - } - res.write(builder.toString({pretty:'true'})); -======= res.write(createXmlFromRow(row)); ->>>>>>> be4bf1e3bc92921c502508072cd75196238a3fca }); //console.log(createNodesForWayQuery(row.nodes)); |