From 95a49a933da76987ff6d075b9d5e8276e516d5d0 Mon Sep 17 00:00:00 2001 From: James Addison Date: Thu, 12 Nov 2020 10:57:00 +0000 Subject: [PATCH 1/2] Enable the 'energy' unit test --- test/sankey-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sankey-test.js b/test/sankey-test.js index 4720c05..0ab83f0 100644 --- a/test/sankey-test.js +++ b/test/sankey-test.js @@ -1,7 +1,7 @@ var tape = require("tape"), d3 = require("../"); -tape.skip("sankey(energy) returns the expected results", function(test) { +tape.test("sankey(energy) returns the expected results", function(test) { var sankey = d3.sankey().nodeWidth(15).nodePadding(10).extent([[1, 1], [959, 494]]), energy = sankey(require("./energy")); test.deepEqual(energy.nodes.map(nodePosition), require("./energy-nodes")); From 03a0d70573f1cf85da9f2a1cb93566e5b1eb7326 Mon Sep 17 00:00:00 2001 From: James Addison Date: Thu, 12 Nov 2020 11:01:57 +0000 Subject: [PATCH 2/2] Update JSON test expectations --- test/energy-links.json | 362 ++++++++++++++++++++--------------------- test/energy-nodes.json | 86 +++++----- 2 files changed, 224 insertions(+), 224 deletions(-) diff --git a/test/energy-links.json b/test/energy-links.json index 52c5cd8..01e16ed 100644 --- a/test/energy-links.json +++ b/test/energy-links.json @@ -3,47 +3,47 @@ "source": { "x": 1, "dx": 15, - "y": 130, + "y": 100.6, "dy": 13.3 }, "target": { "x": 135.7, "dx": 15, - "y": 115.8, + "y": 105.8, "dy": 41.5 }, "dy": 13.3, "sy": 0, - "ty": 19.4 + "ty": 0 }, { "source": { "x": 135.7, "dx": 15, - "y": 115.8, + "y": 105.8, "dy": 41.5 }, "target": { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, "dy": 0.1, "sy": 41.4, - "ty": 0 + "ty": -0 }, { "source": { "x": 135.7, "dx": 15, - "y": 115.8, + "y": 105.8, "dy": 41.5 }, "target": { "x": 944, "dx": 15, - "y": 60.9, + "y": 1, "dy": 93.7 }, "dy": 2.9, @@ -54,13 +54,13 @@ "source": { "x": 135.7, "dx": 15, - "y": 115.8, + "y": 105.8, "dy": 41.5 }, "target": { "x": 270.4, "dx": 15, - "y": 132.6, + "y": 116.6, "dy": 47.7 }, "dy": 29.9, @@ -71,13 +71,13 @@ "source": { "x": 135.7, "dx": 15, - "y": 115.8, + "y": 105.8, "dy": 41.5 }, "target": { "x": 270.4, "dx": 15, - "y": 190.3, + "y": 212, "dy": 21.8 }, "dy": 8.7, @@ -88,18 +88,18 @@ "source": { "x": 1, "dx": 15, - "y": 490.3, + "y": 405, "dy": 3.7 }, "target": { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, "dy": 3.7, "sy": 0, - "ty": 65.3 + "ty": 0.1 }, { "source": { @@ -111,211 +111,211 @@ "target": { "x": 270.4, "dx": 15, - "y": 132.6, + "y": 116.6, "dy": 47.7 }, "dy": 3.7, - "sy": 0, + "sy": -0, "ty": 35.9 }, { "source": { "x": 1, "dx": 15, - "y": 218.7, + "y": 201.8, "dy": 1.2 }, "target": { "x": 135.7, "dx": 15, - "y": 198.6, + "y": 187.6, "dy": 8.1 }, "dy": 1.2, "sy": 0, - "ty": 6.8 + "ty": 0 }, { "source": { "x": 1, "dx": 15, - "y": 201.8, + "y": 213.1, "dy": 6.8 }, "target": { "x": 135.7, "dx": 15, - "y": 198.6, + "y": 187.6, "dy": 8.1 }, "dy": 6.8, "sy": 0, - "ty": 0 + "ty": 1.2 }, { "source": { "x": 135.7, "dx": 15, - "y": 198.6, + "y": 187.6, "dy": 8.1 }, "target": { "x": 270.4, "dx": 15, - "y": 132.6, + "y": 116.6, "dy": 47.7 }, "dy": 8.1, - "sy": 0, + "sy": -0, "ty": 39.7 }, { "source": { "x": 539.9, "dx": 15, - "y": 258.6, + "y": 94.3, "dy": 8.5 }, "target": { "x": 944, "dx": 15, - "y": 225.3, + "y": 176, "dy": 60.7 }, "dy": 1.1, - "sy": 0, - "ty": 46.6 + "sy": -0, + "ty": 0 }, { "source": { "x": 539.9, "dx": 15, - "y": 258.6, + "y": 94.3, "dy": 8.5 }, "target": { "x": 944, "dx": 15, - "y": 356.8, + "y": 308.9, "dy": 14.3 }, "dy": 2.4, "sy": 6.1, - "ty": 4.4 + "ty": -0 }, { "source": { "x": 539.9, "dx": 15, - "y": 258.6, + "y": 94.3, "dy": 8.5 }, "target": { "x": 944, "dx": 15, - "y": 295.9, + "y": 246.6, "dy": 39.7 }, "dy": 4.9, "sy": 1.1, - "ty": 12.1 + "ty": 0 }, { "source": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "target": { "x": 944, "dx": 15, - "y": 164.5, + "y": 115.2, "dy": 11.1 }, "dy": 11.1, "sy": 6, - "ty": 0 + "ty": -0 }, { "source": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "target": { "x": 944, "dx": 15, - "y": 295.9, + "y": 246.6, "dy": 39.7 }, "dy": 12.1, - "sy": 76.2, - "ty": 0 + "sy": 73.3, + "ty": 4.9 }, { "source": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "target": { "x": 674.6, "dx": 15, - "y": 220.7, + "y": 286.7, "dy": 2.9 }, "dy": 2.9, - "sy": 36.8, - "ty": 0 + "sy": 85.4, + "ty": -0 }, { "source": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "target": { "x": 944, "dx": 15, - "y": 225.3, + "y": 176, "dy": 60.7 }, "dy": 36.5, - "sy": 39.7, - "ty": 5 + "sy": 36.8, + "ty": 6.1 }, { "source": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "target": { "x": 944, "dx": 15, - "y": 392.4, + "y": 359.1, "dy": 20.7 }, "dy": 4, "sy": 94, - "ty": 0 + "ty": -0 }, { "source": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "target": { "x": 944, "dx": 15, - "y": 345.6, + "y": 296.3, "dy": 1.2 }, "dy": 0.5, @@ -326,30 +326,30 @@ "source": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "target": { "x": 944, "dx": 15, - "y": 356.8, + "y": 308.9, "dy": 14.3 }, "dy": 4.4, "sy": 88.8, - "ty": 0 + "ty": 2.4 }, { "source": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "target": { "x": 944, "dx": 15, - "y": 60.9, + "y": 1, "dy": 93.7 }, "dy": 6, @@ -360,13 +360,13 @@ "source": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "target": { "x": 944, "dx": 15, - "y": 381.1, + "y": 333.2, "dy": 1.3 }, "dy": 0.8, @@ -377,13 +377,13 @@ "source": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "target": { "x": 944, "dx": 15, - "y": 185.7, + "y": 136.4, "dy": 9.6 }, "dy": 9.6, @@ -394,13 +394,13 @@ "source": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "target": { "x": 944, "dx": 15, - "y": 205.3, + "y": 156, "dy": 10 }, "dy": 10, @@ -411,98 +411,98 @@ "source": { "x": 1, "dx": 15, - "y": 248.7, + "y": 259.1, "dy": 4.3 }, "target": { "x": 135.7, "dx": 15, - "y": 225.2, + "y": 273.3, "dy": 13.1 }, "dy": 4.3, - "sy": 0, - "ty": 8.8 + "sy": -0, + "ty": -0 }, { "source": { "x": 1, "dx": 15, - "y": 229.9, + "y": 295.2, "dy": 8.8 }, "target": { "x": 135.7, "dx": 15, - "y": 225.2, + "y": 273.3, "dy": 13.1 }, "dy": 8.8, - "sy": 0, - "ty": 0 + "sy": -0, + "ty": 4.3 }, { "source": { "x": 270.4, "dx": 15, - "y": 190.3, + "y": 212, "dy": 21.8 }, "target": { "x": 944, "dx": 15, - "y": 356.8, + "y": 308.9, "dy": 14.3 }, "dy": 0, "sy": 21.8, - "ty": 4.4 + "ty": 6.8 }, { "source": { "x": 270.4, "dx": 15, - "y": 190.3, + "y": 212, "dy": 21.8 }, "target": { "x": 944, "dx": 15, - "y": 60.9, + "y": 1, "dy": 93.7 }, "dy": 0.1, - "sy": 16.2, + "sy": -0, "ty": 92.9 }, { "source": { "x": 270.4, "dx": 15, - "y": 190.3, + "y": 212, "dy": 21.8 }, "target": { "x": 405.1, "dx": 15, - "y": 35.4, + "y": 5.7, "dy": 148.5 }, "dy": 16.2, - "sy": 0, + "sy": 0.1, "ty": 132.3 }, { "source": { "x": 270.4, "dx": 15, - "y": 190.3, + "y": 212, "dy": 21.8 }, "target": { "x": 944, "dx": 15, - "y": 345.6, + "y": 296.3, "dy": 1.2 }, "dy": 0.2, @@ -513,47 +513,47 @@ "source": { "x": 270.4, "dx": 15, - "y": 190.3, + "y": 212, "dy": 21.8 }, "target": { "x": 944, "dx": 15, - "y": 225.3, + "y": 176, "dy": 60.7 }, "dy": 5.2, "sy": 16.4, - "ty": 41.5 + "ty": 42.6 }, { "source": { "x": 1, "dx": 15, - "y": 315.9, + "y": 248.4, "dy": 0.7 }, "target": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "dy": 0.7, "sy": 0, - "ty": 88.9 + "ty": 62.4 }, { "source": { "x": 674.6, "dx": 15, - "y": 220.7, + "y": 286.7, "dy": 2.9 }, "target": { "x": 809.3, "dx": 15, - "y": 259.9, + "y": 290.5, "dy": 2.2 }, "dy": 2.2, @@ -564,13 +564,13 @@ "source": { "x": 674.6, "dx": 15, - "y": 220.7, + "y": 286.7, "dy": 2.9 }, "target": { "x": 944, "dx": 15, - "y": 60.9, + "y": 1, "dy": 93.7 }, "dy": 0.7, @@ -581,13 +581,13 @@ "source": { "x": 809.3, "dx": 15, - "y": 259.9, + "y": 290.5, "dy": 2.2 }, "target": { "x": 944, "dx": 15, - "y": 392.4, + "y": 359.1, "dy": 20.7 }, "dy": 2.2, @@ -598,30 +598,30 @@ "source": { "x": 1, "dx": 15, - "y": 326.7, + "y": 273.4, "dy": 0.7 }, "target": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "dy": 0.7, "sy": 0, - "ty": 96.1 + "ty": 63.2 }, { "source": { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, "target": { "x": 944, "dx": 15, - "y": 225.3, + "y": 176, "dy": 60.7 }, "dy": 12.9, @@ -632,30 +632,30 @@ "source": { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, "target": { "x": 944, "dx": 15, - "y": 455.2, + "y": 394.5, "dy": 13.7 }, "dy": 13.7, - "sy": 50.3, - "ty": 0 + "sy": 28.3, + "ty": -0 }, { "source": { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, "target": { "x": 944, "dx": 15, - "y": 392.4, + "y": 359.1, "dy": 20.7 }, "dy": 14.5, @@ -666,47 +666,47 @@ "source": { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, "target": { "x": 944, "dx": 15, - "y": 492.5, + "y": 418.2, "dy": 1.5 }, "dy": 1.5, - "sy": 67.5, + "sy": 42, "ty": 0 }, { "source": { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, "target": { "x": 944, "dx": 15, - "y": 423.2, + "y": 429.8, "dy": 22 }, "dy": 22, - "sy": 28.3, + "sy": 43.5, "ty": 0 }, { "source": { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, "target": { "x": 944, "dx": 15, - "y": 345.6, + "y": 296.3, "dy": 1.2 }, "dy": 0.4, @@ -717,30 +717,30 @@ "source": { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, "target": { "x": 944, "dx": 15, - "y": 478.9, + "y": 461.8, "dy": 3.5 }, "dy": 3.5, - "sy": 64, + "sy": 65.5, "ty": 0 }, { "source": { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, "target": { "x": 944, "dx": 15, - "y": 381.1, + "y": 333.2, "dy": 1.3 }, "dy": 0.5, @@ -757,28 +757,28 @@ "target": { "x": 135.7, "dx": 15, - "y": 115.8, + "y": 105.8, "dy": 41.5 }, "dy": 0.5, - "sy": 0, + "sy": -0, "ty": 41 }, { "source": { "x": 135.7, "dx": 15, - "y": 225.2, + "y": 273.3, "dy": 13.1 }, "target": { "x": 270.4, "dx": 15, - "y": 190.3, + "y": 212, "dy": 21.8 }, "dy": 13.1, - "sy": 0, + "sy": -0, "ty": 8.7 }, { @@ -791,7 +791,7 @@ "target": { "x": 405.1, "dx": 15, - "y": 35.4, + "y": 5.7, "dy": 148.5 }, "dy": 89.6, @@ -802,13 +802,13 @@ "source": { "x": 1, "dx": 15, - "y": 405, + "y": 418.7, "dy": 53.8 }, "target": { "x": 135.7, "dx": 15, - "y": 400.4, + "y": 413.1, "dy": 65.3 }, "dy": 53.8, @@ -819,13 +819,13 @@ "source": { "x": 1, "dx": 15, - "y": 468.8, + "y": 482.5, "dy": 11.5 }, "target": { "x": 135.7, "dx": 15, - "y": 400.4, + "y": 413.1, "dy": 65.3 }, "dy": 11.5, @@ -836,18 +836,18 @@ "source": { "x": 135.7, "dx": 15, - "y": 400.4, + "y": 413.1, "dy": 65.3 }, "target": { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, "dy": 65.3, "sy": 0, - "ty": 0.1 + "ty": 3.8 }, { "source": { @@ -859,7 +859,7 @@ "target": { "x": 270.4, "dx": 15, - "y": 132.6, + "y": 116.6, "dy": 47.7 }, "dy": 6, @@ -876,7 +876,7 @@ "target": { "x": 135.7, "dx": 15, - "y": 115.8, + "y": 105.8, "dy": 41.5 }, "dy": 8.3, @@ -893,7 +893,7 @@ "target": { "x": 944, "dx": 15, - "y": 295.9, + "y": 246.6, "dy": 39.7 }, "dy": 20.6, @@ -910,7 +910,7 @@ "target": { "x": 944, "dx": 15, - "y": 356.8, + "y": 308.9, "dy": 14.3 }, "dy": 7.5, @@ -921,64 +921,64 @@ "source": { "x": 135.7, "dx": 15, - "y": 323.8, + "y": 205.6, "dy": 6.4 }, "target": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "dy": 6.4, "sy": 0, - "ty": 89.7 + "ty": 56.1 }, { "source": { "x": 135.7, "dx": 15, - "y": 343.7, + "y": 222, "dy": 2.1 }, "target": { "x": 944, "dx": 15, - "y": 295.9, + "y": 246.6, "dy": 39.7 }, "dy": 2.1, - "sy": 0, + "sy": -0, "ty": 17.1 }, { "source": { "x": 1, "dx": 15, - "y": 348.4, + "y": 229.9, "dy": 8.4 }, "target": { "x": 135.7, "dx": 15, - "y": 343.7, + "y": 222, "dy": 2.1 }, "dy": 2.1, "sy": 6.4, - "ty": 0 + "ty": -0 }, { "source": { "x": 1, "dx": 15, - "y": 348.4, + "y": 229.9, "dy": 8.4 }, "target": { "x": 135.7, "dx": 15, - "y": 323.8, + "y": 205.6, "dy": 6.4 }, "dy": 6.4, @@ -989,13 +989,13 @@ "source": { "x": 270.4, "dx": 15, - "y": 132.6, + "y": 116.6, "dy": 47.7 }, "target": { "x": 944, "dx": 15, - "y": 345.6, + "y": 296.3, "dy": 1.2 }, "dy": 0.1, @@ -1006,13 +1006,13 @@ "source": { "x": 270.4, "dx": 15, - "y": 132.6, + "y": 116.6, "dy": 47.7 }, "target": { "x": 405.1, "dx": 15, - "y": 35.4, + "y": 5.7, "dy": 148.5 }, "dy": 42.7, @@ -1023,47 +1023,47 @@ "source": { "x": 270.4, "dx": 15, - "y": 132.6, + "y": 116.6, "dy": 47.7 }, "target": { "x": 944, "dx": 15, - "y": 225.3, + "y": 176, "dy": 60.7 }, "dy": 5, "sy": 42.7, - "ty": 0 + "ty": 1.1 }, { "source": { "x": 405.1, "dx": 15, - "y": 35.4, + "y": 5.7, "dy": 148.5 }, "target": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "dy": 56.1, - "sy": 84, + "sy": 92.4, "ty": 0 }, { "source": { "x": 405.1, "dx": 15, - "y": 35.4, + "y": 5.7, "dy": 148.5 }, "target": { "x": 944, "dx": 15, - "y": 60.9, + "y": 1, "dy": 93.7 }, "dy": 84, @@ -1074,85 +1074,85 @@ "source": { "x": 405.1, "dx": 15, - "y": 35.4, + "y": 5.7, "dy": 148.5 }, "target": { "x": 539.9, "dx": 15, - "y": 258.6, + "y": 94.3, "dy": 8.5 }, "dy": 8.5, - "sy": 140, + "sy": 84, "ty": 0 }, { "source": { "x": 1, "dx": 15, - "y": 337.4, + "y": 284.2, "dy": 1 }, "target": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "dy": 1, - "sy": 0, - "ty": 96.8 + "sy": -0, + "ty": 63.9 }, { "source": { "x": 1, "dx": 15, - "y": 100.6, + "y": 123.9, "dy": 19.4 }, "target": { "x": 135.7, "dx": 15, - "y": 115.8, + "y": 105.8, "dy": 41.5 }, "dy": 19.4, - "sy": 0, - "ty": 0 + "sy": -0, + "ty": 13.3 }, { "source": { "x": 1, "dx": 15, - "y": 303.9, + "y": 314, "dy": 2 }, "target": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "dy": 2, - "sy": 0, - "ty": 86.9 + "sy": -0, + "ty": 64.9 }, { "source": { "x": 1, "dx": 15, - "y": 263, + "y": 326, "dy": 30.9 }, "target": { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, "dy": 30.9, - "sy": 0, - "ty": 56.1 + "sy": -0, + "ty": 67 } ] diff --git a/test/energy-nodes.json b/test/energy-nodes.json index e6ff57a..55abfac 100644 --- a/test/energy-nodes.json +++ b/test/energy-nodes.json @@ -2,43 +2,43 @@ { "x": 1, "dx": 15, - "y": 130, + "y": 100.6, "dy": 13.3 }, { "x": 135.7, "dx": 15, - "y": 115.8, + "y": 105.8, "dy": 41.5 }, { "x": 270.4, "dx": 15, - "y": 394.2, + "y": 401.1, "dy": 69.1 }, { "x": 944, "dx": 15, - "y": 60.9, + "y": 1, "dy": 93.7 }, { "x": 270.4, "dx": 15, - "y": 132.6, + "y": 116.6, "dy": 47.7 }, { "x": 270.4, "dx": 15, - "y": 190.3, + "y": 212, "dy": 21.8 }, { "x": 1, "dx": 15, - "y": 490.3, + "y": 405, "dy": 3.7 }, { @@ -50,157 +50,157 @@ { "x": 1, "dx": 15, - "y": 218.7, + "y": 201.8, "dy": 1.2 }, { "x": 135.7, "dx": 15, - "y": 198.6, + "y": 187.6, "dy": 8.1 }, { "x": 1, "dx": 15, - "y": 201.8, + "y": 213.1, "dy": 6.8 }, { "x": 539.9, "dx": 15, - "y": 258.6, + "y": 94.3, "dy": 8.5 }, { "x": 944, "dx": 15, - "y": 225.3, + "y": 176, "dy": 60.7 }, { "x": 944, "dx": 15, - "y": 356.8, + "y": 308.9, "dy": 14.3 }, { "x": 944, "dx": 15, - "y": 295.9, + "y": 246.6, "dy": 39.7 }, { "x": 539.9, "dx": 15, - "y": 150.6, + "y": 196.2, "dy": 98 }, { "x": 944, "dx": 15, - "y": 164.5, + "y": 115.2, "dy": 11.1 }, { "x": 674.6, "dx": 15, - "y": 220.7, + "y": 286.7, "dy": 2.9 }, { "x": 944, "dx": 15, - "y": 392.4, + "y": 359.1, "dy": 20.7 }, { "x": 944, "dx": 15, - "y": 345.6, + "y": 296.3, "dy": 1.2 }, { "x": 944, "dx": 15, - "y": 381.1, + "y": 333.2, "dy": 1.3 }, { "x": 944, "dx": 15, - "y": 185.7, + "y": 136.4, "dy": 9.6 }, { "x": 944, "dx": 15, - "y": 205.3, + "y": 156, "dy": 10 }, { "x": 1, "dx": 15, - "y": 248.7, + "y": 259.1, "dy": 4.3 }, { "x": 135.7, "dx": 15, - "y": 225.2, + "y": 273.3, "dy": 13.1 }, { "x": 1, "dx": 15, - "y": 229.9, + "y": 295.2, "dy": 8.8 }, { "x": 405.1, "dx": 15, - "y": 35.4, + "y": 5.7, "dy": 148.5 }, { "x": 1, "dx": 15, - "y": 315.9, + "y": 248.4, "dy": 0.7 }, { "x": 809.3, "dx": 15, - "y": 259.9, + "y": 290.5, "dy": 2.2 }, { "x": 1, "dx": 15, - "y": 326.7, + "y": 273.4, "dy": 0.7 }, { "x": 944, "dx": 15, - "y": 455.2, + "y": 394.5, "dy": 13.7 }, { "x": 944, "dx": 15, - "y": 492.5, + "y": 418.2, "dy": 1.5 }, { "x": 944, "dx": 15, - "y": 423.2, + "y": 429.8, "dy": 22 }, { "x": 944, "dx": 15, - "y": 478.9, + "y": 461.8, "dy": 3.5 }, { @@ -218,19 +218,19 @@ { "x": 1, "dx": 15, - "y": 405, + "y": 418.7, "dy": 53.8 }, { "x": 135.7, "dx": 15, - "y": 400.4, + "y": 413.1, "dy": 65.3 }, { "x": 1, "dx": 15, - "y": 468.8, + "y": 482.5, "dy": 11.5 }, { @@ -248,43 +248,43 @@ { "x": 135.7, "dx": 15, - "y": 323.8, + "y": 205.6, "dy": 6.4 }, { "x": 135.7, "dx": 15, - "y": 343.7, + "y": 222, "dy": 2.1 }, { "x": 1, "dx": 15, - "y": 348.4, + "y": 229.9, "dy": 8.4 }, { "x": 1, "dx": 15, - "y": 337.4, + "y": 284.2, "dy": 1 }, { "x": 1, "dx": 15, - "y": 100.6, + "y": 123.9, "dy": 19.4 }, { "x": 1, "dx": 15, - "y": 303.9, + "y": 314, "dy": 2 }, { "x": 1, "dx": 15, - "y": 263, + "y": 326, "dy": 30.9 } ]