mapshaper 0.6.40 → 0.6.42

package/www/mapshaper-gui.js

@@ -1125,21 +1125,26 @@
     var self = {}, html = '';
     var _cancel, _close;
     var warningRxp = /^Warning: /;
-    var el = El('div').appendTo('body').addClass('error-wrapper');
-    var infoBox = El('div').appendTo(el).addClass('error-box info-box selectable');
+    var el = El('div').appendTo('body').addClass('alert-wrapper');
+    var infoBox = El('div').appendTo(el).addClass('alert-box info-box selectable');
+    El('div').appendTo(infoBox).addClass('close2-btn').on('click', function() {
+      if (_cancel) _cancel();
+      self.close();
+    });
+    var container = El('div').appendTo(infoBox);
     if (!title && warningRxp.test(msg)) {
       title = 'Warning';
       msg = msg.replace(warningRxp, '');
     }
     if (title) {
-      html += `<div class="error-title">${title}</div>`;
+      El('div').addClass('alert-title').text(title).appendTo(container);
+    }
+    var content = El('div').appendTo(infoBox);
+    if (msg) {
+      content.html(`<p class="error-message">${msg}</p>`);
     }
-    html += `<p class="error-message">${msg}</p>`;
-    El('div').appendTo(infoBox).addClass('close2-btn').on('click', function() {
-      if (_cancel) _cancel();
-      self.close();
-    });
-    El('div').appendTo(infoBox).addClass('error-content').html(html);
+
+    self.container = function() { return content; };
 
     self.onCancel = function(cb) {
       _cancel = cb;
@@ -1979,7 +1984,7 @@
       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) {
@@ -4023,10 +4028,10 @@
 
     function render() {
       renderLayerList();
-      renderFileList();
+      renderSourceFileList();
     }
 
-    function renderFileList() {
+    function renderSourceFileList() {
       var list = el.findChild('.file-list');
       var files = [];
       list.empty();
@@ -5064,6 +5069,26 @@
     _stop = stop;
   }
 
+  // get detailed error information from error stack (if available)
+  // Example stack string (Node.js):
+  /*
+  /Users/someuser/somescript.js:226
+      opacity: Math.round(weight * 5 / 5 // 0.2 0.4 0.6 etc
+                                       ^
+
+  SyntaxError: missing ) after argument list
+      at internalCompileFunction (node:internal/vm:73:18)
+      at wrapSafe (node:internal/modules/cjs/loader:1149:20)
+      at Module._compile (node:internal/modules/cjs/loader:1190:27)
+      ...
+  */
+  function getErrorDetail(e) {
+    var parts = (typeof e.stack == 'string') ? e.stack.split(/\n\s*\n/) : [];
+    if (parts.length > 1 || true) {
+      return '\nError details:\n' + parts[0];
+    }
+    return '';
+  }
 
   // print a message to stdout
   function print() {
@@ -7993,8 +8018,7 @@
       // stash a function for refreshing the current popup when data changes
       // while the popup is being displayed (e.g. while dragging a label)
       refresh = function() {
-        var rec = table && (editable ? table.getRecordAt(id) : table.getReadOnlyRecordAt(id)) || {};
-        render(content, rec, table, editable);
+        render(content, id, table, editable);
       };
       refresh();
       if (ids && ids.length > 1) {
@@ -8033,7 +8057,8 @@
       tab.show();
     }
 
-    function render(el, rec, table, editable) {
+    function render(el, recId, table, editable) {
+      var rec = table && (editable ? table.getRecordAt(recId) : table.getReadOnlyRecordAt(recId)) || {};
       var tableEl = El('table').addClass('selectable'),
           rows = 0;
       // self.hide(); // clean up if panel is already open
@@ -8048,11 +8073,6 @@
         }
       });
 
-      // add new field form
-      if (editable) {
-        renderNewRow(tableEl, rec, table);
-      }
-
       tableEl.appendTo(el);
       if (rows > 0) {
         // tableEl.appendTo(el);
@@ -8077,15 +8097,58 @@
       }
 
       if (editable) {
+        // render "add field" button
         var line = El('div').appendTo(el);
         El('span').addClass('save-menu-btn').appendTo(line).on('click', async function(e) {
+          // show "add field" dialog
+          renderAddFieldPopup(recId, table);
+        }).text('+ add field');
+      }
+    }
+
+    function renderAddFieldPopup(recId, table) {
+      var popup = showPopupAlert('', 'Add field');
+      var el = popup.container();
+      el.addClass('option-menu');
+      var html = `<input type="text" class="field-name text-input" placeholder="field name"><br>
+    <input type="text" class="field-value text-input" placeholder="value"><br>
+    <div class="btn dialog-btn">Apply</div> <span class="inline-checkbox"><input type="checkbox" class="all" />assign value to all records</span>`;
+      el.html(html);
+
+      var name = el.findChild('.field-name');
+      name.node().focus();
+      var val = el.findChild('.field-value');
+      var box = el.findChild('.all');
+      var btn = el.findChild('.btn').on('click', function() {
+        var all = box.node().checked;
+        var nameStr = name.node().value.trim();
+        if (!nameStr) return;
+        if (table.fieldExists(nameStr)) {
+          name.node().value = '';
+          return;
+        }
+        var valStr = val.node().value.trim();
+        var value = parseUnknownType(valStr);
+        // table.addField(nameStr, function(d) {
+        //   // parse each time to avoid multiple references to objects
+        //   return (all || d == rec) ? parseUnknownType(valStr) : null;
+        // });
 
-        }).text('add field');
-      }
-    }
-
-    function renderNewRow(el, rec, table) {
+        var cmdStr = `-each "d['${nameStr}'] = `;
+        if (!all) {
+          cmdStr += `this.id != ${recId} ? null : `;
+        }
+        valStr = JSON.stringify(JSON.stringify(value));
+        cmdStr = valStr.replace('"', cmdStr);
 
+        gui.console.runMapshaperCommands(cmdStr, function(err) {
+          if (!err) {
+            popup.close();
+          } else {
+            console.error(err);
+          }
+        });
+      });
     }
 
     function renderRow(table, rec, key, type, editable) {
@@ -8121,12 +8184,10 @@
       input.on('change', function(e) {
         var val2 = parser(input.value()),
             strval2 = formatInspectorValue(val2, type);
-        if (strval == strval2) {
-          // contents unchanged
-        } else if (val2 === null && type != 'object') { // allow null objects
+        if (val2 === null && type != 'object') { // allow null objects
           // invalid value; revert to previous value
           input.value(strval);
-        } else {
+        } else if (strval != strval2) {
           // field content has changed
           strval = strval2;
           gui.dispatchEvent('data_preupdate', {FID: currId}); // for undo/redo
@@ -8191,6 +8252,14 @@
     }
   };
 
+  function parseUnknownType(str) {
+    var val = inputParsers.number(str);
+    if (val !== null) return val;
+    val = inputParsers.object(str);
+    if (val !== null) return val;
+    return str;
+  }
+
   function getInputParser(type) {
     return inputParsers[type || 'multiple'];
   }
@@ -9171,6 +9240,10 @@
       return calcBounds(_cx, _cy, _scale / (k || 1));
     };
 
+    this.getFullBounds = function() {
+      return _fullBounds;
+    };
+
     // Update the extent of 'full' zoom without navigating the current view
     //
     this.setFullBounds = function(fullBounds, strictBounds) {
@@ -9506,6 +9579,7 @@
         canv.drawVertices(layer.shapes, arcs, style, filter);
       }
     }
+    canv.clearStyles();
   }
 
 
@@ -9566,6 +9640,11 @@
         _pixelColor = getPixelColorFunction(),
         _ext;
 
+    _self.clearStyles = function() {
+      _ctx.fillStyle = null;
+      _ctx.strokeStyle = null;
+    };
+
     _self.prep = function(extent) {
       var w = extent.width(),
           h = extent.height(),
@@ -10551,25 +10630,11 @@
 
 
   function getDisplayBounds(lyr, arcs) {
-    var arcBounds = arcs ? arcs.getBounds() : new Bounds(),
-        bounds = arcBounds, // default display extent: all arcs in the dataset
-        lyrBounds;
-
-    if (lyr.geometry_type == 'point') {
-      lyrBounds = internal.getLayerBounds(lyr);
-      if (lyrBounds && lyrBounds.hasBounds()) {
-        if (lyrBounds.area() > 0 || !arcBounds.hasBounds()) {
-          bounds = lyrBounds;
-        } else {
-          // if a point layer has no extent (e.g. contains only a single point),
-          // then merge with arc bounds, to place the point in context.
-          bounds = arcBounds.mergeBounds(lyrBounds);
-        }
-      }
-    }
-
-    if (!bounds || !bounds.hasBounds()) { // empty layer
-      bounds = new Bounds();
+    var bounds = internal.getLayerBounds(lyr, arcs) || new Bounds();
+    if (lyr.geometry_type == 'point' && arcs && bounds.hasBounds() && bounds.area() > 0 === false) {
+      // if a point layer has no extent (e.g. contains only a single point),
+      // then merge with arc bounds, to place the point in context.
+      bounds = bounds.mergeBounds(arcs.getBounds());
     }
     return bounds;
   }
@@ -10843,7 +10908,6 @@
         _ext = new MapExtent(position),
         _nav = new MapNav(gui, _ext, _mouse),
         _visibleLayers = [], // cached visible map layers
-        _fullBounds = null,
         _hit,
         _basemap,
         _intersectionLyr, _activeLyr, _overlayLyr,
@@ -10951,8 +11015,8 @@
       updateLayerStyles(getDrawableContentLayers()); // kludge to make sure all layers have styles
 
       // Update map extent (also triggers redraw)
-      projectMapExtent(_ext, oldCRS, this.getDisplayCRS(), getFullBounds());
-      _fullBounds = getFullBounds(); // update this so map extent doesn't get reset after next update
+      projectMapExtent(_ext, oldCRS, this.getDisplayCRS(), calcFullBounds());
+      updateFullBounds();
     };
 
     // Refresh map display in response to data changes, layer selection, etc.
@@ -10995,28 +11059,27 @@
         gui.dispatchEvent('popup-needs-refresh');
       } else if (_hit) {
         _hit.clearSelection();
-        _hit.setLayer(_activeLyr);
       }
+      _hit.setLayer(_activeLyr); // need this every time, to support dynamic reprojection
 
       updateVisibleMapLayers();
-      fullBounds = getFullBounds();
+      fullBounds = calcFullBounds();
 
-      if (!prevLyr || !_fullBounds || prevLyr.tabular || _activeLyr.tabular || isFrameView()) {
+      if (!prevLyr || prevLyr.tabular || _activeLyr.tabular || isFrameView()) {
         needReset = true;
       } else {
-        needReset = mapNeedsReset(fullBounds, _fullBounds, _ext.getBounds(), e.flags);
+        needReset = mapNeedsReset(fullBounds, _ext.getFullBounds(), _ext.getBounds(), e.flags);
       }
 
       if (isFrameView()) {
         _nav.setZoomFactor(0.05); // slow zooming way down to allow fine-tuning frame placement // 0.03
-        _ext.setFrame(getFullBounds()); // TODO: remove redundancy with drawLayers()
+        _ext.setFrame(calcFullBounds()); // TODO: remove redundancy with drawLayers()
         needReset = true; // snap to frame extent
       } else {
         _nav.setZoomFactor(1);
       }
       _ext.setFullBounds(fullBounds, getStrictBounds()); // update 'home' button extent
 
-      _fullBounds = fullBounds;
       if (needReset) {
         _ext.reset();
       }
@@ -11117,12 +11180,17 @@
       return null;
     }
 
-    function getFullBounds() {
+    function updateFullBounds() {
+      _ext.setFullBounds(calcFullBounds(), getStrictBounds());
+    }
+
+    function calcFullBounds() {
       if (isPreviewView()) {
         return internal.getFrameLayerBounds(internal.findFrameLayer(model));
       }
       var b = new Bounds();
-      getDrawableContentLayers().forEach(function(lyr) {
+      var layers = getDrawableContentLayers();
+      layers.forEach(function(lyr) {
         b.mergeBounds(lyr.bounds);
       });
 
@@ -11267,6 +11335,7 @@
     //   (default)  anything could have changed
     function drawLayers2(action) {
       var layersMayHaveChanged = !action;
+      var fullBounds;
       var contentLayers = getDrawableContentLayers();
       var furnitureLayers = getDrawableFurnitureLayers();
       if (!(_ext.width() > 0 && _ext.height() > 0)) {
@@ -11277,7 +11346,7 @@
       if (layersMayHaveChanged) {
         // kludge to handle layer visibility toggling
         _ext.setFrame(isPreviewView() ? getFrameData() : null);
-        _ext.setFullBounds(getFullBounds(), getStrictBounds());
+        updateFullBounds();
         updateLayerStyles(contentLayers);
         updateLayerStackOrder(model.getLayers());// update menu_order property of all layers
       }