mapshaper 0.6.29 → 0.6.31

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.29";
+  var VERSION = "0.6.31";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -4846,13 +4846,14 @@
 
   // @info: info property of source dataset (instead of crs object, so wkt string
   //        can be preserved if present)
-  function setDatasetCrsInfo(dataset, info) {
+  function setDatasetCrsInfo(dataset, crsInfo) {
+    crsInfo = crsInfo || {}; // also accepts null/unknown crs info
     dataset.info = dataset.info || {};
     // Assumes that proj4 object is never mutated.
     // TODO: assign a copy of crs (if present)
-    dataset.info.crs = info.crs;
-    dataset.info.prj = info.prj;
-    dataset.info.crs_string = info.crs_string;
+    dataset.info.crs = crsInfo.crs;
+    dataset.info.prj = crsInfo.prj;
+    dataset.info.crs_string = crsInfo.crs_string;
     return dataset;
   }
 
@@ -23814,6 +23815,10 @@ ${svg}
         type: 'strings',
         describe: 'fields to retain (comma-sep.), e.g. \'fips,name\''
       })
+      .option('invert', {
+        type: 'flag',
+        describe: 'retain only fields that would have been deleted'
+      })
       .option('target', targetOpt);
 
     parser.command('filter-geom')
@@ -36481,7 +36486,7 @@ ${svg}
     return removed;
   }
 
-  cmd.filterFields = function(lyr, names) {
+  cmd.filterFields = function(lyr, names, opts) {
     var table = lyr.data;
     names = names || [];
     requireDataFields(table, names);
@@ -36490,6 +36495,9 @@ ${svg}
     // utils.difference(table.getFields(), names).forEach(table.deleteField, table);
     // the below method sets field order of CSV output, and is generally faster
     var map = mapFieldNames(names);
+    if (opts.invert) {
+      map = invertFieldMap(map, table.getFields());
+    }
     lyr.data.update(getRecordMapper(map));
   };
 
@@ -36500,6 +36508,15 @@ ${svg}
     lyr.data.update(getRecordMapper(map));
   };
 
+  function invertFieldMap(map, fields) {
+    return fields.reduce(function(memo, name) {
+      if (!(name in map)) {
+        memo[name] = name;
+      }
+      return memo;
+    }, {});
+  }
+
   function mapFieldNames(names) {
     return (names || []).reduce(function(memo, str) {
       var parts = str.split('='),
@@ -37123,7 +37140,7 @@ ${svg}
       crsInfo = getDatasetCrsInfo(source.dataset);
     } else if (opts.bbox) {
       bounds = new Bounds(opts.bbox);
-      crsInfo = getCrsInfo('wgs84');
+      crsInfo = probablyDecimalDegreeBounds(bounds) ? getCrsInfo('wgs84') : {};
     }
     bounds = bounds && applyRectangleOptions(bounds, crsInfo.crs, opts);
     if (!bounds || !bounds.hasBounds()) {
@@ -43237,7 +43254,7 @@ ${svg}
         outputLayers = applyCommandToEachLayer(cmd.filterFeatures, targetLayers, arcs, opts);
 
       } else if (name == 'filter-fields') {
-        applyCommandToEachLayer(cmd.filterFields, targetLayers, opts.fields);
+        applyCommandToEachLayer(cmd.filterFields, targetLayers, opts.fields, opts);
 
       } else if (name == 'filter-geom') {
         applyCommandToEachLayer(cmd.filterGeom, targetLayers, arcs, opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.29",
+  "version": "0.6.31",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",
@@ -56,7 +56,7 @@
     "iconv-lite": "^0.6.3",
     "idb-keyval": "^6.2.0",
     "kdbush": "^3.0.0",
-    "mproj": "0.0.36",
+    "mproj": "0.0.37",
     "msgpackr": "^1.8.5",
     "opn": "^5.3.0",
     "rw": "~1.3.3",

package/www/index.html

@@ -100,7 +100,8 @@
 				<img class="pin-btn pinned" src="images/eye2.png">
 	</div>
 			<div class="layer-list"></div>
-			<h4>Sources</h4>
+			<!-- <h4>Sources</h4> -->
+			<h4>Source files</h4>
 			<div class="file-list"></div>
 			<div>
 				<div id="add-file-btn" class="dialog-btn btn">Add a file</div>
@@ -192,8 +193,8 @@ the largest ring of multi-ring features.
 </div></div></div></div>
 			<div class="planar-opt-wrapper"><label for="planar-opt"><input type="checkbox" class="checkbox planar-opt"/>use planar geometry</label>
 							<div class="tip-button">?<div class="tip-anchor">
-			<div class="tip">Interpret x, y values as Cartesian coordinates
-on a plane, rather than longitude, latitude
+			<div class="tip">Treat x, y values as Cartesian coordinates
+on a plane, rather than as longitude, latitude
 coordinates on a sphere.
 </div></div></div></div>
 		</div>
@@ -256,7 +257,7 @@ a smoother appearance.</div></div></div></div>
 
 <div id="import-options" class="main-area popup-dialog">
 	<div class="info-box">
-		<!-- <h4>Queued files</h4> -->
+		<h3 class="list-header">Files</h3>
 
 		<div class="dropped-file-list"></div>
 		
@@ -272,20 +273,20 @@ a smoother appearance.</div></div></div></div>
 self-intersections, to help identify
 topological errors in a dataset.</div></div></div></div>
 
-				<div><label for="snap-points-opt"><input type="checkbox" class="checkbox" id="snap-points-opt" />snap vertices</label>
+				<!-- <div><label for="snap-points-opt"><input type="checkbox" class="checkbox" id="snap-points-opt" />snap vertices</label>
 				<div class="tip-button">?<div class="tip-anchor">
 <div class="tip">Fix topology errors by snapping
 together points with nearly identical
 coordinates. This option does not
-apply to TopoJSON files.</div></div></div></div>
+apply to TopoJSON files.</div></div></div></div> -->
 <div style="height:5px"></div>
 
 		</div>
 
 		<div><input type="text" class="advanced-options" placeholder="import options" /><div class="tip-button">?<div class="tip-anchor">
 <div class="tip">Enter options from the command line
-interface. Examples: "no-topology"
-"encoding=big5"</div></div></div></div>
+interface. Examples: <span id="import-option-examples">no-topology
+encoding=big5</span></div></div></div></div>
 
 		</div>
 

package/www/mapshaper-gui.js

@@ -1959,7 +1959,21 @@
     function showQueuedFiles() {
       var list = gui.container.findChild('.dropped-file-list').empty();
       queuedFiles.forEach(function(f) {
-        El('<p>').text(f.name).appendTo(list);
+        var html = '<span>' + f.name + '</span><img class="close-btn" draggable="false" src="images/close.png">';
+        var entry = El('<div>').html(html);
+        entry.appendTo(list);
+        // init delete button
+        GUI.onClick(entry.findChild('img.close-btn'), function(e) {
+          e.stopPropagation();
+          queuedFiles = queuedFiles.filter(function(item) {
+            return item != f;
+          });
+          if (queuedFiles.length > 0) {
+            showQueuedFiles();
+          } else {
+            gui.clearMode();
+          }
+        });
       });
     }
 
@@ -2026,23 +2040,23 @@
         }
         if (group[internal.PACKAGE_EXT]) {
           await importSessionData(group[internal.PACKAGE_EXT].content, gui);
-        } else {
-          importDataset(group, importOpts);
+        } else if (importDataset(group, importOpts)) {
+          importCount++;
+          gui.session.fileImported(group.filename, optStr);
         }
-        importCount++;
-        gui.session.fileImported(group.filename, optStr);
       }
     }
 
     function importDataset(group, importOpts) {
       var dataset = internal.importContent(group, importOpts);
-      if (datasetIsEmpty(dataset)) return;
+      if (datasetIsEmpty(dataset)) return false;
       if (group.layername) {
         dataset.layers.forEach(lyr => lyr.name = group.layername);
       }
       // save import options for use by repair control, etc.
       dataset.info.import_options = importOpts;
       model.addDataset(dataset);
+      return true;
     }
 
     function addEmptyLayer() {
@@ -2083,7 +2097,7 @@
         var freeform = El('#import-options .advanced-options').node().value;
         importOpts = GUI.parseFreeformOptions(freeform, 'i');
         importOpts.no_repair = !El("#repair-intersections-opt").node().checked;
-        importOpts.snap = !!El("#snap-points-opt").node().checked;
+        // importOpts.snap = !!El("#snap-points-opt").node().checked;
       }
       return importOpts;
     }
@@ -2183,8 +2197,8 @@
             name: filename,
             content: index[filename]
           });
-          return memo;
         }
+        return memo;
       }, []);
     }
 

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.29";
+  var VERSION = "0.6.31";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -4846,13 +4846,14 @@
 
   // @info: info property of source dataset (instead of crs object, so wkt string
   //        can be preserved if present)
-  function setDatasetCrsInfo(dataset, info) {
+  function setDatasetCrsInfo(dataset, crsInfo) {
+    crsInfo = crsInfo || {}; // also accepts null/unknown crs info
     dataset.info = dataset.info || {};
     // Assumes that proj4 object is never mutated.
     // TODO: assign a copy of crs (if present)
-    dataset.info.crs = info.crs;
-    dataset.info.prj = info.prj;
-    dataset.info.crs_string = info.crs_string;
+    dataset.info.crs = crsInfo.crs;
+    dataset.info.prj = crsInfo.prj;
+    dataset.info.crs_string = crsInfo.crs_string;
     return dataset;
   }
 
@@ -23814,6 +23815,10 @@ ${svg}
         type: 'strings',
         describe: 'fields to retain (comma-sep.), e.g. \'fips,name\''
       })
+      .option('invert', {
+        type: 'flag',
+        describe: 'retain only fields that would have been deleted'
+      })
       .option('target', targetOpt);
 
     parser.command('filter-geom')
@@ -36481,7 +36486,7 @@ ${svg}
     return removed;
   }
 
-  cmd.filterFields = function(lyr, names) {
+  cmd.filterFields = function(lyr, names, opts) {
     var table = lyr.data;
     names = names || [];
     requireDataFields(table, names);
@@ -36490,6 +36495,9 @@ ${svg}
     // utils.difference(table.getFields(), names).forEach(table.deleteField, table);
     // the below method sets field order of CSV output, and is generally faster
     var map = mapFieldNames(names);
+    if (opts.invert) {
+      map = invertFieldMap(map, table.getFields());
+    }
     lyr.data.update(getRecordMapper(map));
   };
 
@@ -36500,6 +36508,15 @@ ${svg}
     lyr.data.update(getRecordMapper(map));
   };
 
+  function invertFieldMap(map, fields) {
+    return fields.reduce(function(memo, name) {
+      if (!(name in map)) {
+        memo[name] = name;
+      }
+      return memo;
+    }, {});
+  }
+
   function mapFieldNames(names) {
     return (names || []).reduce(function(memo, str) {
       var parts = str.split('='),
@@ -37123,7 +37140,7 @@ ${svg}
       crsInfo = getDatasetCrsInfo(source.dataset);
     } else if (opts.bbox) {
       bounds = new Bounds(opts.bbox);
-      crsInfo = getCrsInfo('wgs84');
+      crsInfo = probablyDecimalDegreeBounds(bounds) ? getCrsInfo('wgs84') : {};
     }
     bounds = bounds && applyRectangleOptions(bounds, crsInfo.crs, opts);
     if (!bounds || !bounds.hasBounds()) {
@@ -43237,7 +43254,7 @@ ${svg}
         outputLayers = applyCommandToEachLayer(cmd.filterFeatures, targetLayers, arcs, opts);
 
       } else if (name == 'filter-fields') {
-        applyCommandToEachLayer(cmd.filterFields, targetLayers, opts.fields);
+        applyCommandToEachLayer(cmd.filterFields, targetLayers, opts.fields, opts);
 
       } else if (name == 'filter-geom') {
         applyCommandToEachLayer(cmd.filterGeom, targetLayers, arcs, opts);

package/www/modules.js

@@ -12530,7 +12530,10 @@ function wkt_unpack(str) {
   str = convert_wkt_quotes(str);
 
   // Convert WKT entities to JSON arrays
-  str = str.replace(/([A-Z0-9]+)\[/g, '["$1",');
+  // str = str.replace(/([A-Z0-9]+)\[/g, '["$1",');
+  // Changed to ignore some names that look like entities, like "GCS_TWD97[2020]"
+  // allow only [ or , character before the next quote (i.e. block close quotes)
+  str = str.replace(/([A-Z0-9]+)\[(?![^"]*[^\[,"]")/g, '["$1",');
 
   // Enclose axis keywords in quotes to create valid JSON strings
   str = str.replace(/, *([a-zA-Z]+) *(?=[,\]])/g, ',"$1"');

package/www/page.css

@@ -472,6 +472,25 @@ body.dragover #import-options-drop-area .drop-area {
 	overflow-y: auto;
 }
 
+.dropped-file-list img.close-btn {
+	position: absolute;
+	cursor: pointer;
+	width: 14px;
+	height: 14px;
+	padding: 0;
+	top: 3px;
+	right: 0px;
+}
+
+.dropped-file-list > div {
+	position: relative;
+}
+
+.dropped-file-list span {
+	margin-right: 16px;
+}
+
+
 #import-options .dropped-file-list p {
 	line-height: 1;
 	margin-bottom: 5px;
@@ -498,7 +517,7 @@ body.dragover #import-options-drop-area .drop-area {
 	text-align: left;
 	margin-top: 12px;
 	margin-right: 20px;
-	padding: 12px 18px 12px 18px;
+	padding: 12px 16px 12px 18px;
 	vertical-align: top;
 	display: inline-block;
 	/* border: 1px solid #aaa; */
@@ -512,6 +531,10 @@ body.dragover #import-options-drop-area .drop-area {
 	font-weight: normal;
 }
 
+.info-box h3.list-header {
+	margin-bottom: 0.1em;
+}
+
 .info-box h4 {
 	font-size: 1.085em;
 	font-weight: normal;
@@ -541,8 +564,8 @@ body.dragover #import-options-drop-area .drop-area {
 }
 
 .info-box .tip-button {
-	margin-left: 12px;
-	margin-top: 3px;
+	margin: 3px 2px 0 10px;
+
 }
 
 .info-box input[type="checkbox"] {
@@ -762,8 +785,10 @@ body.simplify .layer-control-btn {
 	padding: 0px 14px 2px 14px;
 }
 
+
 .pin-all img,
-.layer-item img {
+.layer-item img
+{
 	position: absolute;
 	width: 16px;
 	height: 16px;
@@ -784,7 +809,7 @@ img.close-btn {
 	height:  18px;
 	width:  18px;
 	margin-top: 1px;
-	margin-right: -5px;
+	margin-right: -3px;
 	cursor: pointer;
 	border-radius: 4px;
 }