aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorslomo <steve.harrison@gmx.net>2011-01-22 13:07:19 +0100
committerslomo <steve.harrison@gmx.net>2011-01-22 13:07:19 +0100
commit35778e6742567d38d349ca358cc5068cc0db1232 (patch)
tree14e9bc3b96ffc11f6611e2a715dee4f183f02805 /src
parent75c6613097ca25055c8830876a2997b5d28beb21 (diff)
downloadosm-xapi-35778e6742567d38d349ca358cc5068cc0db1232.tar.gz
osm-xapi-35778e6742567d38d349ca358cc5068cc0db1232.tar.xz
osm-xapi-35778e6742567d38d349ca358cc5068cc0db1232.zip
first working version with new osmResponse objects
Diffstat (limited to 'src')
-rw-r--r--src/nodejs/main.js114
-rw-r--r--src/nodejs/response.js35
2 files changed, 101 insertions, 48 deletions
diff --git a/src/nodejs/main.js b/src/nodejs/main.js
index f15f158..1928f28 100644
--- a/src/nodejs/main.js
+++ b/src/nodejs/main.js
@@ -4,9 +4,62 @@ var pg = require('pg');
var xmlGenerator = require('./xmlGenerator.js');
var opts = require('opts');
var config = require('./config.json');
+var osmRes = require('./response');
var log4js = require('log4js')();
var log = log4js.getLogger('global');
+
+
+
+
+// #################### MAY be put to different module later
+
+function toISO8601(date) {
+ //2007-03-31T00:09:22+01:00
+ var pad_two = function(n) {
+ return (n < 10 ? '0' : '') + n;
+ };
+
+ return [
+ date.getUTCFullYear(),
+ '-',
+ pad_two(date.getUTCMonth() + 1),
+ '-',
+ pad_two(date.getUTCDate()),
+ 'T',
+ pad_two(date.getUTCHours()),
+ ':',
+ pad_two(date.getUTCMinutes()),
+ ':',
+ pad_two(date.getUTCSeconds()),
+ '+01:00' //FIX ME
+ ].join('');
+}
+
+function rowToNode(row){
+ var node = {
+ 'id' : row.id,
+ 'timestamp': toISO8601(row.tstamp),
+ 'version': row.version,
+ 'changeset': row.changeset_id,
+ 'lat' : row.lat,
+ 'lon' : row.lon
+ }
+ return node;
+}
+
+function rowToWay(row){
+ var way = {
+ 'id' : row.id,
+ 'timestamp' : toISO8601(row.tstamp),
+ 'version' : row.version,
+ 'changeset' : row.changeset_id
+ };
+ return way;
+}
+
+// #################### MAY be put to different module later
+
function loadCustomConfig(path) {
log.info("reading custom config: " + path);
if( path[0] != '/'){
@@ -71,7 +124,7 @@ function createNodesForWayQuery(nodes) {
function dbConnect(res, callback) {
pg.connect(config.connectionString, function(err, client) {
if(err) {
- log.error('message');
+ log.error(err.message);
console.log(config.connectionString);
console.log(err);
res.writeHead(404,{});
@@ -89,37 +142,23 @@ function nodeWorldHandler(req, res, key, value) {
}
function nodeBboxHandler(req, res, key, value, left, bottom, right, top) {
+ res = osmRes.mkXmlRes(res);
+
dbConnect(res, function(client) {
var success = false;
var query = client.query(createNodeBboxQuery(key, value, left, bottom, right, top));
query.on('error', function(err) {
- log.error(err.message);
- res.writeHead(503,{});
- res.end('\n');
+ res.endWith500();
});
query.on('end', function() {
- //console.log("end event\n");
- if(success) {
- res.write("</xml>");
- res.end();
- }
- else {
- //empty response
- res.writeHead(404,{});
- res.end();
- //perhaps write 404? is error also raised?
- }
+ res.atEnd();
});
query.on('row', function(row) {
- if(!success) {
- success = true;
- res.writeHead(200, {'Content-Type': 'text/plain'});
- res.write("<xml>");
- }
- res.write(xmlGenerator.createNode(row));
+ var pojo = rowToNode(row);
+ res.putNode(pojo);
});
});
}
@@ -142,34 +181,16 @@ function wayBboxHandler(req, res, key, value, left, bottom, right, top) {
var query = client.query(createWayBboxQuery(key, value, left, bottom, right, top));
query.on('error', function(err) {
- log.error(err);
- res.writeHead(404,{});
- res.end();
+ res.endWith500();
});
query.on('end', function() {
- if(success) {
- if(count === 0) {
- res.write("</xml>");
- res.end();
- }
- //res.write("</xml>");
- //res.end(); //problem!!!
- }
- else {
- res.writeHead(404,{});
- res.end();
- //perhaps write 404?
+ if(count === 0) {
+ res.atEnd();
}
});
query.on('row', function(row) {
- if(!success) {
- success = true;
- res.writeHead(200, {'Content-Type': 'text/plain'});
- res.write("<xml>");
- }
- //console.log(row);
if(row.nodes != '{}') {
count++;
var subquery = client.query(createNodesForWayQuery(row.nodes));
@@ -177,17 +198,14 @@ function wayBboxHandler(req, res, key, value, left, bottom, right, top) {
subquery.on('end', function() {
count--;
if(count === 0){
- res.write("</xml>");
- res.end();
+ res.atEnd();
}
});
subquery.on('row', function(row) {
- res.write(xmlGenerator.createNode(row));
+ res.putNode(rowToNode(row));
});
-
- //console.log(createNodesForWayQuery(row.nodes));
}
- res.write(xmlGenerator.createWay(row));
+ res.putRow(rowToWay(row));
});
});
}
diff --git a/src/nodejs/response.js b/src/nodejs/response.js
new file mode 100644
index 0000000..47fb170
--- /dev/null
+++ b/src/nodejs/response.js
@@ -0,0 +1,35 @@
+exports.mkJsonRes = function mkJsonRes(res){
+ res.started = false;
+ res.atStart = function (){
+ if(!this.started){
+ this.writeHead(200);
+ this.write('json start start');
+ this.started = true;
+ }
+ }
+ res.atEnd = function(){
+ if(!this.started){
+ this.atStart(pojo);
+ }
+ this.write('json enden');
+ this.end();
+ }
+ res.putNode = function (pojo){
+ if(!this.started){
+ this.atStart(pojo);
+ }
+ this.write(JSON.stringify(pojo));
+ }
+
+ res.endWith500 = function(){
+ this.writeHead(500);
+ this.end();
+ }
+ return res;
+}
+
+exports.mkXmlRes = function (res){
+ return exports.mkJsonRes(res);
+}
+
+