Merge pull request #8083 from teymour-aldridge/develop

Tidy some things up.

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 .esm-cache
 .vscode/
+.idea/
 /node_modules/
 /.tx/tmp/
 npm-debug.log

modules/actions/circularize.js

@@ -133,7 +133,7 @@ export function actionCircularize(wayId, projection, maxAngle) {
                     var nearAngle = nearNodes[nodeId];
                     var dist = Math.abs(nearAngle - angle);
                     if (dist < min) {
-                        dist = min;
+                        min = dist;
                         origNode = origNodes[nodeId];
                     }
                 }
@@ -252,7 +252,7 @@ export function actionCircularize(wayId, projection, maxAngle) {
                 return false;
             }
         }
-        
+
         //check if central angles are smaller than maxAngle
         for (i = 0; i<hull.length; i++){
             actualPoint = hull[i];
@@ -266,7 +266,7 @@ export function actionCircularize(wayId, projection, maxAngle) {
             if (angle > Math.PI){
                 angle = (2*Math.PI - angle);
             }
- 
+
             if (angle > maxAngle + epsilonAngle) {
                 return false;
             }

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;
             }
 

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(); });
 

modules/ui/shortcuts.js

@@ -74,9 +74,6 @@ export function uiShortcuts(context) {
             .append('span')
             .html(function (d) { return t.html(d.text); });
 
-        tabs = tabs
-            .merge(tabsEnter);
-
         // Update
         wrapper.selectAll('.tab')
             .classed('active', function (d, i) {
@@ -235,9 +232,6 @@ export function uiShortcuts(context) {
             .html(function (d) { return d.text ? t.html(d.text) : '\u00a0'; });
 
 
-        shortcuts = shortcuts
-            .merge(shortcutsEnter);
-
         // Update
         wrapper.selectAll('.shortcut-tab')
             .style('display', function (d, i) {