diff options
| -rw-r--r-- | src/nodejs/parse.js | 30 | ||||
| -rw-r--r-- | src/nodejs/tests/urlToResObj.js | 63 |
2 files changed, 84 insertions, 9 deletions
diff --git a/src/nodejs/parse.js b/src/nodejs/parse.js index 0338954..932f91f 100644 --- a/src/nodejs/parse.js +++ b/src/nodejs/parse.js @@ -5,14 +5,20 @@ exports.urlToXpathObj = function urlToXpathObj(url){ // filter no enough arguments var parseKeyList = function(string){ - result = /(.+)(:?\|(.+))/.exec(string); + + console.log("input f1: " + string); + result = /([^\|]*)/g.exec(string); + console.log(result); result.shift(); return result; } var parseBboxList = function(string){ - result = /(.+)(:?,(.+)){3}/.exec(string); + console.log("input: " + string); + result = /(.+),(.+),(.+),(.+)/.exec(string); + + console.log(result); if(result.length != 4){ throw "error"; @@ -30,19 +36,25 @@ exports.urlToXpathObj = function urlToXpathObj(url){ var xp = {}; - result = /\/(*|node|way|relation)(:?\[(.*)=(.*)\])*/.exec(url); + result = url.match(/\/(\*|node|way|relation)\[(.*)=(.*)\]*/); + console.log("OUTER: " + result); + xp.object=result[1]; for(i=2;i<=result.length;i++){ - if(result[i]==="bbox"){ - xp.bbox = parseBboxValues(result[i+1]); + if(result[i]==="bbox" && result[i]){ + xp.bbox = parseBboxList(result[i+1]); } else { - xp.tag ={}; - xp.tag.keys = parseKeyList(result[i]); - xp.tag.values = parseKeyList(result[i+1]); + if(result[i]){ + xp.tag ={}; + xp.tag.keys = parseKeyList(result[i]); + xp.tag.values = parseKeyList(result[i+1]); + } } i++; - } + } + console.log(xp); + return(xp); } diff --git a/src/nodejs/tests/urlToResObj.js b/src/nodejs/tests/urlToResObj.js new file mode 100644 index 0000000..b45edfd --- /dev/null +++ b/src/nodejs/tests/urlToResObj.js @@ -0,0 +1,63 @@ +var assert = require('assert'); +var test = require('../parse.js'); + + +//TODO function does not exist yet +var toTest = test.urlToXpathObj; + + +// test all simple objects { node, way, relation } + +var simpleNodeString = "/node"; +var expected = { object: "node" }; +assert.deepEqual(toTest(simpleNodeString), expected); + +var simpleNodeStringTrail = "/node/"; +var expected = { object: "node" }; +assert.deepEqual(toTest(simpleNodeStringTrail), expected); + +var simpleWayString = "/way"; +var expected = { object: "way" }; +assert.deepEqual(toTest(simpleWayString), expected); + +var simpleWayStringTrail = "/way/"; +var expected = { object: "way" }; +assert.deepEqual(toTest(simpleWayStringTrail), expected); + +var simpleRelationString = "/relation"; +var expected = { object: "relation" }; +assert.deepEqual(toTest(simpleRelationString), expected); + +var simpleRelationStringTrail = "/relation/"; +var expected = { object: "relation" }; +assert.deepEqual(toTest(simpleRelationStringTrail), expected); + +// TODO invalid object eg not (node, way, relation) + +var nodeWithBbox = "/node[bbox=0,51.5,0.25,51.75]"; +var expected = { object: "node", bbox: {left:0, bottom:51.5, right:0.25, top:51.75} }; +assert.deepEqual(toTest(nodeWithBbox), expected); + +var nodeWithSimpleTag = "/node[key=value]"; +var expected = { object: "node", tag: { key:["key"], value:["value"]}}; +assert.deepEqual(toTest(nodeWithSimpleTag), expected); + +var nodeWithTwoValues = "/node[tag=foo|bar]"; +var expected = { object: "node", tag: { key:["key"], value:["foo", "bar"]}}; +assert.deepEqual(toTest(nodeWithTwoValues), expected); + +var nodeWithTwoKeys = "/node[foo,bar=value]"; +var expected = { object: "node", tag: { key:["foo", "bar"], value:["value"]}}; +assert.deepEqual(toTest(nodeWithTwoKeys), expected); + +var tagCrossProduct = "/node[key1,key2=value1,value2]"; +var expected = { object: "node", tag: {key:["key1", "key2"], value:["value1", "value2"]}}; +assert.deepEqual(toTest(tagCrossProduct), expected); + +var nodeBboxTag = "/node[bbox=0,0,0,0][key=value]"; +var nodeTagBbox = "/node[bbox=0,0,0,0][key=value]"; +var expected = { object: "node", bbox: {left:0,bottom:0,right:0,top:0}, tag: {key:["key"], value:["value"]}}; +assert.deepEqual(toTest(nodeBboxTag), expected); +assert.deepEqual(toTest(nodeTagBbox), expected); + + |