From 90d3f59aa6362ca399093ad8c91bf82504e93738 Mon Sep 17 00:00:00 2001 From: teymour-aldridge Date: Wed, 14 Oct 2020 19:00:10 +0100 Subject: [PATCH 1/6] Remove some unneeded variables. These should theoretically actually slow down the JIT (if very marginally) so performance-wise it's better not to have them. --- .gitignore | 1 + modules/actions/circularize.js | 5 ++--- modules/osm/multipolygon.js | 1 - modules/ui/edit_menu.js | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e503c2efa..41e2fc277 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store .esm-cache .vscode/ +.idea/ /node_modules/ /.tx/tmp/ npm-debug.log diff --git a/modules/actions/circularize.js b/modules/actions/circularize.js index c040f1854..008575c22 100644 --- a/modules/actions/circularize.js +++ b/modules/actions/circularize.js @@ -133,7 +133,6 @@ export function actionCircularize(wayId, projection, maxAngle) { var nearAngle = nearNodes[nodeId]; var dist = Math.abs(nearAngle - angle); if (dist < min) { - dist = min; origNode = origNodes[nodeId]; } } @@ -252,7 +251,7 @@ export function actionCircularize(wayId, projection, maxAngle) { return false; } } - + //check if central angles are smaller than maxAngle for (i = 0; i Math.PI){ angle = (2*Math.PI - angle); } - + if (angle > maxAngle + epsilonAngle) { return false; } diff --git a/modules/osm/multipolygon.js b/modules/osm/multipolygon.js index 67d42c57d..efc734b5f 100644 --- a/modules/osm/multipolygon.js +++ b/modules/osm/multipolygon.js @@ -210,7 +210,6 @@ export function osmJoinWays(toJoin, graph) { } if (!nodes) { // couldn't find a joinable way/member - doneSequence = true; break; } diff --git a/modules/ui/edit_menu.js b/modules/ui/edit_menu.js index 99e24c0ec..e7eda610f 100644 --- a/modules/ui/edit_menu.js +++ b/modules/ui/edit_menu.js @@ -126,7 +126,7 @@ export function uiEditMenu(context) { } // update - buttons = buttonsEnter + buttonsEnter .merge(buttons) .classed('disabled', function(d) { return d.disabled(); }); From 371a5dde0eee9e92ff2a834b4d34ab71b5638abb Mon Sep 17 00:00:00 2001 From: teymour-aldridge Date: Wed, 14 Oct 2020 19:00:39 +0100 Subject: [PATCH 2/6] Make a variable inline --- modules/actions/circularize.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/actions/circularize.js b/modules/actions/circularize.js index 008575c22..90450966a 100644 --- a/modules/actions/circularize.js +++ b/modules/actions/circularize.js @@ -1,15 +1,15 @@ -import { median as d3_median } from 'd3-array'; +import {median as d3_median} from 'd3-array'; import { polygonArea as d3_polygonArea, - polygonHull as d3_polygonHull, - polygonCentroid as d3_polygonCentroid + polygonCentroid as d3_polygonCentroid, + polygonHull as d3_polygonHull } from 'd3-polygon'; -import { geoVecInterp, geoVecLength } from '../geo'; -import { osmNode } from '../osm/node'; -import { utilArrayUniq } from '../util'; -import { geoVecLengthSquare } from '../geo/vector'; +import {geoVecInterp, geoVecLength} from '../geo'; +import {osmNode} from '../osm/node'; +import {utilArrayUniq} from '../util'; +import {geoVecLengthSquare} from '../geo/vector'; export function actionCircularize(wayId, projection, maxAngle) { @@ -128,11 +128,10 @@ export function actionCircularize(wayId, projection, maxAngle) { ]); // choose a nearnode to use as the original - var min = Infinity; for (var nodeId in nearNodes) { var nearAngle = nearNodes[nodeId]; var dist = Math.abs(nearAngle - angle); - if (dist < min) { + if (dist < Infinity) { origNode = origNodes[nodeId]; } } From f11eee313e57c817717f8cd1e70bc324aa08dff6 Mon Sep 17 00:00:00 2001 From: teymour-aldridge Date: Wed, 14 Oct 2020 19:04:54 +0100 Subject: [PATCH 3/6] Remove some more unused variable assignments --- modules/ui/shortcuts.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/ui/shortcuts.js b/modules/ui/shortcuts.js index c1edf6239..4d0088dca 100644 --- a/modules/ui/shortcuts.js +++ b/modules/ui/shortcuts.js @@ -74,8 +74,7 @@ export function uiShortcuts(context) { .append('span') .html(function (d) { return t.html(d.text); }); - tabs = tabs - .merge(tabsEnter); + tabs.merge(tabsEnter); // Update wrapper.selectAll('.tab') @@ -235,8 +234,7 @@ export function uiShortcuts(context) { .html(function (d) { return d.text ? t.html(d.text) : '\u00a0'; }); - shortcuts = shortcuts - .merge(shortcutsEnter); + shortcuts.merge(shortcutsEnter); // Update wrapper.selectAll('.shortcut-tab') From b966ac318e09a95276e3c8ed2308ca4b8c8474d8 Mon Sep 17 00:00:00 2001 From: teymour-aldridge Date: Wed, 14 Oct 2020 20:48:30 +0100 Subject: [PATCH 4/6] Add back (and fix) an assignment. --- modules/actions/circularize.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/actions/circularize.js b/modules/actions/circularize.js index 90450966a..09cd2c0df 100644 --- a/modules/actions/circularize.js +++ b/modules/actions/circularize.js @@ -128,10 +128,12 @@ export function actionCircularize(wayId, projection, maxAngle) { ]); // choose a nearnode to use as the original + var min = Infinity; for (var nodeId in nearNodes) { var nearAngle = nearNodes[nodeId]; var dist = Math.abs(nearAngle - angle); - if (dist < Infinity) { + if (dist < min) { + min = dist; origNode = origNodes[nodeId]; } } From 444c2c2c15c924ea642123d50d275de82e33dabf Mon Sep 17 00:00:00 2001 From: teymour-aldridge Date: Fri, 16 Oct 2020 17:26:10 +0100 Subject: [PATCH 5/6] Apply further suggestions from code review. --- modules/actions/circularize.js | 12 ++++++------ modules/ui/shortcuts.js | 4 ---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/actions/circularize.js b/modules/actions/circularize.js index 09cd2c0df..e9f85ae24 100644 --- a/modules/actions/circularize.js +++ b/modules/actions/circularize.js @@ -2,14 +2,14 @@ import {median as d3_median} from 'd3-array'; import { polygonArea as d3_polygonArea, - polygonCentroid as d3_polygonCentroid, - polygonHull as d3_polygonHull + polygonHull as d3_polygonHull, + polygonCentroid as d3_polygonCentroid } from 'd3-polygon'; -import {geoVecInterp, geoVecLength} from '../geo'; -import {osmNode} from '../osm/node'; -import {utilArrayUniq} from '../util'; -import {geoVecLengthSquare} from '../geo/vector'; +import { geoVecInterp, geoVecLength } from '../geo'; +import { osmNode } from '../osm/node'; +import { utilArrayUniq } from '../util'; +import { geoVecLengthSquare } from '../geo/vector'; export function actionCircularize(wayId, projection, maxAngle) { diff --git a/modules/ui/shortcuts.js b/modules/ui/shortcuts.js index 4d0088dca..df9d3dd53 100644 --- a/modules/ui/shortcuts.js +++ b/modules/ui/shortcuts.js @@ -74,8 +74,6 @@ export function uiShortcuts(context) { .append('span') .html(function (d) { return t.html(d.text); }); - tabs.merge(tabsEnter); - // Update wrapper.selectAll('.tab') .classed('active', function (d, i) { @@ -234,8 +232,6 @@ export function uiShortcuts(context) { .html(function (d) { return d.text ? t.html(d.text) : '\u00a0'; }); - shortcuts.merge(shortcutsEnter); - // Update wrapper.selectAll('.shortcut-tab') .style('display', function (d, i) { From c259b32fbcd51cf011f158f2ed02c57c125f0a41 Mon Sep 17 00:00:00 2001 From: teymour-aldridge Date: Fri, 16 Oct 2020 17:35:38 +0100 Subject: [PATCH 6/6] Undo unnecessary formatting change. --- modules/actions/circularize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/actions/circularize.js b/modules/actions/circularize.js index e9f85ae24..0952a653a 100644 --- a/modules/actions/circularize.js +++ b/modules/actions/circularize.js @@ -1,4 +1,4 @@ -import {median as d3_median} from 'd3-array'; +import { median as d3_median } from 'd3-array'; import { polygonArea as d3_polygonArea,