mapshaper 0.6.79 → 0.6.81

package/mapshaper.js

@@ -1612,6 +1612,7 @@
     this.ymin -= halfHeight * ky;
     this.xmax += halfWidth * kx;
     this.ymax += halfHeight * ky;
+    return this;
   };
 
   // Return a bounding box with the same extent as this one.
@@ -5003,7 +5004,7 @@
     if (isLatLngCRS(P)) {
       return xy.concat();
     }
-    proj = getProjTransform(P, parseCrsString('wgs84'));
+    proj = getProjTransform2(P, parseCrsString('wgs84'));
     return proj(xy[0], xy[1]);
   }
 
@@ -26664,7 +26665,7 @@ ${svg}
           codepage = lookupCodePage(ldid),
           samples = getNonAsciiSamples(),
           only7bit = samples.length === 0,
-          encoding, msg;
+          encoding;
 
       // First, check the ldid (language driver id) (an obsolete way to specify which
       // codepage to use for text encoding.)
@@ -26684,10 +26685,12 @@ ${svg}
       // As a last resort, try to guess the encoding:
       if (!encoding) {
         var info = detectEncoding(samples);
+        var msg;
         encoding = info.encoding;
         if (info.confidence < 2) {
-          msg = 'Warning: Unable to auto-detect the DBF file text encoding with high confidence.';
-          msg += '\n\nDefaulting to: ' + encoding + (encoding in encodingNames ? ' (' + encodingNames[encoding] + ')' : '');
+          msg = 'Warning: Unable to auto-detect the DBF file text encoding' +
+            (info.confidence == 1 ? ' with high confidence' : '') + '.';
+          msg += ' Defaulting to ' + encoding + (encoding in encodingNames ? ' (' + encodingNames[encoding] + ').' : '.');
           msg += '\n\nSample of how non-ascii text was imported:\n';
           if (runningInBrowser()) {
             msg += '<pre>' + formatStringsAsGrid(decodeSamples(encoding, samples), 50) + '</pre>';
@@ -45532,7 +45535,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.79";
+  var version = "0.6.81";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.79",
+  "version": "0.6.81",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/index.html

@@ -294,7 +294,6 @@ encoding=big5</span>. Click to see all options.</div></div></div></div>
 		<div class="console-window"><div class="console-buffer selectable"></div></div>
 	</div>
 	<div class="mshp-main-map main-area map-area">
-		<div class="coordinate-info colored-text selectable"></div>
 		<div class="intersection-display">
 			<span class="intersection-check text-btn colored-text">Check line intersections</span><span class="intersection-count">0 line intersections</span>
 			<img class="close-btn" draggable="false" src="images/close.png">

package/www/mapshaper-gui.js

@@ -2544,6 +2544,20 @@
     };
   }
 
+  // p1: [x, y] coords
+  // p2: [x, y] coords offset by 1x1 pixel
+  function formatCoordsForDisplay(p1, p2) {
+    var dx = Math.abs(p1[0] - p2[0]);
+    var dy = Math.abs(p1[1] - p2[1]);
+    var offs = (dx + dy) / 2;
+    var decimals = 0;
+    while (offs < 1 && decimals < 6) {
+      offs *= 10;
+      decimals++;
+    }
+    return [p1[0].toFixed(decimals), p1[1].toFixed(decimals)];
+  }
+
   // Convert a point from display CRS coordinates to data coordinates.
   // These are only different when using dynamic reprojection (basemap view).
   function translateDisplayPoint(lyr, p) {
@@ -2563,8 +2577,7 @@
   }
 
   function isProjectedLayer(lyr) {
-    // TODO: could do some validation on the layer's contents
-    return !!lyr.gui.invertPoint;
+    return !!lyr?.gui.invertPoint;
   }
 
   var darkStroke = "#334",
@@ -2765,30 +2778,7 @@
 
 
   function getDefaultStyle(lyr, baseStyle) {
-    var style = Object.assign({}, baseStyle);
-    // reduce the dot size of large point layers
-    if (lyr.geometry_type == 'point' && style.dotSize > 0) {
-      style.dotSize *= getDotScale$1(lyr);
-    }
-    return style;
-  }
-
-  function getDotScale$1(lyr) {
-    var topTier = 10000;
-    var n = countPoints(lyr.shapes, topTier); // short-circuit point counting above top threshold
-    var k = n < 200 && 4 || n < 2500 && 3 || n < topTier && 2 || 1;
-    return k;
-  }
-
-  function countPoints(shapes, max) {
-    var count = 0;
-    var i, n, shp;
-    max = max || Infinity;
-    for (i=0, n=shapes.length; i<n && count<max; i++) {
-      shp = shapes[i];
-      count += shp ? shp.length : 0;
-    }
-    return count;
+    return Object.assign({}, baseStyle);
   }
 
 
@@ -3232,6 +3222,58 @@
     return layers.reverse();
   }
 
+
+  function adjustPointSymbolSizes(layers, overlayLyr, ext) {
+    var bbox = ext.getBounds().scale(1.5).toArray();
+    var testInBounds = function(p) {
+      return p[0] > bbox[0] && p[0] < bbox[2] && p[1] > bbox[1] && p[1] < bbox[3];
+    };
+    var topTier = 50000;
+    var count = 0;
+    layers = layers.filter(function(lyr) {
+      return lyr.geometry_type == 'point' && lyr.gui.style.dotSize > 0;
+    });
+    layers.forEach(function(lyr) {
+      // short-circuit point counting above top threshold
+      count += countPoints(lyr.gui.displayLayer.shapes, topTier, testInBounds);
+    });
+    count = Math.min(topTier, count) || 1;
+    var k = Math.pow(6 - utils$1.clamp(Math.log10(count), 1, 5), 1.3);
+
+    // zoom adjustments
+    var mapScale = ext.scale();
+    if (mapScale < 0.5) {
+      k *= Math.pow(mapScale + 0.5, 0.35);
+    } else if (mapScale > 1) {
+      // scale faster at first
+      k *= Math.pow(Math.min(mapScale, 4), 0.15);
+      k *= Math.pow(mapScale, 0.05);
+    }
+
+    // scale down when map is small
+    var smallSide = Math.min(ext.width(), ext.height());
+    k *= utils$1.clamp(smallSide / 500, 0.5, 1);
+
+    layers.forEach(function(lyr) {
+      lyr.gui.style.dotScale = k;
+    });
+    if (overlayLyr && overlayLyr.geometry_type == 'point' && overlayLyr.gui.style.dotSize > 0) {
+      overlayLyr.gui.style.dotScale = k;
+    }
+  }
+
+  function countPoints(shapes, max, filter) {
+    var count = 0;
+    var i, j, n, m, shp;
+    for (i=0, n=shapes.length; i<n && count<max; i++) {
+      shp = shapes[i];
+      for (j=0, m=(shp ? shp.length : 0); j<m; j++) {
+        count += filter(shp[j]) ? 1 : 0;
+      }
+    }
+    return count;
+  }
+
   // lyr: a map layer with gui property
   // displayCRS: CRS to use for display, or null (which clears any current display CRS)
   function projectLayerForDisplay(lyr, displayCRS) {
@@ -3286,6 +3328,13 @@
       }
     }
 
+    // make sure that every path layer has an associated arc collection
+    // (if the layer is empty, its dataset may not have an arc collection).
+    // this enables adding shapes using the drawing tools.
+    if (!dataset.arcs && (layer.geometry_type == 'polygon' || layer.geometry_type == 'polyline')) {
+      dataset.arcs = new internal.ArcCollection();
+    }
+
     // Assume that dataset.displayArcs is in the display CRS
     // (it must be deleted upstream if reprojection is needed)
     // if (!obj.empty && dataset.arcs && !displayArcs) {
@@ -3370,6 +3419,21 @@
     }
   }
 
+  // Test if adding point p to a sequence of points (in pixel coords)
+  // would result in a polyline that deviates from a straight line by
+  // more than a given number of pixels
+  //
+  function pointExceedsTolerance(p, points, tolerance) {
+    if (points.length < 2) return false;
+    var p1 = points[0], p2, dist;
+    for (var i=1; i<points.length; i++) {
+      p2 = points[i];
+      dist = Math.sqrt(geom.pointSegDistSq(p2[0], p2[1], p1[0], p1[1], p[0], p[1]));
+      if (dist > tolerance) return true;
+    }
+    return false;
+  }
+
   function setZ(lyr, z) {
     lyr.gui.source.dataset.arcs.setRetainedInterval(z);
     if (isProjectedLayer(lyr)) {
@@ -3439,6 +3503,15 @@
     }
   }
 
+  function deleteFeature(lyr, fid) {
+    var records = lyr.data?.getRecords();
+    if (records) records.splice(fid, 1);
+    lyr.shapes.splice(fid, 1);
+    if (isProjectedLayer(lyr) && lyr.shapes != lyr.gui.displayLayer.shapes) {
+      lyr.gui.displayLayer.shapes.splice(fid, 1);
+    }
+  }
+
   // p: one point in source data coords
   function appendNewPoint(lyr, p) {
     lyr.shapes.push([p]);
@@ -3452,12 +3525,7 @@
   }
 
   function deletePoint(lyr, fid) {
-    var records = lyr.data?.getRecords();
-    lyr.shapes.splice(fid, 1);
-    if (records) records.splice(fid, 1);
-    if (isProjectedLayer(lyr)) {
-      lyr.gui.displayLayer.shapes.splice(fid, 1);
-    }
+    deleteFeature(lyr, fid);
   }
 
   function insertPoint(lyr, fid, shp, d) {
@@ -5620,7 +5688,6 @@
     gui.on('active', updateVisibility);
     gui.on('inactive', updateVisibility);
     gui.model.on('update', updateVisibility);
-    gui.on('mode', updateVisibility);
 
     // @iconRef: selector for an (svg) button icon
     this.addButton = function(iconRef) {
@@ -5649,10 +5716,7 @@
     };
 
     function updateVisibility() {
-      var noData = !gui.model.getActiveLayer();
-      if (GUI.isActiveInstance(gui) && !_hidden && !noData) {
-        buttons.show();
-      } else if (noData && gui.getMode() != 'import') {
+      if (GUI.isActiveInstance(gui) && !_hidden) {
         buttons.show();
       } else {
         buttons.hide();
@@ -5746,29 +5810,37 @@
     var self = this;
     var shiftDown = false;
     var ctrlDown = false;
+    var metaDown = false;
+    var altDown = false;
+
+    function updateControlKeys(e) {
+      shiftDown = e.shiftKey;
+      ctrlDown = e.ctrlKey;
+      metaDown = e.metaKey;
+      altDown = e.altKey;
+    }
     document.addEventListener('keyup', function(e) {
       if (!GUI.isActiveInstance(gui)) return;
       // this can fail to fire if keyup occurs over a context menu
-      shiftDown = e.shiftKey;
-      ctrlDown = e.ctrlKey;
+      updateControlKeys(e);
       self.dispatchEvent('keyup', getEventData(e));
     });
 
     document.addEventListener('keydown', function(e) {
       if (!GUI.isActiveInstance(gui)) return;
-      shiftDown = e.shiftKey;
-      ctrlDown = e.ctrlKey;
+      updateControlKeys(e);
       self.dispatchEvent('keydown', getEventData(e));
     });
 
     document.addEventListener('mousemove', function(e) {
       // refreshing these here to prevent problems when context menu opens
-      shiftDown = e.shiftKey;
-      ctrlDown = e.ctrlKey;
+      updateControlKeys(e);
     });
 
     this.shiftIsPressed = function() { return shiftDown; };
     this.ctrlIsPressed = function() { return ctrlDown; };
+    this.altIsPressed = function() { return altDown; };
+    this.metaIsPressed = function() { return metaDown; };
 
     this.onMenuSubmit = function(menuEl, cb) {
       gui.on('enter_key', function(e) {
@@ -7999,7 +8071,9 @@
         return;
       }
       e.originalEvent.preventDefault();
-      if (!targetLayer) return; // TODO: enable menu on empty map
+      if (!El('body').hasClass('map-view')) {
+        return;
+      }
       triggerHitEvent('contextmenu', e);
     }, false);
 
@@ -8423,7 +8497,9 @@
         mode: interactionMode
       };
       if (evt) {
+        // data coordinates
         eventData.coordinates = translateDisplayPoint(targetLayer, ext.translatePixelCoords(evt.x, evt.y));
+        eventData.display_coordinates = gui.map.pixelCoordsToDisplayCoords(evt.x, evt.y);
         eventData.originalEvent = evt;
         eventData.overMap = isOverMap(evt);
       }
@@ -8468,69 +8544,6 @@
     return self;
   }
 
-  function CoordinatesDisplay(gui, ext, mouse) {
-    var readout = gui.container.findChild('.coordinate-info').hide();
-
-    function enabled() {
-      var lyr = gui.map.getActiveLayer();
-      return !!(lyr && lyr.gui.displayLayer.geometry_type);
-    }
-
-    gui.model.on('update', function(e) {
-      readout.hide();
-    });
-
-    readout.on('copy', function(e) {
-      // remove selection on copy (using timeout or else copy is cancelled)
-      setTimeout(function() {
-        window.getSelection().removeAllRanges();
-      }, 50);
-    });
-
-    // clear coords when map pans
-    ext.on('change', function() {
-      clearCoords();
-      // shapes may change along with map scale
-      // target = lyr ? lyr.getDisplayLayer() : null;
-    });
-
-    mouse.on('leave', clearCoords);
-
-    mouse.on('click', function(e) {
-      if (!enabled()) return;
-      GUI.selectElement(readout.node());
-    });
-
-    mouse.on('hover', onMouseChange);
-    mouse.on('drag', onMouseChange, null, 10); // high priority so editor doesn't block propagation
-
-    function onMouseChange(e) {
-      if (!enabled()) return;
-      if (isOverMap(e)) {
-        displayCoords(gui.map.translatePixelCoords(e.x, e.y));
-      } else {
-        clearCoords();
-      }
-    }
-
-    function displayCoords(p) {
-      var p1 = gui.map.translatePixelCoords(0, ext.height());
-      var p2 = gui.map.translatePixelCoords(ext.width(), 0);
-      var bbox = p1.concat(p2);
-      var decimals = internal.getBoundsPrecisionForDisplay(bbox);
-      var str = internal.getRoundedCoordString(p, decimals);
-      readout.text(str).show();
-    }
-
-    function clearCoords() {
-      readout.hide();
-    }
-
-    function isOverMap(e) {
-      return e.x >= 0 && e.y >= 0 && e.x < ext.width() && e.y < ext.height();
-    }
-  }
-
   function getTimerFunction() {
     return typeof requestAnimationFrame == 'function' ?
       requestAnimationFrame : function(cb) {setTimeout(cb, 25);};
@@ -9079,7 +9092,8 @@
       if (!boxCoords) return null;
       var dataBox = getBBoxCoords(gui.map.getActiveLayer(), boxCoords);
       fixBounds(dataBox);
-      return internal.getRoundedCoords(dataBox, internal.getBoundsPrecisionForDisplay(dataBox));
+      // return internal.getRoundedCoords(dataBox, internal.getBoundsPrecisionForDisplay(dataBox));
+      return dataBox;
     };
 
     box.turnOn = function() {
@@ -9304,8 +9318,7 @@
 
     function useBoxZoom() {
       var mode = gui.getMode();
-      var disabled = ['selection_tool', 'box_tool', 'rectangle_tool'].includes(mode);
-      return !disabled;
+      return !'selection_tool,box_tool,rectangle_tool,drawing_tool'.includes(mode);
     }
 
     function getBoxData(e) {
@@ -9837,12 +9850,18 @@
     });
 
     hit.on('contextmenu', function(e) {
-      var target = hit.getHitTarget();
-      if (!e.overMap || !target || e.mode == 'edit_lines' ||
-          e.mode == 'edit_polygons' || e.mode == 'edit_points') {
+      if (!e.overMap || e.mode == 'edit_lines' || e.mode == 'edit_polygons' ||
+        e.mode == 'edit_points') {
         return;
       }
-      gui.contextMenu.open(e, hit.getHitTarget());
+      var target = hit.getHitTarget();
+      if (e.ids.length == 1) {
+        e.deleteFeature = function() {
+          deleteFeature(target, e.ids[0]);
+          gui.model.updated({filter:true});
+        };
+      }
+      gui.contextMenu.open(e, target);
     });
 
     hit.on('change', function(e) {
@@ -10265,20 +10284,29 @@
     var drawingId = -1; // feature id of path being drawn
     var sessionCount = 0;
     var alert;
+    var pencilPoints = [];
     var _dragging = false;
 
     function active() {
       return initialArcCount >= 0;
     }
 
-    function dragging() {
+    function vertexDragging() {
       return _dragging;
     }
 
-    function drawing() {
+    function pathDrawing() {
       return drawingId > -1;
     }
 
+    function cmdKeyDown() {
+      return gui.keyboard.altIsPressed() || gui.keyboard.metaIsPressed();
+    }
+
+    function pencilIsActive() {
+      return cmdKeyDown() && active() && !vertexDragging() && !!pencilPoints;
+    }
+
     function polygonMode() {
       return active() && hit.getHitTarget().geometry_type == 'polygon';
     }
@@ -10320,7 +10348,7 @@
 
     gui.on('redo_path_extend', function(e) {
       var target = hit.getHitTarget();
-      if (drawing() && prevHoverEvent) {
+      if (pathDrawing() && prevHoverEvent) {
         updatePathEndpoint(e.p);
         appendVertex$1(target, pixToDataCoords(prevHoverEvent.x, prevHoverEvent.y));
       } else {
@@ -10333,7 +10361,7 @@
 
     gui.on('undo_path_extend', function(e) {
       var target = hit.getHitTarget();
-      if (drawing() && prevHoverEvent) {
+      if (pathDrawing() && prevHoverEvent) {
         deleteLastVertex(target);
         updatePathEndpoint(pixToDataCoords(prevHoverEvent.x, prevHoverEvent.y));
       } else {
@@ -10360,11 +10388,11 @@
 
     function showInstructions() {
       var isMac = navigator.userAgent.includes('Mac');
-      var symbol = isMac ? '⌘' : '^';
-      var pathStr = polygonMode() ? 'closed paths' : 'paths';
-      var msg = `Instructions: Click on the map to draw ${pathStr}. Drag vertices to reshape a path. Type ${symbol}Z/${symbol}Y to undo/redo.`;
+      var undoKey = isMac ? '⌘' : '^';
+      var drawKey = isMac ? '⌘' : 'Alt';
+      var msg = `Instructions: Click to start a path or add a point. ${drawKey}-drag draws a path. Drag points to reshape. Type ${undoKey}Z/${undoKey}Y to undo/redo.`;
         alert = showPopupAlert(msg, null, {
-          non_blocking: true, max_width: '360px'});
+          non_blocking: true, max_width: '388px'});
     }
 
     function hideInstructions() {
@@ -10424,7 +10452,7 @@
     }
 
     hit.on('contextmenu', function(e) {
-      if (!active() || drawing() || dragging()) return;
+      if (!active() || pathDrawing() || vertexDragging()) return;
       var target = hit.getHitTarget();
       var vInfo = hoverVertexInfo;
       if (hoverVertexInfo?.type == 'vertex' && !vertexIsEndpoint(vInfo, target)) {
@@ -10437,7 +10465,7 @@
     });
 
     hit.on('dragstart', function(e) {
-      if (!active() || drawing() || !hoverVertexInfo) return;
+      if (!active() || pathDrawing() || !hoverVertexInfo) return;
       hideInstructions();
       e.originalEvent.stopPropagation();
       _dragging = true;
@@ -10449,9 +10477,48 @@
       hit.setHoverVertex(hoverVertexInfo.displayPoint, hoverVertexInfo.type);
     });
 
+    gui.map.getMouse().on('dragend', function(e) {
+      pencilPoints = []; // re-enable pencil after closing a path
+    });
+
+    gui.map.getMouse().on('drag', function(e) {
+      if (!active() || !cmdKeyDown() || vertexDragging()) return;
+      e.stopPropagation(); // prevent panning
+      if (!pencilIsActive()) return;
+      hoverVertexInfo = findPathStartInfo(e);
+      var xy = [e.x, e.y];
+      var p = pixToDataCoords(e.x, e.y);
+      if (!pathDrawing()) {
+        pencilPoints = [xy];
+        startNewPath(p);
+      } else if (pencilPoints.length == 0) {
+        // start pencil-drawing when a path is started
+        pencilPoints = [xy];
+        extendCurrentPath(p);
+      } else if (hoverVertexInfo && pencilPoints.length > 2) {
+        // close path
+        p = hoverVertexInfo.point;
+        appendVertex$1(hit.getHitTarget(), p);
+        extendCurrentPath(p);
+        pencilPoints = null; // stop drawing
+      } else if (pointExceedsTolerance(xy, pencilPoints, 1.5)) {
+        xy = pencilPoints.pop();
+        p = pixToDataCoords(xy[0], xy[1]);
+        pencilPoints = [xy];
+        extendCurrentPath(p);
+      } else {
+        // skip this point, update the hover line
+        pencilPoints.push(xy);
+        updatePathEndpoint(p);
+      }
+    }, null, 3); // higher priority than hit control
+
     hit.on('drag', function(e) {
-      if (!dragging() || drawing()) return;
+      if (!vertexDragging() || pathDrawing()) {
+        return;
+      }
       e.originalEvent.stopPropagation();
+      // dragging a vertex
       var target = hit.getHitTarget();
       var p = ext.translatePixelCoords(e.x, e.y);
       if (gui.keyboard.shiftIsPressed()) {
@@ -10464,7 +10531,7 @@
     });
 
     hit.on('dragend', function(e) {
-      if (!dragging()) return;
+      if (!vertexDragging()) return;
       _dragging = false;
       var target = hit.getHitTarget();
       // kludge to get dataset to recalculate internal bounding boxes
@@ -10481,7 +10548,7 @@
       if (!active()) return;
       // double click finishes a path
       // note: if the preceding 'click' finished the path, this does not fire
-      if (drawing()) {
+      if (pathDrawing()) {
         finishCurrentPath();
         e.originalEvent.stopPropagation(); // prevent dblclick zoom
         return;
@@ -10491,9 +10558,9 @@
     // hover event highlights the nearest point in close proximity to the pointer
     // ... or the closest point along the segment (for adding a new vertex)
     hit.on('hover', function(e) {
-      if (!active() || dragging()) return;
+      if (!active() || vertexDragging()) return;
 
-      if (drawing()) {
+      if (pathDrawing()) {
         if (!e.overMap) {
           finishCurrentPath();
           return;
@@ -10507,7 +10574,7 @@
       // highlight nearby snappable vertex (the closest vertex on a nearby line,
       //   or the first vertex of the current drawing path if not near a line)
       hoverVertexInfo = e.id >= 0 && findDraggableVertices(e) ||
-          drawing() && findPathStartInfo(e) ||
+          pathDrawing() && findPathStartInfo(e) ||
           e.id >= 0 && findInterpolatedPoint(e);
       if (hoverVertexInfo) {
         // hovering near a vertex: highlight the vertex
@@ -10524,14 +10591,15 @@
       if (!active()) return;
       if (detectDoubleClick(e)) return; // ignore second click of a dblclick
       var p = pixToDataCoords(e.x, e.y);
-      if (drawing()) {
+      if (pathDrawing()) {
         extendCurrentPath(hoverVertexInfo?.point || p);
       } else if (gui.keyboard.shiftIsPressed()) {
         deleteActiveVertex(e);
+      } else if (hoverVertexInfo?.type == 'interpolated') {
+        // don't start new path if hovering along a segment -- this is
+        // likely to be an attempt to add a new vertex, not start a new path
       } else {
         startNewPath(p);
-        hideInstructions();
-        updateCursor();
       }
       prevClickEvent = e;
     });
@@ -10557,7 +10625,7 @@
 
     function updateCursor() {
       gui.container.findChild('.map-layers').classed('drawing', active());
-      var useArrow = hoverVertexInfo && !hoverVertexInfo.extendable && !drawing();
+      var useArrow = hoverVertexInfo && !hoverVertexInfo.extendable && !pathDrawing();
       gui.container.findChild('.map-layers').classed('dragging', useArrow);
     }
 
@@ -10623,7 +10691,7 @@
     }
 
     function finishCurrentPath() {
-      if (!drawing()) return;
+      if (!pathDrawing()) return;
       var target = hit.getHitTarget();
       if (getLastArcLength(target) <= 2) { // includes hover point
         deleteLastPath(target);
@@ -10642,6 +10710,8 @@
       gui.dispatchEvent('path_add', {target, p1, p2});
       drawingId = target.shapes.length - 1;
       hit.setDrawingId(drawingId);
+      hideInstructions();
+      updateCursor();
     }
 
     // p: [x, y] source data coordinates of new point on path
@@ -10662,7 +10732,6 @@
         gui.dispatchEvent('path_extend', {target, p, shapes1, shapes2});
         clearDrawingInfo();
         fullRedraw();
-
       } else {
         appendVertex$1(target, p);
         gui.dispatchEvent('path_extend', {target, p});
@@ -10697,22 +10766,22 @@
     }
 
     function findPathStartInfo(e) {
+      if (!pathDrawing()) return false;
       var target = hit.getHitTarget();
       var arcId = target.gui.displayArcs.size() - 1;
-      var data = target.gui.displayArcs.getVertexData();
+      var p1 = ext.translatePixelCoords(e.x, e.y); // mouse coords
+      var p2 = internal.getArcStartCoords(arcId, target.gui.displayArcs); // vertex coords
+      var p3 = internal.getArcStartCoords(arcId, target.gui.source.dataset.arcs);
+      var dist = geom.distance2D(p1[0], p1[1], p2[0], p2[1]);
+      var data = target.gui.source.dataset.arcs.getVertexData();
       var i = data.ii[arcId];
-      var x = data.xx[i];
-      var y = data.yy[i];
-      var p = ext.translatePixelCoords(e.x, e.y);
-      var dist = geom.distance2D(p[0], p[1], x, y);
       var pathLen = data.nn[arcId];
       var pixelDist = dist / ext.getPixelSize();
       if (pixelDist > HOVER_THRESHOLD || pathLen < 4) {
         return null;
       }
-      var point = translateDisplayPoint(target, [x, y]);
       return {
-        target, ids: [i], extendable: false, point, displayPoint: [x, y], type: 'vertex'
+        target, ids: [i], extendable: false, displayPoint: p2, point: p3, type: 'vertex'
       };
     }
 
@@ -10948,6 +11017,7 @@
       }
     };
 
+    // translate display CRS coords to pixel coords
     this.translateCoords = function(x, y) {
       return this.getTransform().transform(x, y);
     };
@@ -10967,6 +11037,7 @@
       return bounds2.width() / _frame.width;
     };
 
+    // convert pixel coords (0,0 is top left corner of map) to display CRS coords
     this.translatePixelCoords = function(x, y) {
       return this.getTransform().invert().transform(x, y);
     };
@@ -11429,8 +11500,7 @@
 
     _self.drawSquareDots = function(shapes, style) {
       var t = getScaledTransform(_ext),
-          scaleRatio = getDotScale(_ext),
-          size = Math.round((style.dotSize || 1) * scaleRatio),
+          size = getDotSize(style),
           styler = style.styler || null,
           xmax = _canvas.width + size,
           ymax = _canvas.height + size,
@@ -11450,7 +11520,7 @@
       for (i=0, n=shapes.length; i<n; i++) {
         if (styler !== null) { // e.g. selected points
           styler(style, i);
-          size = style.dotSize * scaleRatio;
+          size = getDotSize(style);
           if (style.dotColor != color) {
             color = style.dotColor;
             _ctx.fillStyle = color;
@@ -11597,25 +11667,16 @@
     return s;
   }
 
-  function getDotScale(ext) {
-    var smallSide = Math.min(ext.width(), ext.height());
-    var mapScale = ext.scale();
-    // reduce size on smaller screens
-    var j = smallSide < 200 && 0.5 || smallSide < 400 && 0.75 || 1;
-    // grow dots as map zooms in
-    var k = 1;
-    if (mapScale < 0.5) {
-      k = Math.pow(mapScale + 0.5, 0.35);
-    } else if (mapScale > 1) {
-      // scale faster at first, so small dots in large datasets
-      // become easily visible and clickable after zooming in a bit
-      k *= Math.pow(Math.min(mapScale, 10), 0.3);
-      k *= Math.pow(mapScale, 0.1);
-    }
-    // grow pixels more slowly on retina displays (to reduce number of pixels to
-    // draw for large point datasets when slightly zoomed in)
-    var l = Math.pow(GUI.getPixelRatio(), 0.8);
-    return j * k * l;
+  function getDotSize(style) {
+    var size = style.dotSize || 1;
+    // TODO: improve
+    var scale = style.dotScale || 1;
+    size += (scale - 1) / 2;
+    size *= Math.pow(scale, 0.3);
+
+    // shrink dots slightly on retina displays, to adjust for greater clarity
+    // and reduce number of pixels to draw on large datasets.
+    return Math.round(Math.pow(GUI.getPixelRatio(), 0.8) * size);
   }
 
   function getScaledTransform(ext) {
@@ -12483,9 +12544,6 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
     _basemap = new Basemap(gui, _ext);
 
-    if (gui.options.showMouseCoordinates) {
-      new CoordinatesDisplay(gui, _ext, _mouse);
-    }
     _mouse.disable(); // wait for gui.focus() to activate mouse events
 
     model.on('select', function(e) {
@@ -12537,16 +12595,27 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       return internal.toLngLat(p, _dynamicCRS);
     };
 
-    this.getCenterLngLat = function() {
-      var bounds = _ext.getBounds();
+    this.pixelCoordsToDisplayCoords = function(x, y) {
+      var p1 = _ext.translatePixelCoords(x, y);
+      var p2 = _ext.translatePixelCoords(x+1, y+1);
       var crs = this.getDisplayCRS();
-      // TODO: handle case where active layer is a frame layer
-      if (!bounds.hasBounds() || !crs) {
-        return null;
+      if (crs) {
+        p1 = internal.toLngLat(p1, crs) || p1;
+        p2 = internal.toLngLat(p2, crs) || p2;
       }
-      return internal.toLngLat([bounds.centerX(), bounds.centerY()], crs);
+      return formatCoordsForDisplay(p1, p2);
     };
 
+    // this.getCenterLngLat = function() {
+    //   var bounds = _ext.getBounds();
+    //   var crs = this.getDisplayCRS();
+    //   // TODO: handle case where active layer is a frame layer
+    //   if (!bounds.hasBounds() || !crs) {
+    //     return null;
+    //   }
+    //   return internal.toLngLat([bounds.centerX(), bounds.centerY()], crs);
+    // };
+
     this.getDisplayCRS = function() {
       if (!_activeLyr) {
         return _dynamicCRS || internal.parseCrsString('wgs84');
@@ -12613,7 +12682,6 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       _ext.setFullBounds(calcFullBounds());
       _ext.resize();
       _renderer = new LayerRenderer(gui, el);
-      gui.buttons.show();
 
       if (opts.inspectorControl) {
         _hit = new HitControl(gui, _ext, _mouse),
@@ -12675,10 +12743,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       }
 
       if (e.layer) {
-        enhanceLayerForDisplay(e.layer, e.dataset, getDisplayOptions());
-        _activeLyr = e.layer;
-        _activeLyr.gui.style = getActiveLayerStyle(_activeLyr.gui.displayLayer, getGlobalStyleOptions());
-        _activeLyr.active = true;
+        _activeLyr = initActiveLayer(e.layer, e.dataset);
       } else {
         _activeLyr = null;
       }
@@ -12716,10 +12781,12 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
 
     function updateOverlayLayer(e) {
-      var style = getOverlayStyle(_activeLyr.gui.displayLayer, e, getGlobalStyleOptions());
+      var style = !_activeLyr?.gui?.style ? null :
+        getOverlayStyle(_activeLyr.gui.displayLayer, e, getGlobalStyleOptions());
       if (style) {
         var displayLayer = filterLayerByIds(_activeLyr.gui.displayLayer, style.ids);
         var gui = Object.assign({}, _activeLyr.gui, {style, displayLayer});
+        style.dotScale = _activeLyr.gui.style.dotScale;
         _overlayLyr = utils$1.defaults({gui}, _activeLyr);
       } else {
         _overlayLyr = null;
@@ -12863,6 +12930,17 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       });
     }
 
+    function initActiveLayer(lyr, dataset) {
+      enhanceLayerForDisplay(lyr, dataset, getDisplayOptions());
+      lyr.gui.style = getActiveLayerStyle(lyr.gui.displayLayer, getGlobalStyleOptions());
+      lyr.active = true;
+      getVisibleMapLayers().forEach(function(lyr) {
+        delete lyr.active;
+      });
+      lyr.active = true;
+      return lyr;
+    }
+
     function getDrawableFurnitureLayers(layers) {
       if (!isPreviewView()) return [];
       return getVisibleMapLayers().filter(function(o) {
@@ -12929,6 +13007,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
         updateLayerStyles(contentLayers);
         updateLayerStackOrder(model.getLayers());// update menu_order property of all layers
       }
+      adjustPointSymbolSizes(contentLayers, _overlayLyr, _ext);
       sortMapLayers(contentLayers);
       if (_intersectionLyr) {
         contentLayers = contentLayers.concat(_intersectionLyr);
@@ -12997,7 +13076,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
           menu.hide();
           _open = false;
         }
-      }, 300);
+      }, 200);
     }
 
     function addMenuItem(label, func) {
@@ -13010,7 +13089,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
     }
 
     this.open = function(e, lyr) {
-      if (!lyr || !lyr.gui.geographic) return;
+      if (lyr && !lyr.gui.geographic) return; // no popup for tabular data
       _open = true;
       _openCount++;
       var rspace = body.clientWidth - e.pageX;
@@ -13026,8 +13105,9 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       menu.css('top', (e.pageY - 15) + 'px');
 
       // menu contents
-      if (e.coordinates) {
-        addCopyCoords();
+      //
+      if (e.display_coordinates) {
+        addCoords(e.display_coordinates);
       }
       if (e.deleteVertex) {
         addMenuItem('Delete vertex', e.deleteVertex);
@@ -13038,10 +13118,16 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       if (e.ids?.length) {
         addMenuItem('Copy as GeoJSON', copyGeoJSON);
       }
+      if (e.deleteFeature) {
+        addMenuItem(getDeleteLabel(), e.deleteFeature);
+      }
+
+      function getDeleteLabel() {
+        return 'Delete ' + (lyr.geometry_type == 'point' ? 'point' : 'shape');
+      }
 
-      function addCopyCoords() {
-        var bbox = internal.getLayerBounds(lyr, lyr.gui.source.dataset.arcs).toArray();
-        var coordStr = internal.getRoundedCoordString(e.coordinates, internal.getBoundsPrecisionForDisplay(bbox));
+      function addCoords(p) {
+        var coordStr = p[0] + ',' + p[1];
         var displayStr = '• &nbsp;' + coordStr.replace(/-/g, '–').replace(',', ', ');
         addMenuItem(displayStr, function() {
           saveFileContentToClipboard(coordStr);
@@ -13086,7 +13172,6 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       inspectorControl: true,
       saveControl: true,
       disableNavigation: false,
-      showMouseCoordinates: true,
       focus: true
     }, opts);
 

package/www/mapshaper.js

@@ -1612,6 +1612,7 @@
     this.ymin -= halfHeight * ky;
     this.xmax += halfWidth * kx;
     this.ymax += halfHeight * ky;
+    return this;
   };
 
   // Return a bounding box with the same extent as this one.
@@ -5003,7 +5004,7 @@
     if (isLatLngCRS(P)) {
       return xy.concat();
     }
-    proj = getProjTransform(P, parseCrsString('wgs84'));
+    proj = getProjTransform2(P, parseCrsString('wgs84'));
     return proj(xy[0], xy[1]);
   }
 
@@ -26664,7 +26665,7 @@ ${svg}
           codepage = lookupCodePage(ldid),
           samples = getNonAsciiSamples(),
           only7bit = samples.length === 0,
-          encoding, msg;
+          encoding;
 
       // First, check the ldid (language driver id) (an obsolete way to specify which
       // codepage to use for text encoding.)
@@ -26684,10 +26685,12 @@ ${svg}
       // As a last resort, try to guess the encoding:
       if (!encoding) {
         var info = detectEncoding(samples);
+        var msg;
         encoding = info.encoding;
         if (info.confidence < 2) {
-          msg = 'Warning: Unable to auto-detect the DBF file text encoding with high confidence.';
-          msg += '\n\nDefaulting to: ' + encoding + (encoding in encodingNames ? ' (' + encodingNames[encoding] + ')' : '');
+          msg = 'Warning: Unable to auto-detect the DBF file text encoding' +
+            (info.confidence == 1 ? ' with high confidence' : '') + '.';
+          msg += ' Defaulting to ' + encoding + (encoding in encodingNames ? ' (' + encodingNames[encoding] + ').' : '.');
           msg += '\n\nSample of how non-ascii text was imported:\n';
           if (runningInBrowser()) {
             msg += '<pre>' + formatStringsAsGrid(decodeSamples(encoding, samples), 50) + '</pre>';
@@ -45532,7 +45535,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.79";
+  var version = "0.6.81";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.

package/www/page.css

@@ -151,21 +151,6 @@ body.map-view {
 	height: 29px;
 }
 
-.basemap-on .coordinate-info {
-	left: 100px;
-}
-
-.coordinate-info {
-	z-index: 1;
-	position: absolute;
-	bottom: 7px;
-	left: 7px;
-	padding: 2px 5px 2px 5px;
-	font-size: 11px;
-	pointer-events: none;
-	background: rgba(255,255,255,0.4);
-}
-
 .mapshaper-logo {
 	font-weight: bold;
 	font-size: 17px;
@@ -348,12 +333,10 @@ div.alert-box {
 	border-radius: 9px;
 	font-size: 14px;
 	line-height: 1.5;
-/*	color: #555;*/
 	padding: 9px 11px 6px 11px;
 	margin: 9px -1px 3px -1px;
 	min-height: 120px;
 	background: #f8fdff;
-;
 }
 
 .catalog-mode .file-catalog {