changed "changesetId" to "changeset"

osm-spline · Jun 19, 2011 · bcb96be · bcb96be
1 parent 9af055c
commit bcb96be
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 47 deletions.
diff --git a/doc/api.md b/doc/api.md
@@ -44,7 +44,7 @@ OSM node representation.
         version*: <bigint>,
         uid*: <bigint>,
         user*: <string>,
-        changesetId*: <bigint>,
+        changeset*: <bigint>,
         timestamp*: <Date>,
         tags*: [ { key: <str>, value: <str> } ]
     }
@@ -59,7 +59,7 @@ OSM way representation.
         version*: <bigint>,
         uid*: <bigint>,
         user*: <string>,
-        changesetId*: <bigint>,
+        changeset*: <bigint>,
         timestamp*: <Date>,
         nodes: [ <bigint> ],
         tags*: [ { key: <str>, value: <str> } ]
@@ -74,7 +74,7 @@ OSM way representation.
         version*: <bigint>,
         uid*: <bigint>,
         user*: name,
-        changesetId*: <bigint>,
+        changeset*: <bigint>,
         timestamp*: <Date>,
         tags*: [ { key: <str>, value: <str> } ],
         members: [ {

diff --git a/doc/data_structures.md b/doc/data_structures.md
@@ -35,7 +35,7 @@ Node Object
       version*: <number>,
       uid*: <number>,
       user*: <string>,
-      changesetId*: <number>,
+      changeset*: <number>,
       timestamp*: <Date>,
       tags*: [ { key: <str>, value: <str> } ]
     }
@@ -50,7 +50,7 @@ Way Object
       version*: <number>,
       uid*: <number>,
       user*: <string>
-      changesetId*: <number>,
+      changeset*: <number>,
       timestamp*: <Date>,
       nodes: [ <number> ],
       tags*: [ { key: <str>, value: <str> } ]
@@ -66,7 +66,7 @@ Relation Object
       version*: <number>,
       uid*: <number>,
       user*: <string>,
-      changesetId*: <number>,
+      changeset*: <number>,
       timestamp*: <Date>
       tags*: [ { key: <str>, value: <str> } ],
       members: [ {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,15 +80,15 @@ module.exports = {
 
     'test_node':function(test){
         test.ok(true);
-        var expected_node = '<node id="4" lat="4" lon="4" version="4" uid="4" user="etti" changesetId="443654" timestamp="' + date + '">'
+        var expected_node = '<node id="4" lat="4" lon="4" version="4" uid="4" user="etti" changeset="443654" timestamp="' + date + '">'
                           + '<tag k="key1" v="value1"/><tag k="key2" v="value2"/></node>';
         var created_node = xmlGenerator.create('node', sample_node);
         test.equal(expected_node,created_node,"\n\texpected: " + expected_node + "\n\tcreated:  " + created_node+ "\n");
         test.finish();
     },
 
     'test_way':function(test){
-        var expected_way = '<way id="45" version="3" uid="35" user="paul" changesetId="7" timestamp="' + date + '">'
+        var expected_way = '<way id="45" version="3" uid="35" user="paul" changeset="7" timestamp="' + date + '">'
                          + '<nd ref="1"/><nd ref="2"/>'
                          + '<tag k="key1" v="value1"/><tag k="key2" v="value2"/></way>';
         var created_way = xmlGenerator.create('way', sample_way);
@@ -97,7 +97,7 @@ module.exports = {
     },
 
     'test_rel':function(test){
-        var expected = '<relation id="655" version="34" uid="45" user="kl" changesetId="765" timestamp="' + date + '">'
+        var expected = '<relation id="655" version="34" uid="45" user="kl" changeset="765" timestamp="' + date + '">'
                         + '<member type="way" ref="234" role="role"/></relation>';
         var actual = xmlGenerator.create('relation', sample_rel);