From ab0b71f5485a4ddb0771cbeaea4719eed0cc7a1e Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Mon, 26 Nov 2012 13:54:34 -0500
Subject: [PATCH] Fixup saving, test modifying

---
 js/iD/Connection.js | 8 ++++----
 js/iD/format/XML.js | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/iD/Connection.js b/js/iD/Connection.js
index e42870ea4..fd5948560 100644
--- a/js/iD/Connection.js
+++ b/js/iD/Connection.js
@@ -1,5 +1,5 @@
 iD.Connection = function() {
-    var apiURL = 'http://www.openstreetmap.org/api/0.6/',
+    var apiURL = 'http://www.openstreetmap.org/api/0.6',
         connection = {},
         refNodes = {},
         user = {},
@@ -7,13 +7,13 @@ iD.Connection = function() {
 
     // Request data within the bbox from an external OSM server.
     function bboxFromAPI(box, callback) {
-        loadFromURL(apiURL + 'map?bbox=' +
+        loadFromURL(apiURL + '/map?bbox=' +
             [box[0][0], box[1][1], box[1][0], box[0][1]], callback);
     }
 
     // Request data within the bbox from an external OSM server.
     function wayFromAPI(id, callback) {
-        loadFromURL(apiURL + 'way/' + id + '/full', callback);
+        loadFromURL(apiURL + '/way/' + id + '/full', callback);
     }
 
     function loadFromURL(url, callback) {
@@ -115,7 +115,7 @@ iD.Connection = function() {
                         method: 'PUT',
                         path: '/changeset/' + changeset_id + '/close'
                     }, function () {
-                        alert('saved! ' + apiURL.replace('/api/0.6/', '/browse') + '/changeset/' + changeset_id);
+                        alert('saved! ' + apiURL.replace('/api/0.6', '/browse') + '/changeset/' + changeset_id);
                     });
                 });
             });
diff --git a/js/iD/format/XML.js b/js/iD/format/XML.js
index c6635f201..dc8811f5c 100644
--- a/js/iD/format/XML.js
+++ b/js/iD/format/XML.js
@@ -53,7 +53,9 @@ iD.format.XML = {
                 node: {
                     '@id': entity.id.replace('n', ''),
                     '@lat': entity.lat, '@lon': entity.lon,
-                    tag: _.map(entity.tags, function(k, v) {
+                    '@version': (entity.version || 0),
+                    tag: _.map(entity.tags, function(v, k) {
+                        console.log(k, v);
                         return { keyAttributes: { k: k, v: v } };
                     })
                 }
@@ -68,7 +70,7 @@ iD.format.XML = {
                     nd: entity.nodes.map(function(e) {
                         return { keyAttributes: { ref: e.id } };
                     }),
-                    tag: _.map(entity.tags, function(k, v) {
+                    tag: _.map(entity.tags, function(v, k) {
                         return {
                             keyAttributes: { k: k, v: v }
                         };