Merge branch 'master' of github.com:slomo/osm-spline-xapi

Conflicts:
	src/nodejs/no1.js

1 files changed, 170 insertions, 162 deletions

diff --git a/src/nodejs/no1.js b/src/nodejs/no1.js
index 79d50f5..4388e73 100644
--- a/src/nodejs/no1.js
+++ b/src/nodejs/no1.js
@@ -5,15 +5,15 @@ var builder = require('xmlbuilder');
 // load config
 var config = require('./config.json');
 process.argv.forEach(
-        function (val,index, array){
-            if(val=="-c"){
-                path = array[index+1];
-                if( path[0] != '/'){
-                    path = __dirname + '/' + path;
-                }
-                config = require(path);
+    function (val,index, array){
+        if(val=="-c"){
+            path = array[index+1];
+            if( path[0] != '/'){
+                path = __dirname + '/' + path;
             }
-        });
+            config = require(path);
+        }
+    });
 var connectionString = config['connectionString'];
 
 //set up logger
@@ -26,13 +26,11 @@ logger.setLevel('ALL');
 logger.info("server starting...");
 
 function toISO8601(date) {
-	//2007-03-31T00:09:22+01:00
+    //2007-03-31T00:09:22+01:00
     var pad_two = function(n) {
         return (n < 10 ? '0' : '') + n;
     };
-    var pad_three = function(n) {
-        return (n < 100 ? '0' : '') + (n < 10 ? '0' : '') + n;
-    };
+
     return [
         date.getUTCFullYear(),
         '-',
@@ -48,66 +46,76 @@ function toISO8601(date) {
         '+01:00'	//FIX ME
     ].join('');
 }
+
 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 "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));";
 }
 
 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 "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));";
 }
 
 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 "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 + "');";
 }
 
 function nodeWorldHandler(req, res, key, value) {
-
     res.writeHead(200, {'Content-Type': 'text/plain'});
     res.end(' key:' +key +' value:'+value+'\n');
 }
+
 function nodeBboxHandler(req, res, key, value, left, bottom, right, top) {
-	console.log("nodeBboxHandler");
-	db_connect(res, function(client) {
- 			console.log(createNodeBboxQuery(key, value, left, bottom, right, top));
-			var success = false;
-			var query = client.query(createNodeBboxQuery(key, value, left, bottom, right, top));
-
-			query.on('error', function(err) {
-
-				console.log(err);
-				res.writeHead(404,{});
-				res.end('\n');
-			});
-
-			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?
-				}
-			});
-
-			query.on('row', function(row) {
-
-					if(!success) {
-						success = true;
-						res.writeHead(200, {'Content-Type': 'text/plain'});
-						res.write("<xml>");
-					}
+    console.log("nodeBboxHandler");
+    db_connect(res, function(client) {
+ 	console.log(createNodeBboxQuery(key, value, left, bottom, right, top));
+	var success = false;
+	var query = client.query(createNodeBboxQuery(key, value, left, bottom, right, top));
+
+	query.on('error', function(err) {
+	    console.log(err);
+	    res.writeHead(404,{});
+	    res.end('\n');
+	});
+
+	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?
+	    }
+	});
+
+	query.on('row', function(row) {
+	    if(!success) {
+		success = true;
+		res.writeHead(200, {'Content-Type': 'text/plain'});
+		res.write("<xml>");
+	    }
+
+	    console.log(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));
 				});
 	});
+    });
 }
 
 function createXmlFromRow(row) {
@@ -134,134 +142,134 @@ function wayWorldHandler(req, res, key, value) {
 }
 
 function connectionError(err, res) {
-	console.log(err);
-	console.log("foobar");
+    console.log(err);
+    console.log("foobar");
 }
 
 function db_connect(res, callback) {
-	pg.connect(connectionString, function(err, client) {
-		if(err) {
-			console.log(err['message']);
-			res.writeHead(404,{});
-			res.end();
-		} else {
-      		console.log("db connection was successfull");
-			callback(client);
-		}
-	});
+    pg.connect(connectionString, function(err, client) {
+	if(err) {
+	    console.log(err['message']);
+	    res.writeHead(404,{});
+	    res.end();
+	} else {
+      	    console.log("db connection was successfull");
+	    callback(client);
+	}
+    });
 }
 
 function wayBboxHandler(req, res, key, value, left, bottom, right, top) {
-	db_connect(res, function(client) {
-           	var count = 0;
-			var success = false;
-			//console.log(createWayBboxQuery(key, value, left, bottom, right, top));
-			var query = client.query(createWayBboxQuery(key, value, left, bottom, right, top));
-
-			query.on('error', function(err) {
-				console.log(err);
-				res.writeHead(404,{});
-				res.end();
-			});
-
-			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?
-				}
-			});
-
-			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));
-					subquery.on('error',function(err) {});
-					subquery.on('end', function() {
-						count--;
-						if(count==0)
-							res.write("</xml>");
-							res.end();
-						});
-					subquery.on('row', function(row) {
-						console.log(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'}));
-						});
-
-					//console.log(createNodesForWayQuery(row.nodes));
-				}
-
-				var way = builder.begin('way')
-					.att('id', row.id)
-					.att('timetamp', toISO8601(row.tstamp))
-					.att('version', row.version)
-					.att('changeset', row.changeset_id);
-				if(row.tags != '{}') {
-					var temp = row.tags.replace("{","").replace("}","").split(",");
-					for(var x=0;x<temp.length;x=x+2)
-						way.ele('tag')
-							.att('k',escape(temp[x]))
-							.att('v',escape(temp[x+1]));
-				}
-
-				var temp = row.nodes.replace("{","").replace("}","").split(",");
-				for(var x=0;x<temp.length;x++)
-					way.ele('nd')
-						.att('ref',temp[x]);
-
-				res.write(builder.toString({pretty:'true'}));
-			});
+    db_connect(res, function(client) {
+        var count = 0;
+	var success = false;
+	//console.log(createWayBboxQuery(key, value, left, bottom, right, top));
+	var query = client.query(createWayBboxQuery(key, value, left, bottom, right, top));
+
+	query.on('error', function(err) {
+	    console.log(err);
+	    res.writeHead(404,{});
+	    res.end();
+	});
+
+	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?
+	    }
+	});
+
+	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));
+		subquery.on('error',function(err) {});
+		subquery.on('end', function() {
+		    count--;
+		    if(count==0)
+			res.write("</xml>");
+		    res.end();
 		});
+		subquery.on('row', function(row) {
+		    console.log(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'}));
+		});
+
+		//console.log(createNodesForWayQuery(row.nodes));
+	    }
+
+	    var way = builder.begin('way')
+		.att('id', row.id)
+		.att('timetamp', toISO8601(row.tstamp))
+		.att('version', row.version)
+		.att('changeset', row.changeset_id);
+	    if(row.tags != '{}') {
+		var temp = row.tags.replace("{","").replace("}","").split(",");
+		for(var x=0;x<temp.length;x=x+2)
+		    way.ele('tag')
+		    .att('k',escape(temp[x]))
+		    .att('v',escape(temp[x+1]));
+	    }
+
+	    var temp = row.nodes.replace("{","").replace("}","").split(",");
+	    for(var x=0;x<temp.length;x++)
+		way.ele('nd')
+		.att('ref',temp[x]);
+
+	    res.write(builder.toString({pretty:'true'}));
+	});
+    });
 }
 
 function relationWorldHandler(req, res, key, value) {
-
     res.writeHead(200, {'Content-Type': 'text/plain'});
     res.end(' key:' +key +' value:'+value+'!\n');
 }
+
 function relationBboxHandler(req, res, key, value, left, bottom, right, top) {
 
 }
 
 myRoutes = clutch.route404([
-				//['GET /api/(\\w+)(\\[bbox=(\\d,\\d,\\d,\\d)\\])*\\[(\\w+)=(\\w+)\\]$', helloSomeone],
-				['GET /api/node\\[(\\w+)=(\\w+)\\]$',nodeWorldHandler],
-				//['GET /api/node\\[(\\w+)=(\\w+)\\]\\[bbox=(\\d+(\\.\\d+)?),(\\d+),(\\d+),(\\d+)\\]$',nodeBboxHandler],
-				['GET /api/node\\[(\\w+)=(\\w+)\\]\\[bbox=(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?)\\]$',nodeBboxHandler],
-				//['GET /api/node\\[(\\w+)=(\\w+)\\]\\[bbox=(\\d+\\.\\d+),(\\d+),(\\d+),(\\d+)\\]$',nodeBboxHandler],
-				['GET /api/way\\[(\\w+)=(\\w+)\\]$',wayWorldHandler],
-				['GET /api/way\\[(\\w+)=(\\w+)\\]\\[bbox=(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?)\\]$',wayBboxHandler],
-				['GET /api/relation\\[(\\w+)=(\\w+)\\]$',relationWorldHandler],
-				//['GET /api/relation\\[(\\w+)=(\\w+)\\](\\[bbox=(\\d),(\\d),(\\d),(\\d)\\])$',relationBboxHandler],
-				]);
+    //['GET /api/(\\w+)(\\[bbox=(\\d,\\d,\\d,\\d)\\])*\\[(\\w+)=(\\w+)\\]$', helloSomeone],
+    ['GET /api/node\\[(\\w+)=(\\w+)\\]$',nodeWorldHandler],
+    //['GET /api/node\\[(\\w+)=(\\w+)\\]\\[bbox=(\\d+(\\.\\d+)?),(\\d+),(\\d+),(\\d+)\\]$',nodeBboxHandler],
+    ['GET /api/node\\[(\\w+)=(\\w+)\\]\\[bbox=(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?)\\]$',nodeBboxHandler],
+    //['GET /api/node\\[(\\w+)=(\\w+)\\]\\[bbox=(\\d+\\.\\d+),(\\d+),(\\d+),(\\d+)\\]$',nodeBboxHandler],
+    ['GET /api/way\\[(\\w+)=(\\w+)\\]$',wayWorldHandler],
+    ['GET /api/way\\[(\\w+)=(\\w+)\\]\\[bbox=(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?),(\\d+(?:\\.\\d+)?)\\]$',wayBboxHandler],
+    ['GET /api/relation\\[(\\w+)=(\\w+)\\]$',relationWorldHandler],
+    //['GET /api/relation\\[(\\w+)=(\\w+)\\](\\[bbox=(\\d),(\\d),(\\d),(\\d)\\])$',relationBboxHandler],
+]);
 
 
 var http = require('http');