FVDE/ennstatus Changeset - 7c0a409a383f · Chaos Computer Club Lëtzebuerg Projects

Changeset - 7c0a409a383f

Parent rev.

Child rev.

[Not reviewed]

dev

6 19 2

Dennis Fink - 7 years ago 2017-12-11 23:37:32
dennis.fink@c3l.lu

Update javascript libs

7 files changed:

ennstatus/static/js/d3/.bower.json

ennstatus/static/js/d3/.gitattributes

ennstatus/static/js/d3/CONTRIBUTING.md

ennstatus/static/js/d3/LICENSE

ennstatus/static/js/d3/README.md

ennstatus/static/js/d3/bower.json

ennstatus/static/js/d3/d3.js

209

159

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

ennstatus/static/js/d3/.bower.json

➞

Show inline comments

+{
   "name": "d3",
   "description": "A JavaScript visualization library for HTML and SVG.",
   "main": "d3.js",
   "scripts": [
     "d3.js"
   ],
   "ignore": [
     ".DS_Store",
     ".git",
     ".gitignore",
     ".npmignore",
     ".spmignore",
     ".travis.yml",
     "Makefile",
     "bin",
     "component.json",
     "composer.json",
     "index.js",
     "lib",
     "node_modules",
     "package.json",
     "src",
     "test"
   ],
   "homepage": "https://github.com/mbostock/d3",
   "version": "3.5.6",
   "_release": "3.5.6",
   "license": "BSD-3-Clause",
   "ignore": [],
   "homepage": "https://github.com/mbostock-bower/d3-bower",
   "version": "3.5.17",
   "_release": "3.5.17",
   "_resolution": {
     "type": "version",
     "tag": "v3.5.6",
     "commit": "0e88ef5aacbc565b7282790c829ea51dd86c978d"
     "tag": "v3.5.17",
     "commit": "abe0262a205c9f3755c3a757de4dfd1d49f34b24"
   },
-  "_source": "git://github.com/mbostock/d3.git",
+  "_source": "https://github.com/mbostock-bower/d3-bower.git",
   "_target": "~3.5.6",
   "_originalSource": "d3",
   "_direct": true
   "_originalSource": "d3"
+}
@@ \ No newline at end of file @@

ennstatus/static/js/d3/.gitattributes

➞

Show inline comments

deleted file

ennstatus/static/js/d3/CONTRIBUTING.md

➞

Show inline comments

deleted file

ennstatus/static/js/d3/LICENSE

➞

Show inline comments

-Copyright (c) 2010-2015, Michael Bostock
+Copyright (c) 2010-2016, Michael Bostock
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright notice, this
   list of conditions and the following disclaimer.
 * Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 * The name Michael Bostock may not be used to endorse or promote products
   derived from this software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
 INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

ennstatus/static/js/d3/README.md

➞

Show inline comments

 # Data-Driven Documents
-<a href="http://d3js.org"><img src="http://d3js.org/logo.svg" align="left" hspace="10" vspace="6"></a>
+<a href="https://d3js.org"><img src="https://d3js.org/logo.svg" align="left" hspace="10" vspace="6"></a>
 **D3.js** is a JavaScript library for manipulating documents based on data. **D3** helps you bring data to life using HTML, SVG, and CSS. **D3** emphasizes web standards and combines powerful visualization components with a data-driven approach to DOM manipulation, giving you the full capabilities of modern browsers without tying yourself to a proprietary framework.
 Want to learn more? [See the wiki.](https://github.com/mbostock/d3/wiki)
 For examples, [see the gallery](https://github.com/mbostock/d3/wiki/Gallery) and [mbostock’s bl.ocks](http://bl.ocks.org/mbostock).
 ## Good News, Everyone!
 The next major release of D3, 4.0, is coming! See the [4.0 development branch](https://github.com/mbostock/d3/tree/4) and read the [new API reference](https://github.com/mbostock/d3/blob/4/README.md) to get ready.

ennstatus/static/js/d3/bower.json

➞

Show inline comments

+{
   "name": "d3",
   "description": "A JavaScript visualization library for HTML and SVG.",
   "main": "d3.js",
   "scripts": [
     "d3.js"
   ],
   "ignore": [
     ".DS_Store",
     ".git",
     ".gitignore",
     ".npmignore",
     ".spmignore",
     ".travis.yml",
     "Makefile",
     "bin",
     "component.json",
     "composer.json",
     "index.js",
     "lib",
     "node_modules",
     "package.json",
     "src",
     "test"
+  ]
   "license": "BSD-3-Clause",
   "ignore": []
+}

ennstatus/static/js/d3/d3.js

➞

Show inline comments

 !function() {
   var d3 = {
-    version: "3.5.6"
+    version: "3.5.17"
   };
   var d3_arraySlice = [].slice, d3_array = function(list) {
     return d3_arraySlice.call(list);
   };
   var d3_document = this.document;
   function d3_documentElement(node) {
     return node && (node.ownerDocument || node.document || node).documentElement;
+  }
   function d3_window(node) {
     return node && (node.ownerDocument && node.ownerDocument.defaultView || node.document && node || node.defaultView);
+  }
   if (d3_document) {
     try {
       d3_array(d3_document.documentElement.childNodes)[0].nodeType;
     } catch (e) {
       d3_array = function(list) {
         var i = list.length, array = new Array(i);
         while (i--) array[i] = list[i];
         return array;
       };
+    }
+  }
   if (!Date.now) Date.now = function() {
     return +new Date();
   };
   if (d3_document) {
     try {
       d3_document.createElement("DIV").style.setProperty("opacity", 0, "");
     } catch (error) {
       var d3_element_prototype = this.Element.prototype, d3_element_setAttribute = d3_element_prototype.setAttribute, d3_element_setAttributeNS = d3_element_prototype.setAttributeNS, d3_style_prototype = this.CSSStyleDeclaration.prototype, d3_style_setProperty = d3_style_prototype.setProperty;
       d3_element_prototype.setAttribute = function(name, value) {
         d3_element_setAttribute.call(this, name, value + "");
       };
       d3_element_prototype.setAttributeNS = function(space, local, value) {
         d3_element_setAttributeNS.call(this, space, local, value + "");
       };
       d3_style_prototype.setProperty = function(name, value, priority) {
         d3_style_setProperty.call(this, name, value + "", priority);
       };
+    }
+  }
   d3.ascending = d3_ascending;
   function d3_ascending(a, b) {
     return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
+  }
   d3.descending = function(a, b) {
     return b < a ? -1 : b > a ? 1 : b >= a ? 0 : NaN;
   };
@@ @@ -175,110 +175,110 @@ @@
         if (arguments.length < 4) hi = a.length;
         while (lo < hi) {
           var mid = lo + hi >>> 1;
           if (compare(a[mid], x) < 0) lo = mid + 1; else hi = mid;
+        }
         return lo;
       },
       right: function(a, x, lo, hi) {
         if (arguments.length < 3) lo = 0;
         if (arguments.length < 4) hi = a.length;
         while (lo < hi) {
           var mid = lo + hi >>> 1;
           if (compare(a[mid], x) > 0) hi = mid; else lo = mid + 1;
+        }
         return lo;
+      }
     };
+  }
   var d3_bisect = d3_bisector(d3_ascending);
   d3.bisectLeft = d3_bisect.left;
   d3.bisect = d3.bisectRight = d3_bisect.right;
   d3.bisector = function(f) {
     return d3_bisector(f.length === 1 ? function(d, x) {
       return d3_ascending(f(d), x);
     } : f);
   };
   d3.shuffle = function(array, i0, i1) {
     if ((m = arguments.length) < 3) {
       i1 = array.length;
       if (m < 2) i0 = 0;
+    }
     var m = i1 - i0, t, i;
     while (m) {
       i = Math.random() * m-- | 0;
       t = array[m + i0], array[m + i0] = array[i + i0], array[i + i0] = t;
+    }
     return array;
   };
   d3.permute = function(array, indexes) {
     var i = indexes.length, permutes = new Array(i);
     while (i--) permutes[i] = array[indexes[i]];
     return permutes;
   };
   d3.pairs = function(array) {
     var i = 0, n = array.length - 1, p0, p1 = array[0], pairs = new Array(n < 0 ? 0 : n);
     while (i < n) pairs[i] = [ p0 = p1, p1 = array[++i] ];
     return pairs;
   };
   d3.transpose = function(matrix) {
     if (!(n = matrix.length)) return [];
     for (var i = -1, m = d3.min(matrix, d3_transposeLength), transpose = new Array(m); ++i < m; ) {
       for (var j = -1, n, row = transpose[i] = new Array(n); ++j < n; ) {
         row[j] = matrix[j][i];
+      }
+    }
     return transpose;
   };
   function d3_transposeLength(d) {
     return d.length;
+  }
   d3.zip = function() {
     if (!(n = arguments.length)) return [];
     for (var i = -1, m = d3.min(arguments, d3_zipLength), zips = new Array(m); ++i < m; ) {
       for (var j = -1, n, zip = zips[i] = new Array(n); ++j < n; ) {
         zip[j] = arguments[j][i];
+      }
+    }
     return zips;
   };
   function d3_zipLength(d) {
     return d.length;
+  }
   d3.transpose = function(matrix) {
     return d3.zip.apply(d3, matrix);
     return d3.transpose(arguments);
   };
   d3.keys = function(map) {
     var keys = [];
     for (var key in map) keys.push(key);
     return keys;
   };
   d3.values = function(map) {
     var values = [];
     for (var key in map) values.push(map[key]);
     return values;
   };
   d3.entries = function(map) {
     var entries = [];
     for (var key in map) entries.push({
       key: key,
       value: map[key]
     });
     return entries;
   };
   d3.merge = function(arrays) {
     var n = arrays.length, m, i = -1, j = 0, merged, array;
     while (++i < n) j += arrays[i].length;
     merged = new Array(j);
     while (--n >= 0) {
       array = arrays[n];
       m = array.length;
       while (--m >= 0) {
         merged[--j] = array[m];
+      }
+    }
     return merged;
   };
   var abs = Math.abs;
   d3.range = function(start, stop, step) {
     if (arguments.length < 3) {
       step = 1;
       if (arguments.length < 2) {
         stop = start;
         start = 0;
+      }
+    }
     if ((stop - start) / step === Infinity) throw new Error("infinite range");
     var range = [], k = d3_range_integerScale(abs(step)), i = -1, j;
     start *= k, stop *= k, step *= k;
     if (step < 0) while ((j = start + step * ++i) > stop) range.push(j / k); else while ((j = start + step * ++i) < stop) range.push(j / k);
     return range;
   };
   function d3_range_integerScale(x) {
@@ @@ -575,111 +575,109 @@ @@
     };
     d3_selectAll = Sizzle;
     d3_selectMatches = Sizzle.matchesSelector;
+  }
   d3.selection = function() {
     return d3.select(d3_document.documentElement);
   };
   var d3_selectionPrototype = d3.selection.prototype = [];
   d3_selectionPrototype.select = function(selector) {
     var subgroups = [], subgroup, subnode, group, node;
     selector = d3_selection_selector(selector);
     for (var j = -1, m = this.length; ++j < m; ) {
       subgroups.push(subgroup = []);
       subgroup.parentNode = (group = this[j]).parentNode;
       for (var i = -1, n = group.length; ++i < n; ) {
         if (node = group[i]) {
           subgroup.push(subnode = selector.call(node, node.__data__, i, j));
           if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
         } else {
           subgroup.push(null);
+        }
+      }
+    }
     return d3_selection(subgroups);
   };
   function d3_selection_selector(selector) {
     return typeof selector === "function" ? selector : function() {
       return d3_select(selector, this);
     };
+  }
   d3_selectionPrototype.selectAll = function(selector) {
     var subgroups = [], subgroup, node;
     selector = d3_selection_selectorAll(selector);
     for (var j = -1, m = this.length; ++j < m; ) {
       for (var group = this[j], i = -1, n = group.length; ++i < n; ) {
         if (node = group[i]) {
           subgroups.push(subgroup = d3_array(selector.call(node, node.__data__, i, j)));
           subgroup.parentNode = node;
+        }
+      }
+    }
     return d3_selection(subgroups);
   };
   function d3_selection_selectorAll(selector) {
     return typeof selector === "function" ? selector : function() {
       return d3_selectAll(selector, this);
     };
+  }
   var d3_nsXhtml = "http://www.w3.org/1999/xhtml";
   var d3_nsPrefix = {
     svg: "http://www.w3.org/2000/svg",
-    xhtml: "http://www.w3.org/1999/xhtml",
+    xhtml: d3_nsXhtml,
     xlink: "http://www.w3.org/1999/xlink",
     xml: "http://www.w3.org/XML/1998/namespace",
     xmlns: "http://www.w3.org/2000/xmlns/"
   };
   d3.ns = {
     prefix: d3_nsPrefix,
     qualify: function(name) {
       var i = name.indexOf(":"), prefix = name;
       if (i >= 0) {
         prefix = name.slice(0, i);
         name = name.slice(i + 1);
+      }
       if (i >= 0 && (prefix = name.slice(0, i)) !== "xmlns") name = name.slice(i + 1);
       return d3_nsPrefix.hasOwnProperty(prefix) ? {
         space: d3_nsPrefix[prefix],
         local: name
       } : name;
+    }
   };
   d3_selectionPrototype.attr = function(name, value) {
     if (arguments.length < 2) {
       if (typeof name === "string") {
         var node = this.node();
         name = d3.ns.qualify(name);
         return name.local ? node.getAttributeNS(name.space, name.local) : node.getAttribute(name);
+      }
       for (value in name) this.each(d3_selection_attr(value, name[value]));
       return this;
+    }
     return this.each(d3_selection_attr(name, value));
   };
   function d3_selection_attr(name, value) {
     name = d3.ns.qualify(name);
     function attrNull() {
       this.removeAttribute(name);
+    }
     function attrNullNS() {
       this.removeAttributeNS(name.space, name.local);
+    }
     function attrConstant() {
       this.setAttribute(name, value);
+    }
     function attrConstantNS() {
       this.setAttributeNS(name.space, name.local, value);
+    }
     function attrFunction() {
       var x = value.apply(this, arguments);
       if (x == null) this.removeAttribute(name); else this.setAttribute(name, x);
+    }
     function attrFunctionNS() {
       var x = value.apply(this, arguments);
       if (x == null) this.removeAttributeNS(name.space, name.local); else this.setAttributeNS(name.space, name.local, x);
+    }
     return value == null ? name.local ? attrNullNS : attrNull : typeof value === "function" ? name.local ? attrFunctionNS : attrFunction : name.local ? attrConstantNS : attrConstant;
+  }
   function d3_collapse(s) {
     return s.trim().replace(/\s+/g, " ");
+  }
   d3_selectionPrototype.classed = function(name, value) {
     if (arguments.length < 2) {
       if (typeof name === "string") {
@@ @@ -763,151 +761,153 @@ @@
       if (typeof name === "string") return this.node()[name];
       for (value in name) this.each(d3_selection_property(value, name[value]));
       return this;
+    }
     return this.each(d3_selection_property(name, value));
   };
   function d3_selection_property(name, value) {
     function propertyNull() {
       delete this[name];
+    }
     function propertyConstant() {
       this[name] = value;
+    }
     function propertyFunction() {
       var x = value.apply(this, arguments);
       if (x == null) delete this[name]; else this[name] = x;
+    }
     return value == null ? propertyNull : typeof value === "function" ? propertyFunction : propertyConstant;
+  }
   d3_selectionPrototype.text = function(value) {
     return arguments.length ? this.each(typeof value === "function" ? function() {
       var v = value.apply(this, arguments);
       this.textContent = v == null ? "" : v;
     } : value == null ? function() {
       this.textContent = "";
     } : function() {
       this.textContent = value;
     }) : this.node().textContent;
   };
   d3_selectionPrototype.html = function(value) {
     return arguments.length ? this.each(typeof value === "function" ? function() {
       var v = value.apply(this, arguments);
       this.innerHTML = v == null ? "" : v;
     } : value == null ? function() {
       this.innerHTML = "";
     } : function() {
       this.innerHTML = value;
     }) : this.node().innerHTML;
   };
   d3_selectionPrototype.append = function(name) {
     name = d3_selection_creator(name);
     return this.select(function() {
       return this.appendChild(name.apply(this, arguments));
     });
   };
   function d3_selection_creator(name) {
     function create() {
       var document = this.ownerDocument, namespace = this.namespaceURI;
-      return namespace ? document.createElementNS(namespace, name) : document.createElement(name);
+      return namespace === d3_nsXhtml && document.documentElement.namespaceURI === d3_nsXhtml ? document.createElement(name) : document.createElementNS(namespace, name);
+    }
     function createNS() {
       return this.ownerDocument.createElementNS(name.space, name.local);
+    }
     return typeof name === "function" ? name : (name = d3.ns.qualify(name)).local ? createNS : create;
+  }
   d3_selectionPrototype.insert = function(name, before) {
     name = d3_selection_creator(name);
     before = d3_selection_selector(before);
     return this.select(function() {
       return this.insertBefore(name.apply(this, arguments), before.apply(this, arguments) || null);
     });
   };
   d3_selectionPrototype.remove = function() {
     return this.each(d3_selectionRemove);
   };
   function d3_selectionRemove() {
     var parent = this.parentNode;
     if (parent) parent.removeChild(this);
+  }
   d3_selectionPrototype.data = function(value, key) {
     var i = -1, n = this.length, group, node;
     if (!arguments.length) {
       value = new Array(n = (group = this[0]).length);
       while (++i < n) {
         if (node = group[i]) {
           value[i] = node.__data__;
+        }
+      }
       return value;
+    }
     function bind(group, groupData) {
       var i, n = group.length, m = groupData.length, n0 = Math.min(n, m), updateNodes = new Array(m), enterNodes = new Array(m), exitNodes = new Array(n), node, nodeData;
       if (key) {
         var nodeByKeyValue = new d3_Map(), keyValues = new Array(n), keyValue;
         for (i = -1; ++i < n; ) {
           if (nodeByKeyValue.has(keyValue = key.call(node = group[i], node.__data__, i))) {
             exitNodes[i] = node;
           } else {
             nodeByKeyValue.set(keyValue, node);
           if (node = group[i]) {
             if (nodeByKeyValue.has(keyValue = key.call(node, node.__data__, i))) {
               exitNodes[i] = node;
             } else {
               nodeByKeyValue.set(keyValue, node);
+            }
             keyValues[i] = keyValue;
+          }
           keyValues[i] = keyValue;
+        }
         for (i = -1; ++i < m; ) {
           if (!(node = nodeByKeyValue.get(keyValue = key.call(groupData, nodeData = groupData[i], i)))) {
             enterNodes[i] = d3_selection_dataNode(nodeData);
           } else if (node !== true) {
             updateNodes[i] = node;
             node.__data__ = nodeData;
+          }
           nodeByKeyValue.set(keyValue, true);
+        }
         for (i = -1; ++i < n; ) {
           if (nodeByKeyValue.get(keyValues[i]) !== true) {
+          if (i in keyValues && nodeByKeyValue.get(keyValues[i]) !== true) {
             exitNodes[i] = group[i];
+          }
+        }
       } else {
         for (i = -1; ++i < n0; ) {
           node = group[i];
           nodeData = groupData[i];
           if (node) {
             node.__data__ = nodeData;
             updateNodes[i] = node;
           } else {
             enterNodes[i] = d3_selection_dataNode(nodeData);
+          }
+        }
         for (;i < m; ++i) {
           enterNodes[i] = d3_selection_dataNode(groupData[i]);
+        }
         for (;i < n; ++i) {
           exitNodes[i] = group[i];
+        }
+      }
       enterNodes.update = updateNodes;
       enterNodes.parentNode = updateNodes.parentNode = exitNodes.parentNode = group.parentNode;
       enter.push(enterNodes);
       update.push(updateNodes);
       exit.push(exitNodes);
+    }
     var enter = d3_selection_enter([]), update = d3_selection([]), exit = d3_selection([]);
     if (typeof value === "function") {
       while (++i < n) {
         bind(group = this[i], value.call(group, group.parentNode.__data__, i));
+      }
     } else {
       while (++i < n) {
         bind(group = this[i], value);
+      }
+    }
     update.enter = function() {
       return enter;
     };
     update.exit = function() {
       return exit;
     };
     return update;
   };
   function d3_selection_dataNode(data) {
     return {
       __data__: data
@@ @@ -1009,97 +1009,97 @@ @@
   d3_selection_enterPrototype.select = function(selector) {
     var subgroups = [], subgroup, subnode, upgroup, group, node;
     for (var j = -1, m = this.length; ++j < m; ) {
       upgroup = (group = this[j]).update;
       subgroups.push(subgroup = []);
       subgroup.parentNode = group.parentNode;
       for (var i = -1, n = group.length; ++i < n; ) {
         if (node = group[i]) {
           subgroup.push(upgroup[i] = subnode = selector.call(group.parentNode, node.__data__, i, j));
           subnode.__data__ = node.__data__;
         } else {
           subgroup.push(null);
+        }
+      }
+    }
     return d3_selection(subgroups);
   };
   d3_selection_enterPrototype.insert = function(name, before) {
     if (arguments.length < 2) before = d3_selection_enterInsertBefore(this);
     return d3_selectionPrototype.insert.call(this, name, before);
   };
   function d3_selection_enterInsertBefore(enter) {
     var i0, j0;
     return function(d, i, j) {
       var group = enter[j].update, n = group.length, node;
       if (j != j0) j0 = j, i0 = 0;
       if (i >= i0) i0 = i + 1;
       while (!(node = group[i0]) && ++i0 < n) ;
       return node;
     };
+  }
   d3.select = function(node) {
     var group;
     if (typeof node === "string") {
       group = [ d3_select(node, d3_document) ];
       group.parentNode = d3_document.documentElement;
     } else {
       group = [ node ];
       group.parentNode = d3_documentElement(node);
+    }
     return d3_selection([ group ]);
   };
   d3.selectAll = function(nodes) {
     var group;
     if (typeof nodes === "string") {
       group = d3_array(d3_selectAll(nodes, d3_document));
       group.parentNode = d3_document.documentElement;
     } else {
       group = nodes;
+      group = d3_array(nodes);
       group.parentNode = null;
+    }
     return d3_selection([ group ]);
   };
   d3_selectionPrototype.on = function(type, listener, capture) {
     var n = arguments.length;
     if (n < 3) {
       if (typeof type !== "string") {
         if (n < 2) listener = false;
         for (capture in type) this.each(d3_selection_on(capture, type[capture], listener));
         return this;
+      }
       if (n < 2) return (n = this.node()["__on" + type]) && n._;
       capture = false;
+    }
     return this.each(d3_selection_on(type, listener, capture));
   };
   function d3_selection_on(type, listener, capture) {
     var name = "__on" + type, i = type.indexOf("."), wrap = d3_selection_onListener;
     if (i > 0) type = type.slice(0, i);
     var filter = d3_selection_onFilters.get(type);
     if (filter) type = filter, wrap = d3_selection_onFilter;
     function onRemove() {
       var l = this[name];
       if (l) {
         this.removeEventListener(type, l, l.$);
         delete this[name];
+      }
+    }
     function onAdd() {
       var l = wrap(listener, d3_array(arguments));
       onRemove.call(this);
       this.addEventListener(type, this[name] = l, l.$ = capture);
       l._ = listener;
+    }
     function removeAll() {
       var re = new RegExp("^__on([^.]+)" + d3.requote(type) + "$"), match;
       for (var name in this) {
         if (match = name.match(re)) {
           var l = this[name];
           this.removeEventListener(match[1], l, l.$);
           delete this[name];
+        }
+      }
+    }
     return i ? listener ? onAdd : onRemove : listener ? d3_noop : removeAll;
+  }
   var d3_selection_onFilters = d3.map({
@@ @@ -1160,259 +1160,264 @@ @@
   d3.mouse = function(container) {
     return d3_mousePoint(container, d3_eventSource());
   };
   var d3_mouse_bug44083 = this.navigator && /WebKit/.test(this.navigator.userAgent) ? -1 : 0;
   function d3_mousePoint(container, e) {
     if (e.changedTouches) e = e.changedTouches[0];
     var svg = container.ownerSVGElement || container;
     if (svg.createSVGPoint) {
       var point = svg.createSVGPoint();
       if (d3_mouse_bug44083 < 0) {
         var window = d3_window(container);
         if (window.scrollX || window.scrollY) {
           svg = d3.select("body").append("svg").style({
             position: "absolute",
             top: 0,
             left: 0,
             margin: 0,
             padding: 0,
             border: "none"
           }, "important");
           var ctm = svg[0][0].getScreenCTM();
           d3_mouse_bug44083 = !(ctm.f || ctm.e);
           svg.remove();
+        }
+      }
       if (d3_mouse_bug44083) point.x = e.pageX, point.y = e.pageY; else point.x = e.clientX,
       point.y = e.clientY;
       point = point.matrixTransform(container.getScreenCTM().inverse());
       return [ point.x, point.y ];
+    }
     var rect = container.getBoundingClientRect();
     return [ e.clientX - rect.left - container.clientLeft, e.clientY - rect.top - container.clientTop ];
+  }
   d3.touch = function(container, touches, identifier) {
     if (arguments.length < 3) identifier = touches, touches = d3_eventSource().changedTouches;
     if (touches) for (var i = 0, n = touches.length, touch; i < n; ++i) {
       if ((touch = touches[i]).identifier === identifier) {
         return d3_mousePoint(container, touch);
+      }
+    }
   };
   d3.behavior.drag = function() {
     var event = d3_eventDispatch(drag, "drag", "dragstart", "dragend"), origin = null, mousedown = dragstart(d3_noop, d3.mouse, d3_window, "mousemove", "mouseup"), touchstart = dragstart(d3_behavior_dragTouchId, d3.touch, d3_identity, "touchmove", "touchend");
     function drag() {
       this.on("mousedown.drag", mousedown).on("touchstart.drag", touchstart);
+    }
     function dragstart(id, position, subject, move, end) {
       return function() {
         var that = this, target = d3.event.target, parent = that.parentNode, dispatch = event.of(that, arguments), dragged = 0, dragId = id(), dragName = ".drag" + (dragId == null ? "" : "-" + dragId), dragOffset, dragSubject = d3.select(subject(target)).on(move + dragName, moved).on(end + dragName, ended), dragRestore = d3_event_dragSuppress(target), position0 = position(parent, dragId);
+        var that = this, target = d3.event.target.correspondingElement || d3.event.target, parent = that.parentNode, dispatch = event.of(that, arguments), dragged = 0, dragId = id(), dragName = ".drag" + (dragId == null ? "" : "-" + dragId), dragOffset, dragSubject = d3.select(subject(target)).on(move + dragName, moved).on(end + dragName, ended), dragRestore = d3_event_dragSuppress(target), position0 = position(parent, dragId);
         if (origin) {
           dragOffset = origin.apply(that, arguments);
           dragOffset = [ dragOffset.x - position0[0], dragOffset.y - position0[1] ];
         } else {
           dragOffset = [ 0, 0 ];
+        }
         dispatch({
           type: "dragstart"
         });
         function moved() {
           var position1 = position(parent, dragId), dx, dy;
           if (!position1) return;
           dx = position1[0] - position0[0];
           dy = position1[1] - position0[1];
           dragged |= dx | dy;
           position0 = position1;
           dispatch({
             type: "drag",
             x: position1[0] + dragOffset[0],
             y: position1[1] + dragOffset[1],
             dx: dx,
             dy: dy
           });
+        }
         function ended() {
           if (!position(parent, dragId)) return;
           dragSubject.on(move + dragName, null).on(end + dragName, null);
-          dragRestore(dragged && d3.event.target === target);
           dragRestore(dragged);
           dispatch({
             type: "dragend"
           });
+        }
       };
+    }
     drag.origin = function(x) {
       if (!arguments.length) return origin;
       origin = x;
       return drag;
     };
     return d3.rebind(drag, event, "on");
   };
   function d3_behavior_dragTouchId() {
     return d3.event.changedTouches[0].identifier;
+  }
   d3.touches = function(container, touches) {
     if (arguments.length < 2) touches = d3_eventSource().touches;
     return touches ? d3_array(touches).map(function(touch) {
       var point = d3_mousePoint(container, touch);
       point.identifier = touch.identifier;
       return point;
     }) : [];
   };
   var ε = 1e-6, ε2 = ε * ε, π = Math.PI, τ = 2 * π, τε = τ - ε, halfπ = π / 2, d3_radians = π / 180, d3_degrees = 180 / π;
   function d3_sgn(x) {
     return x > 0 ? 1 : x < 0 ? -1 : 0;
+  }
   function d3_cross2d(a, b, c) {
     return (b[0] - a[0]) * (c[1] - a[1]) - (b[1] - a[1]) * (c[0] - a[0]);
+  }
   function d3_acos(x) {
     return x > 1 ? 0 : x < -1 ? π : Math.acos(x);
+  }
   function d3_asin(x) {
     return x > 1 ? halfπ : x < -1 ? -halfπ : Math.asin(x);
+  }
   function d3_sinh(x) {
     return ((x = Math.exp(x)) - 1 / x) / 2;
+  }
   function d3_cosh(x) {
     return ((x = Math.exp(x)) + 1 / x) / 2;
+  }
   function d3_tanh(x) {
     return ((x = Math.exp(2 * x)) - 1) / (x + 1);
+  }
   function d3_haversin(x) {
     return (x = Math.sin(x / 2)) * x;
+  }
   var ρ = Math.SQRT2, ρ2 = 2, ρ4 = 4;
   d3.interpolateZoom = function(p0, p1) {
     var ux0 = p0[0], uy0 = p0[1], w0 = p0[2], ux1 = p1[0], uy1 = p1[1], w1 = p1[2];
     var dx = ux1 - ux0, dy = uy1 - uy0, d2 = dx * dx + dy * dy, d1 = Math.sqrt(d2), b0 = (w1 * w1 - w0 * w0 + ρ4 * d2) / (2 * w0 * ρ2 * d1), b1 = (w1 * w1 - w0 * w0 - ρ4 * d2) / (2 * w1 * ρ2 * d1), r0 = Math.log(Math.sqrt(b0 * b0 + 1) - b0), r1 = Math.log(Math.sqrt(b1 * b1 + 1) - b1), dr = r1 - r0, S = (dr || Math.log(w1 / w0)) / ρ;
     function interpolate(t) {
       var s = t * S;
       if (dr) {
         var coshr0 = d3_cosh(r0), u = w0 / (ρ2 * d1) * (coshr0 * d3_tanh(ρ * s + r0) - d3_sinh(r0));
     var ux0 = p0[0], uy0 = p0[1], w0 = p0[2], ux1 = p1[0], uy1 = p1[1], w1 = p1[2], dx = ux1 - ux0, dy = uy1 - uy0, d2 = dx * dx + dy * dy, i, S;
     if (d2 < ε2) {
       S = Math.log(w1 / w0) / ρ;
       i = function(t) {
         return [ ux0 + t * dx, uy0 + t * dy, w0 * Math.exp(ρ * t * S) ];
       };
     } else {
       var d1 = Math.sqrt(d2), b0 = (w1 * w1 - w0 * w0 + ρ4 * d2) / (2 * w0 * ρ2 * d1), b1 = (w1 * w1 - w0 * w0 - ρ4 * d2) / (2 * w1 * ρ2 * d1), r0 = Math.log(Math.sqrt(b0 * b0 + 1) - b0), r1 = Math.log(Math.sqrt(b1 * b1 + 1) - b1);
       S = (r1 - r0) / ρ;
       i = function(t) {
         var s = t * S, coshr0 = d3_cosh(r0), u = w0 / (ρ2 * d1) * (coshr0 * d3_tanh(ρ * s + r0) - d3_sinh(r0));
         return [ ux0 + u * dx, uy0 + u * dy, w0 * coshr0 / d3_cosh(ρ * s + r0) ];
+      }
       return [ ux0 + t * dx, uy0 + t * dy, w0 * Math.exp(ρ * s) ];
+    }
     interpolate.duration = S * 1e3;
     return interpolate;
       };
+    }
     i.duration = S * 1e3;
     return i;
   };
   d3.behavior.zoom = function() {
     var view = {
       x: 0,
       y: 0,
       k: 1
     }, translate0, center0, center, size = [ 960, 500 ], scaleExtent = d3_behavior_zoomInfinity, duration = 250, zooming = 0, mousedown = "mousedown.zoom", mousemove = "mousemove.zoom", mouseup = "mouseup.zoom", mousewheelTimer, touchstart = "touchstart.zoom", touchtime, event = d3_eventDispatch(zoom, "zoomstart", "zoom", "zoomend"), x0, x1, y0, y1;
     if (!d3_behavior_zoomWheel) {
       d3_behavior_zoomWheel = "onwheel" in d3_document ? (d3_behavior_zoomDelta = function() {
         return -d3.event.deltaY * (d3.event.deltaMode ? 120 : 1);
       }, "wheel") : "onmousewheel" in d3_document ? (d3_behavior_zoomDelta = function() {
         return d3.event.wheelDelta;
       }, "mousewheel") : (d3_behavior_zoomDelta = function() {
         return -d3.event.detail;
       }, "MozMousePixelScroll");
+    }
     function zoom(g) {
       g.on(mousedown, mousedowned).on(d3_behavior_zoomWheel + ".zoom", mousewheeled).on("dblclick.zoom", dblclicked).on(touchstart, touchstarted);
+    }
     zoom.event = function(g) {
       g.each(function() {
         var dispatch = event.of(this, arguments), view1 = view;
         if (d3_transitionInheritId) {
           d3.select(this).transition().each("start.zoom", function() {
             view = this.__chart__ || {
               x: 0,
               y: 0,
               k: 1
             };
             zoomstarted(dispatch);
           }).tween("zoom:zoom", function() {
             var dx = size[0], dy = size[1], cx = center0 ? center0[0] : dx / 2, cy = center0 ? center0[1] : dy / 2, i = d3.interpolateZoom([ (cx - view.x) / view.k, (cy - view.y) / view.k, dx / view.k ], [ (cx - view1.x) / view1.k, (cy - view1.y) / view1.k, dx / view1.k ]);
             return function(t) {
               var l = i(t), k = dx / l[2];
               this.__chart__ = view = {
                 x: cx - l[0] * k,
                 y: cy - l[1] * k,
                 k: k
               };
               zoomed(dispatch);
             };
           }).each("interrupt.zoom", function() {
             zoomended(dispatch);
           }).each("end.zoom", function() {
             zoomended(dispatch);
           });
         } else {
           this.__chart__ = view;
           zoomstarted(dispatch);
           zoomed(dispatch);
           zoomended(dispatch);
+        }
       });
     };
     zoom.translate = function(_) {
       if (!arguments.length) return [ view.x, view.y ];
       view = {
         x: +_[0],
         y: +_[1],
         k: view.k
       };
       rescale();
       return zoom;
     };
     zoom.scale = function(_) {
       if (!arguments.length) return view.k;
       view = {
         x: view.x,
         y: view.y,
-        k: +_
+        k: null
       };
       scaleTo(+_);
       rescale();
       return zoom;
     };
     zoom.scaleExtent = function(_) {
       if (!arguments.length) return scaleExtent;
       scaleExtent = _ == null ? d3_behavior_zoomInfinity : [ +_[0], +_[1] ];
       return zoom;
     };
     zoom.center = function(_) {
       if (!arguments.length) return center;
       center = _ && [ +_[0], +_[1] ];
       return zoom;
     };
     zoom.size = function(_) {
       if (!arguments.length) return size;
       size = _ && [ +_[0], +_[1] ];
       return zoom;
     };
     zoom.duration = function(_) {
       if (!arguments.length) return duration;
       duration = +_;
       return zoom;
     };
     zoom.x = function(z) {
       if (!arguments.length) return x1;
       x1 = z;
       x0 = z.copy();
       view = {
         x: 0,
         y: 0,
         k: 1
       };
       return zoom;
     };
     zoom.y = function(z) {
       if (!arguments.length) return y1;
       y1 = z;
       y0 = z.copy();
       view = {
         x: 0,
         y: 0,
         k: 1
       };
       return zoom;
     };
     function location(p) {
       return [ (p[0] - view.x) / view.k, (p[1] - view.y) / view.k ];
+    }
@@ @@ -1421,107 +1426,107 @@ @@
+    }
     function scaleTo(s) {
       view.k = Math.max(scaleExtent[0], Math.min(scaleExtent[1], s));
+    }
     function translateTo(p, l) {
       l = point(l);
       view.x += p[0] - l[0];
       view.y += p[1] - l[1];
+    }
     function zoomTo(that, p, l, k) {
       that.__chart__ = {
         x: view.x,
         y: view.y,
         k: view.k
       };
       scaleTo(Math.pow(2, k));
       translateTo(center0 = p, l);
       that = d3.select(that);
       if (duration > 0) that = that.transition().duration(duration);
       that.call(zoom.event);
+    }
     function rescale() {
       if (x1) x1.domain(x0.range().map(function(x) {
         return (x - view.x) / view.k;
       }).map(x0.invert));
       if (y1) y1.domain(y0.range().map(function(y) {
         return (y - view.y) / view.k;
       }).map(y0.invert));
+    }
     function zoomstarted(dispatch) {
       if (!zooming++) dispatch({
         type: "zoomstart"
       });
+    }
     function zoomed(dispatch) {
       rescale();
       dispatch({
         type: "zoom",
         scale: view.k,
         translate: [ view.x, view.y ]
       });
+    }
     function zoomended(dispatch) {
       if (!--zooming) dispatch({
         type: "zoomend"
       }), center0 = null;
+    }
     function mousedowned() {
-      var that = this, target = d3.event.target, dispatch = event.of(that, arguments), dragged = 0, subject = d3.select(d3_window(that)).on(mousemove, moved).on(mouseup, ended), location0 = location(d3.mouse(that)), dragRestore = d3_event_dragSuppress(that);
       var that = this, dispatch = event.of(that, arguments), dragged = 0, subject = d3.select(d3_window(that)).on(mousemove, moved).on(mouseup, ended), location0 = location(d3.mouse(that)), dragRestore = d3_event_dragSuppress(that);
       d3_selection_interrupt.call(that);
       zoomstarted(dispatch);
       function moved() {
         dragged = 1;
         translateTo(d3.mouse(that), location0);
         zoomed(dispatch);
+      }
       function ended() {
         subject.on(mousemove, null).on(mouseup, null);
-        dragRestore(dragged && d3.event.target === target);
         dragRestore(dragged);
         zoomended(dispatch);
+      }
+    }
     function touchstarted() {
       var that = this, dispatch = event.of(that, arguments), locations0 = {}, distance0 = 0, scale0, zoomName = ".zoom-" + d3.event.changedTouches[0].identifier, touchmove = "touchmove" + zoomName, touchend = "touchend" + zoomName, targets = [], subject = d3.select(that), dragRestore = d3_event_dragSuppress(that);
       started();
       zoomstarted(dispatch);
       subject.on(mousedown, null).on(touchstart, started);
       function relocate() {
         var touches = d3.touches(that);
         scale0 = view.k;
         touches.forEach(function(t) {
           if (t.identifier in locations0) locations0[t.identifier] = location(t);
         });
         return touches;
+      }
       function started() {
         var target = d3.event.target;
         d3.select(target).on(touchmove, moved).on(touchend, ended);
         targets.push(target);
         var changed = d3.event.changedTouches;
         for (var i = 0, n = changed.length; i < n; ++i) {
           locations0[changed[i].identifier] = null;
+        }
         var touches = relocate(), now = Date.now();
         if (touches.length === 1) {
           if (now - touchtime < 500) {
             var p = touches[0];
             zoomTo(that, p, locations0[p.identifier], Math.floor(Math.log(view.k) / Math.LN2) + 1);
             d3_eventPreventDefault();
+          }
           touchtime = now;
         } else if (touches.length > 1) {
           var p = touches[0], q = touches[1], dx = p[0] - q[0], dy = p[1] - q[1];
           distance0 = dx * dx + dy * dy;
+        }
+      }
       function moved() {
         var touches = d3.touches(that), p0, l0, p1, l1;
         d3_selection_interrupt.call(that);
         for (var i = 0, n = touches.length; i < n; ++i, l1 = null) {
           p1 = touches[i];
           if (l1 = locations0[p1.identifier]) {
             if (l0) break;
             p0 = p1, l0 = l1;
+          }
+        }
         if (l1) {
@@ @@ -1653,99 +1658,98 @@ @@
     return new d3_rgb(d3_xyz_rgb(3.2404542 * x - 1.5371385 * y - .4985314 * z), d3_xyz_rgb(-.969266 * x + 1.8760108 * y + .041556 * z), d3_xyz_rgb(.0556434 * x - .2040259 * y + 1.0572252 * z));
+  }
   function d3_lab_hcl(l, a, b) {
     return l > 0 ? new d3_hcl(Math.atan2(b, a) * d3_degrees, Math.sqrt(a * a + b * b), l) : new d3_hcl(NaN, NaN, l);
+  }
   function d3_lab_xyz(x) {
     return x > .206893034 ? x * x * x : (x - 4 / 29) / 7.787037;
+  }
   function d3_xyz_lab(x) {
     return x > .008856 ? Math.pow(x, 1 / 3) : 7.787037 * x + 4 / 29;
+  }
   function d3_xyz_rgb(r) {
     return Math.round(255 * (r <= .00304 ? 12.92 * r : 1.055 * Math.pow(r, 1 / 2.4) - .055));
+  }
   d3.rgb = d3_rgb;
   function d3_rgb(r, g, b) {
     return this instanceof d3_rgb ? void (this.r = ~~r, this.g = ~~g, this.b = ~~b) : arguments.length < 2 ? r instanceof d3_rgb ? new d3_rgb(r.r, r.g, r.b) : d3_rgb_parse("" + r, d3_rgb, d3_hsl_rgb) : new d3_rgb(r, g, b);
+  }
   function d3_rgbNumber(value) {
     return new d3_rgb(value >> 16, value >> 8 & 255, value & 255);
+  }
   function d3_rgbString(value) {
     return d3_rgbNumber(value) + "";
+  }
   var d3_rgbPrototype = d3_rgb.prototype = new d3_color();
   d3_rgbPrototype.brighter = function(k) {
     k = Math.pow(.7, arguments.length ? k : 1);
     var r = this.r, g = this.g, b = this.b, i = 30;
     if (!r && !g && !b) return new d3_rgb(i, i, i);
     if (r && r < i) r = i;
     if (g && g < i) g = i;
     if (b && b < i) b = i;
     return new d3_rgb(Math.min(255, r / k), Math.min(255, g / k), Math.min(255, b / k));
   };
   d3_rgbPrototype.darker = function(k) {
     k = Math.pow(.7, arguments.length ? k : 1);
     return new d3_rgb(k * this.r, k * this.g, k * this.b);
   };
   d3_rgbPrototype.hsl = function() {
     return d3_rgb_hsl(this.r, this.g, this.b);
   };
   d3_rgbPrototype.toString = function() {
     return "#" + d3_rgb_hex(this.r) + d3_rgb_hex(this.g) + d3_rgb_hex(this.b);
   };
   function d3_rgb_hex(v) {
     return v < 16 ? "0" + Math.max(0, v).toString(16) : Math.min(255, v).toString(16);
+  }
   function d3_rgb_parse(format, rgb, hsl) {
     format = format.toLowerCase();
     var r = 0, g = 0, b = 0, m1, m2, color;
     m1 = /([a-z]+)\((.*)\)/.exec(format);
+    m1 = /([a-z]+)\((.*)\)/.exec(format = format.toLowerCase());
     if (m1) {
       m2 = m1[2].split(",");
       switch (m1[1]) {
        case "hsl":
+        {
           return hsl(parseFloat(m2[0]), parseFloat(m2[1]) / 100, parseFloat(m2[2]) / 100);
+        }
        case "rgb":
+        {
           return rgb(d3_rgb_parseNumber(m2[0]), d3_rgb_parseNumber(m2[1]), d3_rgb_parseNumber(m2[2]));
+        }
+      }
+    }
     if (color = d3_rgb_names.get(format)) {
       return rgb(color.r, color.g, color.b);
+    }
     if (format != null && format.charAt(0) === "#" && !isNaN(color = parseInt(format.slice(1), 16))) {
       if (format.length === 4) {
         r = (color & 3840) >> 4;
         r = r >> 4 | r;
         g = color & 240;
         g = g >> 4 | g;
         b = color & 15;
         b = b << 4 | b;
       } else if (format.length === 7) {
         r = (color & 16711680) >> 16;
         g = (color & 65280) >> 8;
         b = color & 255;
+      }
+    }
     return rgb(r, g, b);
+  }
   function d3_rgb_hsl(r, g, b) {
     var min = Math.min(r /= 255, g /= 255, b /= 255), max = Math.max(r, g, b), d = max - min, h, s, l = (max + min) / 2;
     if (d) {
       s = l < .5 ? d / (max + min) : d / (2 - max - min);
       if (r == max) h = (g - b) / d + (g < b ? 6 : 0); else if (g == max) h = (b - r) / d + 2; else h = (r - g) / d + 4;
       h *= 60;
     } else {
       h = NaN;
       s = l > 0 && l < 1 ? 0 : h;
+    }
     return new d3_hsl(h, s, l);
+  }
   function d3_rgb_lab(r, g, b) {
     r = d3_rgb_xyz(r);
     g = d3_rgb_xyz(g);
@@ @@ -2070,166 +2074,168 @@ @@
           if (c === 10) eol = true; else if (c === 13) {
             eol = true;
             if (text.charCodeAt(I) === 10) ++I, ++k;
           } else if (c !== delimiterCode) continue;
           return text.slice(j, I - k);
+        }
         return text.slice(j);
+      }
       while ((t = token()) !== EOF) {
         var a = [];
         while (t !== EOL && t !== EOF) {
           a.push(t);
           t = token();
+        }
         if (f && (a = f(a, n++)) == null) continue;
         rows.push(a);
+      }
       return rows;
     };
     dsv.format = function(rows) {
       if (Array.isArray(rows[0])) return dsv.formatRows(rows);
       var fieldSet = new d3_Set(), fields = [];
       rows.forEach(function(row) {
         for (var field in row) {
           if (!fieldSet.has(field)) {
             fields.push(fieldSet.add(field));
+          }
+        }
       });
       return [ fields.map(formatValue).join(delimiter) ].concat(rows.map(function(row) {
         return fields.map(function(field) {
           return formatValue(row[field]);
         }).join(delimiter);
       })).join("\n");
     };
     dsv.formatRows = function(rows) {
       return rows.map(formatRow).join("\n");
     };
     function formatRow(row) {
       return row.map(formatValue).join(delimiter);
+    }
     function formatValue(text) {
       return reFormat.test(text) ? '"' + text.replace(/\"/g, '""') + '"' : text;
+    }
     return dsv;
   };
   d3.csv = d3.dsv(",", "text/csv");
   d3.tsv = d3.dsv("	", "text/tab-separated-values");
-  var d3_timer_queueHead, d3_timer_queueTail, d3_timer_interval, d3_timer_timeout, d3_timer_active, d3_timer_frame = this[d3_vendorSymbol(this, "requestAnimationFrame")] || function(callback) {
   var d3_timer_queueHead, d3_timer_queueTail, d3_timer_interval, d3_timer_timeout, d3_timer_frame = this[d3_vendorSymbol(this, "requestAnimationFrame")] || function(callback) {
     setTimeout(callback, 17);
   };
   d3.timer = function(callback, delay, then) {
   d3.timer = function() {
     d3_timer.apply(this, arguments);
   };
   function d3_timer(callback, delay, then) {
     var n = arguments.length;
     if (n < 2) delay = 0;
     if (n < 3) then = Date.now();
     var time = then + delay, timer = {
       c: callback,
       t: time,
       f: false,
       n: null
     };
     if (d3_timer_queueTail) d3_timer_queueTail.n = timer; else d3_timer_queueHead = timer;
     d3_timer_queueTail = timer;
     if (!d3_timer_interval) {
       d3_timer_timeout = clearTimeout(d3_timer_timeout);
       d3_timer_interval = 1;
       d3_timer_frame(d3_timer_step);
+    }
   };
     return timer;
+  }
   function d3_timer_step() {
     var now = d3_timer_mark(), delay = d3_timer_sweep() - now;
     if (delay > 24) {
       if (isFinite(delay)) {
         clearTimeout(d3_timer_timeout);
         d3_timer_timeout = setTimeout(d3_timer_step, delay);
+      }
       d3_timer_interval = 0;
     } else {
       d3_timer_interval = 1;
       d3_timer_frame(d3_timer_step);
+    }
+  }
   d3.timer.flush = function() {
     d3_timer_mark();
     d3_timer_sweep();
   };
   function d3_timer_mark() {
     var now = Date.now();
     d3_timer_active = d3_timer_queueHead;
     while (d3_timer_active) {
       if (now >= d3_timer_active.t) d3_timer_active.f = d3_timer_active.c(now - d3_timer_active.t);
       d3_timer_active = d3_timer_active.n;
     var now = Date.now(), timer = d3_timer_queueHead;
     while (timer) {
       if (now >= timer.t && timer.c(now - timer.t)) timer.c = null;
       timer = timer.n;
+    }
     return now;
+  }
   function d3_timer_sweep() {
     var t0, t1 = d3_timer_queueHead, time = Infinity;
     while (t1) {
       if (t1.f) {
         t1 = t0 ? t0.n = t1.n : d3_timer_queueHead = t1.n;
       } else {
       if (t1.c) {
         if (t1.t < time) time = t1.t;
         t1 = (t0 = t1).n;
       } else {
         t1 = t0 ? t0.n = t1.n : d3_timer_queueHead = t1.n;
+      }
+    }
     d3_timer_queueTail = t0;
     return time;
+  }
   function d3_format_precision(x, p) {
     return p - (x ? Math.ceil(Math.log(x) / Math.LN10) : 1);
+  }
   d3.round = function(x, n) {
     return n ? Math.round(x * (n = Math.pow(10, n))) / n : Math.round(x);
   };
   var d3_formatPrefixes = [ "y", "z", "a", "f", "p", "n", "µ", "m", "", "k", "M", "G", "T", "P", "E", "Z", "Y" ].map(d3_formatPrefix);
   d3.formatPrefix = function(value, precision) {
     var i = 0;
     if (value) {
+    if (value = +value) {
       if (value < 0) value *= -1;
       if (precision) value = d3.round(value, d3_format_precision(value, precision));
       i = 1 + Math.floor(1e-12 + Math.log(value) / Math.LN10);
       i = Math.max(-24, Math.min(24, Math.floor((i - 1) / 3) * 3));
+    }
     return d3_formatPrefixes[8 + i / 3];
   };
   function d3_formatPrefix(d, i) {
     var k = Math.pow(10, abs(8 - i) * 3);
     return {
       scale: i > 8 ? function(d) {
         return d / k;
       } : function(d) {
         return d * k;
       },
       symbol: d
     };
+  }
   function d3_locale_numberFormat(locale) {
     var locale_decimal = locale.decimal, locale_thousands = locale.thousands, locale_grouping = locale.grouping, locale_currency = locale.currency, formatGroup = locale_grouping && locale_thousands ? function(value, width) {
       var i = value.length, t = [], j = 0, g = locale_grouping[0], length = 0;
       while (i > 0 && g > 0) {
         if (length + g + 1 > width) g = Math.max(1, width - length);
         t.push(value.substring(i -= g, i + g));
         if ((length += g + 1) > width) break;
         g = locale_grouping[j = (j + 1) % locale_grouping.length];
+      }
       return t.reverse().join(locale_thousands);
     } : d3_identity;
     return function(specifier) {
       var match = d3_format_re.exec(specifier), fill = match[1] || " ", align = match[2] || ">", sign = match[3] || "-", symbol = match[4] || "", zfill = match[5], width = +match[6], comma = match[7], precision = match[8], type = match[9], scale = 1, prefix = "", suffix = "", integer = false, exponent = true;
       if (precision) precision = +precision.substring(1);
       if (zfill || fill === "0" && align === "=") {
         zfill = fill = "0";
         align = "=";
+      }
       switch (type) {
        case "n":
         comma = true;
         type = "g";
         break;
        case "%":
         scale = 100;
         suffix = "%";
         type = "f";
         break;
@@ @@ -2489,97 +2495,98 @@ @@
       date.setDate(date.getDate() + Math.floor(offset) * 7);
     }, function(date) {
       var day = d3_time.year(date).getDay();
       return Math.floor((d3_time.dayOfYear(date) + (day + i) % 7) / 7) - (day !== i);
     });
     d3_time[day + "s"] = interval.range;
     d3_time[day + "s"].utc = interval.utc.range;
     d3_time[day + "OfYear"] = function(date) {
       var day = d3_time.year(date).getDay();
       return Math.floor((d3_time.dayOfYear(date) + (day + i) % 7) / 7);
     };
   });
   d3_time.week = d3_time.sunday;
   d3_time.weeks = d3_time.sunday.range;
   d3_time.weeks.utc = d3_time.sunday.utc.range;
   d3_time.weekOfYear = d3_time.sundayOfYear;
   function d3_locale_timeFormat(locale) {
     var locale_dateTime = locale.dateTime, locale_date = locale.date, locale_time = locale.time, locale_periods = locale.periods, locale_days = locale.days, locale_shortDays = locale.shortDays, locale_months = locale.months, locale_shortMonths = locale.shortMonths;
     function d3_time_format(template) {
       var n = template.length;
       function format(date) {
         var string = [], i = -1, j = 0, c, p, f;
         while (++i < n) {
           if (template.charCodeAt(i) === 37) {
             string.push(template.slice(j, i));
             if ((p = d3_time_formatPads[c = template.charAt(++i)]) != null) c = template.charAt(++i);
             if (f = d3_time_formats[c]) c = f(date, p == null ? c === "e" ? " " : "0" : p);
             string.push(c);
             j = i + 1;
+          }
+        }
         string.push(template.slice(j, i));
         return string.join("");
+      }
       format.parse = function(string) {
         var d = {
           y: 1900,
           m: 0,
           d: 1,
           H: 0,
           M: 0,
           S: 0,
           L: 0,
           Z: null
         }, i = d3_time_parse(d, template, string, 0);
         if (i != string.length) return null;
         if ("p" in d) d.H = d.H % 12 + d.p * 12;
         var localZ = d.Z != null && d3_date !== d3_date_utc, date = new (localZ ? d3_date_utc : d3_date)();
         if ("j" in d) date.setFullYear(d.y, 0, d.j); else if ("w" in d && ("W" in d || "U" in d)) {
         if ("j" in d) date.setFullYear(d.y, 0, d.j); else if ("W" in d || "U" in d) {
           if (!("w" in d)) d.w = "W" in d ? 1 : 0;
           date.setFullYear(d.y, 0, 1);
           date.setFullYear(d.y, 0, "W" in d ? (d.w + 6) % 7 + d.W * 7 - (date.getDay() + 5) % 7 : d.w + d.U * 7 - (date.getDay() + 6) % 7);
         } else date.setFullYear(d.y, d.m, d.d);
         date.setHours(d.H + (d.Z / 100 | 0), d.M + d.Z % 100, d.S, d.L);
         return localZ ? date._ : date;
       };
       format.toString = function() {
         return template;
       };
       return format;
+    }
     function d3_time_parse(date, template, string, j) {
       var c, p, t, i = 0, n = template.length, m = string.length;
       while (i < n) {
         if (j >= m) return -1;
         c = template.charCodeAt(i++);
         if (c === 37) {
           t = template.charAt(i++);
           p = d3_time_parsers[t in d3_time_formatPads ? template.charAt(i++) : t];
           if (!p || (j = p(date, string, j)) < 0) return -1;
         } else if (c != string.charCodeAt(j++)) {
           return -1;
+        }
+      }
       return j;
+    }
     d3_time_format.utc = function(template) {
       var local = d3_time_format(template);
       function format(date) {
         try {
           d3_date = d3_date_utc;
           var utc = new d3_date();
           utc._ = date;
           return local(utc);
         } finally {
           d3_date = Date;
+        }
+      }
       format.parse = function(string) {
         try {
           d3_date = d3_date_utc;
           var date = local.parse(string);
           return date && date._;
         } finally {
           d3_date = Date;
+        }
       };
       format.toString = local.toString;
@@ @@ -3473,97 +3480,97 @@ @@
     if (from == null) {
       φ = direction * halfπ;
       listener.point(-π, φ);
       listener.point(0, φ);
       listener.point(π, φ);
       listener.point(π, 0);
       listener.point(π, -φ);
       listener.point(0, -φ);
       listener.point(-π, -φ);
       listener.point(-π, 0);
       listener.point(-π, φ);
     } else if (abs(from[0] - to[0]) > ε) {
       var s = from[0] < to[0] ? π : -π;
       φ = direction * s / 2;
       listener.point(-s, φ);
       listener.point(0, φ);
       listener.point(s, φ);
     } else {
       listener.point(to[0], to[1]);
+    }
+  }
   function d3_geo_pointInPolygon(point, polygon) {
     var meridian = point[0], parallel = point[1], meridianNormal = [ Math.sin(meridian), -Math.cos(meridian), 0 ], polarAngle = 0, winding = 0;
     d3_geo_areaRingSum.reset();
     for (var i = 0, n = polygon.length; i < n; ++i) {
       var ring = polygon[i], m = ring.length;
       if (!m) continue;
       var point0 = ring[0], λ0 = point0[0], φ0 = point0[1] / 2 + π / 4, sinφ0 = Math.sin(φ0), cosφ0 = Math.cos(φ0), j = 1;
       while (true) {
         if (j === m) j = 0;
         point = ring[j];
         var λ = point[0], φ = point[1] / 2 + π / 4, sinφ = Math.sin(φ), cosφ = Math.cos(φ), dλ = λ - λ0, sdλ = dλ >= 0 ? 1 : -1, adλ = sdλ * dλ, antimeridian = adλ > π, k = sinφ0 * sinφ;
         d3_geo_areaRingSum.add(Math.atan2(k * sdλ * Math.sin(adλ), cosφ0 * cosφ + k * Math.cos(adλ)));
         polarAngle += antimeridian ? dλ + sdλ * τ : dλ;
         if (antimeridian ^ λ0 >= meridian ^ λ >= meridian) {
           var arc = d3_geo_cartesianCross(d3_geo_cartesian(point0), d3_geo_cartesian(point));
           d3_geo_cartesianNormalize(arc);
           var intersection = d3_geo_cartesianCross(meridianNormal, arc);
           d3_geo_cartesianNormalize(intersection);
           var φarc = (antimeridian ^ dλ >= 0 ? -1 : 1) * d3_asin(intersection[2]);
           if (parallel > φarc || parallel === φarc && (arc[0] || arc[1])) {
             winding += antimeridian ^ dλ >= 0 ? 1 : -1;
+          }
+        }
         if (!j++) break;
         λ0 = λ, sinφ0 = sinφ, cosφ0 = cosφ, point0 = point;
+      }
+    }
-    return (polarAngle < -ε || polarAngle < ε && d3_geo_areaRingSum < 0) ^ winding & 1;
+    return (polarAngle < -ε || polarAngle < ε && d3_geo_areaRingSum < -ε) ^ winding & 1;
+  }
   function d3_geo_clipCircle(radius) {
     var cr = Math.cos(radius), smallRadius = cr > 0, notHemisphere = abs(cr) > ε, interpolate = d3_geo_circleInterpolate(radius, 6 * d3_radians);
     return d3_geo_clip(visible, clipLine, interpolate, smallRadius ? [ 0, -radius ] : [ -π, radius - π ]);
     function visible(λ, φ) {
       return Math.cos(λ) * Math.cos(φ) > cr;
+    }
     function clipLine(listener) {
       var point0, c0, v0, v00, clean;
       return {
         lineStart: function() {
           v00 = v0 = false;
           clean = 1;
         },
         point: function(λ, φ) {
           var point1 = [ λ, φ ], point2, v = visible(λ, φ), c = smallRadius ? v ? 0 : code(λ, φ) : v ? code(λ + (λ < 0 ? π : -π), φ) : 0;
           if (!point0 && (v00 = v0 = v)) listener.lineStart();
           if (v !== v0) {
             point2 = intersect(point0, point1);
             if (d3_geo_sphericalEqual(point0, point2) || d3_geo_sphericalEqual(point1, point2)) {
               point1[0] += ε;
               point1[1] += ε;
               v = visible(point1[0], point1[1]);
+            }
+          }
           if (v !== v0) {
             clean = 0;
             if (v) {
               listener.lineStart();
               point2 = intersect(point1, point0);
               listener.point(point2[0], point2[1]);
             } else {
               point2 = intersect(point0, point1);
               listener.point(point2[0], point2[1]);
               listener.lineEnd();
+            }
             point0 = point2;
           } else if (notHemisphere && point0 && smallRadius ^ v) {
             var t;
             if (!(c & c0) && (t = intersect(point1, point0, true))) {
               clean = 0;
               if (smallRadius) {
                 listener.lineStart();
                 listener.point(t[0][0], t[0][1]);
                 listener.point(t[1][0], t[1][1]);
                 listener.lineEnd();
               } else {
                 listener.point(t[1][0], t[1][1]);
@@ @@ -5941,144 +5948,158 @@ @@
       if (string != null) {
         g.setAttribute("transform", string);
         var t = g.transform.baseVal.consolidate();
+      }
       return new d3_transform(t ? t.matrix : d3_transformIdentity);
     })(string);
   };
   function d3_transform(m) {
     var r0 = [ m.a, m.b ], r1 = [ m.c, m.d ], kx = d3_transformNormalize(r0), kz = d3_transformDot(r0, r1), ky = d3_transformNormalize(d3_transformCombine(r1, r0, -kz)) || 0;
     if (r0[0] * r1[1] < r1[0] * r0[1]) {
       r0[0] *= -1;
       r0[1] *= -1;
       kx *= -1;
       kz *= -1;
+    }
     this.rotate = (kx ? Math.atan2(r0[1], r0[0]) : Math.atan2(-r1[0], r1[1])) * d3_degrees;
     this.translate = [ m.e, m.f ];
     this.scale = [ kx, ky ];
     this.skew = ky ? Math.atan2(kz, ky) * d3_degrees : 0;
+  }
   d3_transform.prototype.toString = function() {
     return "translate(" + this.translate + ")rotate(" + this.rotate + ")skewX(" + this.skew + ")scale(" + this.scale + ")";
   };
   function d3_transformDot(a, b) {
     return a[0] * b[0] + a[1] * b[1];
+  }
   function d3_transformNormalize(a) {
     var k = Math.sqrt(d3_transformDot(a, a));
     if (k) {
       a[0] /= k;
       a[1] /= k;
+    }
     return k;
+  }
   function d3_transformCombine(a, b, k) {
     a[0] += k * b[0];
     a[1] += k * b[1];
     return a;
+  }
   var d3_transformIdentity = {
     a: 1,
     b: 0,
     c: 0,
     d: 1,
     e: 0,
     f: 0
   };
   d3.interpolateTransform = d3_interpolateTransform;
   function d3_interpolateTransform(a, b) {
     var s = [], q = [], n, A = d3.transform(a), B = d3.transform(b), ta = A.translate, tb = B.translate, ra = A.rotate, rb = B.rotate, wa = A.skew, wb = B.skew, ka = A.scale, kb = B.scale;
     if (ta[0] != tb[0] || ta[1] != tb[1]) {
       s.push("translate(", null, ",", null, ")");
   function d3_interpolateTransformPop(s) {
     return s.length ? s.pop() + "," : "";
+  }
   function d3_interpolateTranslate(ta, tb, s, q) {
     if (ta[0] !== tb[0] || ta[1] !== tb[1]) {
       var i = s.push("translate(", null, ",", null, ")");
       q.push({
-        i: 1,
+        i: i - 4,
         x: d3_interpolateNumber(ta[0], tb[0])
       }, {
-        i: 3,
+        i: i - 2,
         x: d3_interpolateNumber(ta[1], tb[1])
       });
     } else if (tb[0] || tb[1]) {
       s.push("translate(" + tb + ")");
     } else {
       s.push("");
+    }
     if (ra != rb) {
+    }
+  }
   function d3_interpolateRotate(ra, rb, s, q) {
     if (ra !== rb) {
       if (ra - rb > 180) rb += 360; else if (rb - ra > 180) ra += 360;
       q.push({
-        i: s.push(s.pop() + "rotate(", null, ")") - 2,
+        i: s.push(d3_interpolateTransformPop(s) + "rotate(", null, ")") - 2,
         x: d3_interpolateNumber(ra, rb)
       });
     } else if (rb) {
       s.push(s.pop() + "rotate(" + rb + ")");
+    }
     if (wa != wb) {
       s.push(d3_interpolateTransformPop(s) + "rotate(" + rb + ")");
+    }
+  }
   function d3_interpolateSkew(wa, wb, s, q) {
     if (wa !== wb) {
       q.push({
-        i: s.push(s.pop() + "skewX(", null, ")") - 2,
+        i: s.push(d3_interpolateTransformPop(s) + "skewX(", null, ")") - 2,
         x: d3_interpolateNumber(wa, wb)
       });
     } else if (wb) {
       s.push(s.pop() + "skewX(" + wb + ")");
+    }
     if (ka[0] != kb[0] || ka[1] != kb[1]) {
       n = s.push(s.pop() + "scale(", null, ",", null, ")");
       s.push(d3_interpolateTransformPop(s) + "skewX(" + wb + ")");
+    }
+  }
   function d3_interpolateScale(ka, kb, s, q) {
     if (ka[0] !== kb[0] || ka[1] !== kb[1]) {
       var i = s.push(d3_interpolateTransformPop(s) + "scale(", null, ",", null, ")");
       q.push({
-        i: n - 4,
+        i: i - 4,
         x: d3_interpolateNumber(ka[0], kb[0])
       }, {
-        i: n - 2,
+        i: i - 2,
         x: d3_interpolateNumber(ka[1], kb[1])
       });
     } else if (kb[0] != 1 || kb[1] != 1) {
       s.push(s.pop() + "scale(" + kb + ")");
+    }
     n = q.length;
     } else if (kb[0] !== 1 || kb[1] !== 1) {
       s.push(d3_interpolateTransformPop(s) + "scale(" + kb + ")");
+    }
+  }
   function d3_interpolateTransform(a, b) {
     var s = [], q = [];
     a = d3.transform(a), b = d3.transform(b);
     d3_interpolateTranslate(a.translate, b.translate, s, q);
     d3_interpolateRotate(a.rotate, b.rotate, s, q);
     d3_interpolateSkew(a.skew, b.skew, s, q);
     d3_interpolateScale(a.scale, b.scale, s, q);
     a = b = null;
     return function(t) {
       var i = -1, o;
+      var i = -1, n = q.length, o;
       while (++i < n) s[(o = q[i]).i] = o.x(t);
       return s.join("");
     };
+  }
   function d3_uninterpolateNumber(a, b) {
     b = (b -= a = +a) || 1 / b;
     return function(x) {
       return (x - a) / b;
     };
+  }
   function d3_uninterpolateClamp(a, b) {
     b = (b -= a = +a) || 1 / b;
     return function(x) {
       return Math.max(0, Math.min(1, (x - a) / b));
     };
+  }
   d3.layout = {};
   d3.layout.bundle = function() {
     return function(links) {
       var paths = [], i = -1, n = links.length;
       while (++i < n) paths.push(d3_layout_bundlePath(links[i]));
       return paths;
     };
   };
   function d3_layout_bundlePath(link) {
     var start = link.source, end = link.target, lca = d3_layout_bundleLeastCommonAncestor(start, end), points = [ start ];
     while (start !== lca) {
       start = start.parent;
       points.push(start);
+    }
     var k = points.length;
     while (end !== lca) {
       points.splice(k, 0, end);
       end = end.parent;
+    }
     return points;
+  }
   function d3_layout_bundleAncestors(node) {
     var ancestors = [], parent = node.parent;
     while (parent != null) {
       ancestors.push(node);
       node = parent;
       parent = parent.parent;
+    }
     ancestors.push(node);
     return ancestors;
+  }
   function d3_layout_bundleLeastCommonAncestor(a, b) {
@@ @@ -6092,308 +6113,317 @@ @@
     return sharedNode;
+  }
   d3.layout.chord = function() {
     var chord = {}, chords, groups, matrix, n, padding = 0, sortGroups, sortSubgroups, sortChords;
     function relayout() {
       var subgroups = {}, groupSums = [], groupIndex = d3.range(n), subgroupIndex = [], k, x, x0, i, j;
       chords = [];
       groups = [];
       k = 0, i = -1;
       while (++i < n) {
         x = 0, j = -1;
         while (++j < n) {
           x += matrix[i][j];
+        }
         groupSums.push(x);
         subgroupIndex.push(d3.range(n));
         k += x;
+      }
       if (sortGroups) {
         groupIndex.sort(function(a, b) {
           return sortGroups(groupSums[a], groupSums[b]);
         });
+      }
       if (sortSubgroups) {
         subgroupIndex.forEach(function(d, i) {
           d.sort(function(a, b) {
             return sortSubgroups(matrix[i][a], matrix[i][b]);
           });
         });
+      }
       k = (τ - padding * n) / k;
       x = 0, i = -1;
       while (++i < n) {
         x0 = x, j = -1;
         while (++j < n) {
           var di = groupIndex[i], dj = subgroupIndex[di][j], v = matrix[di][dj], a0 = x, a1 = x += v * k;
           subgroups[di + "-" + dj] = {
             index: di,
             subindex: dj,
             startAngle: a0,
             endAngle: a1,
             value: v
           };
+        }
         groups[di] = {
           index: di,
           startAngle: x0,
           endAngle: x,
-          value: (x - x0) / k
+          value: groupSums[di]
         };
         x += padding;
+      }
       i = -1;
       while (++i < n) {
         j = i - 1;
         while (++j < n) {
           var source = subgroups[i + "-" + j], target = subgroups[j + "-" + i];
           if (source.value || target.value) {
             chords.push(source.value < target.value ? {
               source: target,
               target: source
             } : {
               source: source,
               target: target
             });
+          }
+        }
+      }
       if (sortChords) resort();
+    }
     function resort() {
       chords.sort(function(a, b) {
         return sortChords((a.source.value + a.target.value) / 2, (b.source.value + b.target.value) / 2);
       });
+    }
     chord.matrix = function(x) {
       if (!arguments.length) return matrix;
       n = (matrix = x) && matrix.length;
       chords = groups = null;
       return chord;
     };
     chord.padding = function(x) {
       if (!arguments.length) return padding;
       padding = x;
       chords = groups = null;
       return chord;
     };
     chord.sortGroups = function(x) {
       if (!arguments.length) return sortGroups;
       sortGroups = x;
       chords = groups = null;
       return chord;
     };
     chord.sortSubgroups = function(x) {
       if (!arguments.length) return sortSubgroups;
       sortSubgroups = x;
       chords = null;
       return chord;
     };
     chord.sortChords = function(x) {
       if (!arguments.length) return sortChords;
       sortChords = x;
       if (chords) resort();
       return chord;
     };
     chord.chords = function() {
       if (!chords) relayout();
       return chords;
     };
     chord.groups = function() {
       if (!groups) relayout();
       return groups;
     };
     return chord;
   };
   d3.layout.force = function() {
     var force = {}, event = d3.dispatch("start", "tick", "end"), size = [ 1, 1 ], drag, alpha, friction = .9, linkDistance = d3_layout_forceLinkDistance, linkStrength = d3_layout_forceLinkStrength, charge = -30, chargeDistance2 = d3_layout_forceChargeDistance2, gravity = .1, theta2 = .64, nodes = [], links = [], distances, strengths, charges;
+    var force = {}, event = d3.dispatch("start", "tick", "end"), timer, size = [ 1, 1 ], drag, alpha, friction = .9, linkDistance = d3_layout_forceLinkDistance, linkStrength = d3_layout_forceLinkStrength, charge = -30, chargeDistance2 = d3_layout_forceChargeDistance2, gravity = .1, theta2 = .64, nodes = [], links = [], distances, strengths, charges;
     function repulse(node) {
       return function(quad, x1, _, x2) {
         if (quad.point !== node) {
           var dx = quad.cx - node.x, dy = quad.cy - node.y, dw = x2 - x1, dn = dx * dx + dy * dy;
           if (dw * dw / theta2 < dn) {
             if (dn < chargeDistance2) {
               var k = quad.charge / dn;
               node.px -= dx * k;
               node.py -= dy * k;
+            }
             return true;
+          }
           if (quad.point && dn && dn < chargeDistance2) {
             var k = quad.pointCharge / dn;
             node.px -= dx * k;
             node.py -= dy * k;
+          }
+        }
         return !quad.charge;
       };
+    }
     force.tick = function() {
       if ((alpha *= .99) < .005) {
         timer = null;
         event.end({
           type: "end",
           alpha: alpha = 0
         });
         return true;
+      }
       var n = nodes.length, m = links.length, q, i, o, s, t, l, k, x, y;
       for (i = 0; i < m; ++i) {
         o = links[i];
         s = o.source;
         t = o.target;
         x = t.x - s.x;
         y = t.y - s.y;
         if (l = x * x + y * y) {
           l = alpha * strengths[i] * ((l = Math.sqrt(l)) - distances[i]) / l;
           x *= l;
           y *= l;
-          t.x -= x * (k = s.weight / (t.weight + s.weight));
+          t.x -= x * (k = s.weight + t.weight ? s.weight / (s.weight + t.weight) : .5);
           t.y -= y * k;
           s.x += x * (k = 1 - k);
           s.y += y * k;
+        }
+      }
       if (k = alpha * gravity) {
         x = size[0] / 2;
         y = size[1] / 2;
         i = -1;
         if (k) while (++i < n) {
           o = nodes[i];
           o.x += (x - o.x) * k;
           o.y += (y - o.y) * k;
+        }
+      }
       if (charge) {
         d3_layout_forceAccumulate(q = d3.geom.quadtree(nodes), alpha, charges);
         i = -1;
         while (++i < n) {
           if (!(o = nodes[i]).fixed) {
             q.visit(repulse(o));
+          }
+        }
+      }
       i = -1;
       while (++i < n) {
         o = nodes[i];
         if (o.fixed) {
           o.x = o.px;
           o.y = o.py;
         } else {
           o.x -= (o.px - (o.px = o.x)) * friction;
           o.y -= (o.py - (o.py = o.y)) * friction;
+        }
+      }
       event.tick({
         type: "tick",
         alpha: alpha
       });
     };
     force.nodes = function(x) {
       if (!arguments.length) return nodes;
       nodes = x;
       return force;
     };
     force.links = function(x) {
       if (!arguments.length) return links;
       links = x;
       return force;
     };
     force.size = function(x) {
       if (!arguments.length) return size;
       size = x;
       return force;
     };
     force.linkDistance = function(x) {
       if (!arguments.length) return linkDistance;
       linkDistance = typeof x === "function" ? x : +x;
       return force;
     };
     force.distance = force.linkDistance;
     force.linkStrength = function(x) {
       if (!arguments.length) return linkStrength;
       linkStrength = typeof x === "function" ? x : +x;
       return force;
     };
     force.friction = function(x) {
       if (!arguments.length) return friction;
       friction = +x;
       return force;
     };
     force.charge = function(x) {
       if (!arguments.length) return charge;
       charge = typeof x === "function" ? x : +x;
       return force;
     };
     force.chargeDistance = function(x) {
       if (!arguments.length) return Math.sqrt(chargeDistance2);
       chargeDistance2 = x * x;
       return force;
     };
     force.gravity = function(x) {
       if (!arguments.length) return gravity;
       gravity = +x;
       return force;
     };
     force.theta = function(x) {
       if (!arguments.length) return Math.sqrt(theta2);
       theta2 = x * x;
       return force;
     };
     force.alpha = function(x) {
       if (!arguments.length) return alpha;
       x = +x;
       if (alpha) {
         if (x > 0) alpha = x; else alpha = 0;
         if (x > 0) {
           alpha = x;
         } else {
           timer.c = null, timer.t = NaN, timer = null;
           event.end({
             type: "end",
             alpha: alpha = 0
           });
+        }
       } else if (x > 0) {
         event.start({
           type: "start",
           alpha: alpha = x
         });
-        d3.timer(force.tick);
+        timer = d3_timer(force.tick);
+      }
       return force;
     };
     force.start = function() {
       var i, n = nodes.length, m = links.length, w = size[0], h = size[1], neighbors, o;
       for (i = 0; i < n; ++i) {
         (o = nodes[i]).index = i;
         o.weight = 0;
+      }
       for (i = 0; i < m; ++i) {
         o = links[i];
         if (typeof o.source == "number") o.source = nodes[o.source];
         if (typeof o.target == "number") o.target = nodes[o.target];
         ++o.source.weight;
         ++o.target.weight;
+      }
       for (i = 0; i < n; ++i) {
         o = nodes[i];
         if (isNaN(o.x)) o.x = position("x", w);
         if (isNaN(o.y)) o.y = position("y", h);
         if (isNaN(o.px)) o.px = o.x;
         if (isNaN(o.py)) o.py = o.y;
+      }
       distances = [];
       if (typeof linkDistance === "function") for (i = 0; i < m; ++i) distances[i] = +linkDistance.call(this, links[i], i); else for (i = 0; i < m; ++i) distances[i] = linkDistance;
       strengths = [];
       if (typeof linkStrength === "function") for (i = 0; i < m; ++i) strengths[i] = +linkStrength.call(this, links[i], i); else for (i = 0; i < m; ++i) strengths[i] = linkStrength;
       charges = [];
       if (typeof charge === "function") for (i = 0; i < n; ++i) charges[i] = +charge.call(this, nodes[i], i); else for (i = 0; i < n; ++i) charges[i] = charge;
       function position(dimension, size) {
         if (!neighbors) {
           neighbors = new Array(n);
           for (j = 0; j < n; ++j) {
             neighbors[j] = [];
+          }
           for (j = 0; j < m; ++j) {
             var o = links[j];
             neighbors[o.source.index].push(o.target);
             neighbors[o.target.index].push(o.source);
+          }
+        }
         var candidates = neighbors[i], j = -1, l = candidates.length, x;
         while (++j < l) if (!isNaN(x = candidates[j][dimension])) return x;
         return Math.random() * size;
+      }
       return force.resume();
     };
     force.resume = function() {
@@ @@ -6557,97 +6587,97 @@ @@
           source: parent,
           target: child
         };
       });
     }));
+  }
   d3.layout.partition = function() {
     var hierarchy = d3.layout.hierarchy(), size = [ 1, 1 ];
     function position(node, x, dx, dy) {
       var children = node.children;
       node.x = x;
       node.y = node.depth * dy;
       node.dx = dx;
       node.dy = dy;
       if (children && (n = children.length)) {
         var i = -1, n, c, d;
         dx = node.value ? dx / node.value : 0;
         while (++i < n) {
           position(c = children[i], x, d = c.value * dx, dy);
           x += d;
+        }
+      }
+    }
     function depth(node) {
       var children = node.children, d = 0;
       if (children && (n = children.length)) {
         var i = -1, n;
         while (++i < n) d = Math.max(d, depth(children[i]));
+      }
       return 1 + d;
+    }
     function partition(d, i) {
       var nodes = hierarchy.call(this, d, i);
       position(nodes[0], 0, size[0], size[1] / depth(nodes[0]));
       return nodes;
+    }
     partition.size = function(x) {
       if (!arguments.length) return size;
       size = x;
       return partition;
     };
     return d3_layout_hierarchyRebind(partition, hierarchy);
   };
   d3.layout.pie = function() {
     var value = Number, sort = d3_layout_pieSortByValue, startAngle = 0, endAngle = τ, padAngle = 0;
     function pie(data) {
       var n = data.length, values = data.map(function(d, i) {
         return +value.call(pie, d, i);
-      }), a = +(typeof startAngle === "function" ? startAngle.apply(this, arguments) : startAngle), da = (typeof endAngle === "function" ? endAngle.apply(this, arguments) : endAngle) - a, p = Math.min(Math.abs(da) / n, +(typeof padAngle === "function" ? padAngle.apply(this, arguments) : padAngle)), pa = p * (da < 0 ? -1 : 1), k = (da - n * pa) / d3.sum(values), index = d3.range(n), arcs = [], v;
+      }), a = +(typeof startAngle === "function" ? startAngle.apply(this, arguments) : startAngle), da = (typeof endAngle === "function" ? endAngle.apply(this, arguments) : endAngle) - a, p = Math.min(Math.abs(da) / n, +(typeof padAngle === "function" ? padAngle.apply(this, arguments) : padAngle)), pa = p * (da < 0 ? -1 : 1), sum = d3.sum(values), k = sum ? (da - n * pa) / sum : 0, index = d3.range(n), arcs = [], v;
       if (sort != null) index.sort(sort === d3_layout_pieSortByValue ? function(i, j) {
         return values[j] - values[i];
       } : function(i, j) {
         return sort(data[i], data[j]);
       });
       index.forEach(function(i) {
         arcs[i] = {
           data: data[i],
           value: v = values[i],
           startAngle: a,
           endAngle: a += v * k + pa,
           padAngle: p
         };
       });
       return arcs;
+    }
     pie.value = function(_) {
       if (!arguments.length) return value;
       value = _;
       return pie;
     };
     pie.sort = function(_) {
       if (!arguments.length) return sort;
       sort = _;
       return pie;
     };
     pie.startAngle = function(_) {
       if (!arguments.length) return startAngle;
       startAngle = _;
       return pie;
     };
     pie.endAngle = function(_) {
       if (!arguments.length) return endAngle;
       endAngle = _;
       return pie;
     };
     pie.padAngle = function(_) {
       if (!arguments.length) return padAngle;
       padAngle = _;
       return pie;
     };
     return pie;
   };
   var d3_layout_pieSortByValue = {};
   d3.layout.stack = function() {
     var values = d3_identity, order = d3_layout_stackOrderDefault, offset = d3_layout_stackOffsetZero, out = d3_layout_stackOut, x = d3_layout_stackX, y = d3_layout_stackY;
     function stack(data, index) {
       if (!(n = data.length)) return data;
@@ @@ -7270,100 +7300,98 @@ @@
+          }
+        }
         children.forEach(stickify);
+      }
+    }
     function worst(row, u) {
       var s = row.area, r, rmax = 0, rmin = Infinity, i = -1, n = row.length;
       while (++i < n) {
         if (!(r = row[i].area)) continue;
         if (r < rmin) rmin = r;
         if (r > rmax) rmax = r;
+      }
       s *= s;
       u *= u;
       return s ? Math.max(u * rmax * ratio / s, s / (u * rmin * ratio)) : Infinity;
+    }
     function position(row, u, rect, flush) {
       var i = -1, n = row.length, x = rect.x, y = rect.y, v = u ? round(row.area / u) : 0, o;
       if (u == rect.dx) {
         if (flush || v > rect.dy) v = rect.dy;
         while (++i < n) {
           o = row[i];
           o.x = x;
           o.y = y;
           o.dy = v;
           x += o.dx = Math.min(rect.x + rect.dx - x, v ? round(o.area / v) : 0);
+        }
         o.z = true;
         o.dx += rect.x + rect.dx - x;
         rect.y += v;
         rect.dy -= v;
       } else {
         if (flush || v > rect.dx) v = rect.dx;
         while (++i < n) {
           o = row[i];
           o.x = x;
           o.y = y;
           o.dx = v;
           y += o.dy = Math.min(rect.y + rect.dy - y, v ? round(o.area / v) : 0);
+        }
         o.z = false;
         o.dy += rect.y + rect.dy - y;
         rect.x += v;
         rect.dx -= v;
+      }
+    }
     function treemap(d) {
       var nodes = stickies || hierarchy(d), root = nodes[0];
       root.x = 0;
       root.y = 0;
       root.dx = size[0];
       root.dy = size[1];
       root.x = root.y = 0;
       if (root.value) root.dx = size[0], root.dy = size[1]; else root.dx = root.dy = 0;
       if (stickies) hierarchy.revalue(root);
       scale([ root ], root.dx * root.dy / root.value);
       (stickies ? stickify : squarify)(root);
       if (sticky) stickies = nodes;
       return nodes;
+    }
     treemap.size = function(x) {
       if (!arguments.length) return size;
       size = x;
       return treemap;
     };
     treemap.padding = function(x) {
       if (!arguments.length) return padding;
       function padFunction(node) {
         var p = x.call(treemap, node, node.depth);
         return p == null ? d3_layout_treemapPadNull(node) : d3_layout_treemapPad(node, typeof p === "number" ? [ p, p, p, p ] : p);
+      }
       function padConstant(node) {
         return d3_layout_treemapPad(node, x);
+      }
       var type;
       pad = (padding = x) == null ? d3_layout_treemapPadNull : (type = typeof x) === "function" ? padFunction : type === "number" ? (x = [ x, x, x, x ],
       padConstant) : padConstant;
       return treemap;
     };
     treemap.round = function(x) {
       if (!arguments.length) return round != Number;
       round = x ? Math.round : Number;
       return treemap;
     };
     treemap.sticky = function(x) {
       if (!arguments.length) return sticky;
       sticky = x;
       stickies = null;
       return treemap;
     };
     treemap.ratio = function(x) {
       if (!arguments.length) return ratio;
       ratio = x;
       return treemap;
     };
     treemap.mode = function(x) {
       if (!arguments.length) return mode;
       mode = x + "";
       return treemap;
     };
     return d3_layout_hierarchyRebind(treemap, hierarchy);
   };
@@ @@ -7493,97 +7521,99 @@ @@
     function scale(x) {
       return output(x);
+    }
     scale.invert = function(y) {
       return input(y);
     };
     scale.domain = function(x) {
       if (!arguments.length) return domain;
       domain = x.map(Number);
       return rescale();
     };
     scale.range = function(x) {
       if (!arguments.length) return range;
       range = x;
       return rescale();
     };
     scale.rangeRound = function(x) {
       return scale.range(x).interpolate(d3_interpolateRound);
     };
     scale.clamp = function(x) {
       if (!arguments.length) return clamp;
       clamp = x;
       return rescale();
     };
     scale.interpolate = function(x) {
       if (!arguments.length) return interpolate;
       interpolate = x;
       return rescale();
     };
     scale.ticks = function(m) {
       return d3_scale_linearTicks(domain, m);
     };
     scale.tickFormat = function(m, format) {
       return d3_scale_linearTickFormat(domain, m, format);
     };
     scale.nice = function(m) {
       d3_scale_linearNice(domain, m);
       return rescale();
     };
     scale.copy = function() {
       return d3_scale_linear(domain, range, interpolate, clamp);
     };
     return rescale();
+  }
   function d3_scale_linearRebind(scale, linear) {
     return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
+  }
   function d3_scale_linearNice(domain, m) {
     return d3_scale_nice(domain, d3_scale_niceStep(d3_scale_linearTickRange(domain, m)[2]));
     d3_scale_nice(domain, d3_scale_niceStep(d3_scale_linearTickRange(domain, m)[2]));
     d3_scale_nice(domain, d3_scale_niceStep(d3_scale_linearTickRange(domain, m)[2]));
     return domain;
+  }
   function d3_scale_linearTickRange(domain, m) {
     if (m == null) m = 10;
     var extent = d3_scaleExtent(domain), span = extent[1] - extent[0], step = Math.pow(10, Math.floor(Math.log(span / m) / Math.LN10)), err = m / span * step;
     if (err <= .15) step *= 10; else if (err <= .35) step *= 5; else if (err <= .75) step *= 2;
     extent[0] = Math.ceil(extent[0] / step) * step;
     extent[1] = Math.floor(extent[1] / step) * step + step * .5;
     extent[2] = step;
     return extent;
+  }
   function d3_scale_linearTicks(domain, m) {
     return d3.range.apply(d3, d3_scale_linearTickRange(domain, m));
+  }
   function d3_scale_linearTickFormat(domain, m, format) {
     var range = d3_scale_linearTickRange(domain, m);
     if (format) {
       var match = d3_format_re.exec(format);
       match.shift();
       if (match[8] === "s") {
         var prefix = d3.formatPrefix(Math.max(abs(range[0]), abs(range[1])));
         if (!match[7]) match[7] = "." + d3_scale_linearPrecision(prefix.scale(range[2]));
         match[8] = "f";
         format = d3.format(match.join(""));
         return function(d) {
           return format(prefix.scale(d)) + prefix.symbol;
         };
+      }
       if (!match[7]) match[7] = "." + d3_scale_linearFormatPrecision(match[8], range);
       format = match.join("");
     } else {
       format = ",." + d3_scale_linearPrecision(range[2]) + "f";
+    }
     return d3.format(format);
+  }
   var d3_scale_linearFormatSignificant = {
     s: 1,
     g: 1,
     p: 1,
     r: 1,
     e: 1
   };
   function d3_scale_linearPrecision(value) {
     return -Math.floor(Math.log(value) / Math.LN10 + .01);
+  }
   function d3_scale_linearFormatPrecision(type, range) {
     var p = d3_scale_linearPrecision(range[2]);
     return type in d3_scale_linearFormatSignificant ? Math.abs(p - d3_scale_linearPrecision(Math.max(abs(range[0]), abs(range[1])))) + +(type !== "e") : p - (type === "%") * 2;
+  }
@@ @@ -7595,100 +7625,101 @@ @@
       return (positive ? Math.log(x < 0 ? 0 : x) : -Math.log(x > 0 ? 0 : -x)) / Math.log(base);
+    }
     function pow(x) {
       return positive ? Math.pow(base, x) : -Math.pow(base, -x);
+    }
     function scale(x) {
       return linear(log(x));
+    }
     scale.invert = function(x) {
       return pow(linear.invert(x));
     };
     scale.domain = function(x) {
       if (!arguments.length) return domain;
       positive = x[0] >= 0;
       linear.domain((domain = x.map(Number)).map(log));
       return scale;
     };
     scale.base = function(_) {
       if (!arguments.length) return base;
       base = +_;
       linear.domain(domain.map(log));
       return scale;
     };
     scale.nice = function() {
       var niced = d3_scale_nice(domain.map(log), positive ? Math : d3_scale_logNiceNegative);
       linear.domain(niced);
       domain = niced.map(pow);
       return scale;
     };
     scale.ticks = function() {
       var extent = d3_scaleExtent(domain), ticks = [], u = extent[0], v = extent[1], i = Math.floor(log(u)), j = Math.ceil(log(v)), n = base % 1 ? 2 : base;
       if (isFinite(j - i)) {
         if (positive) {
           for (;i < j; i++) for (var k = 1; k < n; k++) ticks.push(pow(i) * k);
           ticks.push(pow(i));
         } else {
           ticks.push(pow(i));
           for (;i++ < j; ) for (var k = n - 1; k > 0; k--) ticks.push(pow(i) * k);
+        }
         for (i = 0; ticks[i] < u; i++) {}
         for (j = ticks.length; ticks[j - 1] > v; j--) {}
         ticks = ticks.slice(i, j);
+      }
       return ticks;
     };
     scale.tickFormat = function(n, format) {
       if (!arguments.length) return d3_scale_logFormat;
       if (arguments.length < 2) format = d3_scale_logFormat; else if (typeof format !== "function") format = d3.format(format);
       var k = Math.max(.1, n / scale.ticks().length), f = positive ? (e = 1e-12, Math.ceil) : (e = -1e-12,
       Math.floor), e;
       var k = Math.max(1, base * n / scale.ticks().length);
       return function(d) {
         return d / pow(f(log(d) + e)) <= k ? format(d) : "";
         var i = d / pow(Math.round(log(d)));
         if (i * base < base - .5) i *= base;
         return i <= k ? format(d) : "";
       };
     };
     scale.copy = function() {
       return d3_scale_log(linear.copy(), base, positive, domain);
     };
     return d3_scale_linearRebind(scale, linear);
+  }
   var d3_scale_logFormat = d3.format(".0e"), d3_scale_logNiceNegative = {
     floor: function(x) {
       return -Math.ceil(-x);
     },
     ceil: function(x) {
       return -Math.floor(-x);
+    }
   };
   d3.scale.pow = function() {
     return d3_scale_pow(d3.scale.linear(), 1, [ 0, 1 ]);
   };
   function d3_scale_pow(linear, exponent, domain) {
     var powp = d3_scale_powPow(exponent), powb = d3_scale_powPow(1 / exponent);
     function scale(x) {
       return linear(powp(x));
+    }
     scale.invert = function(x) {
       return powb(linear.invert(x));
     };
     scale.domain = function(x) {
       if (!arguments.length) return domain;
       linear.domain((domain = x.map(Number)).map(powp));
       return scale;
     };
     scale.ticks = function(m) {
       return d3_scale_linearTicks(domain, m);
     };
     scale.tickFormat = function(m, format) {
       return d3_scale_linearTickFormat(domain, m, format);
     };
     scale.nice = function(m) {
       return scale.domain(d3_scale_linearNice(domain, m));
     };
     scale.exponent = function(x) {
       if (!arguments.length) return exponent;
       powp = d3_scale_powPow(exponent = x);
       powb = d3_scale_powPow(1 / exponent);
       linear.domain(domain.map(powp));
       return scale;
     };
     scale.copy = function() {
@@ @@ -7937,290 +7968,295 @@ @@
+  }
   d3.svg = {};
   function d3_zero() {
     return 0;
+  }
   d3.svg.arc = function() {
     var innerRadius = d3_svg_arcInnerRadius, outerRadius = d3_svg_arcOuterRadius, cornerRadius = d3_zero, padRadius = d3_svg_arcAuto, startAngle = d3_svg_arcStartAngle, endAngle = d3_svg_arcEndAngle, padAngle = d3_svg_arcPadAngle;
     function arc() {
       var r0 = Math.max(0, +innerRadius.apply(this, arguments)), r1 = Math.max(0, +outerRadius.apply(this, arguments)), a0 = startAngle.apply(this, arguments) - halfπ, a1 = endAngle.apply(this, arguments) - halfπ, da = Math.abs(a1 - a0), cw = a0 > a1 ? 0 : 1;
       if (r1 < r0) rc = r1, r1 = r0, r0 = rc;
       if (da >= τε) return circleSegment(r1, cw) + (r0 ? circleSegment(r0, 1 - cw) : "") + "Z";
       var rc, cr, rp, ap, p0 = 0, p1 = 0, x0, y0, x1, y1, x2, y2, x3, y3, path = [];
       if (ap = (+padAngle.apply(this, arguments) || 0) / 2) {
         rp = padRadius === d3_svg_arcAuto ? Math.sqrt(r0 * r0 + r1 * r1) : +padRadius.apply(this, arguments);
         if (!cw) p1 *= -1;
         if (r1) p1 = d3_asin(rp / r1 * Math.sin(ap));
         if (r0) p0 = d3_asin(rp / r0 * Math.sin(ap));
+      }
       if (r1) {
         x0 = r1 * Math.cos(a0 + p1);
         y0 = r1 * Math.sin(a0 + p1);
         x1 = r1 * Math.cos(a1 - p1);
         y1 = r1 * Math.sin(a1 - p1);
         var l1 = Math.abs(a1 - a0 - 2 * p1) <= π ? 0 : 1;
         if (p1 && d3_svg_arcSweep(x0, y0, x1, y1) === cw ^ l1) {
           var h1 = (a0 + a1) / 2;
           x0 = r1 * Math.cos(h1);
           y0 = r1 * Math.sin(h1);
           x1 = y1 = null;
+        }
       } else {
         x0 = y0 = 0;
+      }
       if (r0) {
         x2 = r0 * Math.cos(a1 - p0);
         y2 = r0 * Math.sin(a1 - p0);
         x3 = r0 * Math.cos(a0 + p0);
         y3 = r0 * Math.sin(a0 + p0);
         var l0 = Math.abs(a0 - a1 + 2 * p0) <= π ? 0 : 1;
         if (p0 && d3_svg_arcSweep(x2, y2, x3, y3) === 1 - cw ^ l0) {
           var h0 = (a0 + a1) / 2;
           x2 = r0 * Math.cos(h0);
           y2 = r0 * Math.sin(h0);
           x3 = y3 = null;
+        }
       } else {
         x2 = y2 = 0;
+      }
       if ((rc = Math.min(Math.abs(r1 - r0) / 2, +cornerRadius.apply(this, arguments))) > .001) {
+      if (da > ε && (rc = Math.min(Math.abs(r1 - r0) / 2, +cornerRadius.apply(this, arguments))) > .001) {
         cr = r0 < r1 ^ cw ? 0 : 1;
         var oc = x3 == null ? [ x2, y2 ] : x1 == null ? [ x0, y0 ] : d3_geom_polygonIntersect([ x0, y0 ], [ x3, y3 ], [ x1, y1 ], [ x2, y2 ]), ax = x0 - oc[0], ay = y0 - oc[1], bx = x1 - oc[0], by = y1 - oc[1], kc = 1 / Math.sin(Math.acos((ax * bx + ay * by) / (Math.sqrt(ax * ax + ay * ay) * Math.sqrt(bx * bx + by * by))) / 2), lc = Math.sqrt(oc[0] * oc[0] + oc[1] * oc[1]);
         var rc1 = rc, rc0 = rc;
         if (da < π) {
           var oc = x3 == null ? [ x2, y2 ] : x1 == null ? [ x0, y0 ] : d3_geom_polygonIntersect([ x0, y0 ], [ x3, y3 ], [ x1, y1 ], [ x2, y2 ]), ax = x0 - oc[0], ay = y0 - oc[1], bx = x1 - oc[0], by = y1 - oc[1], kc = 1 / Math.sin(Math.acos((ax * bx + ay * by) / (Math.sqrt(ax * ax + ay * ay) * Math.sqrt(bx * bx + by * by))) / 2), lc = Math.sqrt(oc[0] * oc[0] + oc[1] * oc[1]);
           rc0 = Math.min(rc, (r0 - lc) / (kc - 1));
           rc1 = Math.min(rc, (r1 - lc) / (kc + 1));
+        }
         if (x1 != null) {
-          var rc1 = Math.min(rc, (r1 - lc) / (kc + 1)), t30 = d3_svg_arcCornerTangents(x3 == null ? [ x2, y2 ] : [ x3, y3 ], [ x0, y0 ], r1, rc1, cw), t12 = d3_svg_arcCornerTangents([ x1, y1 ], [ x2, y2 ], r1, rc1, cw);
           var t30 = d3_svg_arcCornerTangents(x3 == null ? [ x2, y2 ] : [ x3, y3 ], [ x0, y0 ], r1, rc1, cw), t12 = d3_svg_arcCornerTangents([ x1, y1 ], [ x2, y2 ], r1, rc1, cw);
           if (rc === rc1) {
             path.push("M", t30[0], "A", rc1, ",", rc1, " 0 0,", cr, " ", t30[1], "A", r1, ",", r1, " 0 ", 1 - cw ^ d3_svg_arcSweep(t30[1][0], t30[1][1], t12[1][0], t12[1][1]), ",", cw, " ", t12[1], "A", rc1, ",", rc1, " 0 0,", cr, " ", t12[0]);
           } else {
             path.push("M", t30[0], "A", rc1, ",", rc1, " 0 1,", cr, " ", t12[0]);
+          }
         } else {
           path.push("M", x0, ",", y0);
+        }
         if (x3 != null) {
-          var rc0 = Math.min(rc, (r0 - lc) / (kc - 1)), t03 = d3_svg_arcCornerTangents([ x0, y0 ], [ x3, y3 ], r0, -rc0, cw), t21 = d3_svg_arcCornerTangents([ x2, y2 ], x1 == null ? [ x0, y0 ] : [ x1, y1 ], r0, -rc0, cw);
           var t03 = d3_svg_arcCornerTangents([ x0, y0 ], [ x3, y3 ], r0, -rc0, cw), t21 = d3_svg_arcCornerTangents([ x2, y2 ], x1 == null ? [ x0, y0 ] : [ x1, y1 ], r0, -rc0, cw);
           if (rc === rc0) {
             path.push("L", t21[0], "A", rc0, ",", rc0, " 0 0,", cr, " ", t21[1], "A", r0, ",", r0, " 0 ", cw ^ d3_svg_arcSweep(t21[1][0], t21[1][1], t03[1][0], t03[1][1]), ",", 1 - cw, " ", t03[1], "A", rc0, ",", rc0, " 0 0,", cr, " ", t03[0]);
           } else {
             path.push("L", t21[0], "A", rc0, ",", rc0, " 0 0,", cr, " ", t03[0]);
+          }
         } else {
           path.push("L", x2, ",", y2);
+        }
       } else {
         path.push("M", x0, ",", y0);
         if (x1 != null) path.push("A", r1, ",", r1, " 0 ", l1, ",", cw, " ", x1, ",", y1);
         path.push("L", x2, ",", y2);
         if (x3 != null) path.push("A", r0, ",", r0, " 0 ", l0, ",", 1 - cw, " ", x3, ",", y3);
+      }
       path.push("Z");
       return path.join("");
+    }
     function circleSegment(r1, cw) {
       return "M0," + r1 + "A" + r1 + "," + r1 + " 0 1," + cw + " 0," + -r1 + "A" + r1 + "," + r1 + " 0 1," + cw + " 0," + r1;
+    }
     arc.innerRadius = function(v) {
       if (!arguments.length) return innerRadius;
       innerRadius = d3_functor(v);
       return arc;
     };
     arc.outerRadius = function(v) {
       if (!arguments.length) return outerRadius;
       outerRadius = d3_functor(v);
       return arc;
     };
     arc.cornerRadius = function(v) {
       if (!arguments.length) return cornerRadius;
       cornerRadius = d3_functor(v);
       return arc;
     };
     arc.padRadius = function(v) {
       if (!arguments.length) return padRadius;
       padRadius = v == d3_svg_arcAuto ? d3_svg_arcAuto : d3_functor(v);
       return arc;
     };
     arc.startAngle = function(v) {
       if (!arguments.length) return startAngle;
       startAngle = d3_functor(v);
       return arc;
     };
     arc.endAngle = function(v) {
       if (!arguments.length) return endAngle;
       endAngle = d3_functor(v);
       return arc;
     };
     arc.padAngle = function(v) {
       if (!arguments.length) return padAngle;
       padAngle = d3_functor(v);
       return arc;
     };
     arc.centroid = function() {
       var r = (+innerRadius.apply(this, arguments) + +outerRadius.apply(this, arguments)) / 2, a = (+startAngle.apply(this, arguments) + +endAngle.apply(this, arguments)) / 2 - halfπ;
       return [ Math.cos(a) * r, Math.sin(a) * r ];
     };
     return arc;
   };
   var d3_svg_arcAuto = "auto";
   function d3_svg_arcInnerRadius(d) {
     return d.innerRadius;
+  }
   function d3_svg_arcOuterRadius(d) {
     return d.outerRadius;
+  }
   function d3_svg_arcStartAngle(d) {
     return d.startAngle;
+  }
   function d3_svg_arcEndAngle(d) {
     return d.endAngle;
+  }
   function d3_svg_arcPadAngle(d) {
     return d && d.padAngle;
+  }
   function d3_svg_arcSweep(x0, y0, x1, y1) {
     return (x0 - x1) * y0 - (y0 - y1) * x0 > 0 ? 0 : 1;
+  }
   function d3_svg_arcCornerTangents(p0, p1, r1, rc, cw) {
     var x01 = p0[0] - p1[0], y01 = p0[1] - p1[1], lo = (cw ? rc : -rc) / Math.sqrt(x01 * x01 + y01 * y01), ox = lo * y01, oy = -lo * x01, x1 = p0[0] + ox, y1 = p0[1] + oy, x2 = p1[0] + ox, y2 = p1[1] + oy, x3 = (x1 + x2) / 2, y3 = (y1 + y2) / 2, dx = x2 - x1, dy = y2 - y1, d2 = dx * dx + dy * dy, r = r1 - rc, D = x1 * y2 - x2 * y1, d = (dy < 0 ? -1 : 1) * Math.sqrt(r * r * d2 - D * D), cx0 = (D * dy - dx * d) / d2, cy0 = (-D * dx - dy * d) / d2, cx1 = (D * dy + dx * d) / d2, cy1 = (-D * dx + dy * d) / d2, dx0 = cx0 - x3, dy0 = cy0 - y3, dx1 = cx1 - x3, dy1 = cy1 - y3;
+    var x01 = p0[0] - p1[0], y01 = p0[1] - p1[1], lo = (cw ? rc : -rc) / Math.sqrt(x01 * x01 + y01 * y01), ox = lo * y01, oy = -lo * x01, x1 = p0[0] + ox, y1 = p0[1] + oy, x2 = p1[0] + ox, y2 = p1[1] + oy, x3 = (x1 + x2) / 2, y3 = (y1 + y2) / 2, dx = x2 - x1, dy = y2 - y1, d2 = dx * dx + dy * dy, r = r1 - rc, D = x1 * y2 - x2 * y1, d = (dy < 0 ? -1 : 1) * Math.sqrt(Math.max(0, r * r * d2 - D * D)), cx0 = (D * dy - dx * d) / d2, cy0 = (-D * dx - dy * d) / d2, cx1 = (D * dy + dx * d) / d2, cy1 = (-D * dx + dy * d) / d2, dx0 = cx0 - x3, dy0 = cy0 - y3, dx1 = cx1 - x3, dy1 = cy1 - y3;
     if (dx0 * dx0 + dy0 * dy0 > dx1 * dx1 + dy1 * dy1) cx0 = cx1, cy0 = cy1;
     return [ [ cx0 - ox, cy0 - oy ], [ cx0 * r1 / r, cy0 * r1 / r ] ];
+  }
   function d3_svg_line(projection) {
     var x = d3_geom_pointX, y = d3_geom_pointY, defined = d3_true, interpolate = d3_svg_lineLinear, interpolateKey = interpolate.key, tension = .7;
     function line(data) {
       var segments = [], points = [], i = -1, n = data.length, d, fx = d3_functor(x), fy = d3_functor(y);
       function segment() {
         segments.push("M", interpolate(projection(points), tension));
+      }
       while (++i < n) {
         if (defined.call(this, d = data[i], i)) {
           points.push([ +fx.call(this, d, i), +fy.call(this, d, i) ]);
         } else if (points.length) {
           segment();
           points = [];
+        }
+      }
       if (points.length) segment();
       return segments.length ? segments.join("") : null;
+    }
     line.x = function(_) {
       if (!arguments.length) return x;
       x = _;
       return line;
     };
     line.y = function(_) {
       if (!arguments.length) return y;
       y = _;
       return line;
     };
     line.defined = function(_) {
       if (!arguments.length) return defined;
       defined = _;
       return line;
     };
     line.interpolate = function(_) {
       if (!arguments.length) return interpolateKey;
       if (typeof _ === "function") interpolateKey = interpolate = _; else interpolateKey = (interpolate = d3_svg_lineInterpolators.get(_) || d3_svg_lineLinear).key;
       return line;
     };
     line.tension = function(_) {
       if (!arguments.length) return tension;
       tension = _;
       return line;
     };
     return line;
+  }
   d3.svg.line = function() {
     return d3_svg_line(d3_identity);
   };
   var d3_svg_lineInterpolators = d3.map({
     linear: d3_svg_lineLinear,
     "linear-closed": d3_svg_lineLinearClosed,
     step: d3_svg_lineStep,
     "step-before": d3_svg_lineStepBefore,
     "step-after": d3_svg_lineStepAfter,
     basis: d3_svg_lineBasis,
     "basis-open": d3_svg_lineBasisOpen,
     "basis-closed": d3_svg_lineBasisClosed,
     bundle: d3_svg_lineBundle,
     cardinal: d3_svg_lineCardinal,
     "cardinal-open": d3_svg_lineCardinalOpen,
     "cardinal-closed": d3_svg_lineCardinalClosed,
     monotone: d3_svg_lineMonotone
   });
   d3_svg_lineInterpolators.forEach(function(key, value) {
     value.key = key;
     value.closed = /-closed$/.test(key);
   });
   function d3_svg_lineLinear(points) {
     return points.join("L");
+    return points.length > 1 ? points.join("L") : points + "Z";
+  }
   function d3_svg_lineLinearClosed(points) {
-    return d3_svg_lineLinear(points) + "Z";
+    return points.join("L") + "Z";
+  }
   function d3_svg_lineStep(points) {
     var i = 0, n = points.length, p = points[0], path = [ p[0], ",", p[1] ];
     while (++i < n) path.push("H", (p[0] + (p = points[i])[0]) / 2, "V", p[1]);
     if (n > 1) path.push("H", p[0]);
     return path.join("");
+  }
   function d3_svg_lineStepBefore(points) {
     var i = 0, n = points.length, p = points[0], path = [ p[0], ",", p[1] ];
     while (++i < n) path.push("V", (p = points[i])[1], "H", p[0]);
     return path.join("");
+  }
   function d3_svg_lineStepAfter(points) {
     var i = 0, n = points.length, p = points[0], path = [ p[0], ",", p[1] ];
     while (++i < n) path.push("H", (p = points[i])[0], "V", p[1]);
     return path.join("");
+  }
   function d3_svg_lineCardinalOpen(points, tension) {
     return points.length < 4 ? d3_svg_lineLinear(points) : points[1] + d3_svg_lineHermite(points.slice(1, -1), d3_svg_lineCardinalTangents(points, tension));
+  }
   function d3_svg_lineCardinalClosed(points, tension) {
-    return points.length < 3 ? d3_svg_lineLinear(points) : points[0] + d3_svg_lineHermite((points.push(points[0]),
+    return points.length < 3 ? d3_svg_lineLinearClosed(points) : points[0] + d3_svg_lineHermite((points.push(points[0]),
     points), d3_svg_lineCardinalTangents([ points[points.length - 2] ].concat(points, [ points[1] ]), tension));
+  }
   function d3_svg_lineCardinal(points, tension) {
     return points.length < 3 ? d3_svg_lineLinear(points) : points[0] + d3_svg_lineHermite(points, d3_svg_lineCardinalTangents(points, tension));
+  }
   function d3_svg_lineHermite(points, tangents) {
     if (tangents.length < 1 || points.length != tangents.length && points.length != tangents.length + 2) {
       return d3_svg_lineLinear(points);
+    }
     var quad = points.length != tangents.length, path = "", p0 = points[0], p = points[1], t0 = tangents[0], t = t0, pi = 1;
     if (quad) {
       path += "Q" + (p[0] - t0[0] * 2 / 3) + "," + (p[1] - t0[1] * 2 / 3) + "," + p[0] + "," + p[1];
       p0 = points[1];
       pi = 2;
+    }
     if (tangents.length > 1) {
       t = tangents[1];
       p = points[pi];
       pi++;
       path += "C" + (p0[0] + t0[0]) + "," + (p0[1] + t0[1]) + "," + (p[0] - t[0]) + "," + (p[1] - t[1]) + "," + p[0] + "," + p[1];
       for (var i = 2; i < tangents.length; i++, pi++) {
         p = points[pi];
         t = tangents[i];
         path += "S" + (p[0] - t[0]) + "," + (p[1] - t[1]) + "," + p[0] + "," + p[1];
+      }
+    }
     if (quad) {
       var lp = points[pi];
       path += "Q" + (p[0] + t[0] * 2 / 3) + "," + (p[1] + t[1] * 2 / 3) + "," + lp[0] + "," + lp[1];
+    }
     return path;
+  }
   function d3_svg_lineCardinalTangents(points, tension) {
     var tangents = [], a = (1 - tension) / 2, p0, p1 = points[0], p2 = points[1], i = 1, n = points.length;
     while (++i < n) {
       p0 = p1;
       p1 = p2;
       p2 = points[i];
       tangents.push([ a * (p2[0] - p0[0]), a * (p2[1] - p0[1]) ]);
+    }
     return tangents;
+  }
   function d3_svg_lineBasis(points) {
     if (points.length < 3) return d3_svg_lineLinear(points);
     var i = 1, n = points.length, pi = points[0], x0 = pi[0], y0 = pi[1], px = [ x0, x0, x0, (pi = points[1])[0] ], py = [ y0, y0, y0, pi[1] ], path = [ x0, ",", y0, "L", d3_svg_lineDot4(d3_svg_lineBasisBezier3, px), ",", d3_svg_lineDot4(d3_svg_lineBasisBezier3, py) ];
     points.push(points[n - 1]);
     while (++i <= n) {
       pi = points[i];
@@ @@ -8566,99 +8602,101 @@ @@
+  }
   var d3_svg_symbols = d3.map({
     circle: d3_svg_symbolCircle,
     cross: function(size) {
       var r = Math.sqrt(size / 5) / 2;
       return "M" + -3 * r + "," + -r + "H" + -r + "V" + -3 * r + "H" + r + "V" + -r + "H" + 3 * r + "V" + r + "H" + r + "V" + 3 * r + "H" + -r + "V" + r + "H" + -3 * r + "Z";
     },
     diamond: function(size) {
       var ry = Math.sqrt(size / (2 * d3_svg_symbolTan30)), rx = ry * d3_svg_symbolTan30;
       return "M0," + -ry + "L" + rx + ",0" + " 0," + ry + " " + -rx + ",0" + "Z";
     },
     square: function(size) {
       var r = Math.sqrt(size) / 2;
       return "M" + -r + "," + -r + "L" + r + "," + -r + " " + r + "," + r + " " + -r + "," + r + "Z";
     },
     "triangle-down": function(size) {
       var rx = Math.sqrt(size / d3_svg_symbolSqrt3), ry = rx * d3_svg_symbolSqrt3 / 2;
       return "M0," + ry + "L" + rx + "," + -ry + " " + -rx + "," + -ry + "Z";
     },
     "triangle-up": function(size) {
       var rx = Math.sqrt(size / d3_svg_symbolSqrt3), ry = rx * d3_svg_symbolSqrt3 / 2;
       return "M0," + -ry + "L" + rx + "," + ry + " " + -rx + "," + ry + "Z";
+    }
   });
   d3.svg.symbolTypes = d3_svg_symbols.keys();
   var d3_svg_symbolSqrt3 = Math.sqrt(3), d3_svg_symbolTan30 = Math.tan(30 * d3_radians);
   d3_selectionPrototype.transition = function(name) {
     var id = d3_transitionInheritId || ++d3_transitionId, ns = d3_transitionNamespace(name), subgroups = [], subgroup, node, transition = d3_transitionInherit || {
       time: Date.now(),
       ease: d3_ease_cubicInOut,
       delay: 0,
       duration: 250
     };
     for (var j = -1, m = this.length; ++j < m; ) {
       subgroups.push(subgroup = []);
       for (var group = this[j], i = -1, n = group.length; ++i < n; ) {
         if (node = group[i]) d3_transitionNode(node, i, ns, id, transition);
         subgroup.push(node);
+      }
+    }
     return d3_transition(subgroups, ns, id);
   };
   d3_selectionPrototype.interrupt = function(name) {
     return this.each(name == null ? d3_selection_interrupt : d3_selection_interruptNS(d3_transitionNamespace(name)));
   };
   var d3_selection_interrupt = d3_selection_interruptNS(d3_transitionNamespace());
   function d3_selection_interruptNS(ns) {
     return function() {
       var lock, active;
       if ((lock = this[ns]) && (active = lock[lock.active])) {
         if (--lock.count) delete lock[lock.active]; else delete this[ns];
       var lock, activeId, active;
       if ((lock = this[ns]) && (active = lock[activeId = lock.active])) {
         active.timer.c = null;
         active.timer.t = NaN;
         if (--lock.count) delete lock[activeId]; else delete this[ns];
         lock.active += .5;
         active.event && active.event.interrupt.call(this, this.__data__, active.index);
+      }
     };
+  }
   function d3_transition(groups, ns, id) {
     d3_subclass(groups, d3_transitionPrototype);
     groups.namespace = ns;
     groups.id = id;
     return groups;
+  }
   var d3_transitionPrototype = [], d3_transitionId = 0, d3_transitionInheritId, d3_transitionInherit;
   d3_transitionPrototype.call = d3_selectionPrototype.call;
   d3_transitionPrototype.empty = d3_selectionPrototype.empty;
   d3_transitionPrototype.node = d3_selectionPrototype.node;
   d3_transitionPrototype.size = d3_selectionPrototype.size;
   d3.transition = function(selection, name) {
     return selection && selection.transition ? d3_transitionInheritId ? selection.transition(name) : selection : d3.selection().transition(selection);
   };
   d3.transition.prototype = d3_transitionPrototype;
   d3_transitionPrototype.select = function(selector) {
     var id = this.id, ns = this.namespace, subgroups = [], subgroup, subnode, node;
     selector = d3_selection_selector(selector);
     for (var j = -1, m = this.length; ++j < m; ) {
       subgroups.push(subgroup = []);
       for (var group = this[j], i = -1, n = group.length; ++i < n; ) {
         if ((node = group[i]) && (subnode = selector.call(node, node.__data__, i, j))) {
           if ("__data__" in node) subnode.__data__ = node.__data__;
           d3_transitionNode(subnode, i, ns, id, node[ns][id]);
           subgroup.push(subnode);
         } else {
           subgroup.push(null);
+        }
+      }
+    }
     return d3_transition(subgroups, ns, id);
   };
   d3_transitionPrototype.selectAll = function(selector) {
     var id = this.id, ns = this.namespace, subgroups = [], subgroup, subnodes, node, subnode, transition;
     selector = d3_selection_selectorAll(selector);
     for (var j = -1, m = this.length; ++j < m; ) {
       for (var group = this[j], i = -1, n = group.length; ++i < n; ) {
         if (node = group[i]) {
           transition = node[ns][id];
           subnodes = selector.call(node, node.__data__, i, j);
           subgroups.push(subgroup = []);
           for (var k = -1, o = subnodes.length; ++k < o; ) {
             if (subnode = subnodes[k]) d3_transitionNode(subnode, k, ns, id, transition);
@@ @@ -8823,206 +8861,219 @@ @@
   d3_transitionPrototype.each = function(type, listener) {
     var id = this.id, ns = this.namespace;
     if (arguments.length < 2) {
       var inherit = d3_transitionInherit, inheritId = d3_transitionInheritId;
       try {
         d3_transitionInheritId = id;
         d3_selection_each(this, function(node, i, j) {
           d3_transitionInherit = node[ns][id];
           type.call(node, node.__data__, i, j);
         });
       } finally {
         d3_transitionInherit = inherit;
         d3_transitionInheritId = inheritId;
+      }
     } else {
       d3_selection_each(this, function(node) {
         var transition = node[ns][id];
         (transition.event || (transition.event = d3.dispatch("start", "end", "interrupt"))).on(type, listener);
       });
+    }
     return this;
   };
   d3_transitionPrototype.transition = function() {
     var id0 = this.id, id1 = ++d3_transitionId, ns = this.namespace, subgroups = [], subgroup, group, node, transition;
     for (var j = 0, m = this.length; j < m; j++) {
       subgroups.push(subgroup = []);
       for (var group = this[j], i = 0, n = group.length; i < n; i++) {
         if (node = group[i]) {
           transition = node[ns][id0];
           d3_transitionNode(node, i, ns, id1, {
             time: transition.time,
             ease: transition.ease,
             delay: transition.delay + transition.duration,
             duration: transition.duration
           });
+        }
         subgroup.push(node);
+      }
+    }
     return d3_transition(subgroups, ns, id1);
   };
   function d3_transitionNamespace(name) {
     return name == null ? "__transition__" : "__transition_" + name + "__";
+  }
   function d3_transitionNode(node, i, ns, id, inherit) {
     var lock = node[ns] || (node[ns] = {
       active: 0,
       count: 0
     }), transition = lock[id];
     }), transition = lock[id], time, timer, duration, ease, tweens;
     function schedule(elapsed) {
       var delay = transition.delay;
       timer.t = delay + time;
       if (delay <= elapsed) return start(elapsed - delay);
       timer.c = start;
+    }
     function start(elapsed) {
       var activeId = lock.active, active = lock[activeId];
       if (active) {
         active.timer.c = null;
         active.timer.t = NaN;
         --lock.count;
         delete lock[activeId];
         active.event && active.event.interrupt.call(node, node.__data__, active.index);
+      }
       for (var cancelId in lock) {
         if (+cancelId < id) {
           var cancel = lock[cancelId];
           cancel.timer.c = null;
           cancel.timer.t = NaN;
           --lock.count;
           delete lock[cancelId];
+        }
+      }
       timer.c = tick;
       d3_timer(function() {
         if (timer.c && tick(elapsed || 1)) {
           timer.c = null;
           timer.t = NaN;
+        }
         return 1;
       }, 0, time);
       lock.active = id;
       transition.event && transition.event.start.call(node, node.__data__, i);
       tweens = [];
       transition.tween.forEach(function(key, value) {
         if (value = value.call(node, node.__data__, i)) {
           tweens.push(value);
+        }
       });
       ease = transition.ease;
       duration = transition.duration;
+    }
     function tick(elapsed) {
       var t = elapsed / duration, e = ease(t), n = tweens.length;
       while (n > 0) {
         tweens[--n].call(node, e);
+      }
       if (t >= 1) {
         transition.event && transition.event.end.call(node, node.__data__, i);
         if (--lock.count) delete lock[id]; else delete node[ns];
         return 1;
+      }
+    }
     if (!transition) {
       var time = inherit.time;
       time = inherit.time;
       timer = d3_timer(schedule, 0, time);
       transition = lock[id] = {
         tween: new d3_Map(),
         time: time,
         timer: timer,
         delay: inherit.delay,
         duration: inherit.duration,
         ease: inherit.ease,
         index: i
       };
       inherit = null;
       ++lock.count;
       d3.timer(function(elapsed) {
         var delay = transition.delay, duration, ease, timer = d3_timer_active, tweened = [];
         timer.t = delay + time;
         if (delay <= elapsed) return start(elapsed - delay);
         timer.c = start;
         function start(elapsed) {
           if (lock.active > id) return stop();
           var active = lock[lock.active];
           if (active) {
             --lock.count;
             delete lock[lock.active];
             active.event && active.event.interrupt.call(node, node.__data__, active.index);
+          }
           lock.active = id;
           transition.event && transition.event.start.call(node, node.__data__, i);
           transition.tween.forEach(function(key, value) {
             if (value = value.call(node, node.__data__, i)) {
               tweened.push(value);
+            }
           });
           ease = transition.ease;
           duration = transition.duration;
           d3.timer(function() {
             timer.c = tick(elapsed || 1) ? d3_true : tick;
             return 1;
           }, 0, time);
+        }
         function tick(elapsed) {
           if (lock.active !== id) return 1;
           var t = elapsed / duration, e = ease(t), n = tweened.length;
           while (n > 0) {
             tweened[--n].call(node, e);
+          }
           if (t >= 1) {
             transition.event && transition.event.end.call(node, node.__data__, i);
             return stop();
+          }
+        }
         function stop() {
           if (--lock.count) delete lock[id]; else delete node[ns];
           return 1;
+        }
       }, 0, time);
+    }
+  }
   d3.svg.axis = function() {
     var scale = d3.scale.linear(), orient = d3_svg_axisDefaultOrient, innerTickSize = 6, outerTickSize = 6, tickPadding = 3, tickArguments_ = [ 10 ], tickValues = null, tickFormat_;
     function axis(g) {
       g.each(function() {
         var g = d3.select(this);
         var scale0 = this.__chart__ || scale, scale1 = this.__chart__ = scale.copy();
         var ticks = tickValues == null ? scale1.ticks ? scale1.ticks.apply(scale1, tickArguments_) : scale1.domain() : tickValues, tickFormat = tickFormat_ == null ? scale1.tickFormat ? scale1.tickFormat.apply(scale1, tickArguments_) : d3_identity : tickFormat_, tick = g.selectAll(".tick").data(ticks, scale1), tickEnter = tick.enter().insert("g", ".domain").attr("class", "tick").style("opacity", ε), tickExit = d3.transition(tick.exit()).style("opacity", ε).remove(), tickUpdate = d3.transition(tick.order()).style("opacity", 1), tickSpacing = Math.max(innerTickSize, 0) + tickPadding, tickTransform;
         var range = d3_scaleRange(scale1), path = g.selectAll(".domain").data([ 0 ]), pathUpdate = (path.enter().append("path").attr("class", "domain"),
         d3.transition(path));
         tickEnter.append("line");
         tickEnter.append("text");
         var lineEnter = tickEnter.select("line"), lineUpdate = tickUpdate.select("line"), text = tick.select("text").text(tickFormat), textEnter = tickEnter.select("text"), textUpdate = tickUpdate.select("text"), sign = orient === "top" || orient === "left" ? -1 : 1, x1, x2, y1, y2;
         if (orient === "bottom" || orient === "top") {
           tickTransform = d3_svg_axisX, x1 = "x", y1 = "y", x2 = "x2", y2 = "y2";
           text.attr("dy", sign < 0 ? "0em" : ".71em").style("text-anchor", "middle");
           pathUpdate.attr("d", "M" + range[0] + "," + sign * outerTickSize + "V0H" + range[1] + "V" + sign * outerTickSize);
         } else {
           tickTransform = d3_svg_axisY, x1 = "y", y1 = "x", x2 = "y2", y2 = "x2";
           text.attr("dy", ".32em").style("text-anchor", sign < 0 ? "end" : "start");
           pathUpdate.attr("d", "M" + sign * outerTickSize + "," + range[0] + "H0V" + range[1] + "H" + sign * outerTickSize);
+        }
         lineEnter.attr(y2, sign * innerTickSize);
         textEnter.attr(y1, sign * tickSpacing);
         lineUpdate.attr(x2, 0).attr(y2, sign * innerTickSize);
         textUpdate.attr(x1, 0).attr(y1, sign * tickSpacing);
         if (scale1.rangeBand) {
           var x = scale1, dx = x.rangeBand() / 2;
           scale0 = scale1 = function(d) {
             return x(d) + dx;
           };
         } else if (scale0.rangeBand) {
           scale0 = scale1;
         } else {
           tickExit.call(tickTransform, scale1, scale0);
+        }
         tickEnter.call(tickTransform, scale0, scale1);
         tickUpdate.call(tickTransform, scale1, scale1);
       });
+    }
     axis.scale = function(x) {
       if (!arguments.length) return scale;
       scale = x;
       return axis;
     };
     axis.orient = function(x) {
       if (!arguments.length) return orient;
       orient = x in d3_svg_axisOrients ? x + "" : d3_svg_axisDefaultOrient;
       return axis;
     };
     axis.ticks = function() {
       if (!arguments.length) return tickArguments_;
       tickArguments_ = arguments;
+      tickArguments_ = d3_array(arguments);
       return axis;
     };
     axis.tickValues = function(x) {
       if (!arguments.length) return tickValues;
       tickValues = x;
       return axis;
     };
     axis.tickFormat = function(x) {
       if (!arguments.length) return tickFormat_;
       tickFormat_ = x;
       return axis;
     };
     axis.tickSize = function(x) {
       var n = arguments.length;
       if (!n) return innerTickSize;
       innerTickSize = +x;
       outerTickSize = +arguments[n - 1];
       return axis;
     };
     axis.innerTickSize = function(x) {
       if (!arguments.length) return innerTickSize;
       innerTickSize = +x;
       return axis;
     };
     axis.outerTickSize = function(x) {
       if (!arguments.length) return outerTickSize;
       outerTickSize = +x;
       return axis;
     };
     axis.tickPadding = function(x) {
       if (!arguments.length) return tickPadding;
       tickPadding = +x;
       return axis;
     };
     axis.tickSubdivide = function() {
       return arguments.length && axis;
     };
     return axis;
   };
   var d3_svg_axisDefaultOrient = "bottom", d3_svg_axisOrients = {
     top: 1,
     right: 1,
     bottom: 1,
     left: 1
   };
   function d3_svg_axisX(selection, x0, x1) {
     selection.attr("transform", function(d) {
       var v0 = x0(d);
@@ @@ -9454,51 +9505,50 @@ @@
     ceil: d3_identity
   };
   d3_time_scaleLocalMethods.year = d3_time.year;
   d3_time.scale = function() {
     return d3_time_scale(d3.scale.linear(), d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
   };
   var d3_time_scaleUtcMethods = d3_time_scaleLocalMethods.map(function(m) {
     return [ m[0].utc, m[1] ];
   });
   var d3_time_scaleUtcFormat = d3_time_formatUtc.multi([ [ ".%L", function(d) {
     return d.getUTCMilliseconds();
   } ], [ ":%S", function(d) {
     return d.getUTCSeconds();
   } ], [ "%I:%M", function(d) {
     return d.getUTCMinutes();
   } ], [ "%I %p", function(d) {
     return d.getUTCHours();
   } ], [ "%a %d", function(d) {
     return d.getUTCDay() && d.getUTCDate() != 1;
   } ], [ "%b %d", function(d) {
     return d.getUTCDate() != 1;
   } ], [ "%B", function(d) {
     return d.getUTCMonth();
   } ], [ "%Y", d3_true ] ]);
   d3_time_scaleUtcMethods.year = d3_time.year.utc;
   d3_time.scale.utc = function() {
     return d3_time_scale(d3.scale.linear(), d3_time_scaleUtcMethods, d3_time_scaleUtcFormat);
   };
   d3.text = d3_xhrType(function(request) {
     return request.responseText;
   });
   d3.json = function(url, callback) {
     return d3_xhr(url, "application/json", d3_json, callback);
   };
   function d3_json(request) {
     return JSON.parse(request.responseText);
+  }
   d3.html = function(url, callback) {
     return d3_xhr(url, "text/html", d3_html, callback);
   };
   function d3_html(request) {
     var range = d3_document.createRange();
     range.selectNode(d3_document.body);
     return range.createContextualFragment(request.responseText);
+  }
   d3.xml = d3_xhrType(function(request) {
     return request.responseXML;
   });
   if (typeof define === "function" && define.amd) define(d3); else if (typeof module === "object" && module.exports) module.exports = d3;
   this.d3 = d3;
   if (typeof define === "function" && define.amd) this.d3 = d3, define(d3); else if (typeof module === "object" && module.exports) module.exports = d3; else this.d3 = d3;
 }();
@@ \ No newline at end of file @@

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)