v0.7.14

Author: mbloch

CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.7.14
+* Added support for importing GeoTIFFs and also PNGs and JPEGs with world file and .prj sidecar files.
+* Rasters can only be exported as layers in an SVG.
+* The only supported raster editing operation is clipping to a rectangle.
+* Raster reprojection is not yet supported.
+
 v0.7.13
 * Moved the layers panel in the web UI to the left sidebar, which it now shares with the console.
 * Added options to the `-style` command: `icon`, `icon-size` and `icon-color`. This lets you add a variety of icons to a label layer.

docs/reference.md

@@ -197,7 +197,7 @@ mapshaper -i 'lat,lon,label\n48.86,2.35,Paris\n51.51,-0.13,London' \
 
 `percentile-range=` [Raster] Input percentile range used with `scaling=percentile`. The default is `2,98`.
 
-`rendition=` [GeoTIFF] Import a specific GeoTIFF rendition, such as `full` or `overview-1`. By default, large GeoTIFFs are imported from the best available reduced-resolution rendition under Mapshaper's import size limit. Use `rendition=full` to force full-resolution import.
+`rendition=` [GeoTIFF] Import a specific GeoTIFF rendition, using a slug such as `full` or `overview-1`. When a GeoTIFF has internal overviews, Mapshaper lists the available slugs during import. By default, large GeoTIFFs are imported from the best available reduced-resolution overview under Mapshaper's import size limit, or resampled during import if no suitable overview is available. Use `rendition=full` to force full-resolution import.
 
 `name=`  Rename the imported layer (or layers).
 

package-lock.json

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

package.json

@@ -120,18 +120,19 @@ export var ExportControl = function(gui) {
         } else {
           // stack seems to change if Error is logged directly
           console.error(err.stack);
-          var msg = 'Export failed for an unknown reason';
-          if (err.name == 'UserError') {
-            msg = err.message;
-          }
-          gui.alert(msg, 'Export failed');
+          gui.alert(getExportErrorMessage(err), 'Export failed');
         }
       }).finally(function() {
         gui.clearProgressMessage();
       });
     }, 20);
   }
 
+  function getExportErrorMessage(err) {
+    if (err && err.message) return err.message;
+    return 'Export failed for an unknown reason';
+  }
+
   function getExportOpts() {
     return GUI.parseFreeformOptions(getExportOptsAsString(), 'o');
   }
@@ -287,9 +288,11 @@ export var ExportControl = function(gui) {
   }
 
   function getDefaultExportFormat() {
-    var dataset = model.getActiveLayer().dataset;
+    var active = model.getActiveLayer();
+    var dataset = active.dataset;
     var inputFmt = dataset.info && dataset.info.input_formats &&
         dataset.info.input_formats[0];
+    if (active.layer && internal.layerHasRaster(active.layer)) return 'svg';
     return getExportFormats().includes(inputFmt) ? inputFmt : 'geojson';
   }
 

src/gui/gui-export-control.mjs

@@ -16,7 +16,7 @@ import { copyDatasetForExport, copyDatasetForRenaming } from '../dataset/mapshap
 import { mergeDatasetsForExport } from '../dataset/mapshaper-merging';
 import { getOutputFormat } from '../io/mapshaper-output-format';
 import utils from '../utils/mapshaper-utils';
-import { error } from '../utils/mapshaper-logging';
+import { error, stop } from '../utils/mapshaper-logging';
 import { buildTopology } from '../topology/mapshaper-topology';
 import { runningInBrowser } from '../mapshaper-env';
 import { getFileBase } from '../utils/mapshaper-filename-utils';
@@ -56,6 +56,7 @@ export async function exportTargetLayers(catalog, targets, opts) {
 async function exportDatasets(datasets, opts) {
   var format = getOutputFormat(datasets[0], opts);
   var files;
+  validateRasterExportFormat(datasets, format);
   if (format != 'geoparquet' && (opts.compression || opts.level !== undefined)) {
     error('The compression= and level= options only apply to GeoParquet output');
   }
@@ -125,6 +126,18 @@ async function exportDatasets(datasets, opts) {
   return files;
 }
 
+function validateRasterExportFormat(datasets, format) {
+  if (!datasetsHaveRasterLayers(datasets)) return;
+  if (format == 'svg' || format == PACKAGE_EXT) return;
+  stop('Raster layers can only be exported as SVG or ' + PACKAGE_EXT + ' files');
+}
+
+function datasetsHaveRasterLayers(datasets) {
+  return datasets.some(function(dataset) {
+    return dataset.layers && dataset.layers.some(layerHasRaster);
+  });
+}
+
 // Return an array of objects with 'filename' and 'content' members.
 //
 export function exportFileContent(dataset, opts) {
@@ -137,6 +150,7 @@ export function exportFileContent(dataset, opts) {
   } else if (!exporter) {
     error('Unknown output format:', outFmt);
   }
+  validateRasterExportFormat([dataset], outFmt);
 
   // shallow-copy dataset and layers, so layers can be renamed for export
   dataset = utils.defaults({

src/io/mapshaper-export.mjs

@@ -23,6 +23,12 @@ describe('raster layers', function () {
     assert(file.content.includes('preserveAspectRatio="none"'));
   });
 
+  it('rejects raster export to vector and table formats', function () {
+    assert.throws(function() {
+      api.internal.exportFileContent(getRasterDataset(), {format: 'geojson'});
+    }, /Raster layers can only be exported as SVG or/);
+  });
+
   it('clips embedded SVG raster images to a frame layer', function () {
     var dataset = getRasterDataset();
     var frameDataset = getFrameDataset();