mapshaper 0.6.117 → 0.6.118

package/package.json

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

package/www/index.html

@@ -287,6 +287,10 @@ a smoother appearance.</div></div></div></div>
 			<div class="dropped-file-list"></div>
 			<div class="option-menu">
 				<div id="path-import-options">
+					<div id="gpkg-import-options" class="hidden">
+						<h4>GeoPackage layers</h4>
+						<div class="gpkg-layer-list option-menu"></div>
+					</div>
 			</div>
 			<div style="margin-top: 10px"><input type="text" class="text-input advanced-options" placeholder="import options">
 				<a href="https://github.com/mbloch/mapshaper/wiki/Command-Reference#-i-input" target="mapshaper_import_docs">

package/www/mapshaper-gui.js

@@ -1956,6 +1956,28 @@
     }
   }
 
+  async function getGeoPackageFeatureTables(content) {
+    var geopackage, gpkg, source;
+    await loadGeopackageLib();
+    geopackage = window.modules && window.modules['@ngageoint/geopackage'];
+    if (!geopackage || !geopackage.GeoPackageAPI) {
+      throw Error('GeoPackage library is not loaded');
+    }
+    if (content instanceof Uint8Array) {
+      source = content;
+    } else if (content instanceof ArrayBuffer) {
+      source = new Uint8Array(content);
+    } else {
+      source = content;
+    }
+    gpkg = await geopackage.GeoPackageAPI.open(source);
+    try {
+      return gpkg.getFeatureTables() || [];
+    } finally {
+      gpkg.close();
+    }
+  }
+
   // @cb function(<FileList>)
   function DropControl(gui, el, cb) {
     var area = El(el);
@@ -2105,6 +2127,10 @@
     var importTotal = 0;
     var useQuickView = false;
     var queuedFiles = [];
+    var gpkgLayerEntries = [];
+    var gpkgSelectAllBtn = null;
+    var gpkgListRequestId = 0;
+    var gpkgListPending = false;
     var manifestFiles = opts.files || [];
     var catalog;
 
@@ -2192,6 +2218,7 @@
 
     function clearQueuedFiles() {
       queuedFiles = [];
+      clearGeoPackageLayerSelectionMenu();
       gui.container.removeClass('queued-files');
       gui.container.findChild('.dropped-file-list').empty();
     }
@@ -2223,12 +2250,13 @@
           });
           if (queuedFiles.length > 0) {
             showQueuedFiles();
+            updateGeoPackageLayerSelectionMenu();
           } else {
             gui.clearMode();
           }
         });
       });
-      submitBtn.classed('disabled', queuedFiles.length === 0);
+      updateImportSubmitState();
     }
 
     function receiveDroppedItems(arr) {
@@ -2277,6 +2305,7 @@
       gui.container.classed('queued-files', queuedFiles.length > 0);
       El('#path-import-options').classed('hidden', !filesMayContainPaths(queuedFiles));
       showQueuedFiles();
+      updateGeoPackageLayerSelectionMenu();
     }
 
     function hideImportMenu() {
@@ -2313,13 +2342,14 @@
       var optStr = GUI.formatCommandOptions(importOpts);
       fileData = null;
       for (var group of groups) {
+        var groupImportOpts = getGroupImportOpts(group, importOpts);
         if (group.size > 4e7) {
           gui.showProgressMessage('Importing');
           await wait(35);
         }
         if (group[internal.PACKAGE_EXT]) {
           await importSessionData(group[internal.PACKAGE_EXT].content, gui);
-        } else if (await importDataset(group, importOpts)) {
+        } else if (await importDataset(group, groupImportOpts)) {
           importCount++;
           gui.session.fileImported(group.filename, optStr);
         }
@@ -2328,6 +2358,8 @@
 
     async function importDataset(group, importOpts) {
       var dataset;
+      var datasets;
+      var imported = false;
       if (group.gpkg) {
         await loadGeopackageLib();
       }
@@ -2336,21 +2368,25 @@
       } else {
         dataset = internal.importContent(group, importOpts);
       }
-      if (datasetIsEmpty(dataset)) return false;
-      if (group.layername) {
-        dataset.layers.forEach(lyr => lyr.name = group.layername);
-      }
-      // TODO: add popup here
-      // save import options for use by repair control, etc.
-      dataset.info.import_options = importOpts;
-      try {
-        await considerReprojecting(gui, dataset, importOpts);
-      } catch(e) {
-        gui.alert(e.message, 'Projection error');
-        return false;
+      datasets = Array.isArray(dataset) ? dataset : [dataset];
+      for (var d of datasets) {
+        if (datasetIsEmpty(d)) continue;
+        if (group.layername) {
+          d.layers.forEach(lyr => lyr.name = group.layername);
+        }
+        // TODO: add popup here
+        // save import options for use by repair control, etc.
+        d.info.import_options = importOpts;
+        try {
+          await considerReprojecting(gui, d, importOpts);
+        } catch(e) {
+          gui.alert(e.message, 'Projection error');
+          return false;
+        }
+        model.addDataset(d);
+        imported = true;
       }
-      model.addDataset(dataset);
-      return true;
+      return imported;
     }
 
 
@@ -2358,7 +2394,7 @@
     function filesMayContainPaths(files) {
       return utils$1.some(files, function(f) {
           var type = internal.guessInputFileType(f.name);
-          return type == 'shp' || type == 'json' || internal.isZipFile(f.name);
+          return type == 'shp' || type == 'json' || type == 'gpkg' || internal.isZipFile(f.name);
       });
     }
 
@@ -2383,6 +2419,167 @@
       return importOpts;
     }
 
+    function getGroupImportOpts(group, importOpts) {
+      var layersByFile, filename, selected;
+      if (!group.gpkg) return importOpts;
+      layersByFile = getSelectedGeoPackageLayersByFile();
+      filename = group.gpkg.filename;
+      selected = layersByFile[filename];
+      if (!selected || selected.length === 0) return importOpts;
+      return Object.assign({}, importOpts, {
+        gpkg_layers: selected
+      });
+    }
+
+    function clearGeoPackageLayerSelectionMenu() {
+      gpkgLayerEntries = [];
+      gpkgSelectAllBtn = null;
+      gpkgListPending = false;
+      var container = El('#gpkg-import-options');
+      if (!container.node()) return;
+      container.addClass('hidden');
+      container.findChild('.gpkg-layer-list').empty();
+    }
+
+    function getQueuedGeoPackageFiles() {
+      return queuedFiles.filter(function(file) {
+        return internal.guessInputFileType(file.name) == 'gpkg';
+      });
+    }
+
+    async function updateGeoPackageLayerSelectionMenu() {
+      var gpkgFiles = getQueuedGeoPackageFiles();
+      var requestId = ++gpkgListRequestId;
+      clearGeoPackageLayerSelectionMenu();
+      if (useQuickView || gpkgFiles.length === 0) {
+        updateImportSubmitState();
+        return;
+      }
+      gpkgListPending = true;
+      updateImportSubmitState();
+      try {
+        var tablesByFile = await Promise.all(gpkgFiles.map(async function(file) {
+          return {
+            file: file,
+            tables: await getGeoPackageFeatureTables(file.content)
+          };
+        }));
+        if (requestId != gpkgListRequestId) return;
+        renderGeoPackageLayerSelectionMenu(tablesByFile);
+      } catch (e) {
+        console.error(e);
+        if (requestId == gpkgListRequestId) {
+          clearGeoPackageLayerSelectionMenu();
+          gui.alert(e.message || 'Unable to read GeoPackage layers', 'Import error');
+        }
+      } finally {
+        if (requestId == gpkgListRequestId) {
+          gpkgListPending = false;
+          updateImportSubmitState();
+        }
+      }
+    }
+
+    function renderGeoPackageLayerSelectionMenu(tablesByFile) {
+      var container = El('#gpkg-import-options');
+      var list = container.findChild('.gpkg-layer-list').empty();
+      gpkgLayerEntries = [];
+      gpkgSelectAllBtn = null;
+      tablesByFile.forEach(function(item) {
+        var filename = item.file.name;
+        var tables = item.tables || [];
+        if (tables.length === 0) return;
+        tables.forEach(function(tableName) {
+          var label = El('label').addClass('gpkg-layer-item');
+          var box = El('input')
+            .attr('type', 'checkbox')
+            .attr('data-gpkg-file', filename)
+            .attr('data-gpkg-layer', tableName)
+            .node();
+          box.checked = true;
+          box.addEventListener('click', updateGeoPackageSelectAllToggle);
+          label.appendChild(box);
+          label.appendChild(El('span').text(' ' + tableName));
+          list.appendChild(label);
+          var entry = {
+            filename: filename,
+            layer: tableName,
+            checkbox: box
+          };
+          gpkgLayerEntries.push(entry);
+        });
+      });
+      if (gpkgLayerEntries.length === 0) {
+        container.addClass('hidden');
+        return;
+      }
+      if (gpkgLayerEntries.length > 1) {
+        list.node().insertBefore(initGeoPackageSelectAllToggle().node(), list.node().firstChild);
+      }
+      container.removeClass('hidden');
+      updateGeoPackageSelectAllToggle();
+    }
+
+    function initGeoPackageSelectAllToggle() {
+      var toggle = El('label').addClass('gpkg-layer-item');
+      var btn = El('input')
+        .attr('type', 'checkbox')
+        .attr('value', 'toggle')
+        .node();
+      btn.checked = true;
+      btn.addEventListener('click', function() {
+        var state = getGeoPackageSelectionState();
+        setGeoPackageLayerSelection(state != 'all');
+        updateGeoPackageSelectAllToggle();
+      });
+      toggle.appendChild(btn);
+      toggle.appendChild(El('span').text(' Select all'));
+      gpkgSelectAllBtn = btn;
+      return toggle;
+    }
+
+    function setGeoPackageLayerSelection(checked) {
+      gpkgLayerEntries.forEach(function(entry) {
+        entry.checkbox.checked = !!checked;
+      });
+    }
+
+    function getGeoPackageSelectionState() {
+      var count = getSelectedGeoPackageLayerCount();
+      if (gpkgLayerEntries.length > 0 && count == gpkgLayerEntries.length) return 'all';
+      if (count === 0) return 'none';
+      return 'some';
+    }
+
+    function getSelectedGeoPackageLayerCount() {
+      return gpkgLayerEntries.reduce(function(memo, entry) {
+        return memo + (entry.checkbox.checked ? 1 : 0);
+      }, 0);
+    }
+
+    function getSelectedGeoPackageLayersByFile() {
+      return gpkgLayerEntries.reduce(function(memo, entry) {
+        if (!entry.checkbox.checked) return memo;
+        if (!memo[entry.filename]) memo[entry.filename] = [];
+        memo[entry.filename].push(entry.layer);
+        return memo;
+      }, {});
+    }
+
+    function updateGeoPackageSelectAllToggle() {
+      if (gpkgSelectAllBtn) {
+        gpkgSelectAllBtn.checked = getGeoPackageSelectionState() == 'all';
+      }
+      updateImportSubmitState();
+    }
+
+    function updateImportSubmitState() {
+      var disabled = queuedFiles.length === 0 ||
+        gpkgListPending ||
+        (gpkgLayerEntries.length > 0 && getSelectedGeoPackageLayerCount() === 0);
+      submitBtn.classed('disabled', disabled);
+    }
+
     // @file a File object
     async function readContentFileAsync(file, cb) {
       var reader = new FileReader();