mirror of
https://github.com/FoggedLens/iD.git
synced 2026-05-20 23:44:47 +02:00
Begin d3 v4 update
This commit is contained in:
@@ -24,7 +24,6 @@
|
||||
<div id='frame'>
|
||||
</div>
|
||||
<pre id='report'></pre>
|
||||
<script src="http://d3js.org/d3.v3.min.js"></script>
|
||||
<script src="https://raw.github.com/bestiejs/benchmark.js/v1.0.0/benchmark.js"></script>
|
||||
<script>
|
||||
var suite = new Benchmark.Suite;
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
<div id='frame'>
|
||||
</div>
|
||||
<pre id='report'></pre>
|
||||
<script src="http://d3js.org/d3.v3.min.js"></script>
|
||||
<script src="https://raw.github.com/bestiejs/benchmark.js/v1.0.0/benchmark.js"></script>
|
||||
<script>
|
||||
var suite = new Benchmark.Suite;
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
</script>
|
||||
|
||||
<!-- include source files here... -->
|
||||
<script src='../js/lib/d3.v3.js'></script>
|
||||
<script src='../dist/iD.js'></script>
|
||||
|
||||
<script src='spec/spec_helpers.js'></script>
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
<body>
|
||||
<!-- include source files here... -->
|
||||
<script src='../node_modules/lodash/lodash.js'></script>
|
||||
<script src='../js/lib/d3.v3.js'></script>
|
||||
|
||||
<script src='../js/id/id.js'></script>
|
||||
<script src='../js/lib/id/geo.js'></script>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
describe('iD.actions.Circularize', function () {
|
||||
var projection = d3.geo.mercator();
|
||||
var projection = d3.geoMercator();
|
||||
|
||||
function isCircular(id, graph) {
|
||||
var points = _.map(graph.childNodes(graph.entity(id)), 'loc').map(projection),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
describe('iD.actions.Move', function() {
|
||||
var projection = d3.geo.mercator().scale(250 / Math.PI);
|
||||
var projection = d3.geoMercator().scale(250 / Math.PI);
|
||||
|
||||
describe('#disabled', function() {
|
||||
it('returns falsy by default', function() {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
describe('iD.actions.Orthogonalize', function () {
|
||||
var projection = d3.geo.mercator();
|
||||
var projection = d3.geoMercator();
|
||||
|
||||
it('orthogonalizes a perfect quad', function () {
|
||||
var graph = iD.Graph([
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
describe('iD.actions.RestrictTurn', function() {
|
||||
var projection = d3.geo.mercator().scale(250 / Math.PI);
|
||||
var projection = d3.geoMercator().scale(250 / Math.PI);
|
||||
|
||||
it('adds a restriction to an unrestricted turn', function() {
|
||||
// u====*--->w
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
describe('iD.actions.Straighten', function () {
|
||||
var projection = d3.geo.mercator();
|
||||
var projection = d3.geoMercator();
|
||||
|
||||
describe('#disabled', function () {
|
||||
it('returns falsy for ways with internal nodes near centerline', function () {
|
||||
|
||||
@@ -4,7 +4,7 @@ describe('iD.TileLayer', function() {
|
||||
beforeEach(function() {
|
||||
context = iD.Context(window);
|
||||
d = d3.select(document.createElement('div'));
|
||||
c = iD.TileLayer(context).projection(d3.geo.mercator());
|
||||
c = iD.TileLayer(context).projection(d3.geoMercator());
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
describe('iD.svg.Areas', function () {
|
||||
var surface,
|
||||
projection = d3.geo.projection(function(x, y) { return [x, y]; })
|
||||
projection = d3.geoProjection(function(x, y) { return [x, y]; })
|
||||
.clipExtent([[0, 0], [Infinity, Infinity]]),
|
||||
all = d3.functor(true),
|
||||
none = d3.functor(false);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
describe('iD.svg.Lines', function () {
|
||||
var surface,
|
||||
projection = d3.geo.projection(function(x, y) { return [x, y]; })
|
||||
projection = d3.geoProjection(function(x, y) { return [x, y]; })
|
||||
.clipExtent([[0, 0], [Infinity, Infinity]]),
|
||||
all = d3.functor(true),
|
||||
none = d3.functor(false);
|
||||
|
||||
Reference in New Issue
Block a user