From f66535f06816ca23aaa838811fa21fe16e39ef7c Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 17 Jan 2013 13:14:46 -0500
Subject: [PATCH 01/25] Fix tests

---
 test/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/index.html b/test/index.html
index f8d570f36..36fe00755 100644
--- a/test/index.html
+++ b/test/index.html
@@ -25,6 +25,7 @@
     <script src='../js/lib/d3.trigger.js'></script>
     <script src='../js/lib/d3.typeahead.js'></script>
     <script src='../js/lib/d3.one.js'></script>
+    <script src='../js/lib/d3.tail.js'></script>
     <script src='../js/lib/ohauth.js'></script>
     <script src='../js/lib/jxon.js'></script>
 

From 1a81a8508a3a48ea10710d935fc20833489d5bf1 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 17 Jan 2013 13:21:03 -0500
Subject: [PATCH 02/25] Fix mocha globals for window event listener

---
 test/index.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/index.html b/test/index.html
index 36fe00755..195b459f6 100644
--- a/test/index.html
+++ b/test/index.html
@@ -108,7 +108,10 @@
 
     <script>
         iD.debug = true;
-        mocha.setup('bdd');
+        mocha.setup({
+            ui: 'bdd',
+            globals: ['__onresize.tail-size']
+        });
         var expect = chai.expect;
     </script>
 

From f0e6ec66596de7d8bad6d76d5491b4441195a90b Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 17 Jan 2013 13:53:52 -0500
Subject: [PATCH 03/25] Finish tests for new geo functionality

---
 test/spec/util.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/test/spec/util.js b/test/spec/util.js
index 3ac1cdda2..2cfa8dc16 100644
--- a/test/spec/util.js
+++ b/test/spec/util.js
@@ -92,5 +92,25 @@ describe('Util', function() {
                 expect(iD.util.geo.polygonContainsPolygon(outer, inner)).to.be.false;
             });
         });
+
+        describe('#polygonIntersectsPolygon', function() {
+            it('says a polygon in a polygon intersects it', function() {
+                var outer = [[0, 0], [0, 3], [3, 3], [3, 0], [0, 0]];
+                var inner = [[1, 1], [1, 2], [2, 2], [2, 1], [1, 1]];
+                expect(iD.util.geo.polygonIntersectsPolygon(outer, inner)).to.be.true;
+            });
+
+            it('says a polygon that partially intersects does', function() {
+                var outer = [[0, 0], [0, 3], [3, 3], [3, 0], [0, 0]];
+                var inner = [[-1, -1], [1, 2], [2, 2], [2, 1], [1, 1]];
+                expect(iD.util.geo.polygonIntersectsPolygon(outer, inner)).to.be.true;
+            });
+
+            it('says totally disjoint polygons do not intersect', function() {
+                var outer = [[0, 0], [0, 3], [3, 3], [3, 0], [0, 0]];
+                var inner = [[-1, -1], [-1, -2], [-2, -2], [-2, -1], [-1, -1]];
+                expect(iD.util.geo.polygonIntersectsPolygon(outer, inner)).to.be.false;
+            });
+        });
     });
 });

From feea5065e22a924e7f64fc33611d167c05ec0fc8 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 17 Jan 2013 14:18:49 -0500
Subject: [PATCH 04/25] Do not permit values longer than 255 chars in the
 inspector

---
 js/id/ui/inspector.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 3af39c1b7..600538e4c 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -114,12 +114,14 @@ iD.ui.inspector = function() {
         inputs.append('input')
             .property('type', 'text')
             .attr('class', 'key')
+            .attr('maxlength', 255)
             .property('value', function(d) { return d.key; })
             .on('change', function(d) { d.key = this.value; });
 
         inputs.append('input')
             .property('type', 'text')
             .attr('class', 'value')
+            .attr('maxlength', 255)
             .property('value', function(d) { return d.value; })
             .on('change', function(d) { d.value = this.value; })
             .on('keydown.push-more', pushMore);
@@ -271,7 +273,7 @@ iD.ui.inspector = function() {
 
     inspector.tags = function (tags) {
         if (!arguments.length) {
-            var tags = {};
+            tags = {};
             tagList.selectAll('li').each(function() {
                 var row = d3.select(this),
                     key = row.selectAll('.key').property('value'),

From 9b21fae8cbaf24e0f78c85b8c115f85803d1d0d2 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 17 Jan 2013 14:46:39 -0500
Subject: [PATCH 05/25] Validation. This adds basic validation and display to
 commits

Included is

* Untagged POIs, ways, areas
* Tags that suggest that lines should be areas
---
 index.html              |  1 +
 js/id/graph/validate.js | 47 +++++++++++++++++++++++++++++++++++++++++
 js/id/id.js             |  2 +-
 js/id/ui/commit.js      | 41 +++++++++++++++++++++++++++++------
 js/id/ui/save.js        | 15 ++++++++++++-
 5 files changed, 97 insertions(+), 9 deletions(-)
 create mode 100644 js/id/graph/validate.js

diff --git a/index.html b/index.html
index 9db659489..2d42c9f1c 100644
--- a/index.html
+++ b/index.html
@@ -108,6 +108,7 @@
         <script src='js/id/graph/node.js'></script>
         <script src='js/id/graph/relation.js'></script>
         <script src='js/id/graph/way.js'></script>
+        <script src='js/id/graph/validate.js'></script>
 
         <script src='js/id/connection.js'></script>
     </head>
diff --git a/js/id/graph/validate.js b/js/id/graph/validate.js
new file mode 100644
index 000000000..addb774ca
--- /dev/null
+++ b/js/id/graph/validate.js
@@ -0,0 +1,47 @@
+iD.validate = function(changes) {
+    var warnings = [], change;
+
+    // https://github.com/openstreetmap/josm/blob/mirror/src/org/
+    // openstreetmap/josm/data/validation/tests/UnclosedWays.java#L80
+    function tagSuggestsArea(change) {
+        if (_.isEmpty(change.tags)) return false;
+        var tags = change.tags;
+        var presence = ['landuse', 'amenities', 'tourism', 'shop'];
+        for (var i = 0; i < presence.length; i++) {
+            if (tags[presence[i]] !== undefined) {
+                return presence[i] + '=' + tags[presence[i]];
+            }
+        }
+        if (tags.building && tags.building === 'yes') return 'building=yes';
+    }
+
+    if (changes.created.length) {
+        for (var i = 0; i < changes.created.length; i++) {
+            change = changes.created[i];
+
+            if (change.geometry() === 'point' && _.isEmpty(change.tags)) {
+                warnings.push({
+                    message: 'Untagged point which is not part of a line or area',
+                    entity: change
+                });
+            }
+
+            if (change.geometry() === 'line' && _.isEmpty(change.tags)) {
+                warnings.push({ message: 'Untagged line', entity: change });
+            }
+
+            if (change.geometry() === 'area' && _.isEmpty(change.tags)) {
+                warnings.push({ message: 'Untagged area', entity: change });
+            }
+
+            if (change.geometry() === 'line' && tagSuggestsArea(change)) {
+                warnings.push({
+                    message: 'The tag ' + tagSuggestsArea(change) + ' suggests line should be area, but it is not and area',
+                    entity: change
+                });
+            }
+        }
+    }
+
+    return warnings.length ? [warnings] : [];
+};
diff --git a/js/id/id.js b/js/id/id.js
index 96f4d09d5..e22a77ca6 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -96,7 +96,7 @@ window.iD = function(container) {
 
         var save_button = bar.append('button')
             .attr('class', 'save action wide')
-            .call(iD.ui.save().map(map));
+            .call(iD.ui.save().map(map).controller(controller));
 
         history.on('change.warn-unload', function() {
             var changes = history.changes(),
diff --git a/js/id/ui/commit.js b/js/id/ui/commit.js
index 547f4505f..06d072275 100644
--- a/js/id/ui/commit.js
+++ b/js/id/ui/commit.js
@@ -1,5 +1,5 @@
 iD.ui.commit = function() {
-    var event = d3.dispatch('cancel', 'save');
+    var event = d3.dispatch('cancel', 'save', 'fix');
 
     function zipSame(d) {
         var c = [], n = -1;
@@ -58,12 +58,12 @@ iD.ui.commit = function() {
 
         header.append('p').text('The changes you upload will be visible on all maps that use OpenStreetMap data.');
 
-        var commit = body.append('div').attr('class','modal-section');
-                commit.append('textarea')
-                    .attr('class', 'changeset-comment')
-                    .attr('placeholder', 'Brief Description of your contributions');
+        var comment_section = body.append('div').attr('class','modal-section');
+        comment_section.append('textarea')
+            .attr('class', 'changeset-comment')
+            .attr('placeholder', 'Brief Description of your contributions');
 
-        var buttonwrap = commit.append('div')
+        var buttonwrap = comment_section.append('div')
                     .attr('class', 'buttons');
 
         var savebutton = buttonwrap.append('button')
@@ -84,12 +84,39 @@ iD.ui.commit = function() {
             cancelbutton.append('span').attr('class','icon close icon-pre-text');
             cancelbutton.append('span').attr('class','label').text('Cancel');
 
+        var warnings = body.selectAll('div.warning-section')
+            .data(iD.validate(changes))
+            .enter()
+            .append('div').attr('class', 'modal-section warning-section');
+
+        warnings.append('h3')
+            .text('Warnings');
+
+        var warning_li = warnings.append('ul')
+            .attr('class', 'changeset-list')
+            .selectAll('li')
+            .data(function(d) { return d; })
+            .enter()
+            .append('li');
+
+        warning_li.append('button')
+            .attr('class', 'minor')
+            .on('click', event.fix)
+            .append('span')
+            .attr('class', 'icon inspect');
+
+        warning_li.append('strong').text(function(d) {
+            return d.message;
+        });
+
         var section = body.selectAll('div.commit-section')
             .data(['modified', 'deleted', 'created'].filter(changesLength))
             .enter()
             .append('div').attr('class', 'commit-section modal-section fillL2');
 
-        section.append('h3').text(String)
+        section.append('h3').text(function(d) {
+            return d.charAt(0).toUpperCase() + d.slice(1);
+            })
             .append('small')
             .attr('class', 'count')
             .text(changesLength);
diff --git a/js/id/ui/save.js b/js/id/ui/save.js
index 27d6ef1e5..e40125e71 100644
--- a/js/id/ui/save.js
+++ b/js/id/ui/save.js
@@ -1,6 +1,6 @@
 iD.ui.save = function() {
 
-    var map;
+    var map, controller;
 
     function save(selection) {
 
@@ -59,6 +59,13 @@ iD.ui.save = function() {
                                 .on('cancel', function() {
                                     modal.remove();
                                 })
+                                .on('fix', function(d) {
+                                    var ext = d.entity.extent(map.history().graph());
+                                    map.extent(ext[0], ext[1]);
+                                    if (map.zoom() > 19) map.zoom(19);
+                                    controller.enter(iD.modes.Select(d.entity));
+                                    modal.remove();
+                                })
                                 .on('save', commit));
                     });
                 } else {
@@ -91,5 +98,11 @@ iD.ui.save = function() {
         return save;
     };
 
+    save.controller = function(_) {
+        if (!arguments.length) return controller;
+        controller = _;
+        return save;
+    };
+
     return save;
 };

From 9f1506af5e755b755231b6f3e8799b3fd475b315 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 09:48:21 -0800
Subject: [PATCH 06/25] Always use rounded projection

---
 js/id/renderer/map.js     | 21 +++++++++++----------
 js/id/svg.js              |  1 -
 js/id/svg/areas.js        |  6 +++---
 js/id/svg/lines.js        |  6 +++---
 js/id/svg/midpoints.js    |  4 ++--
 js/id/svg/points.js       |  4 ++--
 js/id/svg/vertices.js     |  4 ++--
 test/spec/svg/areas.js    |  2 +-
 test/spec/svg/points.js   |  2 +-
 test/spec/svg/vertices.js |  4 ++--
 10 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 9edb347e4..467f7f351 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -5,6 +5,7 @@ iD.Map = function() {
         translateStart,
         keybinding = d3.keybinding(),
         projection = d3.geo.mercator().scale(1024),
+        roundedProjection = iD.svg.RoundProjection(projection),
         zoom = d3.behavior.zoom()
             .translate(projection.translate())
             .scale(projection.scale())
@@ -16,11 +17,11 @@ iD.Map = function() {
         background = iD.Background()
             .projection(projection),
         transformProp = iD.util.prefixCSSProperty('Transform'),
-        points = iD.svg.Points(),
-        vertices = iD.svg.Vertices(),
-        lines = iD.svg.Lines(),
-        areas = iD.svg.Areas(),
-        midpoints = iD.svg.Midpoints(),
+        points = iD.svg.Points(roundedProjection),
+        vertices = iD.svg.Vertices(roundedProjection),
+        lines = iD.svg.Lines(roundedProjection),
+        areas = iD.svg.Areas(roundedProjection),
+        midpoints = iD.svg.Midpoints(roundedProjection),
         tail = d3.tail(),
         surface, tilegroup;
 
@@ -97,11 +98,11 @@ iD.Map = function() {
         }
 
         surface
-            .call(points, graph, all, filter, projection)
-            .call(vertices, graph, all, filter, projection)
-            .call(lines, graph, all, filter, projection)
-            .call(areas, graph, all, filter, projection)
-            .call(midpoints, graph, all, filter, projection);
+            .call(points, graph, all, filter)
+            .call(vertices, graph, all, filter)
+            .call(lines, graph, all, filter)
+            .call(areas, graph, all, filter)
+            .call(midpoints, graph, all, filter);
     }
 
     function editOff() {
diff --git a/js/id/svg.js b/js/id/svg.js
index 5860126e9..e1d26e058 100644
--- a/js/id/svg.js
+++ b/js/id/svg.js
@@ -6,7 +6,6 @@ iD.svg = {
     },
 
     PointTransform: function (projection) {
-        projection = iD.svg.RoundProjection(projection);
         return function (entity) {
             return 'translate(' + projection(entity.loc) + ')';
         };
diff --git a/js/id/svg/areas.js b/js/id/svg/areas.js
index ff24afecc..4fe06ba92 100644
--- a/js/id/svg/areas.js
+++ b/js/id/svg/areas.js
@@ -1,4 +1,4 @@
-iD.svg.Areas = function() {
+iD.svg.Areas = function(projection) {
 
     var area_stack = {
         building: 0,
@@ -26,7 +26,7 @@ iD.svg.Areas = function() {
         return as - bs;
     }
 
-    return function drawAreas(surface, graph, entities, filter, projection) {
+    return function drawAreas(surface, graph, entities, filter) {
         var areas = [];
 
         for (var i = 0; i < entities.length; i++) {
@@ -47,7 +47,7 @@ iD.svg.Areas = function() {
             var nodes = _.pluck(entity.nodes, 'loc');
             if (nodes.length === 0) return (lineStrings[entity.id] = '');
             else return (lineStrings[entity.id] =
-                'M' + nodes.map(iD.svg.RoundProjection(projection)).join('L'));
+                'M' + nodes.map(projection).join('L'));
         }
 
         function drawPaths(group, areas, filter, classes) {
diff --git a/js/id/svg/lines.js b/js/id/svg/lines.js
index 3f1b634d7..4a2acfe38 100644
--- a/js/id/svg/lines.js
+++ b/js/id/svg/lines.js
@@ -1,4 +1,4 @@
-iD.svg.Lines = function() {
+iD.svg.Lines = function(projection) {
 
     var arrowtext = '►\u3000\u3000',
         alength;
@@ -53,7 +53,7 @@ iD.svg.Lines = function() {
         return paths;
     }
 
-    return function drawLines(surface, graph, entities, filter, projection) {
+    return function drawLines(surface, graph, entities, filter) {
 
         if (!alength) {
             var arrow = surface.append('text').text(arrowtext);
@@ -80,7 +80,7 @@ iD.svg.Lines = function() {
             var nodes = _.pluck(entity.nodes, 'loc');
             if (nodes.length === 0) return (lineStrings[entity.id] = '');
             else return (lineStrings[entity.id] =
-                'M' + nodes.map(iD.svg.RoundProjection(projection)).join('L'));
+                'M' + nodes.map(projection).join('L'));
         }
 
         var casing = surface.select('.layer-casing'),
diff --git a/js/id/svg/midpoints.js b/js/id/svg/midpoints.js
index 9c060ea3b..321e75c8e 100644
--- a/js/id/svg/midpoints.js
+++ b/js/id/svg/midpoints.js
@@ -1,5 +1,5 @@
-iD.svg.Midpoints = function() {
-    return function drawMidpoints(surface, graph, entities, filter, projection) {
+iD.svg.Midpoints = function(projection) {
+    return function drawMidpoints(surface, graph, entities, filter) {
         var midpoints = [];
 
         for (var i = 0; i < entities.length; i++) {
diff --git a/js/id/svg/points.js b/js/id/svg/points.js
index 7a2600814..37c4bbf91 100644
--- a/js/id/svg/points.js
+++ b/js/id/svg/points.js
@@ -1,4 +1,4 @@
-iD.svg.Points = function() {
+iD.svg.Points = function(projection) {
     function imageHref(d) {
         // TODO: optimize
         for (var k in d.tags) {
@@ -10,7 +10,7 @@ iD.svg.Points = function() {
         return 'icons/unknown.png';
     }
 
-    return function drawPoints(surface, graph, entities, filter, projection) {
+    return function drawPoints(surface, graph, entities, filter) {
         var points = [];
 
         for (var i = 0; i < entities.length; i++) {
diff --git a/js/id/svg/vertices.js b/js/id/svg/vertices.js
index 700ef5538..ff775fa3e 100644
--- a/js/id/svg/vertices.js
+++ b/js/id/svg/vertices.js
@@ -1,5 +1,5 @@
-iD.svg.Vertices = function() {
-    return function drawVertices(surface, graph, entities, filter, projection) {
+iD.svg.Vertices = function(projection) {
+    return function drawVertices(surface, graph, entities, filter) {
         var vertices = [];
 
         for (var i = 0; i < entities.length; i++) {
diff --git a/test/spec/svg/areas.js b/test/spec/svg/areas.js
index 54a7c1d35..5e910dbfc 100644
--- a/test/spec/svg/areas.js
+++ b/test/spec/svg/areas.js
@@ -12,7 +12,7 @@ describe("iD.svg.Areas", function () {
         var area = iD.Way({tags: {area: 'yes', building: 'yes'}}),
             graph = iD.Graph([area]);
 
-        surface.call(iD.svg.Areas(), graph, [area], filter, projection);
+        surface.call(iD.svg.Areas(projection), graph, [area], filter);
 
         expect(surface.select('.area')).to.be.classed('tag-building');
         expect(surface.select('.area')).to.be.classed('tag-building-yes');
diff --git a/test/spec/svg/points.js b/test/spec/svg/points.js
index 664f88a80..be06ae487 100644
--- a/test/spec/svg/points.js
+++ b/test/spec/svg/points.js
@@ -12,7 +12,7 @@ describe("iD.svg.Points", function () {
         var node = iD.Node({tags: {amenity: "cafe"}, loc: [0, 0], _poi: true}),
             graph = iD.Graph([node]);
 
-        surface.call(iD.svg.Points(), graph, [node], filter, projection);
+        surface.call(iD.svg.Points(projection), graph, [node], filter);
 
         expect(surface.select('.point')).to.be.classed('tag-amenity');
         expect(surface.select('.point')).to.be.classed('tag-amenity-cafe');
diff --git a/test/spec/svg/vertices.js b/test/spec/svg/vertices.js
index 760734053..dccdf80a0 100644
--- a/test/spec/svg/vertices.js
+++ b/test/spec/svg/vertices.js
@@ -12,7 +12,7 @@ describe("iD.svg.Vertices", function () {
         var node = iD.Node({tags: {highway: "traffic_signals"}, loc: [0, 0]}),
             graph = iD.Graph([node]);
 
-        surface.call(iD.svg.Vertices(), graph, [node], filter, projection);
+        surface.call(iD.svg.Vertices(projection), graph, [node], filter);
 
         expect(surface.select('.vertex')).to.be.classed('tag-highway');
         expect(surface.select('.vertex')).to.be.classed('tag-highway-traffic_signals');
@@ -24,7 +24,7 @@ describe("iD.svg.Vertices", function () {
             way2 = iD.Way({nodes: [node.id]}),
             graph = iD.Graph([node, way1, way2]);
 
-        surface.call(iD.svg.Vertices(), graph, [node], filter, projection);
+        surface.call(iD.svg.Vertices(projection), graph, [node], filter);
 
         expect(surface.select('.vertex')).to.be.classed('shared');
     });

From e24b22b518b35778c0e9344d6470bc0858637e9a Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 09:57:22 -0800
Subject: [PATCH 07/25] Extract iD.svg.LineString

---
 js/id/svg.js             | 16 ++++++++++++++++
 js/id/svg/areas.js       | 12 +-----------
 js/id/svg/lines.js       | 10 +---------
 test/index.html          |  1 +
 test/index_packaged.html |  1 +
 test/spec/svg.js         | 10 ++++++++++
 6 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 test/spec/svg.js

diff --git a/js/id/svg.js b/js/id/svg.js
index e1d26e058..bf73f32b8 100644
--- a/js/id/svg.js
+++ b/js/id/svg.js
@@ -9,5 +9,21 @@ iD.svg = {
         return function (entity) {
             return 'translate(' + projection(entity.loc) + ')';
         };
+    },
+
+    LineString: function (projection) {
+        var cache = {};
+        return function (entity) {
+            if (cache[entity.id] !== undefined) {
+                return cache[entity.id];
+            }
+
+            if (entity.nodes.length === 0) {
+                return (cache[entity.id] = '');
+            }
+
+            return (cache[entity.id] =
+                'M' + entity.nodes.map(function (n) { return projection(n.loc); }).join('L'));
+        }
     }
 };
diff --git a/js/id/svg/areas.js b/js/id/svg/areas.js
index 4fe06ba92..3862aca0c 100644
--- a/js/id/svg/areas.js
+++ b/js/id/svg/areas.js
@@ -38,17 +38,7 @@ iD.svg.Areas = function(projection) {
 
         areas.sort(areastack);
 
-        var lineStrings = {};
-
-        function lineString(entity) {
-            if (lineStrings[entity.id] !== undefined) {
-                return lineStrings[entity.id];
-            }
-            var nodes = _.pluck(entity.nodes, 'loc');
-            if (nodes.length === 0) return (lineStrings[entity.id] = '');
-            else return (lineStrings[entity.id] =
-                'M' + nodes.map(projection).join('L'));
-        }
+        var lineString = iD.svg.LineString(projection);
 
         function drawPaths(group, areas, filter, classes) {
             var paths = group.selectAll('path')
diff --git a/js/id/svg/lines.js b/js/id/svg/lines.js
index 4a2acfe38..167a9e75e 100644
--- a/js/id/svg/lines.js
+++ b/js/id/svg/lines.js
@@ -73,15 +73,7 @@ iD.svg.Lines = function(projection) {
 
         lines.sort(waystack);
 
-        function lineString(entity) {
-            if (lineStrings[entity.id] !== undefined) {
-                return lineStrings[entity.id];
-            }
-            var nodes = _.pluck(entity.nodes, 'loc');
-            if (nodes.length === 0) return (lineStrings[entity.id] = '');
-            else return (lineStrings[entity.id] =
-                'M' + nodes.map(projection).join('L'));
-        }
+        var lineString = iD.svg.LineString(projection);
 
         var casing = surface.select('.layer-casing'),
             stroke = surface.select('.layer-stroke'),
diff --git a/test/index.html b/test/index.html
index 195b459f6..96095a244 100644
--- a/test/index.html
+++ b/test/index.html
@@ -151,6 +151,7 @@
     <script src="spec/renderer/hash.js"></script>
     <script src="spec/renderer/map.js"></script>
 
+    <script src="spec/svg.js"></script>
     <script src="spec/svg/areas.js"></script>
     <script src="spec/svg/points.js"></script>
     <script src="spec/svg/vertices.js"></script>
diff --git a/test/index_packaged.html b/test/index_packaged.html
index 92c61df79..cf333b416 100644
--- a/test/index_packaged.html
+++ b/test/index_packaged.html
@@ -60,6 +60,7 @@
     <script src="spec/renderer/hash.js"></script>
     <script src="spec/renderer/map.js"></script>
 
+    <script src="spec/svg.js"></script>
     <script src="spec/svg/areas.js"></script>
     <script src="spec/svg/points.js"></script>
     <script src="spec/svg/vertices.js"></script>
diff --git a/test/spec/svg.js b/test/spec/svg.js
new file mode 100644
index 000000000..bbb78c990
--- /dev/null
+++ b/test/spec/svg.js
@@ -0,0 +1,10 @@
+describe("iD.svg.LineString", function () {
+    it("returns an SVG path description for the entity's nodes", function () {
+        var a = iD.Node({loc: [0, 0]}),
+            b = iD.Node({loc: [2, 3]}),
+            way = iD.Way({nodes: [a, b]}),
+            projection = Object;
+
+        expect(iD.svg.LineString(projection)(way)).to.equal("M0,0L2,3");
+    });
+});

From f64c2df17ff81421eb9e9f9ccf2339c0153f2e52 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 10:40:14 -0800
Subject: [PATCH 08/25] Return null rather than empty string

Empty string still generates the error 'Problem parsing d=""',
while null results in no 'd' attribute at all.
---
 js/id/svg.js     | 2 +-
 test/spec/svg.js | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/js/id/svg.js b/js/id/svg.js
index bf73f32b8..e2b1dc2ad 100644
--- a/js/id/svg.js
+++ b/js/id/svg.js
@@ -19,7 +19,7 @@ iD.svg = {
             }
 
             if (entity.nodes.length === 0) {
-                return (cache[entity.id] = '');
+                return (cache[entity.id] = null);
             }
 
             return (cache[entity.id] =
diff --git a/test/spec/svg.js b/test/spec/svg.js
index bbb78c990..265562071 100644
--- a/test/spec/svg.js
+++ b/test/spec/svg.js
@@ -7,4 +7,11 @@ describe("iD.svg.LineString", function () {
 
         expect(iD.svg.LineString(projection)(way)).to.equal("M0,0L2,3");
     });
+
+    it("returns null for an entity with no nodes", function () {
+        var way = iD.Way(),
+            projection = Object;
+
+        expect(iD.svg.LineString(projection)(way)).to.be.null;
+    });
 });

From 8564279926257f48ef93273373a554da1a932ffc Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 10:43:04 -0800
Subject: [PATCH 09/25] Use identity projection in tests

---
 test/spec/svg/areas.js    | 2 +-
 test/spec/svg/points.js   | 2 +-
 test/spec/svg/vertices.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/spec/svg/areas.js b/test/spec/svg/areas.js
index 5e910dbfc..d978e81c6 100644
--- a/test/spec/svg/areas.js
+++ b/test/spec/svg/areas.js
@@ -1,6 +1,6 @@
 describe("iD.svg.Areas", function () {
     var surface,
-        projection = d3.geo.mercator(),
+        projection = Object,
         filter = d3.functor(true);
 
     beforeEach(function () {
diff --git a/test/spec/svg/points.js b/test/spec/svg/points.js
index be06ae487..6e991962c 100644
--- a/test/spec/svg/points.js
+++ b/test/spec/svg/points.js
@@ -1,6 +1,6 @@
 describe("iD.svg.Points", function () {
     var surface,
-        projection = d3.geo.mercator(),
+        projection = Object,
         filter = d3.functor(true);
 
     beforeEach(function () {
diff --git a/test/spec/svg/vertices.js b/test/spec/svg/vertices.js
index dccdf80a0..8ce5e3a80 100644
--- a/test/spec/svg/vertices.js
+++ b/test/spec/svg/vertices.js
@@ -1,6 +1,6 @@
 describe("iD.svg.Vertices", function () {
     var surface,
-        projection = d3.geo.mercator(),
+        projection = Object,
         filter = d3.functor(true);
 
     beforeEach(function () {

From 545789efcc64daeaa83b2ca0821dcde74e092e50 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 10:51:51 -0800
Subject: [PATCH 10/25] More area tests

---
 js/id/svg/areas.js     |  2 +-
 test/spec/svg/areas.js | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/js/id/svg/areas.js b/js/id/svg/areas.js
index 3862aca0c..e77fe8a4d 100644
--- a/js/id/svg/areas.js
+++ b/js/id/svg/areas.js
@@ -41,7 +41,7 @@ iD.svg.Areas = function(projection) {
         var lineString = iD.svg.LineString(projection);
 
         function drawPaths(group, areas, filter, classes) {
-            var paths = group.selectAll('path')
+            var paths = group.selectAll('path.area')
                 .filter(filter)
                 .data(areas, iD.Entity.key);
 
diff --git a/test/spec/svg/areas.js b/test/spec/svg/areas.js
index d978e81c6..112e25d03 100644
--- a/test/spec/svg/areas.js
+++ b/test/spec/svg/areas.js
@@ -8,6 +8,16 @@ describe("iD.svg.Areas", function () {
             .call(iD.svg.Surface());
     });
 
+    it("adds way and area classes", function () {
+        var area = iD.Way({tags: {area: 'yes'}}),
+            graph = iD.Graph([area]);
+
+        surface.call(iD.svg.Areas(projection), graph, [area], filter);
+
+        expect(surface.select('path')).to.be.classed('way');
+        expect(surface.select('path')).to.be.classed('area');
+    });
+
     it("adds tag classes", function () {
         var area = iD.Way({tags: {area: 'yes', building: 'yes'}}),
             graph = iD.Graph([area]);
@@ -17,4 +27,17 @@ describe("iD.svg.Areas", function () {
         expect(surface.select('.area')).to.be.classed('tag-building');
         expect(surface.select('.area')).to.be.classed('tag-building-yes');
     });
+
+    it("preserves non-area paths", function () {
+        var area = iD.Way({tags: {area: 'yes'}}),
+            graph = iD.Graph([area]);
+
+        surface.select('.layer-fill')
+            .append('path')
+            .attr('class', 'other');
+
+        surface.call(iD.svg.Areas(projection), graph, [area], filter);
+
+        expect(surface.selectAll('.other')[0].length).to.equal(1);
+    });
 });

From 9a76b81125368c3380d1616d56bbdc825c7a89b7 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 11:01:20 -0800
Subject: [PATCH 11/25] First cut on multipolygon rendering

---
 css/map.css                    | 22 ++++++++++----
 index.html                     |  1 +
 js/id/renderer/map.js          |  2 ++
 js/id/svg/multipolygons.js     | 54 ++++++++++++++++++++++++++++++++++
 js/id/svg/tag_classes.js       |  2 +-
 test/index.html                |  2 ++
 test/index_packaged.html       |  1 +
 test/spec/svg/multipolygons.js | 43 +++++++++++++++++++++++++++
 8 files changed, 121 insertions(+), 6 deletions(-)
 create mode 100644 js/id/svg/multipolygons.js
 create mode 100644 test/spec/svg/multipolygons.js

diff --git a/css/map.css b/css/map.css
index b2929f149..fc54d7499 100644
--- a/css/map.css
+++ b/css/map.css
@@ -142,29 +142,37 @@ path.stroke.tag-railway-subway {
     stroke-dasharray: 8,8;
 }
 
-path.area {
+path.area,
+path.multipolygon {
     stroke-width:2;
     stroke:#fff;
     fill:#fff;
     fill-opacity:0.3;
 }
 
+path.multipolygon {
+    fill-rule: evenodd;
+}
+
 path.area.selected {
     stroke-width:4 !important;
 }
 
-path.area.tag-natural {
+path.area.tag-natural,
+path.multipolygon.tag-natural {
     stroke: #ADD6A5;
     fill: #ADD6A5;
     stroke-width:1;
 }
 
-path.area.tag-natural-water {
+path.area.tag-natural-water,
+path.multipolygon.tag-natural-water {
     stroke: #6382FF;
     fill: #ADBEFF;
 }
 
-path.area.tag-building {
+path.area.tag-building,
+path.multipolygon.tag-building {
     stroke: #9E176A;
     stroke-width: 1;
     fill: #ff6ec7;
@@ -173,7 +181,11 @@ path.area.tag-building {
 path.area.tag-landuse,
 path.area.tag-natural-wood,
 path.area.tag-natural-tree,
-path.area.tag-natural-grassland {
+path.area.tag-natural-grassland,
+path.multipolygon.tag-landuse,
+path.multipolygon.tag-natural-wood,
+path.multipolygon.tag-natural-tree,
+path.multipolygon.tag-natural-grassland {
     stroke: #006B34;
     stroke-width: 1;
     fill: #189E59;
diff --git a/index.html b/index.html
index 2d42c9f1c..4e42441f7 100644
--- a/index.html
+++ b/index.html
@@ -41,6 +41,7 @@
         <script src="js/id/svg/areas.js"></script>
         <script src="js/id/svg/lines.js"></script>
         <script src="js/id/svg/midpoints.js"></script>
+        <script src="js/id/svg/multipolygons.js"></script>
         <script src="js/id/svg/points.js"></script>
         <script src="js/id/svg/surface.js"></script>
         <script src="js/id/svg/tag_classes.js"></script>
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 467f7f351..ec232d542 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -21,6 +21,7 @@ iD.Map = function() {
         vertices = iD.svg.Vertices(roundedProjection),
         lines = iD.svg.Lines(roundedProjection),
         areas = iD.svg.Areas(roundedProjection),
+        multipolygons = iD.svg.Multipolygons(roundedProjection),
         midpoints = iD.svg.Midpoints(roundedProjection),
         tail = d3.tail(),
         surface, tilegroup;
@@ -102,6 +103,7 @@ iD.Map = function() {
             .call(vertices, graph, all, filter)
             .call(lines, graph, all, filter)
             .call(areas, graph, all, filter)
+            .call(multipolygons, graph, all, filter)
             .call(midpoints, graph, all, filter);
     }
 
diff --git a/js/id/svg/multipolygons.js b/js/id/svg/multipolygons.js
new file mode 100644
index 000000000..bad07ff41
--- /dev/null
+++ b/js/id/svg/multipolygons.js
@@ -0,0 +1,54 @@
+iD.svg.Multipolygons = function(projection) {
+    return function(surface, graph, entities, filter) {
+        var multipolygons = [];
+
+        for (var i = 0; i < entities.length; i++) {
+            var entity = entities[i];
+            if (entity.geometry() === 'relation' && entity.tags.type === 'multipolygon') {
+                multipolygons.push(entity);
+            }
+        }
+
+        var lineStrings = {};
+
+        function lineString(entity) {
+            if (lineStrings[entity.id] !== undefined) {
+                return lineStrings[entity.id];
+            }
+
+            var multipolygon = entity.multipolygon(graph);
+            if (entity.members.length == 0 || !multipolygon) {
+                return (lineStrings[entity.id] = null);
+            }
+
+            multipolygon = _.flatten(multipolygon, true);
+            return (lineStrings[entity.id] =
+                multipolygon.map(function (ring) {
+                    return 'M' + ring.map(function (node) { return projection(node.loc); }).join('L');
+                }).join(""));
+        }
+
+        function drawPaths(group, multipolygons, filter, classes) {
+            var paths = group.selectAll('path.multipolygon')
+                .filter(filter)
+                .data(multipolygons, iD.Entity.key);
+
+            paths.enter()
+                .append('path')
+                .attr('class', classes);
+
+            paths
+                .order()
+                .attr('d', lineString)
+                .call(iD.svg.TagClasses());
+
+            paths.exit()
+                .remove();
+
+            return paths;
+        }
+
+        var fill = surface.select('.layer-fill'),
+            paths = drawPaths(fill, multipolygons, filter, 'relation multipolygon');
+    };
+};
diff --git a/js/id/svg/tag_classes.js b/js/id/svg/tag_classes.js
index 43562fd5c..0295ca7e6 100644
--- a/js/id/svg/tag_classes.js
+++ b/js/id/svg/tag_classes.js
@@ -1,7 +1,7 @@
 iD.svg.TagClasses = function() {
     var keys = iD.util.trueObj([
         'highway', 'railway', 'motorway', 'amenity', 'natural',
-        'landuse', 'building', 'oneway', 'bridge'
+        'landuse', 'building', 'oneway', 'bridge', 'boundary'
     ]), tagClassRe = /^tag-/;
 
     return function tagClassesSelection(selection) {
diff --git a/test/index.html b/test/index.html
index 96095a244..ab7b521cd 100644
--- a/test/index.html
+++ b/test/index.html
@@ -43,6 +43,7 @@
     <script src="../js/id/svg/areas.js"></script>
     <script src="../js/id/svg/lines.js"></script>
     <script src="../js/id/svg/midpoints.js"></script>
+    <script src="../js/id/svg/multipolygons.js"></script>
     <script src="../js/id/svg/points.js"></script>
     <script src="../js/id/svg/surface.js"></script>
     <script src="../js/id/svg/tag_classes.js"></script>
@@ -153,6 +154,7 @@
 
     <script src="spec/svg.js"></script>
     <script src="spec/svg/areas.js"></script>
+    <script src="spec/svg/multipolygons.js"></script>
     <script src="spec/svg/points.js"></script>
     <script src="spec/svg/vertices.js"></script>
     <script src="spec/svg/tag_classes.js"></script>
diff --git a/test/index_packaged.html b/test/index_packaged.html
index cf333b416..9044adf66 100644
--- a/test/index_packaged.html
+++ b/test/index_packaged.html
@@ -62,6 +62,7 @@
 
     <script src="spec/svg.js"></script>
     <script src="spec/svg/areas.js"></script>
+    <script src="spec/svg/multipolygons.js"></script>
     <script src="spec/svg/points.js"></script>
     <script src="spec/svg/vertices.js"></script>
     <script src="spec/svg/tag_classes.js"></script>
diff --git a/test/spec/svg/multipolygons.js b/test/spec/svg/multipolygons.js
new file mode 100644
index 000000000..67f44ebae
--- /dev/null
+++ b/test/spec/svg/multipolygons.js
@@ -0,0 +1,43 @@
+describe("iD.svg.Multipolygons", function () {
+    var surface,
+        projection = Object,
+        filter = d3.functor(true);
+
+    beforeEach(function () {
+        surface = d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'svg'))
+            .call(iD.svg.Surface());
+    });
+
+    it("adds relation and multipolygon classes", function () {
+        var relation = iD.Relation({tags: {type: 'multipolygon'}}),
+            graph = iD.Graph([relation]);
+
+        surface.call(iD.svg.Multipolygons(projection), graph, [relation], filter);
+
+        expect(surface.select('path')).to.be.classed('relation');
+        expect(surface.select('path')).to.be.classed('multipolygon');
+    });
+
+    it("adds tag classes", function () {
+        var relation = iD.Relation({tags: {type: 'multipolygon', boundary: "administrative"}}),
+            graph = iD.Graph([relation]);
+
+        surface.call(iD.svg.Multipolygons(projection), graph, [relation], filter);
+
+        expect(surface.select('.relation')).to.be.classed('tag-boundary');
+        expect(surface.select('.relation')).to.be.classed('tag-boundary-administrative');
+    });
+
+    it("preserves non-multipolygon paths", function () {
+        var relation = iD.Relation({tags: {type: 'multipolygon'}}),
+            graph = iD.Graph([relation]);
+
+        surface.select('.layer-fill')
+            .append('path')
+            .attr('class', 'other');
+
+        surface.call(iD.svg.Multipolygons(projection), graph, [relation], filter);
+
+        expect(surface.selectAll('.other')[0].length).to.equal(1);
+    });
+});

From 81d4036322c0faefabc1db389a5b0cb8a0f980b0 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 17 Jan 2013 15:20:16 -0500
Subject: [PATCH 12/25] Smarter contributors box, links to history when
 truncated. Fixes #306

---
 js/id/id.js              |  6 +++++-
 js/id/ui/contributors.js | 40 +++++++++++++++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/js/id/id.js b/js/id/id.js
index e22a77ca6..828aa45f9 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -156,8 +156,12 @@ window.iD = function(container) {
             .attr('class','about-block fillD pad1');
         contributors.append('span')
             .attr('class', 'icon nearby icon-pre-text');
-        contributors.append('pan')
+        contributors.append('span')
             .text('Viewing contributions by ');
+        contributors.append('span')
+            .attr('class', 'contributor-list');
+        contributors.append('span')
+            .attr('class', 'contributor-count');
 
         history.on('change.buttons', function() {
             var undo = history.undoAnnotation(),
diff --git a/js/id/ui/contributors.js b/js/id/ui/contributors.js
index 72dedf1d1..36d1cf432 100644
--- a/js/id/ui/contributors.js
+++ b/js/id/ui/contributors.js
@@ -3,22 +3,48 @@ iD.ui.contributors = function(map) {
     function contributors(selection) {
 
         var users = {},
+            limit = 3,
             entities = map.history().graph().intersects(map.extent());
+
         for (var i in entities) {
-            if (entities[i].user) {
-                users[entities[i].user] = true;
-                if (Object.keys(users).length > 10) break;
-            }
+            if (entities[i].user) users[entities[i].user] = true;
         }
-        var u = Object.keys(users);
-        var l = selection.selectAll('a.user-link').data(u);
+
+        var u = Object.keys(users),
+            subset = u.slice(0, limit);
+
+        var l = selection
+            .select('.contributor-list')
+            .selectAll('a.user-link')
+            .data(subset);
+
+
         l.enter().append('a')
             .attr('class', 'user-link')
-            .attr('href', function(d) { return map.connection().userUrl(d); })
+            .attr('href', function(d) { console.log(d); return map.connection().userUrl(d); })
             .attr('target', '_blank')
             .text(String);
+
         l.exit().remove();
 
+        selection
+            .select('.contributor-count')
+            .html('');
+
+        if (u.length > limit) {
+            selection
+                .select('.contributor-count')
+                .append('a')
+                .attr('target', '_blank')
+                .attr('href', function() {
+                    var ext = map.extent();
+                    return 'http://www.openstreetmap.org/browse/changesets?bbox=' + [
+                        ext[0][0], ext[1][1],
+                        ext[1][0], ext[0][1]];
+                })
+                .text(' and ' + (u.length - limit) + ' others');
+        }
+
         if (!u.length) {
             selection.transition().style('opacity', 0);
         } else if (selection.style('opacity') === '0') {

From 65946992768b5f1912c88e7df13ce3324e9964b7 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 17 Jan 2013 15:24:22 -0500
Subject: [PATCH 13/25] Stray console

---
 js/id/ui/contributors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/id/ui/contributors.js b/js/id/ui/contributors.js
index 36d1cf432..3dc5a4014 100644
--- a/js/id/ui/contributors.js
+++ b/js/id/ui/contributors.js
@@ -21,7 +21,7 @@ iD.ui.contributors = function(map) {
 
         l.enter().append('a')
             .attr('class', 'user-link')
-            .attr('href', function(d) { console.log(d); return map.connection().userUrl(d); })
+            .attr('href', function(d) { return map.connection().userUrl(d); })
             .attr('target', '_blank')
             .text(String);
 

From 5a2444b55185b08bc220f4448575e907f659bc3e Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 13:44:30 -0800
Subject: [PATCH 14/25] Extract and fix extent/intersection calculations

Extents are now [[min x, min y], [max x, max y]].
---
 Makefile                  |   2 +
 index.html                |   3 ++
 js/id/geo.js              |   1 +
 js/id/geo/extent.js       |  37 ++++++++++++++
 js/id/graph/entity.js     |   6 +--
 js/id/graph/node.js       |   2 +-
 js/id/graph/way.js        |   7 +--
 js/id/modes/select.js     |   4 +-
 js/id/renderer/map.js     |  21 ++++----
 js/id/ui/geocoder.js      |   2 +-
 js/id/ui/save.js          |   3 +-
 test/index.html           |   5 ++
 test/index_packaged.html  |   2 +
 test/spec/geo/extent.js   | 100 ++++++++++++++++++++++++++++++++++++++
 test/spec/graph/node.js   |   4 +-
 test/spec/graph/way.js    |   8 +--
 test/spec/renderer/map.js |  13 ++---
 17 files changed, 180 insertions(+), 40 deletions(-)
 create mode 100644 js/id/geo.js
 create mode 100644 js/id/geo/extent.js
 create mode 100644 test/spec/geo/extent.js

diff --git a/Makefile b/Makefile
index 2819f2884..657915e1e 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,8 @@ all: \
 	js/id/oauth.js \
 	js/id/services/*.js \
 	js/id/util.js \
+	js/id/geo.js \
+	js/id/geo/*.js \
 	js/id/actions.js \
 	js/id/actions/*.js \
 	js/id/behavior.js \
diff --git a/index.html b/index.html
index 4e42441f7..64d839d93 100644
--- a/index.html
+++ b/index.html
@@ -32,6 +32,9 @@
         <script src='js/id/oauth.js'></script>
         <script src='js/id/services/taginfo.js'></script>
 
+        <script src="js/id/geo.js"></script>
+        <script src="js/id/geo/extent.js"></script>
+
         <script src='js/id/renderer/background.js'></script>
         <script src='js/id/renderer/background_source.js'></script>
         <script src='js/id/renderer/map.js'></script>
diff --git a/js/id/geo.js b/js/id/geo.js
new file mode 100644
index 000000000..06b63ae14
--- /dev/null
+++ b/js/id/geo.js
@@ -0,0 +1 @@
+iD.geo = {};
diff --git a/js/id/geo/extent.js b/js/id/geo/extent.js
new file mode 100644
index 000000000..80bf631c6
--- /dev/null
+++ b/js/id/geo/extent.js
@@ -0,0 +1,37 @@
+iD.geo.Extent = function (min, max) {
+    if (!(this instanceof iD.geo.Extent)) return new iD.geo.Extent(min, max);
+    if (min instanceof iD.geo.Extent) {
+        return min;
+    } else if (min && min.length === 2 && min[0].length === 2 && min[1].length === 2) {
+        this[0] = min[0];
+        this[1] = min[1];
+    } else {
+        this[0] = min        || [ Infinity,  Infinity];
+        this[1] = max || min || [-Infinity, -Infinity];
+    }
+};
+
+iD.geo.Extent.prototype = [[], []];
+
+_.extend(iD.geo.Extent.prototype, {
+    extend: function (obj) {
+        obj = iD.geo.Extent(obj);
+        return iD.geo.Extent([Math.min(obj[0][0], this[0][0]),
+                              Math.min(obj[0][1], this[0][1])],
+                             [Math.max(obj[1][0], this[1][0]),
+                              Math.max(obj[1][1], this[1][1])]);
+    },
+
+    center: function () {
+        return [(this[0][0] + this[1][0]) / 2,
+                (this[0][1] + this[1][1]) / 2];
+    },
+
+    intersects: function (obj) {
+        obj = iD.geo.Extent(obj);
+        return obj[0][0] <= this[1][0] &&
+               obj[0][1] <= this[1][1] &&
+               obj[1][0] >= this[0][0] &&
+               obj[1][1] >= this[0][1];
+    }
+});
diff --git a/js/id/graph/entity.js b/js/id/graph/entity.js
index afc152589..8c8f9a6fb 100644
--- a/js/id/graph/entity.js
+++ b/js/id/graph/entity.js
@@ -74,11 +74,7 @@ iD.Entity.prototype = {
     },
 
     intersects: function(extent, resolver) {
-        var _extent = this.extent(resolver);
-        return _extent[0][0] > extent[0][0] &&
-               _extent[1][0] < extent[1][0] &&
-               _extent[0][1] < extent[0][1] &&
-               _extent[1][1] > extent[1][1];
+        return this.extent(resolver).intersects(extent);
     },
 
     hasInterestingTags: function() {
diff --git a/js/id/graph/node.js b/js/id/graph/node.js
index 9500991fa..fd3a1cd69 100644
--- a/js/id/graph/node.js
+++ b/js/id/graph/node.js
@@ -2,7 +2,7 @@ iD.Node = iD.Entity.extend({
     type: "node",
 
     extent: function() {
-        return [this.loc, this.loc];
+        return iD.geo.Extent(this.loc);
     },
 
     geometry: function() {
diff --git a/js/id/graph/way.js b/js/id/graph/way.js
index 5c3e1210b..305f12051 100644
--- a/js/id/graph/way.js
+++ b/js/id/graph/way.js
@@ -4,14 +4,11 @@ iD.Way = iD.Entity.extend({
 
     extent: function(resolver) {
         return resolver.transient(this, 'extent', function() {
-            var extent = [[-Infinity, Infinity], [Infinity, -Infinity]];
+            var extent = iD.geo.Extent();
             for (var i = 0, l = this.nodes.length; i < l; i++) {
                 var node = this.nodes[i];
                 if (node.loc === undefined) node = resolver.entity(node);
-                if (node.loc[0] > extent[0][0]) extent[0][0] = node.loc[0];
-                if (node.loc[0] < extent[1][0]) extent[1][0] = node.loc[0];
-                if (node.loc[1] < extent[0][1]) extent[0][1] = node.loc[1];
-                if (node.loc[1] > extent[1][1]) extent[1][1] = node.loc[1];
+                extent = extent.extend(node.loc);
             }
             return extent;
         });
diff --git a/js/id/modes/select.js b/js/id/modes/select.js
index d091fdc57..4d567fd59 100644
--- a/js/id/modes/select.js
+++ b/js/id/modes/select.js
@@ -59,8 +59,8 @@ iD.modes.Select = function (entity) {
             map_size = mode.map.size(),
             entity_extent = entity.extent(mode.history.graph()),
             left_edge = map_size[0] - inspector_size[0],
-            left = mode.map.projection(entity_extent[1])[0],
-            right = mode.map.projection(entity_extent[0])[0];
+            left = mode.map.projection(entity_extent[0])[0],
+            right = mode.map.projection(entity_extent[1])[0];
 
         if (left > left_edge &&
             right > left_edge) mode.map.centerEase(
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index ec232d542..59f46f0ee 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -257,26 +257,23 @@ iD.Map = function() {
         }, 20);
     };
 
-    map.extent = function(tl, br) {
+    map.extent = function(_) {
         if (!arguments.length) {
-            return [projection.invert([0, 0]), projection.invert(dimensions)];
+            return iD.geo.Extent(projection.invert([0, dimensions[1]]),
+                                 projection.invert([dimensions[0], 0]));
         } else {
-
-            var TL = projection(tl),
-                BR = projection(br);
+            var extent = iD.geo.Extent(_),
+                tl = projection([extent[0][0], extent[1][1]]),
+                br = projection([extent[1][0], extent[0][1]]);
 
             // Calculate maximum zoom that fits extent
-            var hFactor = (BR[0] - TL[0]) / dimensions[0],
-                vFactor = (BR[1] - TL[1]) / dimensions[1],
+            var hFactor = (br[0] - tl[0]) / dimensions[0],
+                vFactor = (br[1] - tl[1]) / dimensions[1],
                 hZoomDiff = Math.log(Math.abs(hFactor)) / Math.LN2,
                 vZoomDiff = Math.log(Math.abs(vFactor)) / Math.LN2,
                 newZoom = map.zoom() - Math.max(hZoomDiff, vZoomDiff);
 
-            // Calculate center of projected extent
-            var midPoint = [(TL[0] + BR[0]) / 2, (TL[1] + BR[1]) / 2],
-                midLoc = projection.invert(midPoint);
-
-            map.zoom(newZoom).center(midLoc);
+            map.zoom(newZoom).center(extent.center());
         }
     };
 
diff --git a/js/id/ui/geocoder.js b/js/id/ui/geocoder.js
index 87eaa7d74..4bd8c0629 100644
--- a/js/id/ui/geocoder.js
+++ b/js/id/ui/geocoder.js
@@ -16,7 +16,7 @@ iD.ui.geocoder = function() {
                         .text('No location found for "' + resp.query[0] + '"');
                 }
                 var bounds = resp.results[0][0].bounds;
-                map.extent([bounds[0], bounds[3]], [bounds[2], bounds[1]]);
+                map.extent(iD.geo.Extent([bounds[0], bounds[1]], [bounds[2], bounds[3]]));
             });
         }
 
diff --git a/js/id/ui/save.js b/js/id/ui/save.js
index e40125e71..6bf8419c3 100644
--- a/js/id/ui/save.js
+++ b/js/id/ui/save.js
@@ -60,8 +60,7 @@ iD.ui.save = function() {
                                     modal.remove();
                                 })
                                 .on('fix', function(d) {
-                                    var ext = d.entity.extent(map.history().graph());
-                                    map.extent(ext[0], ext[1]);
+                                    map.extent(d.entity.extent(map.history().graph()));
                                     if (map.zoom() > 19) map.zoom(19);
                                     controller.enter(iD.modes.Select(d.entity));
                                     modal.remove();
diff --git a/test/index.html b/test/index.html
index ab7b521cd..7f63be2a3 100644
--- a/test/index.html
+++ b/test/index.html
@@ -34,6 +34,9 @@
     <script src='../js/id/oauth.js'></script>
     <script src='../js/id/services/taginfo.js'></script>
 
+    <script src="../js/id/geo.js"></script>
+    <script src="../js/id/geo/extent.js"></script>
+
     <script src='../js/id/renderer/background.js'></script>
     <script src='../js/id/renderer/background_source.js'></script>
     <script src='../js/id/renderer/map.js'></script>
@@ -139,6 +142,8 @@
     <script src="spec/format/geojson.js"></script>
     <script src="spec/format/xml.js"></script>
 
+    <script src="spec/geo/extent.js"></script>
+
     <script src="spec/graph/graph.js"></script>
     <script src="spec/graph/entity.js"></script>
     <script src="spec/graph/node.js"></script>
diff --git a/test/index_packaged.html b/test/index_packaged.html
index 9044adf66..042a0227e 100644
--- a/test/index_packaged.html
+++ b/test/index_packaged.html
@@ -47,6 +47,8 @@
     <script src="spec/format/geojson.js"></script>
     <script src="spec/format/xml.js"></script>
 
+    <script src="spec/geo/extent.js"></script>
+
     <script src="spec/graph/graph.js"></script>
     <script src="spec/graph/entity.js"></script>
     <script src="spec/graph/node.js"></script>
diff --git a/test/spec/geo/extent.js b/test/spec/geo/extent.js
new file mode 100644
index 000000000..54f328efb
--- /dev/null
+++ b/test/spec/geo/extent.js
@@ -0,0 +1,100 @@
+describe("iD.geo.Extent", function () {
+    describe("constructor", function () {
+        it("defaults to infinitely empty extent", function () {
+            expect(iD.geo.Extent()).to.eql([[Infinity, Infinity], [-Infinity, -Infinity]]);
+        });
+
+        it("constructs via a point", function () {
+            var p = [0, 0];
+            expect(iD.geo.Extent(p)).to.eql([p, p]);
+        });
+
+        it("constructs via two points", function () {
+            var min = [0, 0],
+                max = [5, 10];
+            expect(iD.geo.Extent(min, max)).to.eql([min, max]);
+        });
+
+        it("constructs via an extent", function () {
+            var min = [0, 0],
+                max = [5, 10];
+            expect(iD.geo.Extent([min, max])).to.eql([min, max]);
+        });
+
+        it("constructs via an iD.geo.Extent", function () {
+            var min = [0, 0],
+                max = [5, 10],
+                extent = iD.geo.Extent(min, max);
+            expect(iD.geo.Extent(extent)).to.equal(extent);
+        });
+
+        it("has length 2", function () {
+            expect(iD.geo.Extent().length).to.equal(2);
+        });
+
+        it("has min element", function () {
+            var min = [0, 0],
+                max = [5, 10];
+            expect(iD.geo.Extent(min, max)[0]).to.equal(min);
+        });
+
+        it("has max element", function () {
+            var min = [0, 0],
+                max = [5, 10];
+            expect(iD.geo.Extent(min, max)[1]).to.equal(max);
+        });
+    });
+
+    describe("#center", function () {
+        it("returns the center point", function () {
+           expect(iD.geo.Extent([0, 0], [5, 10]).center()).to.eql([2.5, 5]);
+        });
+    });
+
+    describe("#extend", function () {
+        it("does not modify self", function () {
+            var extent = iD.geo.Extent([0, 0], [0, 0]);
+            extent.extend([1, 1]);
+            expect(extent).to.eql([[0, 0], [0, 0]]);
+        });
+
+        it("returns the minimal extent containing self and the given point", function () {
+            expect(iD.geo.Extent().extend([0, 0])).to.eql([[0, 0], [0, 0]]);
+            expect(iD.geo.Extent([0, 0], [0, 0]).extend([5, 10])).to.eql([[0, 0], [5, 10]]);
+        });
+
+        it("returns the minimal extent containing self and the given extent", function () {
+            expect(iD.geo.Extent().extend([[0, 0], [5, 10]])).to.eql([[0, 0], [5, 10]]);
+            expect(iD.geo.Extent([0, 0], [0, 0]).extend([[4, -1], [5, 10]])).to.eql([[0, -1], [5, 10]]);
+        });
+    });
+
+    describe('#intersects', function () {
+        it("returns true for a point inside self", function () {
+            expect(iD.geo.Extent([0, 0], [5, 5]).intersects([2, 2])).to.be.true;
+        });
+
+        it("returns true for a point on the boundary of self", function () {
+            expect(iD.geo.Extent([0, 0], [5, 5]).intersects([0, 0])).to.be.true;
+        });
+
+        it("returns false for a point outside self", function () {
+            expect(iD.geo.Extent([0, 0], [5, 5]).intersects([6, 6])).to.be.false;
+        });
+
+        it("returns true for an extent contained by self", function () {
+            expect(iD.geo.Extent([0, 0], [5, 5]).intersects([[1, 1], [2, 2]])).to.be.true;
+            expect(iD.geo.Extent([1, 1], [2, 2]).intersects([[0, 0], [5, 5]])).to.be.true;
+        });
+
+        it("returns true for an extent intersected by self", function () {
+            expect(iD.geo.Extent([0, 0], [5, 5]).intersects([[1, 1], [6, 6]])).to.be.true;
+            expect(iD.geo.Extent([1, 1], [6, 6]).intersects([[0, 0], [5, 5]])).to.be.true;
+        });
+
+        it("returns false for an extent not intersected by self", function () {
+            expect(iD.geo.Extent([0, 0], [5, 5]).intersects([[6, 6], [7, 7]])).to.be.false;
+            expect(iD.geo.Extent([[6, 6], [7, 7]]).intersects([[0, 0], [5, 5]])).to.be.false;
+        });
+    });
+});
diff --git a/test/spec/graph/node.js b/test/spec/graph/node.js
index 929946b04..8045270b3 100644
--- a/test/spec/graph/node.js
+++ b/test/spec/graph/node.js
@@ -29,11 +29,11 @@ describe('iD.Node', function () {
 
     describe("#intersects", function () {
         it("returns true for a node within the given extent", function () {
-            expect(iD.Node({loc: [0, 0]}).intersects([[-180, 90], [180, -90]])).to.equal(true);
+            expect(iD.Node({loc: [0, 0]}).intersects([[-5, -5], [5, 5]])).to.equal(true);
         });
 
         it("returns false for a node outside the given extend", function () {
-            expect(iD.Node({loc: [0, 0]}).intersects([[100, 90], [180, -90]])).to.equal(false);
+            expect(iD.Node({loc: [6, 6]}).intersects([[-5, -5], [5, 5]])).to.equal(false);
         });
     });
 
diff --git a/test/spec/graph/way.js b/test/spec/graph/way.js
index 3aa8045fb..19a4514db 100644
--- a/test/spec/graph/way.js
+++ b/test/spec/graph/way.js
@@ -41,7 +41,7 @@ describe('iD.Way', function() {
                 node2 = iD.Node({loc: [5, 10]}),
                 way   = iD.Way({nodes: [node1.id, node2.id]}),
                 graph = iD.Graph([node1, node2, way]);
-            expect(way.extent(graph)).to.eql([[5, 0], [0, 10]]);
+            expect(way.extent(graph)).to.eql([[0, 0], [5, 10]]);
         });
     });
 
@@ -50,14 +50,14 @@ describe('iD.Way', function() {
             var node  = iD.Node({loc: [0, 0]}),
                 way   = iD.Way({nodes: [node.id]}),
                 graph = iD.Graph([node, way]);
-            expect(way.intersects([[-180, 90], [180, -90]], graph)).to.equal(true);
+            expect(way.intersects([[-5, -5], [5, 5]], graph)).to.equal(true);
         });
 
         it("returns false for way with no nodes within the given extent", function () {
-            var node  = iD.Node({loc: [0, 0]}),
+            var node  = iD.Node({loc: [6, 6]}),
                 way   = iD.Way({nodes: [node.id]}),
                 graph = iD.Graph([node, way]);
-            expect(way.intersects([[100, 90], [180, -90]], graph)).to.equal(false);
+            expect(way.intersects([[-5, -5], [5, 5]], graph)).to.equal(false);
         });
     });
 
diff --git a/test/spec/renderer/map.js b/test/spec/renderer/map.js
index 4cec560e9..611a2d1ff 100644
--- a/test/spec/renderer/map.js
+++ b/test/spec/renderer/map.js
@@ -54,16 +54,17 @@ describe('Map', function() {
 
     describe('#extent', function() {
         it('gets and sets extent', function() {
-            expect(map.size([100, 100])).to.equal(map);
-            expect(map.center([0, 0])).to.equal(map);
+            map.size([100, 100])
+                .center([0, 0]);
+
             expect(map.extent()[0][0]).to.be.closeTo(-17.5, 0.5);
             expect(map.extent()[1][0]).to.be.closeTo(17.5, 0.5);
-            expect(map.extent([10, 1], [30, 1]));
+            expect(map.extent([[10, 1], [30, 1]]));
             expect(map.extent()[0][0]).to.be.closeTo(10, 0.1);
             expect(map.extent()[1][0]).to.be.closeTo(30, 0.1);
-            expect(map.extent([-1, -20], [1, -40]));
-            expect(map.extent()[0][1]).to.be.closeTo(-20, 0.1);
-            expect(map.extent()[1][1]).to.be.closeTo(-40, 0.1);
+            expect(map.extent([[-1, -40], [1, -20]]));
+            expect(map.extent()[0][1]).to.be.closeTo(-40, 1);
+            expect(map.extent()[1][1]).to.be.closeTo(-20, 1);
         });
     });
 

From 9abe3af312554470a0d79a8f75e3f1587a08cb7d Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 14:14:31 -0800
Subject: [PATCH 15/25] Fix extent and difference rendering for multi polygons

---
 js/id/graph/relation.js     | 10 ++++++++--
 js/id/renderer/map.js       | 10 ++++++++--
 test/spec/graph/relation.js |  9 ++++++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/js/id/graph/relation.js b/js/id/graph/relation.js
index 4788ad0d1..490b98ac7 100644
--- a/js/id/graph/relation.js
+++ b/js/id/graph/relation.js
@@ -2,8 +2,14 @@ iD.Relation = iD.Entity.extend({
     type: "relation",
     members: [],
 
-    extent: function() {
-        return [[NaN, NaN], [NaN, NaN]];
+    extent: function(resolver) {
+        return resolver.transient(this, 'extent', function() {
+            var extent = iD.geo.Extent();
+            for (var i = 0, l = this.members.length; i < l; i++) {
+                extent = extent.extend(resolver.entity(this.members[i].id).extent(resolver));
+            }
+            return extent;
+        });
     },
 
     geometry: function() {
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 59f46f0ee..a21a8a2d0 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -69,8 +69,7 @@ iD.Map = function() {
             all = graph.intersects(extent);
             filter = d3.functor(true);
         } else {
-            var only = {},
-                filterOnly = {};
+            var only = {};
             for (var j = 0; j < difference.length; j++) {
                 var id = difference[j],
                     entity = graph.fetch(id);
@@ -86,6 +85,13 @@ iD.Map = function() {
                                 only[parents[k].id] = graph.fetch(parents[k].id);
                             }
                         }
+                        parents = graph.parentRelations(only[id]);
+                        for (k = 0; k < parents.length; k++) {
+                            // Don't re-fetch parents
+                            if (only[parents[k].id] === undefined) {
+                                only[parents[k].id] = parents[k].id;
+                            }
+                        }
                     }
                 }
             }
diff --git a/test/spec/graph/relation.js b/test/spec/graph/relation.js
index 26a1a2022..7395521c0 100644
--- a/test/spec/graph/relation.js
+++ b/test/spec/graph/relation.js
@@ -36,7 +36,14 @@ describe('iD.Relation', function () {
     });
 
     describe("#extent", function () {
-        it("returns the minimal extent containing the extents of all members");
+        it("returns the minimal extent containing the extents of all members", function () {
+            var a = iD.Node({loc: [0, 0]}),
+                b = iD.Node({loc: [5, 10]}),
+                r = iD.Relation({members: [{id: a.id}, {id: b.id}]}),
+                graph = iD.Graph([a, b, r]);
+
+            expect(r.extent(graph)).to.eql([[0, 0], [5, 10]])
+        });
     });
 
     describe("#multipolygon", function () {

From 8c051dc80182d84167bc55668f639d5e98afcff8 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 17 Jan 2013 18:05:48 -0500
Subject: [PATCH 16/25] Add centerZoom to center and zoom the map with one
 redraw. Fixes #416

Also throttles redraw and make hash track the map faster.
---
 js/id/id.js            |  3 +--
 js/id/renderer/hash.js | 12 ++++++-----
 js/id/renderer/map.js  | 46 +++++++++++++++++++++++++++---------------
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/js/id/id.js b/js/id/id.js
index 828aa45f9..afcdfc3e4 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -209,8 +209,7 @@ window.iD = function(container) {
         var hash = iD.Hash().map(map);
 
         if (!hash.hadHash) {
-            map.zoom(20)
-                .center([-77.02271,38.90085]);
+            map.centerZoom([-77.02271, 38.90085], 20);
         }
 
         d3.select('.user-container').call(iD.ui.userpanel(connection)
diff --git a/js/id/renderer/hash.js b/js/id/renderer/hash.js
index 05691ef59..bb454811b 100644
--- a/js/id/renderer/hash.js
+++ b/js/id/renderer/hash.js
@@ -1,5 +1,5 @@
 iD.Hash = function() {
-    var hash = {},
+    var hash = { hadHash: false },
         s0, // cached location.hash
         lat = 90 - 1e-8, // allowable latitude range
         map;
@@ -10,8 +10,9 @@ iD.Hash = function() {
         if (args.length < 3 || args.some(isNaN)) {
             return true; // replace bogus hash
         } else {
-            map.zoom(args[0])
-                .center([args[2], Math.min(lat, Math.max(-lat, args[1]))]);
+            map.centerZoom([args[2],
+                Math.min(lat, Math.max(-lat, args[1]))],
+                args[0]);
         }
     };
 
@@ -27,12 +28,13 @@ iD.Hash = function() {
     var move = _.throttle(function() {
         var s1 = formatter(map);
         if (s0 !== s1) location.replace(s0 = s1); // don't recenter the map!
-    }, 1000);
+    }, 100);
 
     function hashchange() {
         if (location.hash === s0) return; // ignore spurious hashchange events
-        if (parser(map, (s0 = location.hash).substring(2)))
+        if (parser(map, (s0 = location.hash).substring(2))) {
             move(); // replace bogus hash
+        }
     }
 
     hash.map = function(x) {
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index a21a8a2d0..75043a1f8 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -161,7 +161,7 @@ iD.Map = function() {
         redraw();
     }
 
-    function redraw(difference) {
+    var redraw = _.throttle(function(difference) {
         dispatch.move(map);
         surface.attr('data-zoom', ~~map.zoom());
         tilegroup.call(background);
@@ -172,7 +172,7 @@ iD.Map = function() {
             editOff();
         }
         return map;
-    }
+    }, 10);
 
     function pointLocation(p) {
         var translate = projection.translate(),
@@ -207,10 +207,7 @@ iD.Map = function() {
         return map;
     };
 
-    map.zoom = function(z) {
-        if (!arguments.length) {
-            return Math.max(Math.log(projection.scale()) / Math.LN2 - 8, 0);
-        }
+    function setZoom(z) {
         var scale = 256 * Math.pow(2, z),
             center = pxCenter(),
             l = pointLocation(center);
@@ -223,8 +220,17 @@ iD.Map = function() {
         t[1] += center[1] - l[1];
         projection.translate(t);
         zoom.translate(projection.translate());
-        return redraw();
-    };
+    }
+
+    function setCenter(loc) {
+        var t = projection.translate(),
+            c = pxCenter(),
+            ll = projection(loc);
+        projection.translate([
+            t[0] - ll[0] + c[0],
+            t[1] - ll[1] + c[1]]);
+        zoom.translate(projection.translate());
+    }
 
     map.size = function(_) {
         if (!arguments.length) return dimensions;
@@ -244,17 +250,25 @@ iD.Map = function() {
         if (!arguments.length) {
             return projection.invert(pxCenter());
         } else {
-            var t = projection.translate(),
-                c = pxCenter(),
-                ll = projection(loc);
-            projection.translate([
-                t[0] - ll[0] + c[0],
-                t[1] - ll[1] + c[1]]);
-            zoom.translate(projection.translate());
+            setCenter(loc);
             return redraw();
         }
     };
 
+    map.zoom = function(z) {
+        if (!arguments.length) {
+            return Math.max(Math.log(projection.scale()) / Math.LN2 - 8, 0);
+        }
+        setZoom(z);
+        return redraw();
+    };
+
+    map.centerZoom = function(loc, z) {
+        setCenter(loc);
+        setZoom(z);
+        return redraw();
+    };
+
     map.centerEase = function(loc) {
         var from = map.center().slice(), t = 0;
         d3.timer(function() {
@@ -279,7 +293,7 @@ iD.Map = function() {
                 vZoomDiff = Math.log(Math.abs(vFactor)) / Math.LN2,
                 newZoom = map.zoom() - Math.max(hZoomDiff, vZoomDiff);
 
-            map.zoom(newZoom).center(extent.center());
+            map.centerZoom(extent.center(), newZoom);
         }
     };
 

From 7df1a00f3853d36516155abaf5df3a34dd622b3f Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 17 Jan 2013 18:13:16 -0500
Subject: [PATCH 17/25] Fix hash tests

---
 test/spec/renderer/hash.js | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/test/spec/renderer/hash.js b/test/spec/renderer/hash.js
index 64945683d..44d3c64a2 100644
--- a/test/spec/renderer/hash.js
+++ b/test/spec/renderer/hash.js
@@ -7,7 +7,8 @@ describe("hash", function () {
             on:     function () { return map; },
             off:    function () { return map; },
             zoom:   function () { return arguments.length ? map : 0; },
-            center: function () { return arguments.length ? map : [0, 0] }
+            center: function () { return arguments.length ? map : [0, 0] },
+            centerZoom: function () { return arguments.length ? map : [0, 0] }
         };
     });
 
@@ -28,18 +29,11 @@ describe("hash", function () {
             expect(hash.hadHash).to.be.true;
         });
 
-        it("zooms map to requested level", function () {
+        it("centerZooms map to requested level", function () {
             location.hash = "?map=20.00/38.87952/-77.02405";
-            sinon.spy(map, 'zoom');
+            sinon.spy(map, 'centerZoom');
             hash.map(map);
-            expect(map.zoom).to.have.been.calledWith(20.0);
-        });
-
-        it("centers map at requested coordinates", function () {
-            location.hash = "?map=20.00/38.87952/-77.02405";
-            sinon.spy(map, 'center');
-            hash.map(map);
-            expect(map.center).to.have.been.calledWith([-77.02405, 38.87952]);
+            expect(map.centerZoom).to.have.been.calledWith([-77.02405,38.87952], 20.0);
         });
 
         it("binds the map's move event", function () {
@@ -66,23 +60,13 @@ describe("hash", function () {
             d3.select(window).one("hashchange", fn);
         }
 
-        it("zooms map to requested level", function (done) {
+        it("centerZooms map at requested coordinates", function (done) {
             onhashchange(function () {
-                expect(map.zoom).to.have.been.calledWith(20.0);
+                expect(map.centerZoom).to.have.been.calledWith([-77.02405,38.87952], 20.0);
                 done();
             });
 
-            sinon.spy(map, 'zoom');
-            location.hash = "#?map=20.00/38.87952/-77.02405";
-        });
-
-        it("centers map at requested coordinates", function (done) {
-            onhashchange(function () {
-                expect(map.center).to.have.been.calledWith([-77.02405, 38.87952]);
-                done();
-            });
-
-            sinon.spy(map, 'center');
+            sinon.spy(map, 'centerZoom');
             location.hash = "#?map=20.00/38.87952/-77.02405";
         });
     });

From 3eaf4a46e03fb7a1ca2328169d697daac014d8d0 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 15:12:48 -0800
Subject: [PATCH 18/25] Add CSS classes for relation memberships

An entity that is a member of a relation will have the classes
`member`, `member-role-<member role>`, and `member-type-<relation type>`.

The first use of these classes is to avoid filling multipolygon
member areas.
---
 css/map.css                     |  4 +++
 index.html                      |  1 +
 js/id/svg/areas.js              |  3 +-
 js/id/svg/lines.js              | 40 ++++++++++++------------
 js/id/svg/member_classes.js     | 32 +++++++++++++++++++
 js/id/svg/multipolygons.js      |  3 +-
 js/id/svg/points.js             |  3 +-
 js/id/svg/vertices.js           |  1 +
 test/index.html                 |  3 ++
 test/index_packaged.html        |  2 ++
 test/spec/svg/areas.js          | 12 ++++++++
 test/spec/svg/member_classes.js | 54 +++++++++++++++++++++++++++++++++
 12 files changed, 135 insertions(+), 23 deletions(-)
 create mode 100644 js/id/svg/member_classes.js
 create mode 100644 test/spec/svg/member_classes.js

diff --git a/css/map.css b/css/map.css
index fc54d7499..bf600b18d 100644
--- a/css/map.css
+++ b/css/map.css
@@ -154,6 +154,10 @@ path.multipolygon {
     fill-rule: evenodd;
 }
 
+path.area.member-type-multipolygon {
+    fill: none;
+}
+
 path.area.selected {
     stroke-width:4 !important;
 }
diff --git a/index.html b/index.html
index 64d839d93..16dce5779 100644
--- a/index.html
+++ b/index.html
@@ -43,6 +43,7 @@
         <script src="js/id/svg.js"></script>
         <script src="js/id/svg/areas.js"></script>
         <script src="js/id/svg/lines.js"></script>
+        <script src="js/id/svg/member_classes.js"></script>
         <script src="js/id/svg/midpoints.js"></script>
         <script src="js/id/svg/multipolygons.js"></script>
         <script src="js/id/svg/points.js"></script>
diff --git a/js/id/svg/areas.js b/js/id/svg/areas.js
index e77fe8a4d..5a3c31288 100644
--- a/js/id/svg/areas.js
+++ b/js/id/svg/areas.js
@@ -52,7 +52,8 @@ iD.svg.Areas = function(projection) {
             paths
                 .order()
                 .attr('d', lineString)
-                .call(iD.svg.TagClasses());
+                .call(iD.svg.TagClasses())
+                .call(iD.svg.MemberClasses(graph));
 
             paths.exit()
                 .remove();
diff --git a/js/id/svg/lines.js b/js/id/svg/lines.js
index 167a9e75e..375a88f05 100644
--- a/js/id/svg/lines.js
+++ b/js/id/svg/lines.js
@@ -33,27 +33,27 @@ iD.svg.Lines = function(projection) {
         return as - bs;
     }
 
-    function drawPaths(group, lines, filter, classes, lineString) {
-        var paths = group.selectAll('path')
-            .filter(filter)
-            .data(lines, iD.Entity.key);
-
-        paths.enter()
-            .append('path')
-            .attr('class', classes);
-
-        paths
-            .order()
-            .attr('d', lineString)
-            .call(iD.svg.TagClasses());
-
-        paths.exit()
-            .remove();
-
-        return paths;
-    }
-
     return function drawLines(surface, graph, entities, filter) {
+        function drawPaths(group, lines, filter, classes, lineString) {
+            var paths = group.selectAll('path')
+                .filter(filter)
+                .data(lines, iD.Entity.key);
+
+            paths.enter()
+                .append('path')
+                .attr('class', classes);
+
+            paths
+                .order()
+                .attr('d', lineString)
+                .call(iD.svg.TagClasses())
+                .call(iD.svg.MemberClasses(graph));
+
+            paths.exit()
+                .remove();
+
+            return paths;
+        }
 
         if (!alength) {
             var arrow = surface.append('text').text(arrowtext);
diff --git a/js/id/svg/member_classes.js b/js/id/svg/member_classes.js
new file mode 100644
index 000000000..b675288c3
--- /dev/null
+++ b/js/id/svg/member_classes.js
@@ -0,0 +1,32 @@
+iD.svg.MemberClasses = function(graph) {
+    var tagClassRe = /^member-?/;
+
+    return function memberClassesSelection(selection) {
+        selection.each(function memberClassesEach(d, i) {
+            var classes, value = this.className;
+
+            if (value.baseVal !== undefined) value = value.baseVal;
+
+            classes = value.trim().split(/\s+/).filter(function(name) {
+                return name.length && !tagClassRe.test(name);
+            }).join(' ');
+
+            var relations = graph.parentRelations(d);
+
+            if (relations.length) {
+                classes += ' member';
+            }
+
+            relations.forEach(function (relation) {
+                classes += ' member-type-' + relation.tags.type;
+                classes += ' member-role-' + _.find(relation.members, function (member) { return member.id == d.id; }).role;
+            });
+
+            classes = classes.trim();
+
+            if (classes !== value) {
+                d3.select(this).attr('class', classes);
+            }
+        });
+    };
+};
diff --git a/js/id/svg/multipolygons.js b/js/id/svg/multipolygons.js
index bad07ff41..6330cf685 100644
--- a/js/id/svg/multipolygons.js
+++ b/js/id/svg/multipolygons.js
@@ -40,7 +40,8 @@ iD.svg.Multipolygons = function(projection) {
             paths
                 .order()
                 .attr('d', lineString)
-                .call(iD.svg.TagClasses());
+                .call(iD.svg.TagClasses())
+                .call(iD.svg.MemberClasses(graph));
 
             paths.exit()
                 .remove();
diff --git a/js/id/svg/points.js b/js/id/svg/points.js
index 37c4bbf91..5862a5cb9 100644
--- a/js/id/svg/points.js
+++ b/js/id/svg/points.js
@@ -45,7 +45,8 @@ iD.svg.Points = function(projection) {
             .attr('transform', 'translate(-8, -8)');
 
         groups.attr('transform', iD.svg.PointTransform(projection))
-            .call(iD.svg.TagClasses());
+            .call(iD.svg.TagClasses())
+            .call(iD.svg.MemberClasses(graph));
 
         // Selecting the following implicitly
         // sets the data (point entity) on the element
diff --git a/js/id/svg/vertices.js b/js/id/svg/vertices.js
index ff775fa3e..ce81dface 100644
--- a/js/id/svg/vertices.js
+++ b/js/id/svg/vertices.js
@@ -31,6 +31,7 @@ iD.svg.Vertices = function(projection) {
 
         groups.attr('transform', iD.svg.PointTransform(projection))
             .call(iD.svg.TagClasses())
+            .call(iD.svg.MemberClasses(graph))
             .classed('shared', function(entity) { return graph.parentWays(entity).length > 1; });
 
         // Selecting the following implicitly
diff --git a/test/index.html b/test/index.html
index 7f63be2a3..0777751d5 100644
--- a/test/index.html
+++ b/test/index.html
@@ -45,6 +45,7 @@
     <script src="../js/id/svg.js"></script>
     <script src="../js/id/svg/areas.js"></script>
     <script src="../js/id/svg/lines.js"></script>
+    <script src="../js/id/svg/member_classes.js"></script>
     <script src="../js/id/svg/midpoints.js"></script>
     <script src="../js/id/svg/multipolygons.js"></script>
     <script src="../js/id/svg/points.js"></script>
@@ -159,6 +160,8 @@
 
     <script src="spec/svg.js"></script>
     <script src="spec/svg/areas.js"></script>
+    <script src="spec/svg/lines.js"></script>
+    <script src="spec/svg/member_classes.js"></script>
     <script src="spec/svg/multipolygons.js"></script>
     <script src="spec/svg/points.js"></script>
     <script src="spec/svg/vertices.js"></script>
diff --git a/test/index_packaged.html b/test/index_packaged.html
index 042a0227e..070a2666b 100644
--- a/test/index_packaged.html
+++ b/test/index_packaged.html
@@ -64,6 +64,8 @@
 
     <script src="spec/svg.js"></script>
     <script src="spec/svg/areas.js"></script>
+    <script src="spec/svg/lines.js"></script>
+    <script src="spec/svg/member_classes.js"></script>
     <script src="spec/svg/multipolygons.js"></script>
     <script src="spec/svg/points.js"></script>
     <script src="spec/svg/vertices.js"></script>
diff --git a/test/spec/svg/areas.js b/test/spec/svg/areas.js
index 112e25d03..4f984540a 100644
--- a/test/spec/svg/areas.js
+++ b/test/spec/svg/areas.js
@@ -28,6 +28,18 @@ describe("iD.svg.Areas", function () {
         expect(surface.select('.area')).to.be.classed('tag-building-yes');
     });
 
+    it("adds member classes", function () {
+        var area = iD.Way({tags: {area: 'yes'}}),
+            relation = iD.Relation({members: [{id: area.id, role: 'outer'}], tags: {type: 'multipolygon'}}),
+            graph = iD.Graph([area, relation]);
+
+        surface.call(iD.svg.Areas(projection), graph, [area], filter);
+
+        expect(surface.select('.area')).to.be.classed('member');
+        expect(surface.select('.area')).to.be.classed('member-role-outer');
+        expect(surface.select('.area')).to.be.classed('member-type-multipolygon');
+    });
+
     it("preserves non-area paths", function () {
         var area = iD.Way({tags: {area: 'yes'}}),
             graph = iD.Graph([area]);
diff --git a/test/spec/svg/member_classes.js b/test/spec/svg/member_classes.js
new file mode 100644
index 000000000..651ba2342
--- /dev/null
+++ b/test/spec/svg/member_classes.js
@@ -0,0 +1,54 @@
+describe("iD.svg.MemberClasses", function () {
+    var selection;
+
+    beforeEach(function () {
+        selection = d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'g'));
+    });
+
+    it("adds no classes to elements that aren't a member of any relations", function() {
+        var node = iD.Node(),
+            graph = iD.Graph([node]);
+
+        selection
+            .datum(node)
+            .call(iD.svg.MemberClasses(graph));
+
+        expect(selection.attr('class')).to.equal(null);
+    });
+
+    it("adds tags for member, role, and type", function() {
+        var node = iD.Node(),
+            relation = iD.Relation({members: [{id: node.id, role: 'r'}], tags: {type: 't'}}),
+            graph = iD.Graph([node, relation]);
+
+        selection
+            .datum(node)
+            .call(iD.svg.MemberClasses(graph));
+
+        expect(selection.attr('class')).to.equal('member member-type-t member-role-r');
+    });
+
+    it('removes classes for tags that are no longer present', function() {
+        var node = iD.Entity(),
+            graph = iD.Graph([node]);
+
+        selection
+            .attr('class', 'member member-type-t member-role-r')
+            .datum(node)
+            .call(iD.svg.MemberClasses(graph));
+
+        expect(selection.attr('class')).to.equal('');
+    });
+
+    it("preserves existing non-'member-'-prefixed classes", function() {
+        var node = iD.Entity(),
+            graph = iD.Graph([node]);
+
+        selection
+            .attr('class', 'selected')
+            .datum(node)
+            .call(iD.svg.MemberClasses(graph));
+
+        expect(selection.attr('class')).to.equal('selected');
+    });
+});

From 2c6e244fb07b09b65ff64cc8e139cc0223e006bc Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 15:13:01 -0800
Subject: [PATCH 19/25] Add tests for iD.svg.Lines

---
 test/spec/svg/lines.js | 54 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 test/spec/svg/lines.js

diff --git a/test/spec/svg/lines.js b/test/spec/svg/lines.js
new file mode 100644
index 000000000..61c3229a9
--- /dev/null
+++ b/test/spec/svg/lines.js
@@ -0,0 +1,54 @@
+describe("iD.svg.Lines", function () {
+    var surface,
+        projection = Object,
+        filter = d3.functor(true);
+
+    beforeEach(function () {
+        surface = d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'svg'))
+            .call(iD.svg.Surface());
+    });
+
+    it("adds way and area classes", function () {
+        var line = iD.Way(),
+            graph = iD.Graph([line]);
+
+        surface.call(iD.svg.Lines(projection), graph, [line], filter);
+
+        expect(surface.select('path')).to.be.classed('way');
+        expect(surface.select('path')).to.be.classed('line');
+    });
+
+    it("adds tag classes", function () {
+        var line = iD.Way({tags: {highway: 'residential'}}),
+            graph = iD.Graph([line]);
+
+        surface.call(iD.svg.Lines(projection), graph, [line], filter);
+
+        expect(surface.select('.line')).to.be.classed('tag-highway');
+        expect(surface.select('.line')).to.be.classed('tag-highway-residential');
+    });
+
+    it("adds member classes", function () {
+        var line = iD.Way(),
+            relation = iD.Relation({members: [{id: line.id}], tags: {type: 'route'}}),
+            graph = iD.Graph([line, relation]);
+
+        surface.call(iD.svg.Lines(projection), graph, [line], filter);
+
+        expect(surface.select('.line')).to.be.classed('member');
+        expect(surface.select('.line')).to.be.classed('member-type-route');
+    });
+
+    it("preserves non-line paths", function () {
+        var line = iD.Way(),
+            graph = iD.Graph([line]);
+
+        surface.select('.layer-fill')
+            .append('path')
+            .attr('class', 'other');
+
+        surface.call(iD.svg.Lines(projection), graph, [line], filter);
+
+        expect(surface.selectAll('.other')[0].length).to.equal(1);
+    });
+});

From 1c21b2a38144b2857ca39fa9e3776f4406531d40 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 17 Jan 2013 18:20:24 -0500
Subject: [PATCH 20/25] Fix up bbox extent link

---
 js/id/ui/contributors.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/id/ui/contributors.js b/js/id/ui/contributors.js
index 3dc5a4014..c0036a677 100644
--- a/js/id/ui/contributors.js
+++ b/js/id/ui/contributors.js
@@ -39,8 +39,8 @@ iD.ui.contributors = function(map) {
                 .attr('href', function() {
                     var ext = map.extent();
                     return 'http://www.openstreetmap.org/browse/changesets?bbox=' + [
-                        ext[0][0], ext[1][1],
-                        ext[1][0], ext[0][1]];
+                        ext[0][0], ext[0][1],
+                        ext[1][0], ext[1][1]];
                 })
                 .text(' and ' + (u.length - limit) + ' others');
         }

From d2921caf6cf64fbeb2152aec4cff895a2cfaea9c Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 15:57:15 -0800
Subject: [PATCH 21/25] Fix build

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 657915e1e..788eef43e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ all: \
 	js/lib/d3.keybinding.js \
 	js/lib/d3.one.js \
 	js/lib/d3.size.js \
+	js/lib/d3.tail.js \
 	js/lib/d3.trigger.js \
 	js/lib/d3.typeahead.js \
 	js/lib/jxon.js \

From e933b9d088799bfe63d38c2cb72cccf3f441d818 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 16:31:45 -0800
Subject: [PATCH 22/25] Include parent relations recursively

Fixes drawing when dragging a multipolygon vertex.
---
 js/id/renderer/map.js | 44 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 75043a1f8..729d37936 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -70,31 +70,31 @@ iD.Map = function() {
             filter = d3.functor(true);
         } else {
             var only = {};
-            for (var j = 0; j < difference.length; j++) {
-                var id = difference[j],
-                    entity = graph.fetch(id);
-                // Even if the entity is false (deleted), it needs to be
-                // removed from the surface
-                only[id] = entity;
-                if (entity && entity.intersects(extent, graph)) {
-                    if (only[id].type === 'node') {
-                        var parents = graph.parentWays(only[id]);
-                        for (var k = 0; k < parents.length; k++) {
-                            // Don't re-fetch parents
-                            if (only[parents[k].id] === undefined) {
-                                only[parents[k].id] = graph.fetch(parents[k].id);
-                            }
-                        }
-                        parents = graph.parentRelations(only[id]);
-                        for (k = 0; k < parents.length; k++) {
-                            // Don't re-fetch parents
-                            if (only[parents[k].id] === undefined) {
-                                only[parents[k].id] = parents[k].id;
-                            }
-                        }
+
+            function addParents(parents) {
+                for (var i = 0; i < parents.length; i++) {
+                    var parent = parents[i];
+                    if (only[parent.id] === undefined) {
+                        only[parent.id] = graph.fetch(parent.id);
+                        addParents(graph.parentRelations(parent));
                     }
                 }
             }
+
+            for (var j = 0; j < difference.length; j++) {
+                var id = difference[j],
+                    entity = graph.fetch(id);
+
+                // Even if the entity is false (deleted), it needs to be
+                // removed from the surface
+                only[id] = entity;
+
+                if (entity && entity.intersects(extent, graph)) {
+                    addParents(graph.parentWays(only[id]));
+                    addParents(graph.parentRelations(only[id]));
+                }
+            }
+
             all = _.compact(_.values(only));
             filter = function(d) { return d.midpoint ? d.way in only : d.id in only; };
         }

From d40c6451708d8f60651fddc4a022c19f860459c7 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 16:32:50 -0800
Subject: [PATCH 23/25] Fix packaged tests

---
 test/index_packaged.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/index_packaged.html b/test/index_packaged.html
index 070a2666b..630ed1088 100644
--- a/test/index_packaged.html
+++ b/test/index_packaged.html
@@ -20,7 +20,10 @@
 
     <script>
         iD.debug = true;
-        mocha.setup('bdd');
+        mocha.setup({
+            ui: 'bdd',
+            globals: ['__onresize.tail-size']
+        });
         var expect = chai.expect;
     </script>
 

From bf251dce150e6376a5768241d99044799fd654fb Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 17 Jan 2013 17:20:22 -0800
Subject: [PATCH 24/25] Handle incomplete relations

---
 js/id/graph/relation.js     | 14 ++++++++------
 test/spec/graph/relation.js | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/js/id/graph/relation.js b/js/id/graph/relation.js
index 490b98ac7..7d8a9aa89 100644
--- a/js/id/graph/relation.js
+++ b/js/id/graph/relation.js
@@ -4,11 +4,13 @@ iD.Relation = iD.Entity.extend({
 
     extent: function(resolver) {
         return resolver.transient(this, 'extent', function() {
-            var extent = iD.geo.Extent();
-            for (var i = 0, l = this.members.length; i < l; i++) {
-                extent = extent.extend(resolver.entity(this.members[i].id).extent(resolver));
-            }
-            return extent;
+            return this.members.reduce(function (extent, member) {
+                if (member = resolver.entity(member.id)) {
+                    return extent.extend(member.extent(resolver))
+                } else {
+                    return extent;
+                }
+            }, iD.geo.Extent());
         });
     },
 
@@ -28,7 +30,7 @@ iD.Relation = iD.Entity.extend({
     //
     multipolygon: function(resolver) {
         var members = this.members
-            .filter(function (m) { return m.type === 'way'; })
+            .filter(function (m) { return m.type === 'way' && resolver.entity(m.id); })
             .map(function (m) { return { role: m.role || 'outer', id: m.id, nodes: resolver.fetch(m.id).nodes }; });
 
         function join(ways) {
diff --git a/test/spec/graph/relation.js b/test/spec/graph/relation.js
index 7395521c0..8880fc98c 100644
--- a/test/spec/graph/relation.js
+++ b/test/spec/graph/relation.js
@@ -44,6 +44,15 @@ describe('iD.Relation', function () {
 
             expect(r.extent(graph)).to.eql([[0, 0], [5, 10]])
         });
+
+        it("returns the known extent of incomplete relations", function () {
+            var a = iD.Node({loc: [0, 0]}),
+                b = iD.Node({loc: [5, 10]}),
+                r = iD.Relation({members: [{id: a.id}, {id: b.id}]}),
+                graph = iD.Graph([a, r]);
+
+            expect(r.extent(graph)).to.eql([[0, 0], [0, 0]])
+        });
     });
 
     describe("#multipolygon", function () {
@@ -239,5 +248,17 @@ describe('iD.Relation', function () {
 
             expect(r.multipolygon(graph)).to.eql([[[a, b, c, a], [d, e, f, d]], [[g, h, i, g]]]);
         });
+
+        specify("incomplete relation", function () {
+            var a  = iD.Node(),
+                b  = iD.Node(),
+                c  = iD.Node(),
+                w1 = iD.Way({nodes: [a.id, b.id, c.id]}),
+                w2 = iD.Way(),
+                r  = iD.Relation({members: [{id: w2.id, type: 'way'}, {id: w1.id, type: 'way'}]}),
+                g  = iD.Graph([a, b, c, w1, r]);
+
+            expect(r.multipolygon(g)).to.eql([[[a, b, c]]]);
+        });
     });
 });

From 0246f2c5dd759b5d8a83fa989ee7885ac7288129 Mon Sep 17 00:00:00 2001
From: saman bb <samanpwbb@gmail.com>
Date: Fri, 18 Jan 2013 01:17:08 -0500
Subject: [PATCH 25/25] style / layout refactoring

---
 css/app.css               |  179 +++---
 img/source/sprite.svg     | 1155 +++++++++++++------------------------
 img/sprite.png            |  Bin 15999 -> 12910 bytes
 js/id/id.js               |    3 +-
 js/id/ui/inspector.js     |    2 +-
 js/id/ui/layerswitcher.js |    6 +-
 6 files changed, 484 insertions(+), 861 deletions(-)

diff --git a/css/app.css b/css/app.css
index 53eec9933..8b46887f5 100644
--- a/css/app.css
+++ b/css/app.css
@@ -18,7 +18,7 @@ body {
 }
 
 .limiter {
-    max-width: 1400px;
+    max-width: 1200px;
 }
 
 div, textarea, input, span, ul, li, ol, a, button {
@@ -164,24 +164,15 @@ ul li { list-style: none;}
 ul.toggle-list li a {
     font-weight: bold;
     padding: 10px;
-    border-top: 1px solid #CCC;
+    border-top: 1px solid white;
     display:block;
 }
 
-ul.toggle-list li a:hover {
-    background: #ececec;
-}
-
 ul.toggle-list .icon {
     float: left;
     margin-right: 5px;
 }
 
-a.selected {
-    color:#222;
-}
-
-
 ul.link-list li {
     float: left;
     display: inline-block;
@@ -199,11 +190,10 @@ ul.link-list li:first-child {
 /* Utility Classes
 ------------------------------------------------------- */
 
-.fillL { background-color: white;}
+.fillL { background: white;}
 .fillL2 { background: #f7f7f7 url(../img/background-pattern-1.png) repeat;}
 .fillD {
-    background-color: #222222;
-    background-color: rgba(0,0,0,.8);
+    background: rgba(0,0,0,.7);
     color: white;
 }
 
@@ -216,9 +206,8 @@ form.hide {
 }
 
 .content {
-    background-color:#fff;
+    background:#fff;
     border-radius: 4px;
-    border: 1px solid #ccc;
 }
 
 .pad1    {padding: 10px;}
@@ -230,8 +219,7 @@ form.hide {
 
 button {
     line-height:20px;
-    border:1px solid #aaa;
-    box-shadow: inset 0 0 0px 1px #fff;
+    border:0;
     color:#222;
     background: white;
     font-weight:bold;
@@ -242,17 +230,20 @@ button {
 }
 
 button:hover {
-    background-color: #ececec;
+    background: #ececec;
+}
+
+button.col3:hover {
+    background: #bde5aa;
 }
 
 button.active {
-    box-shadow: inset 0 0 0px 1px #fff, inset 0 0 6px 1px rgba(0,0,0,.35);
     cursor:url(../img/cursor-pointing.png) 6 1, auto;
 }
 
 button.active:not([disabled]) {
-    background-color: #ececec;
-    box-shadow: inset 0 0 0px 1px #fff, inset 0 0 6px 1px rgba(0,0,0,.25);
+    background: #6bc641;
+    color: white;
 }
 
 button.wide,
@@ -282,14 +273,15 @@ button.centered {
 
 .button-wrap {
     display: inline-block;
-    padding:10px 0 10px 10px;
+    padding-right:10px;
     margin: 0;
 }
 
 .button-wrap button:only-child { width: 100%;}
+.button-wrap:last-child { padding-right: 0; }
 
 .joined button {
-    border-right-width: 0;
+    border-right: 1px solid rgba(0,0,0,.5);
     border-radius:0;
 }
 
@@ -298,15 +290,16 @@ button.centered {
 }
 
 .joined button:last-child {
-    border-right-width: 1px;
+    border-right-width: 0px;
     border-radius:0 4px 4px 0;
 }
 
 button.action {
-    background: #444;
+    color: white;
+    background: #7092ff;
 }
 button.action:hover {
-    background: #222;
+    background: #597BE7;
 }
 
 button.delete {
@@ -328,15 +321,9 @@ button.save .count {
 }
 
 button.save.has-count .count {
-    display: block;
-    color: #444;
-    background: #fff;
-    border-radius: 0 3px 3px 0;
-    padding: 9px;
-    float: right;
-    margin-left: 10px;
-    margin-top: -9px;
-    margin-right: -8px;
+    display: inline-block;
+    color: rgba(255,255,255,.5);
+    padding-left: 5px;
 }
 
 button.close {
@@ -346,22 +333,22 @@ button.close {
 }
 
 button .label {
-    margin-right: 3px;
+    display: none;
 }
 
-button.action .label {
+button.save .label {
+    display: inline-block;
     color: white;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 }
 
 button[disabled] {
     cursor:auto;
-    background: white;
+    background: #cecece;
     pointer-events:none;
 }
 
 button[disabled] .label {
-    color:#ccc;
+    color:#999999;
     text-shadow: none;
 }
 
@@ -386,18 +373,13 @@ button[disabled]:hover {
     height: 40px;
 }
 
-.icon.icon-pre-text {
-  margin-right: 3px;
-}
-
 /* Definitions for every icon */
-
-.icon.browse     { background-position:   0px 0px;}
-.icon.add-point  { background-position: -20px 0px;}
-.icon.add-line   { background-position: -40px 0px;}
-.icon.add-area   { background-position: -60px 0px;}
-.icon.undo       { background-position: -80px 0px;}
-.icon.redo       { background-position: -100px 0px;}
+button.active:not([disabled]) .icon.browse     { background-position:   0px -20px;}
+button.active:not([disabled]) .icon.add-point  { background-position: -20px -20px;}
+button.active:not([disabled]) .icon.add-line   { background-position: -40px -20px;}
+button.active:not([disabled]) .icon.add-area   { background-position: -60px -20px;}
+button.active:not([disabled]) .icon.undo       { background-position: -80px -20px;}
+button.active:not([disabled]) .icon.redo      { background-position: -100px -20px;}
 .icon.apply      { background-position: -120px 0px;}
 .icon.save       { background-position: -140px 0px;}
 .icon.close      { background-position: -160px 0px;}
@@ -411,10 +393,13 @@ button[disabled]:hover {
 .icon.avatar     { background-position: -320px 0px;}
 .icon.nearby     { background-position: -340px 0px;}
 
-.fillD .icon.browse     { background-position:   0px -20px;}
-.fillD .icon.add-point  { background-position: -20px -20px;}
-.fillD .icon.add-line   { background-position: -40px -20px;}
-.fillD .icon.add-area   { background-position: -60px -20px;}
+.icon.browse     { background-position:   0px 0px;}
+.icon.add-point  { background-position: -20px 0px;}
+.icon.add-line   { background-position: -40px 0px;}
+.icon.add-area   { background-position: -60px 0px;}
+.icon.undo       { background-position: -80px 0px;}
+.icon.redo      { background-position: -100px 0px;}
+
 .fillD .icon.undo       { background-position: -80px -20px;}
 .fillD .icon.redo       { background-position: -100px -20px;}
 .fillD .icon.apply      { background-position: -120px -20px;}
@@ -422,11 +407,11 @@ button[disabled]:hover {
 .fillD .icon.close      { background-position: -160px -20px;}
 .fillD .icon.delete     { background-position: -180px -20px;}
 .fillD .icon.remove     { background-position: -200px -20px;}
-.fillD .icon.inspect    { background-position: -220px -20px;}
-.fillD .icon.zoom-in    { background-position: -240px -20px;}
-.fillD .icon.zoom-out   { background-position: -260px -20px;}
-.fillD .icon.geocode    { background-position: -280px -20px;}
-.fillD .icon.layers     { background-position: -300px -20px;}
+.map-control .icon.inspect    { background-position: -220px -20px;}
+.map-control .icon.zoom-in    { background-position: -240px -20px;}
+.map-control .icon.zoom-out   { background-position: -260px -20px;}
+.map-control .icon.geocode    { background-position: -280px -20px;}
+.map-control .icon.layers     { background-position: -300px -20px;}
 .fillD .icon.avatar     { background-position: -320px -20px;}
 .fillD .icon.nearby     { background-position: -340px -20px;}
 
@@ -465,12 +450,12 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 ------------------------------------------------------- */
 
 #bar {
-    border-bottom:1px solid #ccc;
     position:absolute;
     left:0px;
     top:0px;
     right:0;
     height:60px;
+    background: rgba(0,0,0,.8);
 }
 
 /* Status box */
@@ -485,12 +470,10 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     opacity:0;
     display:none;
     padding-left: 10px;
-    max-width: 600px;
+    max-width: 500px;
 }
 
 .inspector {
-    border-left:  1px solid #ccc;
-    border-bottom: 1px solid #ccc;
     min-height: 60px;
     position: relative;
 }
@@ -500,7 +483,6 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 }
 
 .inspector-inner.head {
-    border-bottom: 1px solid #ccc;
     background:#fff;
     z-index:1;
     position:relative;
@@ -580,13 +562,14 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     right: 30px;
 }
 
-.inspector-buttons {
-    border-top: 1px solid #ccc;
-}
-
 .inspector-buttons .button-wrap {
     width: 20%;
 }
+.inspector-buttons .button-wrap:first-child { padding-right: 5px;}
+
+.inspector-buttons .button-wrap:last-child { 
+    padding-left: 5px; 
+}
 
 .inspector-inner .add-tag-row {
     width: 100%;
@@ -604,12 +587,22 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 /* Map Controls */
 
 .map-control {
-    left:10px;
+    left:0px;
     position:absolute;
 }
 
 .map-control button {
     width: 40px;
+    border-radius: 0 4px 4px 0;
+    background: rgba(0, 0, 0, .8);
+}
+
+.map-control button:hover {
+    background: rgba(0, 0, 0, .9);
+}
+
+.map-control button.active:hover {
+    background: #6bc641;
 }
 
 .map-overlay {
@@ -618,6 +611,7 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     left:50px;
     top:0;
     display: block;
+    border-radius: 4px;
 }
 
 /* Zoomer */
@@ -628,12 +622,13 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 }
 
 .zoombuttons button.zoom-in {
-    border-radius:4px 4px 0 0;
+    border-radius:0 4px 0 0;
+    border-bottom: 1px solid rgba(0, 0, 0, .5);
 }
 
 .zoombuttons button.zoom-out {
     border-top:0;
-    border-radius:0 0 4px 4px;
+    border-radius:0 0 4px 0;
 }
 
 /* Layer Switcher */
@@ -642,28 +637,24 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     top:210px;
 }
 
-.layerswitcher-control .adjustments {
-    padding:5px;
-    opacity:0.2;
-}
-
-.layerswitcher-control .adjustments:hover {
-    opacity:1;
-}
-
-.layerswitcher-control .adjustments .reset {
+.layerswitcher-control .adjustments button {
+    opacity:0.5;
     height:20px;
     font-size:10px;
     font-weight:normal;
-    padding:0 5px;
+    padding:0 5px 3px 5px;
+    background: white;
+    border: 1px solid #ddd;
+    border-radius: 0; 
+}
+
+.layerswitcher-control .adjustments button:hover {
+    opacity: 1;
 }
 
 .layerswitcher-control .nudge {
-    height:20px;
     width:20px;
-    font-size:10px;
     margin-right:2px;
-    font-weight:normal;
 }
 
 .opacity-options-wrapper {
@@ -735,7 +726,7 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     display:block;
     position:absolute;
     overflow:hidden;
-    top:60px;
+    top:0px;
     left:0;
     right:0;
     bottom:0;
@@ -860,9 +851,6 @@ div.typeahead a:first-child {
     text-align: center;
 }
 
-.modal button { margin-bottom: 0;}
-.modal button:first-child { margin-left: 0;}
-
 .modal button.close-modal {
     float:right;
     margin-right:10px;
@@ -912,11 +900,14 @@ div.typeahead a:first-child {
 }
 
 .modal-section {
-    padding: 20px;
-    border-bottom: 1px solid #ccc;
+    padding: 10px;
 }
 
-.modal-section:last-child { border-bottom: 0;}
+
+.body .modal-section:last-child { 
+    border-bottom: 0;
+    border-radius: 0 0 4px 4px;
+}
 
 .modal-section img.wiki-image {
     max-width: 400px;
diff --git a/img/source/sprite.svg b/img/source/sprite.svg
index f239c672f..c3fdcf407 100644
--- a/img/source/sprite.svg
+++ b/img/source/sprite.svg
@@ -13,7 +13,7 @@
    height="200"
    id="svg12393"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.1 r9760"
    sodipodi:docname="sprite.svg"
    inkscape:export-filename="/Users/saman/work_repos/iD/img/sprite.png"
    inkscape:export-xdpi="90"
@@ -39,8 +39,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="150.66428"
-     inkscape:cy="90.493266"
+     inkscape:cx="54.93799"
+     inkscape:cy="205.49862"
      inkscape:document-units="px"
      inkscape:current-layer="layer12"
      showgrid="false"
@@ -165,7 +165,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -175,110 +175,6 @@
      id="layer1"
      transform="translate(-25,-62.362183)"
      style="display:inline">
-    <g
-       id="g9613"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       transform="translate(505,-570)">
-      <path
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-         d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z"
-         transform="translate(0,52.362183)"
-         id="path9615"
-         inkscape:connector-curvature="0" />
-      <g
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-         id="g9617"
-         clip-path="url(#clipPath9141-6)">
-        <rect
-           y="657.36218"
-           x="-131"
-           height="6"
-           width="1"
-           id="rect9619"
-           style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
-        <g
-           style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-           id="g9621" />
-      </g>
-    </g>
-    <g
-       transform="translate(505,-571)"
-       style="fill:#ffffff;fill-opacity:1;display:inline"
-       id="g9146-2">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9074-0"
-         transform="translate(0,52.362183)"
-         d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <g
-         clip-path="url(#clipPath9141-6)"
-         id="g9131-3"
-         style="fill:#ffffff;fill-opacity:1">
-        <rect
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect9101-5"
-           width="1"
-           height="6"
-           x="-131"
-           y="657.36218" />
-        <g
-           id="g9121-5"
-           style="fill:#ffffff;fill-opacity:1">
-          <path
-             inkscape:connector-curvature="0"
-             id="path9092-3"
-             d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z"
-             style="opacity:0.2;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)" />
-          <path
-             transform="translate(0,52.362183)"
-             inkscape:connector-curvature="0"
-             id="path9107-8"
-             d="m -126,615 -4.5,-4.5 0,6.5 z"
-             style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             inkscape:connector-curvature="0"
-             style="opacity:0.4;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z"
-             id="path9097-1" />
-          <path
-             id="path9099-2"
-             d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z"
-             style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="cccc"
-             style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z"
-             id="path9109-4"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m -135,658.36218 4.5,4.5 0,-6.5 z"
-             id="path9113-6"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(505,-590)"
-       style="fill:#ffffff;fill-opacity:1;display:inline"
-       id="g9653">
-      <path
-         inkscape:connector-curvature="0"
-         id="path9655"
-         transform="translate(0,52.362183)"
-         d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect9659"
-         width="1"
-         height="6"
-         x="-131"
-         y="657.36218" />
-    </g>
     <g
        id="g9591"
        style="fill:#1a1a1a;fill-opacity:1;display:inline"
@@ -339,78 +235,12 @@
         </g>
       </g>
     </g>
-    <g
-       id="g9693"
-       style="fill:#cccccc;fill-opacity:1;display:inline"
-       transform="translate(505,-551)">
-      <path
-         style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z"
-         transform="translate(0,52.362183)"
-         id="path9695"
-         inkscape:connector-curvature="0" />
-      <g
-         style="fill:#cccccc;fill-opacity:1"
-         id="g9697"
-         clip-path="url(#clipPath9141-6)">
-        <rect
-           y="657.36218"
-           x="-131"
-           height="6"
-           width="1"
-           id="rect9699"
-           style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           style="fill:#cccccc;fill-opacity:1"
-           id="g9701">
-          <path
-             transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
-             style="opacity:0.2;color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z"
-             id="path9703"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:0.1;color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m -126,615 -4.5,-4.5 0,6.5 z"
-             id="path9705"
-             inkscape:connector-curvature="0"
-             transform="translate(0,52.362183)" />
-          <path
-             id="path9707"
-             d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z"
-             style="opacity:0.4;color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             style="opacity:0.6;color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z"
-             id="path9709" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path9711"
-             d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z"
-             style="opacity:0.1;color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="cccc" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path9713"
-             d="m -135,658.36218 4.5,4.5 0,-6.5 z"
-             style="opacity:0.1;color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        </g>
-      </g>
-    </g>
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer12"
      inkscape:label="sprite"
      transform="translate(-25,2.6796875e-6)">
-    <path
-       sodipodi:nodetypes="scsssscccsssssssssssscscscccscs"
-       inkscape:connector-curvature="0"
-       id="path58950"
-       d="m 35,23 c 0,1 0,4 0,4 0,0 0,0.5 -0.5,0.5 -0.5,0 -0.429283,-0.27516 -0.5,-0.5 -0.304688,-0.96875 -0.867187,-2.36459 -1,-3 -0.204595,-0.97885 -0.666667,-1 -1,-1 -1,0 -1,1 -1,1 l 1,4 0,3 C 32,31 31.5,30.5 30.5,29.5 29.945312,28.94531 29.257659,28.7508 28.8125,29.00781 28.377049,29.25922 28.150942,29.89541 28.5,30.5 28.853553,31.11237 32,35 32,35 c 1,1 2,1 4,1 2.666667,0 1,0 3,0 2,0 2.288488,-2.86546 3,-5 1,-3 1.5,-5 1.5,-5 0.113427,-0.42332 -0.04289,-0.846 -0.5,-1 -0.880461,-0.29662 -1.36006,0.35278 -1.5,1 -0.25,1.15625 -0.5,2 -0.5,2 -0.09375,0.31383 0.0013,0.5 -0.5,0.5 C 39.99086,28.5 40,28 40,28 c 0,0 0,-2.66667 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 0,1 0,1.66667 0,3 0,0 0.01305,0.5 -0.5,0.5 C 36.998673,27.5 37,27 37,27 c 0,0 0,-3 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
     <g
        transform="translate(105.03464,-25.104239)"
        id="g58869"
@@ -422,140 +252,16 @@
          id="g58873"
          style="fill:#ffffff;fill-opacity:1" />
     </g>
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 313.5,22.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
-       id="path47890"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 334.5,22 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z m -5.40625,6 -1.09375,0.5 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,3.5 L 328,32 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
-       id="path47899" />
-    <g
-       transform="translate(-355,-136)"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="g47420">
-      <g
-         transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,-113.14357,-447.56033)"
-         id="g47422"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
-        <path
-           inkscape:connector-curvature="0"
-           style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 586,160 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z"
-           transform="matrix(0.70710677,-0.70710678,0.70710678,0.70710677,396.47753,236.46835)"
-           id="path47424" />
-      </g>
-      <g
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="g47426"
-         transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,1293.1436,-447.56033)" />
-    </g>
-    <g
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       transform="translate(-671.00001,-95)"
-       id="g47428">
-      <g
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.11111116;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="g47430"
-         transform="matrix(0.64285714,0,0,0.64285714,332.85714,42.142857)">
-        <path
-           id="path47432"
-           transform="matrix(1.5555556,0,0,1.5555556,3.3333378,-129.33333)"
-           d="m 592.5,159 c -2.48528,0 -4.5,2.01472 -4.5,4.5 0,2.48528 2.01472,4.5 4.5,4.5 2.48528,0 4.5,-2.01472 4.5,-4.5 0,-2.48528 -2.01472,-4.5 -4.5,-4.5 z m 0,2 c 1.38071,0 2.5,1.11929 2.5,2.5 0,1.38071 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.11929 -2.5,-2.5 0,-1.38071 1.11929,-2.5 2.5,-2.5 z"
-           style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 924,124 -4,4 0,2 2,0 4,-4 z"
-         id="path47434"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-      <g
-         transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)"
-         id="g47436"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.59998751;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:connector-curvature="0"
-       id="path16650"
-       d="M 169.00002,8.999999 175,1.9999989 l 6.00002,7.0000201 -4,-10e-6 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 190,4.9999992 -1,1 0,1 4,3.9999998 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-3.9999998 0,-1 -1,-1 -1,0 -4,4 -4,-4 -1,0 z"
-       id="path16468"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 90,23 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -6,2 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 1,-1 z m -2,6 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       id="path14225" />
-    <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 79,22.000003 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0637,-0.05934 -0.0937,-0.09375 C 79.0967,24.480522 79,24.251524 79,24.000003 c 0,-0.55228 0.44772,-1 1,-1 z m -9,9 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 C 71.9033,32.519484 72,32.748487 72,33.000003 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
-       id="path14227" />
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 55,23 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 0.15625,3 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z"
-       id="path14231"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 134.5,23 129.5625,31.5625 126,28 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
-       transform="translate(25,-3.8281252e-7)"
-       id="path14235"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 113,21.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
-       id="path14239"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccc"
-       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-       sodipodi:nodetypes="cccccccccccccccccccccc"
-       inkscape:connector-curvature="0"
-       id="path14241"
-       d="m 136,21.01282 5,4.5 -5,4.5 0,-3 -3,0 -1,0.98718 0,3.01282 1,0.98718 5,0.0128 1,1.00002 0,1 -1,0.99998 -5,0 -2,-0.99998 -1,-1 -1,-2.00002 0,-3 1,-1.99998 1,-1 2,-1.00002 3,0 z"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       id="path12526"
-       d="m 90,5 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -6,2 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 1,-1 z m -2,6 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
        style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
        d="m 90,4 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -6,2 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 1,-1 z m -2,6 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
        id="path5288-4" />
-    <path
-       id="path12528"
-       d="m 79,4.000003 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0637,-0.05934 -0.0937,-0.09375 C 79.0967,6.480522 79,6.251524 79,6.000003 c 0,-0.55228 0.44772,-1 1,-1 z m -9,9 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 C 71.9033,14.519484 72,14.748487 72,15.000003 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
        style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
        d="m 79,3.000003 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0637,-0.05934 -0.0937,-0.09375 C 79.0967,5.480522 79,5.251524 79,5.000003 c 0,-0.55228 0.44772,-1 1,-1 z m -9,9 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 C 71.9033,13.519484 72,13.748487 72,14.000003 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
        id="path5387" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path12530"
-       d="m 55,5 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 0.15625,3 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
     <path
        style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
        d="m 55,3.9999981 c -2.76142,0 -5,2.23858 -5,5 0,2.7614299 5,6.9999999 5,6.9999999 0,0 5,-4.23857 5,-6.9999999 0,-2.76142 -2.23858,-5 -5,-5 z m 0.15625,3 c 1.10457,0 2,0.89543 2,2 0,1.1045699 -0.89543,1.9999999 -2,1.9999999 -1.104569,0 -2,-0.89543 -2,-1.9999999 0,-1.10457 0.895431,-2 2,-2 z"
@@ -565,27 +271,6 @@
        id="g5460"
        transform="translate(-321,-101.36218)"
        style="fill:#6bc641;fill-opacity:1;display:inline" />
-    <g
-       id="g12598">
-      <path
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 113,3.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
-         id="path12594"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-      <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-         sodipodi:nodetypes="cccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path12596"
-         d="m 136,3.01282 5,4.5 -5,4.5 0,-3 -3,0 -1,0.98718 0,3.01282 1,0.98718 5,0.0128 1,1.00002 0,1 -1,0.99998 -5,0 -2,-0.99998 -1,-1 -1,-2.00002 0,-3 1,-1.99998 1,-1 2,-1.00002 3,0 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
     <path
        style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="m 113,2.01282 -5,4.5 5,4.5 0,-3 3,0 L 117,9 117,12.01282 116,13 l -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
@@ -604,114 +289,21 @@
        id="path9203"
        d="m 136,2.01282 5,4.5 -5,4.5 0,-3 -3,0 L 132,9 l 0,3.01282 1,0.98718 5,0.0128 1,1.00002 0,1 -1,0.99998 -5,0 -2,-0.99998 -1,-1 -1,-2.00002 0,-3 1,-1.99998 1,-1 2,-1.00002 3,0 z"
        style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       id="path14159"
-       d="m 90,24 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -6,2 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 1,-1 z m -2,6 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path14161"
-       d="m 79,23.000003 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0637,-0.05934 -0.0937,-0.09375 C 79.0967,25.480522 79,25.251524 79,25.000003 c 0,-0.55228 0.44772,-1 1,-1 z m -9,9 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 C 71.9033,33.519484 72,33.748487 72,34.000003 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path14165"
-       d="m 55,24 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 0.15625,3 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 134.5,24 129.5625,32.5625 126,29 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
-       transform="translate(25,-3.8281252e-7)"
-       id="path14169"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-       sodipodi:nodetypes="cccccccccccccccccccccc"
-       inkscape:connector-curvature="0"
-       id="path14173"
-       d="m 113,22.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 136,22.01282 5,4.5 -5,4.5 0,-3 -3,0 -1,0.98718 0,3.01282 1,0.98718 5,0.0128 1,1.00002 0,1 -1,0.99998 -5,0 -2,-0.99998 -1,-1 -1,-2.00002 0,-3 1,-1.99998 1,-1 2,-1.00002 3,0 z"
-       id="path14175"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccc"
-       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
     <g
        style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline"
        transform="translate(-321,-62.36218)"
        id="g16215" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 90,44 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -6,2 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 1,-1 z m -2,6 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       id="path16225" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 79,43.000003 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0637,-0.05934 -0.0937,-0.09375 C 79.0967,45.480522 79,45.251524 79,45.000003 c 0,-0.55228 0.44772,-1 1,-1 z m -9,9 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 C 71.9033,53.519484 72,53.748487 72,54.000003 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
-       id="path16227" />
-    <path
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 55,43.999998 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 0.15625,3 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z"
-       id="path16231"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 134.5,44 129.5625,52.5625 126,49 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
-       transform="translate(25,-3.8281252e-7)"
-       id="path16235"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 113,42.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
-       id="path16239"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccc"
-       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-       sodipodi:nodetypes="cccccccccccccccccccccc"
-       inkscape:connector-curvature="0"
-       id="path16241"
-       d="m 136,42.01282 5,4.5 -5,4.5 0,-3 -3,0 -1,0.98718 0,3.01282 1,0.98718 5,0.0128 1,1.00002 0,1 -1,0.99998 -5,0 -2,-0.99998 -1,-1 -1,-2.00002 0,-3 1,-1.99998 1,-1 2,-1.00002 3,0 z"
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
        inkscape:connector-curvature="0"
        id="path9584-1-9"
        d="m 190,3.9999992 -1,1 0,1 4,4 -4,3.9999998 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-3.9999998 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 -1,0 z"
        style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       id="path16416"
-       d="m 190,23.000004 -1,0.999999 0,0.999995 4,4.000005 -4,3.999999 0,0.999996 1,1.000004 1,-5e-6 4,-3.999999 4,4.000004 1,2e-6 1,-1 0,-1.000002 -4,-4.000004 4,-4 0,-0.999995 -1,-1.000005 -1,5e-6 -4,4 -4,-4.000004 -1,5e-6 z"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 190,24.000004 -1,0.999999 0,0.999995 4,4.000005 -4,3.999999 0,0.999996 1,1.000004 1,-5e-6 4,-3.999999 4,4.000004 1,2e-6 1,-1 0,-1.000002 -4,-4.000004 4,-4 0,-0.999995 -1,-1.000005 -1,5e-6 -4,4 -4,-4.000004 -1,5e-6 z"
-       id="path16409" />
-    <path
-       id="path16411"
-       d="m 190.00001,44.000007 -1,1 -1e-5,0.999995 4.00001,4.000004 -4,4 -1e-5,0.999995 1,1.000005 1,-5e-6 4,-4 4,4.000004 1.00001,2e-6 1,-0.999999 -1e-5,-1.000003 -4,-4.000004 4,-4 0,-0.999995 -1,-1.000005 -0.99999,5e-6 -4,4 L 191,44.000002 l -0.99999,5e-6 z"
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
     <g
        transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,877.1436,-601.56033)"
        id="g16306-5"
        style="display:inline" />
     <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:1"
        d="m 169.00002,9.9999989 5.99998,-7 6.00002,7.0000201 -4,-10e-6 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.0000201 z"
        id="path9203-8"
        inkscape:connector-curvature="0"
@@ -719,51 +311,6 @@
        inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 169.00002,28.999999 5.99998,-7 6.00002,7.00002 -4,-1e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
-       id="path16631"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:connector-curvature="0"
-       id="path16623"
-       d="m 169.00002,29.999999 5.99998,-7 6.00002,7.00002 -4,-1e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 169.00002,49.999999 5.99998,-7 6.00002,7.00002 -4,-1e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
-       id="path16625"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 210,21.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
-       id="path16763"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" />
-    <path
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
-       id="path16765"
-       d="m 210,22.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 210,42.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
-       id="path16769"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" />
     <rect
        style="opacity:0.2;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
        id="rect5406"
@@ -771,32 +318,14 @@
        height="5.999999"
        x="92"
        y="6.999999" />
-    <rect
-       y="27"
-       x="92"
-       height="5.999999"
-       width="6"
-       id="rect17381"
-       style="opacity:0.2;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path22360"
-       d="M 159.5,3 154.5625,11.5625 151,8 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
        inkscape:connector-curvature="0"
        id="path22362"
        d="M 159.5,4 154.5625,12.5625 151,9 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
-       id="path22364"
-       d="m 210,1.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:1" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:1"
        d="m 210,2.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
        id="path22366"
        sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" />
@@ -935,26 +464,6 @@
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90" />
     </g>
-    <g
-       id="g47472"
-       style="fill:#ffffff;fill-opacity:1;display:inline"
-       transform="translate(-355,-154)">
-      <g
-         style="fill:#ffffff;fill-opacity:1;display:inline"
-         id="g47474"
-         transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,-113.14357,-447.56033)">
-        <path
-           id="path47476"
-           transform="matrix(0.70710677,-0.70710678,0.70710678,0.70710677,396.47753,236.46835)"
-           d="m 586,160 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,1293.1436,-447.56033)"
-         id="g47478"
-         style="fill:#ffffff;fill-opacity:1;display:inline" />
-    </g>
     <g
        transform="translate(-355,-155)"
        style="display:inline"
@@ -975,32 +484,6 @@
          id="g16306-51"
          transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,1293.1436,-447.56033)" />
     </g>
-    <g
-       id="g47480"
-       transform="translate(-671.00001,-113)"
-       style="fill:#ffffff;fill-opacity:1;display:inline">
-      <g
-         transform="matrix(0.64285714,0,0,0.64285714,332.85714,42.142857)"
-         id="g47482"
-         style="fill:#ffffff;fill-opacity:1">
-        <path
-           inkscape:connector-curvature="0"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 592.5,159 c -2.48528,0 -4.5,2.01472 -4.5,4.5 0,2.48528 2.01472,4.5 4.5,4.5 2.48528,0 4.5,-2.01472 4.5,-4.5 0,-2.48528 -2.01472,-4.5 -4.5,-4.5 z m 0,2 c 1.38071,0 2.5,1.11929 2.5,2.5 0,1.38071 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.11929 -2.5,-2.5 0,-1.38071 1.11929,-2.5 2.5,-2.5 z"
-           transform="matrix(1.5555556,0,0,1.5555556,3.3333378,-129.33333)"
-           id="path47484" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
-         id="path47486"
-         d="m 924,124 -4,4 0,2 2,0 4,-4 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-      <g
-         style="fill:#ffffff;fill-opacity:1"
-         id="g47488"
-         transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)" />
-    </g>
     <g
        style="fill:#7092ff;fill-opacity:1;display:inline"
        transform="translate(-671.00001,-114)"
@@ -1021,121 +504,6 @@
          id="g44387"
          style="fill:#7092ff;fill-opacity:1" />
     </g>
-    <g
-       id="g47402"
-       style="fill:#ffffff;fill-opacity:1;display:inline"
-       transform="translate(-355,-135)">
-      <g
-         style="fill:#ffffff;fill-opacity:1;display:inline"
-         id="g47404"
-         transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,-113.14357,-447.56033)">
-        <path
-           id="path47406"
-           transform="matrix(0.70710677,-0.70710678,0.70710678,0.70710677,396.47753,236.46835)"
-           d="m 586,160 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,1293.1436,-447.56033)"
-         id="g47408"
-         style="fill:#ffffff;fill-opacity:1;display:inline" />
-    </g>
-    <g
-       id="g47410"
-       transform="translate(-671.00001,-94)"
-       style="fill:#ffffff;fill-opacity:1;display:inline">
-      <g
-         transform="matrix(0.64285714,0,0,0.64285714,332.85714,42.142857)"
-         id="g47412"
-         style="fill:#ffffff;fill-opacity:1">
-        <path
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 231.5,24 c -2.48528,0 -4.5,2.01472 -4.5,4.5 0,0.723486 0.19662,1.394362 0.5,2 l -3.5,3.5 0,2 2,0 3.5,-3.5 c 0.60564,0.303377 1.27651,0.5 2,0.5 2.48528,0 4.5,-2.01472 4.5,-4.5 0,-2.48528 -2.01472,-4.5 -4.5,-4.5 z m 0,2 c 1.38071,0 2.5,1.11929 2.5,2.5 0,1.38071 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.11929 -2.5,-2.5 0,-1.38071 1.11929,-2.5 2.5,-2.5 z"
-           transform="matrix(1.5555556,0,0,1.5555556,564.88891,80.666664)"
-           id="path47414"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         style="fill:#ffffff;fill-opacity:1"
-         id="g47418"
-         transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)" />
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 231,45 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z"
-       id="path47520" />
-    <g
-       style="fill:#cccccc;fill-opacity:1;display:inline"
-       transform="translate(-671.00001,-74)"
-       id="g47524">
-      <g
-         style="fill:#cccccc;fill-opacity:1"
-         id="g47526"
-         transform="matrix(0.64285714,0,0,0.64285714,332.85714,42.142857)">
-        <path
-           style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 231.5,44 c -2.48528,0 -4.5,2.01472 -4.5,4.5 0,0.723486 0.19662,1.394362 0.5,2 l -3.5,3.5 0,2 2,0 3.5,-3.5 c 0.60564,0.303377 1.27651,0.5 2,0.5 2.48528,0 4.5,-2.01472 4.5,-4.5 0,-2.48528 -2.01472,-4.5 -4.5,-4.5 z m 0,2 c 1.38071,0 2.5,1.11929 2.5,2.5 0,1.38071 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.11929 -2.5,-2.5 0,-1.38071 1.11929,-2.5 2.5,-2.5 z"
-           transform="matrix(1.5555556,0,0,1.5555556,564.88891,49.555553)"
-           id="path47528"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)"
-         id="g47532"
-         style="fill:#cccccc;fill-opacity:1" />
-    </g>
-    <g
-       transform="translate(-656,92.63782)"
-       id="g14243"
-       style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline">
-      <path
-         inkscape:connector-curvature="0"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
-         transform="translate(756,-73.637817)"
-         id="path14245" />
-    </g>
-    <g
-       id="g14247"
-       transform="translate(-635,92.63782)"
-       style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline">
-      <path
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 925,-65.637817 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z"
-         id="path14249"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-    </g>
-    <g
-       style="fill:#ffffff;fill-opacity:1;display:inline"
-       id="g14113"
-       transform="translate(-656,74.637817)">
-      <path
-         id="path14115"
-         transform="translate(756,-73.637817)"
-         d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       style="fill:#ffffff;fill-opacity:1;display:inline"
-       transform="translate(-635,74.637817)"
-       id="g14117">
-      <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         id="path14119"
-         d="m 925,-65.637817 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
     <g
        transform="translate(-656,73.637817)"
        id="g9588-4"
@@ -1161,96 +529,16 @@
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90" />
     </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="path47914"
-       d="m 313.5,4.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
        style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="m 313.5,3.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
        id="path3048-0-7-5-6"
        inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path47916"
-       d="m 334.5,4 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z m -5.40625,6 -1.09375,0.5 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,3.5 L 328,14 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
     <path
        style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
        d="m 334.5,3 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z M 329.09375,9 328,9.5 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,3.5 L 328,13 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
        id="path5530-2"
        inkscape:connector-curvature="0" />
-    <g
-       style="fill:#ffffff;fill-opacity:1;display:inline"
-       id="g14177"
-       transform="translate(-656,93.63782)">
-      <path
-         id="path14179"
-         transform="translate(756,-73.637817)"
-         d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       style="fill:#ffffff;fill-opacity:1;display:inline"
-       transform="translate(-635,93.63782)"
-       id="g14181">
-      <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         id="path14183"
-         d="m 925,-65.637817 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="path14187"
-       d="m 313.5,23.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       id="path14193"
-       d="m 334.5,23 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z m -5.40625,6 -1.09375,0.5 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,3.5 L 328,33 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(-656,113.63782)"
-       id="g47761"
-       style="fill:#cccccc;fill-opacity:1;display:inline">
-      <path
-         inkscape:connector-curvature="0"
-         style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
-         transform="translate(756,-73.637817)"
-         id="path47763" />
-    </g>
-    <g
-       id="g47765"
-       transform="translate(-635,113.63782)"
-       style="fill:#ffffff;fill-opacity:1;display:inline">
-      <path
-         style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 925,-65.637817 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z"
-         id="path47767"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 334.5,43 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z m -5.40625,6 -1.09375,0.5 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,3.5 L 328,53 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
-       id="path47795" />
-    <path
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 313.5,43.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
-       id="path47777"
-       inkscape:connector-curvature="0" />
     <g
        transform="translate(105.03464,-6.104239)"
        id="g58885">
@@ -1260,30 +548,12 @@
       <g
          id="g58889" />
     </g>
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 35,5 c 0,1 0,4 0,4 0,0 0,0.5 -0.5,0.5 C 34,9.5 34.070717,9.22484 34,9 33.695312,8.03125 33.132813,6.63541 33,6 32.795405,5.02115 32.333333,5 32,5 31,5 31,6 31,6 l 1,4 0,3 C 32,13 31.5,12.5 30.5,11.5 29.945312,10.94531 29.257659,10.7508 28.8125,11.00781 28.377049,11.25922 28.150942,11.89541 28.5,12.5 28.853553,13.11237 32,17 32,17 c 1,1 2,1 4,1 2.666667,0 1,0 3,0 2,0 2.288488,-2.86546 3,-5 1,-3 1.5,-5 1.5,-5 C 43.613427,7.57668 43.45711,7.154 43,7 42.119539,6.70338 41.63994,7.35278 41.5,8 41.25,9.15625 41,10 41,10 40.90625,10.31383 41.0013,10.5 40.5,10.5 39.99086,10.5 40,10 40,10 c 0,0 0,-2.66667 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 0,1 0,1.66667 0,3 0,0 0.01305,0.5 -0.5,0.5 C 36.998673,9.5 37,9 37,9 37,9 37,6 37,5 37,4 36,4 36,4 36,4 35,4 35,5 z"
-       id="path58946"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="scsssscccsssssssssssscscscccscs" />
     <path
        sodipodi:nodetypes="scsssscccsssssssssssscscscccscs"
        inkscape:connector-curvature="0"
        id="path55334"
        d="m 35,4 c 0,1 0,4 0,4 0,0 0,0.5 -0.5,0.5 C 34,8.5 34.070717,8.22484 34,8 33.695312,7.03125 33.132813,5.63541 33,5 32.795405,4.02115 32.333333,4 32,4 31,4 31,5 31,5 l 1,4 0,3 C 32,12 31.5,11.5 30.5,10.5 29.945312,9.94531 29.257659,9.7508 28.8125,10.00781 28.377049,10.25922 28.150942,10.89541 28.5,11.5 28.853553,12.11237 32,16 32,16 c 1,1 2,1 4,1 2.666667,0 1,0 3,0 2,0 2.288488,-2.86546 3,-5 C 43,9 43.5,7 43.5,7 43.613427,6.57668 43.45711,6.154 43,6 42.119539,5.70338 41.63994,6.35278 41.5,7 41.25,8.15625 41,9 41,9 40.90625,9.31383 41.0013,9.5 40.5,9.5 39.99086,9.5 40,9 40,9 40,9 40,6.33333 40,5 40,4 39,4 39,4 c 0,0 -1,0 -1,1 0,1 0,1.66667 0,3 0,0 0.01305,0.5 -0.5,0.5 C 36.998673,8.5 37,8 37,8 37,8 37,5 37,4 37,3 36,3 36,3 36,3 35,3 35,4 z"
        style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 35,24 c 0,1 0,4 0,4 0,0 0,0.5 -0.5,0.5 -0.5,0 -0.429283,-0.27516 -0.5,-0.5 -0.304688,-0.96875 -0.867187,-2.36459 -1,-3 -0.204595,-0.97885 -0.666667,-1 -1,-1 -1,0 -1,1 -1,1 l 1,4 0,3 C 32,32 31.5,31.5 30.5,30.5 29.945312,29.94531 29.257659,29.7508 28.8125,30.00781 28.377049,30.25922 28.150942,30.89541 28.5,31.5 28.853553,32.11237 32,36 32,36 c 1,1 2,1 4,1 2.666667,0 1,0 3,0 2,0 2.288488,-2.86546 3,-5 1,-3 1.5,-5 1.5,-5 0.113427,-0.42332 -0.04289,-0.846 -0.5,-1 -0.880461,-0.29662 -1.36006,0.35278 -1.5,1 -0.25,1.15625 -0.5,2 -0.5,2 -0.09375,0.31383 0.0013,0.5 -0.5,0.5 C 39.99086,29.5 40,29 40,29 c 0,0 0,-2.66667 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 0,1 0,1.66667 0,3 0,0 0.01305,0.5 -0.5,0.5 C 36.998673,28.5 37,28 37,28 c 0,0 0,-3 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z"
-       id="path58948"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="scsssscccsssssssssssscscscccscs" />
-    <path
-       sodipodi:nodetypes="scsssscccsssssssssssscscscccscs"
-       inkscape:connector-curvature="0"
-       id="path58971"
-       d="m 35,44 c 0,1 0,4 0,4 0,0 0,0.5 -0.5,0.5 -0.5,0 -0.429283,-0.27516 -0.5,-0.5 -0.304688,-0.96875 -0.867187,-2.36459 -1,-3 -0.204595,-0.97885 -0.666667,-1 -1,-1 -1,0 -1,1 -1,1 l 1,4 0,3 C 32,52 31.5,51.5 30.5,50.5 29.945312,49.94531 29.257659,49.7508 28.8125,50.00781 28.377049,50.25922 28.150942,50.89541 28.5,51.5 28.853553,52.11237 32,56 32,56 c 1,1 2,1 4,1 2.666667,0 1,0 3,0 2,0 2.288488,-2.86546 3,-5 1,-3 1.5,-5 1.5,-5 0.113427,-0.42332 -0.04289,-0.846 -0.5,-1 -0.880461,-0.29662 -1.36006,0.35278 -1.5,1 -0.25,1.15625 -0.5,2 -0.5,2 -0.09375,0.31383 0.0013,0.5 -0.5,0.5 C 39.99086,49.5 40,49 40,49 c 0,0 0,-2.66667 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 0,1 0,1.66667 0,3 0,0 0.01305,0.5 -0.5,0.5 C 36.998673,48.5 37,48 37,48 c 0,0 0,-3 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z"
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
     <rect
        y="80"
        x="65"
@@ -1349,36 +619,207 @@
            style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       </g>
     </g>
-    <path
-       sodipodi:nodetypes="ccsccssccssccsccc"
-       inkscape:connector-curvature="0"
-       id="path14117"
-       d="m 354.5,3.9999972 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,0.9999998 1,2.1538468 1,2.1538468 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,16.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,11.999997 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.1538468 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
        style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="m 354.5,2.9999972 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.1538468 1,2.1538468 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,15.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,10.999997 l 0,-0.846153 c 0,0 1,-1.1538468 1,-2.1538468 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
        id="path54704-4"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccsccssccssccsccc" />
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       d="m 354.5,21.999997 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,34.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,29.999997 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
-       id="path14120"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccsccssccssccsccc" />
-    <path
-       sodipodi:nodetypes="ccsccssccssccsccc"
-       inkscape:connector-curvature="0"
-       id="path14122"
-       d="m 354.5,22.999997 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,35.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,30.999997 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 354.5,42.999997 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,55.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,50.999997 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
-       id="path14143"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccsccssccssccsccc" />
+    <g
+       id="g33258"
+       style="fill:#999999">
+      <g
+         transform="translate(505,-613.36218)"
+         style="display:inline;fill:#999999;fill-opacity:1"
+         id="g9693">
+        <path
+           inkscape:connector-curvature="0"
+           id="path9695"
+           transform="translate(0,52.362183)"
+           d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z"
+           style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <g
+           clip-path="url(#clipPath9141-6)"
+           id="g9697"
+           style="fill:#999999;fill-opacity:1">
+          <rect
+             style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect9699"
+             width="1"
+             height="6"
+             x="-131"
+             y="657.36218" />
+          <g
+             id="g9701"
+             style="fill:#999999;fill-opacity:1">
+            <path
+               inkscape:connector-curvature="0"
+               id="path9703"
+               d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z"
+               style="opacity:0.20000000000000001;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+               transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)" />
+            <path
+               transform="translate(0,52.362183)"
+               inkscape:connector-curvature="0"
+               id="path9705"
+               d="m -126,615 -4.5,-4.5 0,6.5 z"
+               style="opacity:0.10000000000000001;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+            <path
+               inkscape:connector-curvature="0"
+               style="opacity:0.40000000000000002;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+               d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z"
+               id="path9707" />
+            <path
+               id="path9709"
+               d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z"
+               style="opacity:0.59999999999999998;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+               inkscape:connector-curvature="0" />
+            <path
+               sodipodi:nodetypes="cccc"
+               style="opacity:0.10000000000000001;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+               d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z"
+               id="path9711"
+               inkscape:connector-curvature="0" />
+            <path
+               style="opacity:0.10000000000000001;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+               d="m -135,658.36218 4.5,4.5 0,-6.5 z"
+               id="path9713"
+               inkscape:connector-curvature="0" />
+          </g>
+        </g>
+      </g>
+      <path
+         id="path16225"
+         d="m 90,44 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -6,2 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 1,-1 z m -2,6 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path16227"
+         d="m 79,43.000003 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0637,-0.05934 -0.0937,-0.09375 C 79.0967,45.480522 79,45.251524 79,45.000003 c 0,-0.55228 0.44772,-1 1,-1 z m -9,9 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 C 71.9033,53.519484 72,53.748487 72,54.000003 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path16231"
+         d="m 55,43.999998 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 0.15625,3 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path16235"
+         transform="translate(25,-3.8281252e-7)"
+         d="M 134.5,44 129.5625,52.5625 126,49 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+         sodipodi:nodetypes="cccccccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path16239"
+         d="m 113,42.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 136,42.01282 5,4.5 -5,4.5 0,-3 -3,0 -1,0.98718 0,3.01282 1,0.98718 5,0.0128 1,1.00002 0,1 -1,0.99998 -5,0 -2,-0.99998 -1,-1 -1,-2.00002 0,-3 1,-1.99998 1,-1 2,-1.00002 3,0 z"
+         id="path16241"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccccc"
+         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 190.00001,44.000007 -1,1 -1e-5,0.999995 4.00001,4.000004 -4,4 -1e-5,0.999995 1,1.000005 1,-5e-6 4,-4 4,4.000004 1.00001,2e-6 1,-0.999999 -1e-5,-1.000003 -4,-4.000004 4,-4 0,-0.999995 -1,-1.000005 -0.99999,5e-6 -4,4 L 191,44.000002 l -0.99999,5e-6 z"
+         id="path16411" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+         sodipodi:nodetypes="cccccccccc"
+         inkscape:connector-curvature="0"
+         id="path16625"
+         d="m 169.00002,49.999999 5.99998,-7 6.00002,7.00002 -4,-1e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
+         id="path16769"
+         d="m 210,42.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path47520"
+         d="m 231,45 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g47524"
+         transform="translate(-671.00001,-74)"
+         style="fill:#999999;fill-opacity:1;display:inline">
+        <g
+           transform="matrix(0.64285714,0,0,0.64285714,332.85714,42.142857)"
+           id="g47526"
+           style="fill:#999999;fill-opacity:1">
+          <path
+             inkscape:connector-curvature="0"
+             id="path47528"
+             transform="matrix(1.5555556,0,0,1.5555556,564.88891,49.555553)"
+             d="m 231.5,44 c -2.48528,0 -4.5,2.01472 -4.5,4.5 0,0.723486 0.19662,1.394362 0.5,2 l -3.5,3.5 0,2 2,0 3.5,-3.5 c 0.60564,0.303377 1.27651,0.5 2,0.5 2.48528,0 4.5,-2.01472 4.5,-4.5 0,-2.48528 -2.01472,-4.5 -4.5,-4.5 z m 0,2 c 1.38071,0 2.5,1.11929 2.5,2.5 0,1.38071 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.11929 -2.5,-2.5 0,-1.38071 1.11929,-2.5 2.5,-2.5 z"
+             style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        </g>
+        <g
+           style="fill:#999999;fill-opacity:1"
+           id="g47532"
+           transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)" />
+      </g>
+      <g
+         style="fill:#999999;fill-opacity:1;display:inline"
+         id="g47761"
+         transform="translate(-656,113.63782)">
+        <path
+           id="path47763"
+           transform="translate(756,-73.637817)"
+           d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
+           style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="fill:#999999;fill-opacity:1;display:inline"
+         transform="translate(-635,113.63782)"
+         id="g47765">
+        <path
+           inkscape:export-ydpi="90"
+           inkscape:export-xdpi="90"
+           inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:connector-curvature="0"
+           id="path47767"
+           d="m 925,-65.637817 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z"
+           style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+      <path
+         id="path47795"
+         d="m 334.5,43 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z m -5.40625,6 -1.09375,0.5 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,3.5 L 328,53 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path47777"
+         d="m 313.5,43.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+         d="m 35,44 c 0,1 0,4 0,4 0,0 0,0.5 -0.5,0.5 -0.5,0 -0.429283,-0.27516 -0.5,-0.5 -0.304688,-0.96875 -0.867187,-2.36459 -1,-3 -0.204595,-0.97885 -0.666667,-1 -1,-1 -1,0 -1,1 -1,1 l 1,4 0,3 C 32,52 31.5,51.5 30.5,50.5 29.945312,49.94531 29.257659,49.7508 28.8125,50.00781 28.377049,50.25922 28.150942,50.89541 28.5,51.5 28.853553,52.11237 32,56 32,56 c 1,1 2,1 4,1 2.666667,0 1,0 3,0 2,0 2.288488,-2.86546 3,-5 1,-3 1.5,-5 1.5,-5 0.113427,-0.42332 -0.04289,-0.846 -0.5,-1 -0.880461,-0.29662 -1.36006,0.35278 -1.5,1 -0.25,1.15625 -0.5,2 -0.5,2 -0.09375,0.31383 0.0013,0.5 -0.5,0.5 C 39.99086,49.5 40,49 40,49 c 0,0 0,-2.66667 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 0,1 0,1.66667 0,3 0,0 0.01305,0.5 -0.5,0.5 C 36.998673,48.5 37,48 37,48 c 0,0 0,-3 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z"
+         id="path58971"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="scsssscccsssssssssssscscscccscs" />
+      <path
+         sodipodi:nodetypes="ccsccssccssccsccc"
+         inkscape:connector-curvature="0"
+         id="path14143"
+         d="m 354.5,42.999997 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,55.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,50.999997 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
     <path
        id="path46639"
        d="m 208,87.999997 c -4.97056,0 -9,4.02944 -9,9 0,1.45311 0.35716,2.816163 0.96875,4.031253 L 193,108 l 0,2 c 0,1 1,2 2,2 l 2,0 6.96875,-6.96875 C 205.18384,105.64284 206.54689,106 208,106 c 4.97056,0 9,-4.02944 9,-9.000003 0,-4.97056 -4.02944,-9 -9,-9 z m 0,4 c 2.76142,0 5,2.23858 5,5 C 213,99.76142 210.76142,102 208,102 c -2.76142,0 -5,-2.23858 -5,-5.000003 0,-2.76142 2.23858,-5 5,-5 z"
@@ -1417,7 +858,197 @@
        sodipodi:cy="100"
        sodipodi:rx="4"
        sodipodi:ry="4"
-       d="m 144,100 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       d="m 144,100 c 0,2.20914 -1.79086,4 -4,4 -2.20914,0 -4,-1.79086 -4,-4 0,-2.209139 1.79086,-4 4,-4 2.20914,0 4,1.790861 4,4 z"
        transform="translate(25,-2.6796875e-6)" />
+    <g
+       transform="translate(505,-633.36218)"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;display:inline"
+       id="g33295">
+      <path
+         inkscape:connector-curvature="0"
+         id="path33297"
+         transform="translate(0,52.362183)"
+         d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         clip-path="url(#clipPath9141-6)"
+         id="g33299"
+         style="fill:#ffffff;fill-opacity:1">
+        <rect
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect33301"
+           width="1"
+           height="6"
+           x="-131"
+           y="657.36218" />
+        <g
+           id="g33303"
+           style="fill:#ffffff;fill-opacity:1">
+          <path
+             inkscape:connector-curvature="0"
+             id="path33305"
+             d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z"
+             style="opacity:0.20000000000000001;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)" />
+          <path
+             transform="translate(0,52.362183)"
+             inkscape:connector-curvature="0"
+             id="path33307"
+             d="m -126,615 -4.5,-4.5 0,6.5 z"
+             style="opacity:0.10000000000000001;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             inkscape:connector-curvature="0"
+             style="opacity:0.40000000000000002;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z"
+             id="path33309" />
+          <path
+             id="path33311"
+             d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z"
+             style="opacity:0.59999999999999998;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="cccc"
+             style="opacity:0.10000000000000001;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z"
+             id="path33313"
+             inkscape:connector-curvature="0" />
+          <path
+             style="opacity:0.10000000000000001;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m -135,658.36218 4.5,4.5 0,-6.5 z"
+             id="path33315"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+    <path
+       id="path33317"
+       d="m 90,24 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -6,2 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 1,-1 z m -2,6 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path33319"
+       d="m 79,23.000003 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0637,-0.05934 -0.0937,-0.09375 C 79.0967,25.480522 79,25.251524 79,25.000003 c 0,-0.55228 0.44772,-1 1,-1 z m -9,9 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 C 71.9033,33.519484 72,33.748487 72,34.000003 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path33321"
+       d="m 55,23.999998 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 0.15625,3 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path33323"
+       d="M 159.5,24 154.5625,32.5625 151,29 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 -1.5,0 z"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       sodipodi:nodetypes="cccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path33325"
+       d="m 113,22.01282 -5,4.5 5,4.5 0,-3 3,0 1,0.98718 0,3.01282 -1,0.98718 -5,0.0128 -1,1.00002 0,1 1,0.99998 5,0 2,-0.99998 1,-1 1,-2.00002 0,-3 -1,-1.99998 -1,-1 -2,-1.00002 -3,0 z"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 136,22.01282 5,4.5 -5,4.5 0,-3 -3,0 -1,0.98718 0,3.01282 1,0.98718 5,0.0128 1,1.00002 0,1 -1,0.99998 -5,0 -2,-0.99998 -1,-1 -1,-2.00002 0,-3 1,-1.99998 1,-1 2,-1.00002 3,0 z"
+       id="path33327"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccc"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 190.00001,24.000007 -1,1 -1e-5,0.999995 4.00001,4.000004 -4,4 -1e-5,0.999995 1,1.000005 1,-5e-6 4,-4 4,4.000004 1.00001,2e-6 1,-0.999999 -1e-5,-1.000003 -4,-4.000004 4,-4 0,-0.999995 -1,-1.000005 -0.99999,5e-6 -4,4 L 191,24.000002 l -0.99999,5e-6 z"
+       id="path33329" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:connector-curvature="0"
+       id="path33331"
+       d="m 169.00002,29.999999 5.99998,-7 6.00002,7.00002 -4,-1e-5 -1e-5,6 -1.00001,0.99999 -2,0 -1,-0.99998 1e-5,-6.00002 z"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc"
+       id="path33333"
+       d="m 210,22.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path33335"
+       d="m 231,25 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g33337"
+       transform="translate(-671.00001,-94)"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;display:inline">
+      <g
+         transform="matrix(0.64285714,0,0,0.64285714,332.85714,42.142857)"
+         id="g33339"
+         style="fill:#ffffff;fill-opacity:1">
+        <path
+           inkscape:connector-curvature="0"
+           id="path33341"
+           transform="matrix(1.5555556,0,0,1.5555556,564.88891,49.555553)"
+           d="m 231.5,44 c -2.48528,0 -4.5,2.01472 -4.5,4.5 0,0.723486 0.19662,1.394362 0.5,2 l -3.5,3.5 0,2 2,0 3.5,-3.5 c 0.60564,0.303377 1.27651,0.5 2,0.5 2.48528,0 4.5,-2.01472 4.5,-4.5 0,-2.48528 -2.01472,-4.5 -4.5,-4.5 z m 0,2 c 1.38071,0 2.5,1.11929 2.5,2.5 0,1.38071 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.11929 -2.5,-2.5 0,-1.38071 1.11929,-2.5 2.5,-2.5 z"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+      <g
+         style="fill:#ffffff;fill-opacity:1"
+         id="g33343"
+         transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)" />
+    </g>
+    <g
+       style="opacity:1;fill:#ffffff;fill-opacity:1;display:inline"
+       id="g33345"
+       transform="translate(-656,93.63782)">
+      <path
+         id="path33347"
+         transform="translate(756,-73.637817)"
+         d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       style="opacity:1;fill:#ffffff;fill-opacity:1;display:inline"
+       transform="translate(-635,93.63782)"
+       id="g33349">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/saman/trashmoon/img/sprite.png"
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:connector-curvature="0"
+         id="path33351"
+         d="m 925,-65.637817 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <path
+       id="path33353"
+       d="m 334.5,23 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z m -5.40625,6 -1.09375,0.5 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,3.5 L 328,33 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path33355"
+       d="m 313.5,23.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+       d="m 35,24 c 0,1 0,4 0,4 0,0 0,0.5 -0.5,0.5 -0.5,0 -0.429283,-0.27516 -0.5,-0.5 -0.304688,-0.96875 -0.867187,-2.36459 -1,-3 -0.204595,-0.97885 -0.666667,-1 -1,-1 -1,0 -1,1 -1,1 l 1,4 0,3 C 32,32 31.5,31.5 30.5,30.5 29.945312,29.94531 29.257659,29.7508 28.8125,30.00781 28.377049,30.25922 28.150942,30.89541 28.5,31.5 28.853553,32.11237 32,36 32,36 c 1,1 2,1 4,1 2.666667,0 1,0 3,0 2,0 2.288488,-2.86546 3,-5 1,-3 1.5,-5 1.5,-5 0.113427,-0.42332 -0.04289,-0.846 -0.5,-1 -0.880461,-0.29662 -1.36006,0.35278 -1.5,1 -0.25,1.15625 -0.5,2 -0.5,2 -0.09375,0.31383 0.0013,0.5 -0.5,0.5 C 39.99086,29.5 40,29 40,29 c 0,0 0,-2.66667 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 0,1 0,1.66667 0,3 0,0 0.01305,0.5 -0.5,0.5 C 36.998673,28.5 37,28 37,28 c 0,0 0,-3 0,-4 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z"
+       id="path33357"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="scsssscccsssssssssssscscscccscs" />
+    <path
+       sodipodi:nodetypes="ccsccssccssccsccc"
+       inkscape:connector-curvature="0"
+       id="path33359"
+       d="m 354.5,22.999997 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,35.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,30.999997 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
+       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
 </svg>
diff --git a/img/sprite.png b/img/sprite.png
index 2f933d9f8a00da49db90ff2fb02c237dac4d9d75..8a536fa47d550a09c705367d8441a5eb2ba1ea2f 100644
GIT binary patch
literal 12910
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
Teg1&|8v;C5)q+*4SV#U3d7R4z

literal 15999
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
S$pE?#g4C3>kmZP{A^#6j{Kzx_

diff --git a/js/id/id.js b/js/id/id.js
index 2edc7fd23..b1beb425f 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -22,7 +22,8 @@ window.iD = function(container) {
             .call(map);
 
         var bar = container.append('div')
-            .attr('id', 'bar').attr('class', 'fillL2');
+            .attr('id', 'bar')
+            .attr('class','pad1');
 
         var limiter = bar.append('div')
             .attr('class', 'limiter');
diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index b1d26a53b..1724e8ed4 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -47,7 +47,7 @@ iD.ui.inspector = function() {
         drawTags(entity.tags);
 
         inspectorbody.append('div')
-            .attr('class', 'inspector-buttons')
+            .attr('class', 'inspector-buttons pad1')
             .call(drawButtons);
     }
 
diff --git a/js/id/ui/layerswitcher.js b/js/id/ui/layerswitcher.js
index a2acad1b5..4556fbe19 100644
--- a/js/id/ui/layerswitcher.js
+++ b/js/id/ui/layerswitcher.js
@@ -56,7 +56,7 @@ iD.ui.layerswitcher = function(map) {
 
         var opa = content
             .append('div')
-            .attr('class', 'opacity-options-wrapper fillL2');
+            .attr('class', 'opacity-options-wrapper');
 
         opa.append('h4').text('Layers');
 
@@ -102,7 +102,7 @@ iD.ui.layerswitcher = function(map) {
 
         content
             .append('ul')
-            .attr('class', 'toggle-list')
+            .attr('class', 'toggle-list fillL2')
             .selectAll('a.layer')
                 .data(sources)
                 .enter()
@@ -135,7 +135,7 @@ iD.ui.layerswitcher = function(map) {
 
         var adjustments = content
             .append('div')
-            .attr('class', 'adjustments');
+            .attr('class', 'adjustments pad1');
 
         var directions = [
             ['←', [-1, 0]],