aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorslomo <steve.harrison@gmx.net>2011-01-21 17:17:31 +0100
committerslomo <steve.harrison@gmx.net>2011-01-21 17:17:31 +0100
commitd9f64fb77cb2e07f558fa587d708a8278475dac4 (patch)
treeedf0694c0c8ccb5a6f75f2f2e806db99487a26bc /src
parente96cfc0d2262596694ad5f07722ec1a856060b7a (diff)
parentbe4bf1e3bc92921c502508072cd75196238a3fca (diff)
downloadosm-xapi-d9f64fb77cb2e07f558fa587d708a8278475dac4.tar.gz
osm-xapi-d9f64fb77cb2e07f558fa587d708a8278475dac4.tar.xz
osm-xapi-d9f64fb77cb2e07f558fa587d708a8278475dac4.zip
merged again
Diffstat (limited to 'src')
-rw-r--r--src/nodejs/no1.js17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/nodejs/no1.js b/src/nodejs/no1.js
index 64e0593..104966f 100644
--- a/src/nodejs/no1.js
+++ b/src/nodejs/no1.js
@@ -103,17 +103,8 @@ function nodeBboxHandler(req, res, key, value, left, bottom, right, top) {
res.write("<xml>");
}
- log.debug(row);
+ res.write(createXmlFromRow(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);
-
- res.write(createXmlFromRow(row));
});
});
}
@@ -122,7 +113,7 @@ function createXmlFromRow(row) {
log.debug(row);
var node = builder.begin('node')
.att('id', row.id)
- .att('timetamp', toISO8601(row.tstamp))
+ .att('timestamp', toISO8601(row.tstamp))
.att('version', row.version)
.att('changeset', row.changeset_id)
.att('lat', row.lat)
@@ -206,6 +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)
@@ -222,6 +214,9 @@ function wayBboxHandler(req, res, key, value, left, bottom, right, top) {
.att('v',escape(temp[x+1]));
}
res.write(builder.toString({pretty:'true'}));
+=======
+ res.write(createXmlFromRow(row));
+>>>>>>> be4bf1e3bc92921c502508072cd75196238a3fca
});
//console.log(createNodesForWayQuery(row.nodes));