npm - mapshaper - Versions diffs - 0.7.7 → 0.7.9 - Mend

mapshaper 0.7.7 → 0.7.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/www/index.html CHANGED Viewed

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<title>Mapshaper</title>
-	<meta name="Description" content="A topology-aware tool for editing and converting geospatial vector data. Works with Shapefile, GeoJSON, TopoJSON, GeoPackage, FlatGeobuf and KML — in the browser or on the command line.">
+	<meta name="Description" content="A topology-aware tool for editing and converting geospatial vector data. Works with Shapefile, GeoJSON, TopoJSON, GeoPackage, FlatGeobuf, GeoParquet and KML — in the browser or on the command line.">
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -319,7 +319,7 @@ a smoother appearance.</div></div></div></div>
 			<span><input type="checkbox" class="advanced-import-options">with advanced options</span>
 			<div class="mini-drop-area">
 				<div class="subtitle">Drop, paste or <span class="add-btn inline-btn btn"><span class="label-text">select</span></span> files to import.</div>
-				<div class="subtitle">Shapefile, GeoJSON, TopoJSON, GeoPackage, FlatGeobuf, KML and CSV formats are supported. Files can be zipped or gzipped.</div>
+				<div class="subtitle">Shapefile, GeoJSON, TopoJSON, GeoPackage, FlatGeobuf, GeoParquet, KML and CSV formats are supported. Files can be zipped or gzipped.</div>
 			</div>
 		</div>
 		<div class="queued-file-section">

package/www/mapshaper-gui.js CHANGED Viewed

@@ -2064,6 +2064,7 @@
   }
   var geopackagePromise = null;
+  var geoParquetPromise = null;
   async function loadGeopackageLib() {
     if (!window.modules || !window.modules['@ngageoint/geopackage']) {
@@ -2097,6 +2098,16 @@
     }
   }
+  async function loadGeoParquetLib() {
+    if (!window.modules || !window.modules.hyparquet || !window.modules['hyparquet-compressors'] || !window.modules['hyparquet-writer'] || !window.modules['zstd-codec']) {
+      if (!geoParquetPromise) {
+        geoParquetPromise = loadScript('geoparquet.js');
+      }
+      await geoParquetPromise;
+      geoParquetPromise = null;
+    }
+  }
   // @cb function(<FileList>)
   function DropControl(gui, el, cb) {
     var area = El(el);
@@ -2515,7 +2526,10 @@
       if (group.gpkg) {
         await loadGeopackageLib();
       }
-      if (group.gpkg || group.fgb) {
+      if (group.parquet) {
+        await loadGeoParquetLib();
+      }
+      if (group.gpkg || group.fgb || group.parquet) {
         dataset = await internal.importContentAsync(group, importOpts);
       } else {
         dataset = internal.importContent(group, importOpts);
@@ -2546,7 +2560,7 @@
     function filesMayContainPaths(files) {
       return utils$1.some(files, function(f) {
           var type = internal.guessInputFileType(f.name);
-          return type == 'shp' || type == 'json' || type == 'gpkg' || internal.isZipFile(f.name);
+          return type == 'shp' || type == 'json' || type == 'gpkg' || type == 'parquet' || internal.isZipFile(f.name);
       });
     }
@@ -4099,6 +4113,116 @@
     }
   };
+  var FIELD_TYPE_SCAN_LIMIT = 1000;
+  var RECENT_COMMAND_LIMIT = 20;
+  var RECENT_MESSAGE_LIMIT = 10;
+  function getRuntimeStateContext(gui) {
+    var layers = gui.model.getLayers();
+    var active = gui.model.getActiveLayer();
+    var history = gui.session.getHistorySnapshot();
+    var messages = gui.getMessages ? gui.getMessages() : [];
+    return {
+      schema: 'mapshaper-runtime-context',
+      schema_version: 1,
+      generated_at: new Date().toISOString(),
+      privacy_note: 'Contains project metadata only: layer names, field names/types, counts, CRS, recent commands and recent messages. It does not include geometry or attribute records.',
+      ui: getUiContext(gui),
+      active_layer: active ? getLayerTargetId(gui, active.layer) : null,
+      default_targets: getDefaultTargets(gui),
+      layers: layers.map(function(o, i) {
+        return getLayerContext(gui, o.layer, o.dataset, i, active && active.layer);
+      }),
+      session: {
+        command_count: history.commands.length,
+        recent_commands: history.commands.slice(-RECENT_COMMAND_LIMIT),
+        unsaved_changes: gui.session.unsavedChanges()
+      },
+      messages: messages.slice(0, RECENT_MESSAGE_LIMIT)
+    };
+  }
+  function stringifyRuntimeStateContext(gui) {
+    return JSON.stringify(getRuntimeStateContext(gui), null, 2);
+  }
+  function getUiContext(gui) {
+    return {
+      interface: 'web_app',
+      console_open: gui.consoleIsOpen(),
+      panel_mode: gui.getMode(),
+      interaction_mode: gui.interaction ? gui.interaction.getMode() : null,
+      dataset_count: gui.model.getDatasets().length,
+      layer_count: gui.model.getLayers().length,
+      has_data: !gui.model.isEmpty()
+    };
+  }
+  function getDefaultTargets(gui) {
+    return gui.model.getDefaultTargets().map(function(target) {
+      return {
+        layers: target.layers.map(function(lyr) {
+          return getLayerTargetId(gui, lyr);
+        })
+      };
+    });
+  }
+  function getLayerContext(gui, lyr, dataset, i, activeLyr) {
+    var fields = getFieldContexts(lyr);
+    var context = {
+      id: i + 1,
+      target_id: getLayerTargetId(gui, lyr),
+      name: lyr.name || null,
+      active: lyr == activeLyr,
+      geometry_type: lyr.geometry_type || null,
+      feature_count: internal.getFeatureCount(lyr),
+      field_count: fields.length,
+      fields: fields
+    };
+    if (lyr.geometry_type) {
+      context.crs = getCrsContext(dataset);
+    }
+    if (dataset.info && dataset.info.input_formats) {
+      context.input_formats = dataset.info.input_formats.slice();
+    }
+    return context;
+  }
+  function getCrsContext(dataset) {
+    var crs = null;
+    try {
+      crs = internal.getProjInfo(dataset);
+    } catch(e) {}
+    return crs || null;
+  }
+  function getFieldContexts(lyr) {
+    if (!lyr.data || lyr.data.size() === 0) return [];
+    return lyr.data.getFields().map(function(name) {
+      return {
+        name: name,
+        type: getSampledFieldType(lyr.data, name)
+      };
+    });
+  }
+  function getSampledFieldType(table, name) {
+    var n = Math.min(table.size(), FIELD_TYPE_SCAN_LIMIT);
+    var rec, type;
+    for (var i = 0; i < n; i++) {
+      rec = table.getReadOnlyRecordAt(i);
+      type = rec ? internal.getValueType(rec[name]) : null;
+      if (type) return type;
+    }
+    return null;
+  }
+  function getLayerTargetId(gui, lyr) {
+    return internal.formatOptionValue(internal.getLayerTargetId(gui.model, lyr));
+  }
   function Console(gui) {
     var model = gui.model;
     var CURSOR = '$ ';
@@ -4462,6 +4586,10 @@
           clear();
         } else if (cmd == 'tips') {
           printExamples();
+        } else if (cmd == 'context') {
+          toLog(stringifyRuntimeStateContext(gui));
+        } else if (cmd == 'context download') {
+          saveRuntimeContext();
         } else if (cmd == 'history') {
           toLog(gui.session.toCommandLineString());
         } else if (cmd == 'layers') {
@@ -4614,12 +4742,19 @@
       printExample("See a list of all console commands", "$ help");
       printExample("Get help using a single command", "$ help innerlines");
       printExample("Get information about imported datasets", "$ info");
+      printExample("Print bot/debug runtime context as JSON", "$ context");
       printExample("Display browser session as shell commands", "$ history");
       printExample("Delete one state from a national dataset","$ filter 'STATE != \"Alaska\"'");
       printExample("Aggregate counties to states by dissolving shared edges" ,"$ dissolve 'STATE'");
       printExample("Clear the console", "$ clear");
     }
+    function saveRuntimeContext() {
+      var json = stringifyRuntimeStateContext(gui);
+      saveBlobToLocalFile2('mapshaper-runtime-context.json', new Blob([json], {type: 'application/json'}));
+      toLog('Saved runtime context to mapshaper-runtime-context.json', 'console-message');
+    }
   }
   // Test if map should be re-framed to show updated layer
@@ -4968,6 +5103,8 @@
       var opts = getExportOpts();
       if (opts.format == 'geopackage') {
         await loadGeopackageLib();
+      } else if (opts.format == 'geoparquet') {
+        await loadGeoParquetLib();
       }
       opts.active_layer = gui.model.getActiveLayer().layer; // kludge to support restoring active layer in gui
       if (opts.format == internal.PACKAGE_EXT) {
@@ -5108,7 +5245,7 @@
     function getExportFormats() {
       // return ['shapefile', 'geojson', 'topojson', 'json', 'dsv', 'kml', 'svg', internal.PACKAGE_EXT];
-      return ['shapefile', 'json', 'geojson', 'dsv', 'topojson', 'flatgeobuf', 'geopackage', 'kml', internal.PACKAGE_EXT, 'svg'];
+      return ['shapefile', 'json', 'geojson', 'dsv', 'topojson', 'flatgeobuf', 'geopackage', 'geoparquet', 'kml', internal.PACKAGE_EXT, 'svg'];
     }
     function initFormatMenu() {
@@ -15143,6 +15280,18 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       }
     };
+    gui.getMessages = function() {
+      return entries.map(function(entry) {
+        return {
+          severity: entry.severity,
+          title: entry.title,
+          body: entry.body,
+          count: entry.count,
+          time: entry.time.toISOString()
+        };
+      });
+    };
     function severityRank(s) {
       return s === 'error' ? 2 : s === 'warn' ? 1 : 0;
     }
@@ -15311,6 +15460,14 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       return gui.container.hasClass('console-open');
     };
+    gui.getRuntimeStateContext = function() {
+      return getRuntimeStateContext(gui);
+    };
+    gui.stringifyRuntimeStateContext = function() {
+      return stringifyRuntimeStateContext(gui);
+    };
     // Make this instance interactive and editable
     gui.focus = function() {
       var curr = GUI.__active;
@@ -15424,6 +15581,8 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
     new LayerControl(gui);
     HeaderMenu();
     gui.console = new Console(gui);
+    window.mapshaper.getRuntimeStateContext = gui.getRuntimeStateContext;
+    window.mapshaper.stringifyRuntimeStateContext = gui.stringifyRuntimeStateContext;
     startEditing = function() {};