From 380016154f5049460f5221fc1eec655d3e868622 Mon Sep 17 00:00:00 2001
From: booo <borgers@mi.fu-berlin.de>
Date: Sun, 13 Feb 2011 12:00:08 +0100
Subject: handle tags with new node-postgres module; xml escaping still broken
---
src/nodejs/main.js | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
(limited to 'src/nodejs')
diff --git a/src/nodejs/main.js b/src/nodejs/main.js
index 96d1043..faa7e12 100644
--- a/src/nodejs/main.js
+++ b/src/nodejs/main.js
@@ -43,21 +43,18 @@ function rowToNode(row){
'lat' : row.lat,
'lon' : row.lon
};
-
- if(row.tags != '{}') {
- node.tags = [];
- temp = row.tags.replace("{","").replace("}","").split(",");
- for(var x=0;x<temp.length;x=x+2){
+ node.tags = []
+ if(row.tags.length != 0) {
+ for(var i=0;i<row.tags.length;i=i+2) {
node.tags.push({
- 'key' : temp[x],
- 'value' : temp[x+1]
- });
+ 'key' : row.tags[i],
+ 'value' : row.tags[i+1]
+ })
}
}
return node;
}
-//FIXME: parsing of ways is meesed up
function rowToWay(row){
var way = {
'id' : row.id,
@@ -65,17 +62,16 @@ function rowToWay(row){
'version' : row.version,
'changeset' : row.changeset_id
};
- if(row.tags != '{}') {
- way.tags = [];
- // FIXME: something doesnt work at all
- temp = row.tags.replace("{","").replace("}","").split(",");
- for(var x=0;x<temp.length;x=x+2){
+ way.tags = []
+ if(row.tags.length != 0) {
+ for(var i=0;i<row.tags.length;i=i+2) {
way.tags.push({
- 'k' : temp[x],
- 'v' : temp[x+1]
- });
+ 'key' : row.tags[i],
+ 'value' : row.tags[i+1]
+ })
}
}
+ //TODO return nodes of way
return way;
}
--
cgit v1.2.3