From bcb96be07044c65b06845f543085b2bd8aaf5f84 Mon Sep 17 00:00:00 2001 From: Irena Kpogbezan Date: Sun, 19 Jun 2011 18:19:32 +0200 Subject: [PATCH] changed "changesetId" to "changeset" --- doc/api.md | 6 ++--- doc/data_structures.md | 6 ++--- lib/genjson.js | 4 ++-- lib/postgresdb/rowparser.js | 6 ++--- tests/helpers/helper-data-structures.js | 30 ++++++++++++------------- tests/postgresdb/sql-realDatabase.js | 24 ++++++++++---------- tests/samples.js | 6 ++--- tests/test-genxml.js | 12 +++++----- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/doc/api.md b/doc/api.md index 53a1f64..b9169aa 100644 --- a/doc/api.md +++ b/doc/api.md @@ -44,7 +44,7 @@ OSM node representation. version*: , uid*: , user*: , - changesetId*: , + changeset*: , timestamp*: , tags*: [ { key: , value: } ] } @@ -59,7 +59,7 @@ OSM way representation. version*: , uid*: , user*: , - changesetId*: , + changeset*: , timestamp*: , nodes: [ ], tags*: [ { key: , value: } ] @@ -74,7 +74,7 @@ OSM way representation. version*: , uid*: , user*: name, - changesetId*: , + changeset*: , timestamp*: , tags*: [ { key: , value: } ], members: [ { diff --git a/doc/data_structures.md b/doc/data_structures.md index 70aa5fb..aa6e605 100644 --- a/doc/data_structures.md +++ b/doc/data_structures.md @@ -35,7 +35,7 @@ Node Object version*: , uid*: , user*: , - changesetId*: , + changeset*: , timestamp*: , tags*: [ { key: , value: } ] } @@ -50,7 +50,7 @@ Way Object version*: , uid*: , user*: - changesetId*: , + changeset*: , timestamp*: , nodes: [ ], tags*: [ { key: , value: } ] @@ -66,7 +66,7 @@ Relation Object version*: , uid*: , user*: , - changesetId*: , + changeset*: , timestamp*: tags*: [ { key: , value: } ], members: [ { diff --git a/lib/genjson.js b/lib/genjson.js index 7c29c60..361e609 100644 --- a/lib/genjson.js +++ b/lib/genjson.js @@ -8,8 +8,8 @@ var JSONGenerator = function JSONGenerator(config) { }; function genjson(type, elem) { - elem.changeset = elem.changesetId; // XXX This ugs the ugly - but is neccessary - delete elem.changesetId; // because of our internal naming scheme + elem.changeset = elem.changeset; // XXX This ugs the ugly - but is neccessary + delete elem.changeset; // because of our internal naming scheme elem.type = type; return JSON.stringify(elem); } diff --git a/lib/postgresdb/rowparser.js b/lib/postgresdb/rowparser.js index dd48eaa..f16e1e3 100644 --- a/lib/postgresdb/rowparser.js +++ b/lib/postgresdb/rowparser.js @@ -26,7 +26,7 @@ var rowToNode = function(row) { version: row.version, uid: row.user_id, user : row.user_name, - changesetId: row.changeset_id, + changeset: row.changeset_id, timestamp: row.tstamp }; if(row.tags && !_.isEmpty(row.tags)) { @@ -49,7 +49,7 @@ var rowToWay = function(row) { version: row.version, uid: row.user_id, user : row.user_name, - changesetId: row.changeset_id, + changeset: row.changeset_id, timestamp: row.tstamp, nodes: row.nodes }; @@ -73,7 +73,7 @@ var rowToRelation = function(row) { version: row.version, uid: row.user_id, user : row.user_name, - changesetId: row.changeset_id, + changeset: row.changeset_id, timestamp: row.tstamp }; if(row.tags && !_.isEmpty(row.tags)) { diff --git a/tests/helpers/helper-data-structures.js b/tests/helpers/helper-data-structures.js index f90a94f..7ebb378 100644 --- a/tests/helpers/helper-data-structures.js +++ b/tests/helpers/helper-data-structures.js @@ -10,7 +10,7 @@ var knownDatatypes = { version : 'number', uid : 'number', user : 'string', - changesetId : 'number', + changeset : 'number', timestamp : 'Date', tags : [{k : 'string', v : 'string'}] } @@ -25,7 +25,7 @@ var knownDatatypes = { version : 'number', uid : 'number', user : 'string', - changesetId : 'number', + changeset : 'number', timestamp : 'Date', tags : [{k : 'string', v : 'string'}] } @@ -44,7 +44,7 @@ var knownDatatypes = { version : 'number', uid : 'number', user : 'string', - changesetId : 'number', + changeset : 'number', timestamp : 'Date', tags : [{k : 'string', v : 'string'}] } @@ -93,10 +93,10 @@ module.exports = { test.deepEqual(typeof toTestNode.user, "string", "Node user is not a string!"); test.notDeepEqual(toTestNode.user, "", "Node user is empty"); } - if(typeof toTestNode.changesetId != "undefined"){ - test.deepEqual(typeof toTestNode.changesetId, "number", "Node changesetId is not a number!"); - test.ok(toTestNode.changesetId >= 1, "Invalid node changesetId"); - test.strictEqual(toTestNode.changesetId, Math.round(toTestNode.changesetId),"Node.changesetId not an integer"); + if(typeof toTestNode.changeset != "undefined"){ + test.deepEqual(typeof toTestNode.changeset, "number", "Node changeset is not a number!"); + test.ok(toTestNode.changeset >= 1, "Invalid node changeset"); + test.strictEqual(toTestNode.changeset, Math.round(toTestNode.changeset),"Node.changeset not an integer"); } if(typeof toTestNode.timestamp != "undefined"){ @@ -151,10 +151,10 @@ module.exports = { test.notDeepEqual(toTestWay.user, "", "Way user is empty"); } - if(typeof toTestWay.changesetId != "undefined"){ - test.deepEqual(typeof toTestWay.changesetId, "number", "Way changesetId is not a number!"); - test.ok(toTestWay.changesetId >= 1, "Invalid way changesetId"); - test.strictEqual(toTestWay.changesetId, Math.round(toTestWay.changesetId),"Way.changesetId not an integer"); + if(typeof toTestWay.changeset != "undefined"){ + test.deepEqual(typeof toTestWay.changeset, "number", "Way changeset is not a number!"); + test.ok(toTestWay.changeset >= 1, "Invalid way changeset"); + test.strictEqual(toTestWay.changeset, Math.round(toTestWay.changeset),"Way.changeset not an integer"); } if(typeof toTestWay.timestamp != "undefined"){ @@ -212,10 +212,10 @@ module.exports = { test.notDeepEqual(toTestRelation.user, "", "Relation user is empty"); } - if(typeof toTestRelation.changesetId != "undefined"){ - test.deepEqual(typeof toTestRelation.changesetId, "number", "Relation changesetId is not a number!"); - test.ok(toTestRelation.changesetId >= 1, "Test relation changesetId is negative"); - test.strictEqual(toTestRelation.changesetId, Math.round(toTestRelation.changesetId),"Relation.changesetId not an integer"); + if(typeof toTestRelation.changeset != "undefined"){ + test.deepEqual(typeof toTestRelation.changeset, "number", "Relation changeset is not a number!"); + test.ok(toTestRelation.changeset >= 1, "Test relation changeset is negative"); + test.strictEqual(toTestRelation.changeset, Math.round(toTestRelation.changeset),"Relation.changeset not an integer"); } if(typeof toTestRelation.timestamp != "undefined"){ diff --git a/tests/postgresdb/sql-realDatabase.js b/tests/postgresdb/sql-realDatabase.js index d846cd0..12c1396 100644 --- a/tests/postgresdb/sql-realDatabase.js +++ b/tests/postgresdb/sql-realDatabase.js @@ -30,7 +30,7 @@ var node1 = { lon: 9.427, version: 1, uid: 291857, - changesetId: 123456, + changeset: 123456, timestamp: null, tags: [ { key: 'amenity', value: 'hospital' }, @@ -44,7 +44,7 @@ var node2 = { lon: 7.2, version: 1, uid: 291857, - changesetId: 123456, + changeset: 123456, timestamp: null, tags: [] }; @@ -55,7 +55,7 @@ var node3 = { lon: 13.9108, version: 1, uid: 291857, - changesetId: 123456, + changeset: 123456, timestamp: null, tags: [ { key: 'amenity', value: 'hotel' }, @@ -68,7 +68,7 @@ var node4 = { lon: 7.8526, version: 1, uid: 291857, - changesetId: 123456, + changeset: 123456, timestamp: null, tags: [ { key: 'amenity', value: 'hotel' }, @@ -81,7 +81,7 @@ var node5 = { lon: 13.4, version: 1, uid: 291857, - changesetId: 123456, + changeset: 123456, timestamp: null, tags: [ { key: 'amenity', value: 'bar' }, @@ -94,7 +94,7 @@ var node6 = { lon: 11.52, version: 1, uid: 291857, - changesetId: 123456, + changeset: 123456, timestamp: null, tags: [ { key: 'building', value: 'emblem' }, @@ -108,7 +108,7 @@ var node7 = { lon: 11.7, version: 1, uid: 291857, - changesetId: 123456, + changeset: 123456, timestamp: null, tags: [ { key: 'amenity', value: 'hospital' }, @@ -121,7 +121,7 @@ var way1 = { id: 123, version: 3, uid: 291857, - changesetId: 2211, + changeset: 2211, timestamp: null, nodes: [ 1,6,7 ], tags: [] @@ -131,7 +131,7 @@ var way2 = { id: 456, version: 3, uid: 291857, - changesetId: 2211, + changeset: 2211, timestamp: null, nodes: [ 2,5 ], tags: [] @@ -141,7 +141,7 @@ var way3 = { id: 789, version: 3, uid: 291857, - changesetId: 2211, + changeset: 2211, timestamp: null, nodes: [ 2,3 ], tags: [{ key: 'name', value: 'Strandweg' }] @@ -152,7 +152,7 @@ var relation1 { id: 1111, version: 17, uid: 291857, - changesetId: 5334067, + changeset: 5334067, timestamp: null, tags: [ { key : 'note', value: 'OstDeutschland' }, @@ -170,7 +170,7 @@ var relation2 { id: 1112, version: 17, uid: 291857, - changesetId: 5334067, + changeset: 5334067, timestamp: null, tags: [ { key : 'note', value: 'WestDeutschland' }, diff --git a/tests/samples.js b/tests/samples.js index c52f780..a139a95 100644 --- a/tests/samples.js +++ b/tests/samples.js @@ -33,7 +33,7 @@ exports.nodes = function(){ version: 123, uid: 233321231, user: 'manfred j. mustermann', - changesetId: 1237691823, + changeset: 1237691823, timestamp: myTimestamp, tags: [ { key: 'key1', value: 'value1' }, { key: 'key2', value: 'value2' } ] @@ -52,7 +52,7 @@ exports.ways = function(){ version : 2, uid: 1234122, user: 'manfred j. mustermann', - changesetId: 1237691823, + changeset: 1237691823, timestamp: myTimestamp, tags : [{key : 'key1', value : 'value1'}, {key : 'key2', value : 'value2'}, @@ -73,7 +73,7 @@ exports.relations = function() { version: 23123, uid: 1234123, user: 'manfred j. mustermann', - changesetId: 1234123, + changeset: 1234123, timestamp: myTimestamp, tags : [{key : 'key1', value : 'value1'}, {key : 'key2', value : 'value2'}, diff --git a/tests/test-genxml.js b/tests/test-genxml.js index 4550031..4dcf6fd 100644 --- a/tests/test-genxml.js +++ b/tests/test-genxml.js @@ -50,7 +50,7 @@ var sample_node = { version: 4, uid: 4, user: 'etti', - changesetId: 443654, + changeset: 443654, timestamp: date, tags:[{key:'key1',value:'value1'},{key:'key2',value:'value2'}] }; @@ -60,7 +60,7 @@ var sample_way = { version: 3, uid: 35, user: 'paul', - changesetId: 7, + changeset: 7, timestamp: date, nodes : [1, 2], tags:[{key:'key1',value:'value1'},{key:'key2',value:'value2'}] @@ -71,7 +71,7 @@ var sample_rel = { version: 34, uid: 45, user: 'kl', - changesetId: 765, + changeset: 765, timestamp: date, members:[{type:'way',reference:234,role:'role'}] }; @@ -80,7 +80,7 @@ module.exports = { 'test_node':function(test){ test.ok(true); - var expected_node = '' + var expected_node = '' + ''; var created_node = xmlGenerator.create('node', sample_node); test.equal(expected_node,created_node,"\n\texpected: " + expected_node + "\n\tcreated: " + created_node+ "\n"); @@ -88,7 +88,7 @@ module.exports = { }, 'test_way':function(test){ - var expected_way = '' + var expected_way = '' + '' + ''; var created_way = xmlGenerator.create('way', sample_way); @@ -97,7 +97,7 @@ module.exports = { }, 'test_rel':function(test){ - var expected = '' + var expected = '' + ''; var actual = xmlGenerator.create('relation', sample_rel);