From 48196a7a8d4aa10774792bc4c06a3e0472a06ef2 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Mon, 19 Nov 2012 20:46:29 -0500
Subject: [PATCH] Start osmChange work, be a little bit more compact

---
 index.html            | 20 ++++++---------
 js/iD/format/XML.js   | 57 +++++++++++++++++++++++++------------------
 js/iD/renderer/Map.js |  4 +--
 3 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/index.html b/index.html
index 84aa0e8a8..26c95b236 100644
--- a/index.html
+++ b/index.html
@@ -62,12 +62,14 @@
         <script type='text/javascript' src='js/iD/Connection.js'></script>
 
         <script>
-            var map = iD.Map(document.getElementById('map'));
+            var map = iD.Map(document.getElementById('map'))
+                .setAPI('http://api06.dev.openstreetmap.org/api/0.6/');
+
             var m = d3.select('#map');
             var hash = iD.Hash().map(map);
             if (!hash.hadHash) map.setZoom(19).setCenter({
-                lat: 48.83724,
-                lon: 2.35266
+                lat: 51.85888,
+                lon: -1.60015
             });
 
             var controller = iD.Controller(map);
@@ -121,17 +123,11 @@
                     map.redo();
                 }
                 // p
-                if (d3.event.which === 80) {
-                    controller.go(iD.actions.AddPlace);
-                }
+                if (d3.event.which === 80) controller.go(iD.actions.AddPlace);
                 // r
-                if (d3.event.which === 82) {
-                    controller.go(iD.actions.AddRoad);
-                }
+                if (d3.event.which === 82) controller.go(iD.actions.AddRoad);
                 // a
-                if (d3.event.which === 65) {
-                    controller.go(iD.actions.AddArea);
-                }
+                if (d3.event.which === 65) controller.go(iD.actions.AddArea);
             });
         </script>
     </body>
diff --git a/js/iD/format/XML.js b/js/iD/format/XML.js
index 437c5e3ee..e63592c0e 100644
--- a/js/iD/format/XML.js
+++ b/js/iD/format/XML.js
@@ -5,25 +5,41 @@ iD.format.XML = {
         }
     },
     decode: function(s) {
-        return s.replace(/>/g,'&gt;').
-                replace(/</g,'&lt;').
-                replace(/"/g,'&quot;');
+        return s.replace(/>/g,'&gt;').replace(/</g,'&lt;').replace(/"/g,'&quot;');
+    },
+    changeset: function(comment) {
+        return (new XMLSerializer()).serializeToString(
+        JXON.unbuild({
+            osm: {
+                changeset: {
+                    tag: [
+                        { '@k': 'created_by', '@v': 'iD' },
+                        { '@k': 'comment', '@v': comment || '' }
+                    ],
+                    '@version': 0.3,
+                    '@generator': 'iD'
+                }
+            }
+        }));
+    },
+    osmChange: function() {
+        return (new XMLSerializer()).serializeToString(
+        JXON.unbuild({
+            osmChange: {
+                '@version': 0.3,
+                '@generator': 'iD'
+            }
+        }));
     },
     mappings: {
         node: function(entity) {
-            return iD.XML.decode((new XMLSerializer()).serializeToString(
+            return iD.format.XML.decode((new XMLSerializer()).serializeToString(
                 JXON.unbuild({
                     node: {
                         '@id': entity.id,
-                        '@lat': entity.lat,
-                        '@lon': entity.lon,
-                        'tag': _.map(entity.tags, function(k, v) {
-                            return {
-                                keyAttributes: {
-                                    k: k,
-                                    v: v
-                                }
-                            };
+                        '@lat': entity.lat, '@lon': entity.lon,
+                        tag: _.map(entity.tags, function(k, v) {
+                            return { keyAttributes: { k: k, v: v } };
                         })
                     }
                 })
@@ -35,19 +51,12 @@ iD.format.XML = {
                     JXON.unbuild({
                         way: {
                             '@id': entity.id,
-                            'nd': entity.nodes.map(function(e) {
-                                return {
-                                    keyAttributes: {
-                                        ref: e.id
-                                    }
-                                };
+                            nd: entity.nodes.map(function(e) {
+                                return { keyAttributes: { ref: e.id } };
                             }),
-                            'tag': _.map(entity.tags, function(k, v) {
+                            tag: _.map(entity.tags, function(k, v) {
                                 return {
-                                    keyAttributes: {
-                                        k: k,
-                                        v: v
-                                    }
+                                    keyAttributes: { k: k, v: v }
                                 };
                             })
                         }
diff --git a/js/iD/renderer/Map.js b/js/iD/renderer/Map.js
index 440989aad..f8043dc98 100644
--- a/js/iD/renderer/Map.js
+++ b/js/iD/renderer/Map.js
@@ -205,7 +205,6 @@ iD.Map = function(elem) {
             .classed('active', classActive);
     }
 
-
     function drawMarkers(points, filter) {
         var markers = hit_g.selectAll('g.marker')
             .filter(filter)
@@ -219,8 +218,7 @@ iD.Map = function(elem) {
         marker.append('circle')
             .attr({ r: 10, cx: 8, cy: 8 });
         marker.append('image')
-            .attr({ width: 16, height: 16 })
-            .attr('xlink:href', iD.Style.markerimage);
+            .attr({ width: 16, height: 16, 'xlink:href': iD.Style.markerimage });
         markers.attr('transform', function(d) {
                 var pt = projection([d.lon, d.lat]);
                 return 'translate(' + [~~pt[0], ~~pt[1]] + ') transform(-8, -8)';