Fix web UI rendering bug

mbloch · Jul 31, 2023 · 1795ec0 · 1795ec0
1 parent d8000be
commit 1795ec0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/commands/mapshaper-point-to-grid.mjs b/src/commands/mapshaper-point-to-grid.mjs
@@ -294,6 +294,7 @@ function getGridData(bbox, interval, opts) {
       xmin + (c + 1) * interval, ymin + (r + 1) * interval
     ];
   }
+
   return {
     size, cells, pointToCol, pointToRow, colRowToIdx, pointToIdx,
     idxToCol, idxToRow, idxToBBox, idxToPoint

diff --git a/src/gui/gui-canvas.mjs b/src/gui/gui-canvas.mjs
@@ -60,6 +60,7 @@ export function drawStyledLayerToCanvas(obj, canv, ext) {
       canv.drawVertices(layer.shapes, arcs, style, filter);
     }
   }
+  canv.clearStyles();
 }
 
 
@@ -120,6 +121,11 @@ export function DisplayCanvas() {
       _pixelColor = getPixelColorFunction(),
       _ext;
 
+  _self.clearStyles = function() {
+    _ctx.fillStyle = null;
+    _ctx.strokeStyle = null;
+  };
+
   _self.prep = function(extent) {
     var w = extent.width(),
         h = extent.height(),

diff --git a/src/gui/gui-import-control.mjs b/src/gui/gui-import-control.mjs
@@ -252,7 +252,7 @@ export function ImportControl(gui, opts) {
     var names = getFileNames(files);
     var expanded = [];
     if (files.length === 0) return;
-    useQuickView = importCount === 0 && (opts.quick_view || overQuickView);
+    useQuickView = importTotal === 0 && (opts.quick_view || overQuickView);
     try {
       expanded = await expandFiles(files);
     } catch(e) {

diff --git a/src/io/mapshaper-json-import.mjs b/src/io/mapshaper-json-import.mjs
@@ -141,6 +141,7 @@ function selectFromObject(o, path) {
   var separator = path.indexOf('/') > 0 ? '/' : '.';
   var parts = path.split(separator);
   var subpath, array, match;
+
   while (parts.length > 0) {
     subpath = parts.shift();
     match = arrayRxp.exec(subpath);