From fe634f4f9f83fcbfcc0b5fbeb5e0b80abe593174 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Tue, 8 Jan 2013 16:04:31 -0500
Subject: [PATCH] Tag commits with imagery used

---
 js/id/connection.js    |  2 +-
 js/id/format/xml.js    |  5 +++--
 js/id/graph/history.js | 10 ++++++++--
 js/id/id.js            |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/js/id/connection.js b/js/id/connection.js
index 5feae7a28..4e9c90eba 100644
--- a/js/id/connection.js
+++ b/js/id/connection.js
@@ -103,7 +103,7 @@ iD.Connection = function() {
         return oauth.authenticated();
     }
 
-    connection.putChangeset = function(changes, comment, callback) {
+    connection.putChangeset = function(changes, comment, imagery_used, callback) {
         oauth.xhr({
                 method: 'PUT',
                 path: '/api/0.6/changeset/create',
diff --git a/js/id/format/xml.js b/js/id/format/xml.js
index 5167dfe1d..e0ef9e41a 100644
--- a/js/id/format/xml.js
+++ b/js/id/format/xml.js
@@ -15,14 +15,15 @@ iD.format.XML = {
         return s.replace(/>/g,'&gt;').replace(/</g,'&lt;').replace(/"/g,'&quot;');
     },
     // Generate Changeset XML. Returns a string.
-    changeset: function(comment) {
+    changeset: function(comment, imagery_used) {
         return (new XMLSerializer()).serializeToString(
         JXON.unbuild({
             osm: {
                 changeset: {
                     tag: [
                         { '@k': 'created_by', '@v': 'iD 0.0.0' },
-                        { '@k': 'comment', '@v': comment || '' }
+                        { '@k': 'comment', '@v': comment || '' },
+                        { '@k': 'imagery_used', '@v': imagery_used.join(';')}
                     ],
                     '@version': 0.3,
                     '@generator': 'iD'
diff --git a/js/id/graph/history.js b/js/id/graph/history.js
index 9836af4dd..08a3875a3 100644
--- a/js/id/graph/history.js
+++ b/js/id/graph/history.js
@@ -1,5 +1,5 @@
 iD.History = function() {
-    var stack, index,
+    var stack, index, imagery_used,
         dispatch = d3.dispatch('change');
 
     function perform(actions) {
@@ -16,7 +16,9 @@ iD.History = function() {
             graph = actions[i](graph);
         }
 
-        return {graph: graph, annotation: annotation};
+        imagery_used = 'Bing'; // TODO, un-hardcode
+
+        return {graph: graph, annotation: annotation, imagery_used: imagery_used};
     }
 
     function change(previous) {
@@ -108,6 +110,10 @@ iD.History = function() {
             };
         },
 
+        imagery_used: function(source) {
+            return _.unique(_.pluck(stack.slice(1, index + 1), 'imagery_used'));
+        },
+
         reset: function () {
             stack = [{graph: iD.Graph()}];
             index = 0;
diff --git a/js/id/id.js b/js/id/id.js
index 482d0759e..64090e5a2 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -99,7 +99,7 @@ window.iD = function(container) {
                 function save(e) {
                     d3.select('.shaded').remove();
                     var l = iD.loading('Uploading changes to OpenStreetMap.');
-                    connection.putChangeset(history.changes(), e.comment, function(err, changeset_id) {
+                    connection.putChangeset(history.changes(), e.comment, history.imagery_used(), function(err, changeset_id) {
                         l.remove();
                         history.reset();
                         map.flush().redraw();