mapshaper 0.6.97 → 0.6.99

package/mapshaper.js

@@ -14931,6 +14931,24 @@
           return opts.geojson_editor.get(_id);
         }
       });
+
+      Object.defineProperty(ctx, 'feature', {
+        set: function(o) {
+          opts.geojson_editor.set(o, _id);
+        },
+        get: function() {
+          return opts.geojson_editor.get(_id);
+        }
+      });
+
+      Object.defineProperty(ctx, 'geometry', {
+        set: function(o) {
+          opts.geojson_editor.setGeometry(o, _id);
+        },
+        get: function() {
+          return opts.geojson_editor.getGeometry(_id);
+        }
+      });
     }
 
     if (_records) {
@@ -25134,12 +25152,10 @@ ${svg}
         // describe: 'multiply min-area by Polsby-Popper compactness (0-1)'
         type: 'flag',
       })
-      /*
       .option('remove-empty', {
         type: 'flag',
         describe: 'delete features with null geometry'
       })
-      */
       .option('target', targetOpt);
 
     parser.command('graticule')
@@ -34748,6 +34764,11 @@ ${svg}
 
     editShapes(lyr.shapes, pathFilter);
     message(utils.format("Removed %'d sliver%s using %s", removed, utils.pluralSuffix(removed), filterData.label));
+
+    // Remove null shapes (likely removed by clipping/erasing, although possibly already present)
+    if (opts.remove_empty) {
+      cmd.filterFeatures(lyr, dataset.arcs, {remove_empty: true, verbose: false});
+    }
     return removed;
   }
 
@@ -35761,58 +35782,6 @@ ${svg}
 
   cmd.comment = function() {}; // no-op, so -comment doesn't trigger a parsing error
 
-  function expressionUsesGeoJSON(exp) {
-    return exp.includes('this.geojson');
-  }
-
-  function getFeatureEditor(lyr, dataset) {
-    var api = {};
-    // need to copy attribute to avoid circular references if geojson is assigned
-    // to a data property.
-    var copy = copyLayer(lyr);
-    var features = exportLayerAsGeoJSON(copy, dataset, {rfc7946: true}, true);
-    var features2 = [];
-
-    api.get = function(i) {
-      if (i > 0) features[i-1] = null; // garbage-collect old features
-      return features[i];
-    };
-
-    api.set = function(feat, i) {
-      var arr;
-
-      if (utils.isString(feat)) {
-        feat = JSON.parse(feat);
-      }
-
-      if (!feat) return;
-
-      if (feat.type == 'GeometryCollection') {
-        arr = feat.geometries.map(geom => GeoJSON.toFeature(geom));
-      } else if (feat.type == 'FeatureCollection') {
-        arr = feat.features;
-      } else {
-        feat = GeoJSON.toFeature(feat);
-      }
-
-      if (arr) {
-        features2 = features2.concat(arr);
-      } else {
-        features2.push(feat);
-      }
-    };
-
-    api.done = function() {
-      if (features2.length === 0) return; // read-only expression
-      var geojson = {
-        type: 'FeatureCollection',
-        features: features2
-      };
-      return importGeoJSON(geojson);
-    };
-    return api;
-  }
-
   cmd.dashlines = function(lyr, dataset, opts) {
     var crs = getDatasetCRS(dataset);
     var defs = getStashedVar('defs');
@@ -37777,6 +37746,76 @@ ${svg}
     }
   };
 
+  function expressionUsesGeoJSON(exp) {
+    return exp.includes('this.geojson') || exp.includes('this.geometry') || exp.includes('this.feature');
+  }
+
+  function getFeatureEditor(lyr, dataset) {
+    var api = {};
+    // need to copy attribute to avoid circular references if geojson is assigned
+    // to a data property.
+    var copy = copyLayer(lyr);
+    var features = exportLayerAsGeoJSON(copy, dataset, {rfc7946: true}, true);
+    var features2 = [];
+
+    api.get = function(i) {
+      if (i > 0) features[i-1] = null; // garbage-collect old features
+      return features[i];
+    };
+
+    api.getGeometry = function(i) {
+      if (i > 0) features[i-1] = null; // garbage-collect old features
+      return features[i] ? features[i].geometry : null;
+    };
+
+    api.setGeometry = function(geom, i) {
+      if (utils.isString(geom)) {
+        geom = JSON.parse(geom);
+      }
+      // TODO: validate? validate geometry in feature setter?
+      var feat = {
+        type: 'Feature',
+        properties: features[i] ? features[i].properties : null,
+        geometry: geom || null
+      };
+      api.set(feat, i);
+    };
+
+    api.set = function(feat, i) {
+      var arr;
+
+      if (utils.isString(feat)) {
+        feat = JSON.parse(feat);
+      }
+
+      if (!feat) return;
+
+      if (feat.type == 'GeometryCollection') {
+        arr = feat.geometries.map(geom => GeoJSON.toFeature(geom));
+      } else if (feat.type == 'FeatureCollection') {
+        arr = feat.features;
+      } else {
+        feat = GeoJSON.toFeature(feat);
+      }
+
+      if (arr) {
+        features2 = features2.concat(arr);
+      } else {
+        features2.push(feat);
+      }
+    };
+
+    api.done = function() {
+      if (features2.length === 0) return; // read-only expression
+      var geojson = {
+        type: 'FeatureCollection',
+        features: features2
+      };
+      return importGeoJSON(geojson);
+    };
+    return api;
+  }
+
   cmd.filterGeom = function(lyr, arcs, opts) {
     if (!layerHasGeometry(lyr)) {
       stop("Layer is missing geometry");
@@ -45687,7 +45726,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.97";
+  var version = "0.6.99";
 
   // 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.97",
+  "version": "0.6.99",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/mapshaper-gui.js

@@ -1089,6 +1089,103 @@
     return _el;
   }
 
+  function filterLayerByIds(lyr, ids) {
+    var shapes;
+    if (lyr.shapes) {
+      shapes = ids.map(function(id) {
+        return lyr.shapes[id];
+      });
+      return utils$1.defaults({shapes: shapes, data: null}, lyr);
+    }
+    return lyr;
+  }
+
+  function formatLayerNameForDisplay(name) {
+    return name || '[unnamed]';
+  }
+
+  function cleanLayerName(raw) {
+    return raw.replace(/[\n\t/\\]/g, '')
+      .replace(/^[.\s]+/, '').replace(/[.\s]+$/, '');
+  }
+
+  function updateLayerStackOrder(layers) {
+    // 1. assign ascending ids to unassigned layers above the range of other layers
+    layers.forEach(function(o, i) {
+      if (!o.layer.menu_order) o.layer.menu_order = 1e6 + i;
+    });
+    // 2. sort in ascending order
+    layers.sort(function(a, b) {
+      return a.layer.menu_order - b.layer.menu_order;
+    });
+    // 3. assign consecutve ids
+    layers.forEach(function(o, i) {
+      o.layer.menu_order = i + 1;
+    });
+    return layers;
+  }
+
+  function sortLayersForMenuDisplay(layers) {
+    layers = updateLayerStackOrder(layers);
+    return layers.reverse();
+  }
+
+  function setLayerPinning(lyr, pinned) {
+    lyr.pinned = !!pinned;
+  }
+
+
+  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;
+  }
+
   async function showPrompt(msg, title) {
     var popup = showPopupAlert(msg, title);
     return new Promise(function(resolve) {
@@ -1971,7 +2068,12 @@
           model.setDefaultTarget([target.layers[0]], target.dataset);
         }
       }
-      model.updated({select: true});
+      if (opts.display_all && importTotal === 0) {
+        model.getLayers().forEach(function(o) {
+          setLayerPinning(o.layer, true);
+        });
+      }
+      model.updated({select: true}); // trigger redraw
     }
 
     function clearQueuedFiles() {
@@ -3206,99 +3308,6 @@
     }
   }
 
-  function filterLayerByIds(lyr, ids) {
-    var shapes;
-    if (lyr.shapes) {
-      shapes = ids.map(function(id) {
-        return lyr.shapes[id];
-      });
-      return utils$1.defaults({shapes: shapes, data: null}, lyr);
-    }
-    return lyr;
-  }
-
-  function formatLayerNameForDisplay(name) {
-    return name || '[unnamed]';
-  }
-
-  function cleanLayerName(raw) {
-    return raw.replace(/[\n\t/\\]/g, '')
-      .replace(/^[.\s]+/, '').replace(/[.\s]+$/, '');
-  }
-
-  function updateLayerStackOrder(layers) {
-    // 1. assign ascending ids to unassigned layers above the range of other layers
-    layers.forEach(function(o, i) {
-      if (!o.layer.menu_order) o.layer.menu_order = 1e6 + i;
-    });
-    // 2. sort in ascending order
-    layers.sort(function(a, b) {
-      return a.layer.menu_order - b.layer.menu_order;
-    });
-    // 3. assign consecutve ids
-    layers.forEach(function(o, i) {
-      o.layer.menu_order = i + 1;
-    });
-    return layers;
-  }
-
-  function sortLayersForMenuDisplay(layers) {
-    layers = updateLayerStackOrder(layers);
-    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) {
@@ -5029,7 +5038,7 @@
     pinAll.on('click', function() {
       var allOn = testAllLayersPinned();
       model.getLayers().forEach(function(target) {
-        map.setLayerPinning(target, !allOn);
+        setLayerPinning(target.layer, !allOn);
       });
       El.findAll('.pinnable', el.node()).forEach(function(item) {
         El(item).classed('pinned', !allOn);
@@ -5200,7 +5209,7 @@
 
       html = '<!-- ' + lyr.menu_id + '--><div class="' + classes + '">';
       html += rowHTML('name', '<span class="layer-name colored-text dot-underline">' + formatLayerNameForDisplay(lyr.name) + '</span>', 'row1');
-      html += rowHTML('contents', describeLyr(lyr));
+      html += rowHTML('contents', describeLyr(lyr, dataset));
       html += '<img class="close-btn" draggable="false" src="images/close.png">';
       if (opts.pinnable) {
         html += '<img class="eye-btn black-eye" draggable="false" src="images/eye.png">';
@@ -5265,7 +5274,7 @@
         e.stopPropagation();
         if (map.isVisibleLayer(target.layer)) {
           // TODO: check for double map refresh after model.deleteLayer() below
-          map.setLayerPinning(target, false);
+          setLayerPinning(target.layer, false);
         }
         model.deleteLayer(target.layer, target.dataset);
       });
@@ -5289,7 +5298,7 @@
           }
           lyr.hidden = hidden;
           lyr.unpinned = unpinned;
-          map.setLayerPinning(target, pinned);
+          setLayerPinning(lyr, pinned);
           entry.classed('pinned', pinned);
           entry.classed('invisible', hidden);
           updatePinAllButton();
@@ -5330,15 +5339,18 @@
       });
     }
 
-    function describeLyr(lyr) {
+    function describeLyr(lyr, dataset) {
       var n = internal.getFeatureCount(lyr),
+          isFrame = internal.isFrameLayer(lyr, dataset.arcs),
           str, type;
       if (lyr.data && !lyr.shapes) {
         type = 'data record';
       } else if (lyr.geometry_type) {
         type = lyr.geometry_type + ' feature';
       }
-      if (type) {
+      if (isFrame) {
+        str = 'map frame';
+      } else if (type) {
         str = utils$1.format('%,d %s%s', n, type, utils$1.pluralSuffix(n));
       } else {
         str = "[empty]";
@@ -5949,7 +5961,7 @@
       box: 'rectangle tool',
       data: 'edit attributes',
       labels: 'position labels',
-      edit_points: 'add/edit points',
+      edit_points: 'add/drag points',
       edit_lines: 'draw/edit polylines',
       edit_polygons: 'draw/edit polygons',
       vertices: 'edit vertices',
@@ -12477,10 +12489,6 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       drawLayers();
     };
 
-    this.setLayerPinning = function(target, pinned) {
-      target.layer.pinned = !!pinned;
-    };
-
     this.pixelCoordsToLngLatCoords = function(x, y) {
       var crsFrom = this.getDisplayCRS();
       if (!crsFrom) return null; // e.g. table view
@@ -12904,11 +12912,13 @@ 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);
       }
+      // moved this below intersection layer addition, so intersection dots get scaled
+      adjustPointSymbolSizes(contentLayers, _overlayLyr, _ext);
+
       // RENDERING
       // draw main content layers
       _renderer.drawMainLayers(contentLayers, action);
@@ -13558,14 +13568,9 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       dataLoaded = true;
       gui.buttons.show();
       gui.basemap.show();
-      El('#mode-buttons').show();
-      El('#splash-buttons').hide();
+      El('#mode-buttons').show(); // show Simplify, Console, Export, etc.
+      El('#splash-buttons').hide(); // hide Wiki, Github buttons
       El('body').addClass('map-view');
-      if (importOpts.display_all) {
-        gui.model.getLayers().forEach(function(o) {
-          gui.map.setLayerPinning(o, true);
-        });
-      }
       gui.console.runInitialCommands(getInitialConsoleCommands());
     });
   };

package/www/mapshaper.js

@@ -14931,6 +14931,24 @@
           return opts.geojson_editor.get(_id);
         }
       });
+
+      Object.defineProperty(ctx, 'feature', {
+        set: function(o) {
+          opts.geojson_editor.set(o, _id);
+        },
+        get: function() {
+          return opts.geojson_editor.get(_id);
+        }
+      });
+
+      Object.defineProperty(ctx, 'geometry', {
+        set: function(o) {
+          opts.geojson_editor.setGeometry(o, _id);
+        },
+        get: function() {
+          return opts.geojson_editor.getGeometry(_id);
+        }
+      });
     }
 
     if (_records) {
@@ -25134,12 +25152,10 @@ ${svg}
         // describe: 'multiply min-area by Polsby-Popper compactness (0-1)'
         type: 'flag',
       })
-      /*
       .option('remove-empty', {
         type: 'flag',
         describe: 'delete features with null geometry'
       })
-      */
       .option('target', targetOpt);
 
     parser.command('graticule')
@@ -34748,6 +34764,11 @@ ${svg}
 
     editShapes(lyr.shapes, pathFilter);
     message(utils.format("Removed %'d sliver%s using %s", removed, utils.pluralSuffix(removed), filterData.label));
+
+    // Remove null shapes (likely removed by clipping/erasing, although possibly already present)
+    if (opts.remove_empty) {
+      cmd.filterFeatures(lyr, dataset.arcs, {remove_empty: true, verbose: false});
+    }
     return removed;
   }
 
@@ -35761,58 +35782,6 @@ ${svg}
 
   cmd.comment = function() {}; // no-op, so -comment doesn't trigger a parsing error
 
-  function expressionUsesGeoJSON(exp) {
-    return exp.includes('this.geojson');
-  }
-
-  function getFeatureEditor(lyr, dataset) {
-    var api = {};
-    // need to copy attribute to avoid circular references if geojson is assigned
-    // to a data property.
-    var copy = copyLayer(lyr);
-    var features = exportLayerAsGeoJSON(copy, dataset, {rfc7946: true}, true);
-    var features2 = [];
-
-    api.get = function(i) {
-      if (i > 0) features[i-1] = null; // garbage-collect old features
-      return features[i];
-    };
-
-    api.set = function(feat, i) {
-      var arr;
-
-      if (utils.isString(feat)) {
-        feat = JSON.parse(feat);
-      }
-
-      if (!feat) return;
-
-      if (feat.type == 'GeometryCollection') {
-        arr = feat.geometries.map(geom => GeoJSON.toFeature(geom));
-      } else if (feat.type == 'FeatureCollection') {
-        arr = feat.features;
-      } else {
-        feat = GeoJSON.toFeature(feat);
-      }
-
-      if (arr) {
-        features2 = features2.concat(arr);
-      } else {
-        features2.push(feat);
-      }
-    };
-
-    api.done = function() {
-      if (features2.length === 0) return; // read-only expression
-      var geojson = {
-        type: 'FeatureCollection',
-        features: features2
-      };
-      return importGeoJSON(geojson);
-    };
-    return api;
-  }
-
   cmd.dashlines = function(lyr, dataset, opts) {
     var crs = getDatasetCRS(dataset);
     var defs = getStashedVar('defs');
@@ -37777,6 +37746,76 @@ ${svg}
     }
   };
 
+  function expressionUsesGeoJSON(exp) {
+    return exp.includes('this.geojson') || exp.includes('this.geometry') || exp.includes('this.feature');
+  }
+
+  function getFeatureEditor(lyr, dataset) {
+    var api = {};
+    // need to copy attribute to avoid circular references if geojson is assigned
+    // to a data property.
+    var copy = copyLayer(lyr);
+    var features = exportLayerAsGeoJSON(copy, dataset, {rfc7946: true}, true);
+    var features2 = [];
+
+    api.get = function(i) {
+      if (i > 0) features[i-1] = null; // garbage-collect old features
+      return features[i];
+    };
+
+    api.getGeometry = function(i) {
+      if (i > 0) features[i-1] = null; // garbage-collect old features
+      return features[i] ? features[i].geometry : null;
+    };
+
+    api.setGeometry = function(geom, i) {
+      if (utils.isString(geom)) {
+        geom = JSON.parse(geom);
+      }
+      // TODO: validate? validate geometry in feature setter?
+      var feat = {
+        type: 'Feature',
+        properties: features[i] ? features[i].properties : null,
+        geometry: geom || null
+      };
+      api.set(feat, i);
+    };
+
+    api.set = function(feat, i) {
+      var arr;
+
+      if (utils.isString(feat)) {
+        feat = JSON.parse(feat);
+      }
+
+      if (!feat) return;
+
+      if (feat.type == 'GeometryCollection') {
+        arr = feat.geometries.map(geom => GeoJSON.toFeature(geom));
+      } else if (feat.type == 'FeatureCollection') {
+        arr = feat.features;
+      } else {
+        feat = GeoJSON.toFeature(feat);
+      }
+
+      if (arr) {
+        features2 = features2.concat(arr);
+      } else {
+        features2.push(feat);
+      }
+    };
+
+    api.done = function() {
+      if (features2.length === 0) return; // read-only expression
+      var geojson = {
+        type: 'FeatureCollection',
+        features: features2
+      };
+      return importGeoJSON(geojson);
+    };
+    return api;
+  }
+
   cmd.filterGeom = function(lyr, arcs, opts) {
     if (!layerHasGeometry(lyr)) {
       stop("Layer is missing geometry");
@@ -45687,7 +45726,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.97";
+  var version = "0.6.99";
 
   // 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.