mapshaper 0.5.117 → 0.5.118

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+v0.5.118
+* Added -comment command, as a way to add inline comments in long sequences of commands.
+* Added support for importing .cpg files (Shapefile text encoding) in the web UI.
+
 v0.5.117
 * Support reading DBF files larger than 2GB (command line program only).
 

package/bin/mapshaper-gui

@@ -247,6 +247,7 @@ function expandShapefiles(files) {
     if (isUrl(f)) return; // TODO: try to load aux files from URLs
     addAuxFile(files, f, '.dbf');
     addAuxFile(files, f, '.prj');
+    addAuxFile(files, f, '.shx');
     addAuxFile(files, f, '.cpg');
   });
   return files;

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.117";
+  var VERSION = "0.5.118";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -17215,7 +17215,7 @@ ${svg}
   function guessInputFileType(file) {
     var ext = getFileExtension(file || '').toLowerCase(),
         type = null;
-    if (ext == 'dbf' || ext == 'shp' || ext == 'prj' || ext == 'shx' || ext == 'kml') {
+    if (ext == 'dbf' || ext == 'shp' || ext == 'prj' || ext == 'shx' || ext == 'kml' || ext == 'cpg') {
       type = ext;
     } else if (/json$/.test(ext)) {
       type = 'json';
@@ -21088,6 +21088,10 @@ ${svg}
     parser.command('colors')
       .describe('print list of color scheme names');
 
+    parser.command('comment')
+      .describe('add a comment to the sequence of commands')
+      .flag('multi_arg');
+
     parser.command('encodings')
       .describe('print list of supported text encodings (for .dbf import)');
 
@@ -21516,11 +21520,12 @@ ${svg}
 
       // Show a sample of decoded text if non-ascii-range text has been found
       if (encoding && samples.length > 0) {
+        msg = "Detected DBF text encoding: " + encoding + (encoding in encodingNames ? " (" + encodingNames[encoding] + ")" : "");
+        message(msg);
         msg = decodeSamples(encoding, samples);
         msg = formatStringsAsGrid(msg.split('\n'));
         msg = "\nSample text containing non-ascii characters:" + (msg.length > 60 ? '\n' : '') + msg;
-        msg = "Detected DBF text encoding: " + encoding + (encoding in encodingNames ? " (" + encodingNames[encoding] + ")" : "") + msg;
-        message(msg);
+        verbose(msg);
       }
       return encoding;
     }
@@ -23612,6 +23617,10 @@ ${svg}
     if (obj.prj) {
       dataset.info.prj = obj.prj.content;
     }
+    if (obj.cpg) {
+      // TODO: consider using the input encoding as the default output encoding
+      dataset.info.cpg = obj.cpg.content;
+    }
     return dataset;
   }
 
@@ -24061,6 +24070,7 @@ ${svg}
     clearStash();  // prevent errors from overwriting stash
     stashVar('current_command', cmd.name);
     stashVar('DEBUG', job.settings.DEBUG || cmd.debug);
+    stashVar('VERBOSE', job.settings.VERBOSE || cmd.verbose);
     stashVar('QUIET', job.settings.QUIET || cmd.quiet);
     stashVar('defs', job.defs);
     stashVar('input_files', job.input_files);
@@ -30487,6 +30497,9 @@ ${svg}
       targetDataset.arcs = mergedDataset.arcs;
       // dissolve clip layer shapes (to remove overlaps and other topological issues
       // that might confuse the clipping function)
+      // use a data-free copy of the clip lyr, so data records are not dissolved
+      // (this avoids triggering an unnecessary and expensive DBF read operation in some cases).
+      clipLyr = utils.defaults({data: null}, clipLyr);
       clipLyr = dissolvePolygonLayer2(clipLyr, mergedDataset, {quiet: true, silent: true});
 
     } else {
@@ -30888,6 +30901,8 @@ ${svg}
     getColorizerFunction: getColorizerFunction
   });
 
+  cmd.comment = function() {}; // no-op, so -comment doesn't trigger a parsing error
+
   function expressionUsesGeoJSON(exp) {
     return exp.includes('this.geojson');
   }
@@ -39802,7 +39817,7 @@ ${svg}
   function commandAcceptsEmptyTarget(name) {
     return name == 'graticule' || name == 'i' || name == 'help' ||
       name == 'point-grid' || name == 'shape' || name == 'rectangle' ||
-      name == 'include' || name == 'print' || name == 'if' || name == 'elif' ||
+      name == 'include' || name == 'print' || name == 'comment' || name == 'if' || name == 'elif' ||
       name == 'else' || name == 'endif';
   }
 
@@ -39910,6 +39925,9 @@ ${svg}
       } else if (name == 'colorizer') {
         outputLayers = cmd.colorizer(opts);
 
+      } else if (name == 'comment') {
+        // no-op
+
       } else if (name == 'dashlines') {
         applyCommandToEachLayer(cmd.dashlines, targetLayers, targetDataset, opts);
 

package/package.json

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

package/www/elements.css

@@ -67,10 +67,10 @@ div.tip {
 	z-index: 500;
 	cursor: pointer;
 	text-align: center;
-	font-size: 13px;
+	font-size: 14px;
 	line-height: 1;
 	font-weight: normal;
-	color: #799FCB;
+	color: #1385B7;
 }
 
 .tip-button .tip-anchor {

package/www/index.html

@@ -130,7 +130,8 @@
 
 <div class="export-options main-area popup-dialog">
 	<div class="info-box">
-		<h3>Export menu</h3>
+		<div class="close2-btn"></div>
+		<h3>Export options</h3>
 		<div style="height:3px"></div>
 		<div class=export-layers>
 			<h4 class="menu-title">Layers</h4>
@@ -140,22 +141,23 @@
 		<div class="export-formats option-menu">
 		</div>
 
-		<div class="option-menu"><input type="text" class="advanced-options" placeholder="export options" /><div class="tip-button">?<div class="tip-anchor">
+		<div class="option-menu"><input type="text" class="advanced-options" placeholder="command line options" /><div class="tip-button">?<div class="tip-anchor">
 		<div class="tip">Enter options from the command line interface for the -o command. Examples: "bbox" "no-quantization"
 "precision=0.001"</div></div></div></div>
-		<div class="cancel-btn btn dialog-btn">Cancel</div>
+		<!-- <div class="cancel-btn btn dialog-btn">Cancel</div> -->
 		<div class="save-btn btn dialog-btn">Export</div>
 	</div>
 </div>
 
 <div class="basemap-options main-area popup-dialog">
 	<div class="info-box">
+		<div class="close2-btn"></div>
 		<h3>Basemap options</h3>
 		<p class="basemap-note">Your data will be displayed using the Mercator projection.</p>
 		<p class="basemap-warning"></p>
 		<div class="basemap-styles"></div>
 		<div>
-			<div class="close-btn btn dialog-btn">Close</div>
+			<!-- <div class="close-btn btn dialog-btn">Close</div> -->
 			<div class="clear-btn btn dialog-btn disabled">Clear</div>
 			<div class="fade-btn btn dialog-btn disabled">Fade</div>
 			<!-- <div class="hide-btn btn dialog-btn disabled">Hide</div> -->
@@ -165,7 +167,8 @@
 
 <div class="simplify-options main-area popup-dialog">
 	<div class="info-box">
-		<h3>Simplification menu</h3>
+		<div class="close2-btn"></div>
+		<h3>Simplification</h3>
 		<div class="option-menu">
 			<div><label for="import-retain-opt"><input type="checkbox" class="checkbox import-retain-opt"/>prevent shape removal</label>
 							<div class="tip-button">?<div class="tip-anchor">
@@ -208,7 +211,7 @@ a smoother appearance.</div></div></div></div>
 		</div> <!-- option menu -->
 
 		<div>
-			<div class="cancel-btn btn dialog-btn">Cancel</div>
+<!-- 			<div class="cancel-btn btn dialog-btn">Cancel</div> -->
 			<div class="submit-btn btn dialog-btn">Apply</div>
 		</div>
 	</div> <!-- .info-box -->

package/www/mapshaper-gui.js

@@ -310,7 +310,6 @@
 
   // tests if filename is a type that can be used
   GUI.isReadableFileType = function(filename) {
-    var ext = internal.getFileExtension(filename).toLowerCase();
     return !!internal.guessInputFileType(filename) || internal.couldBeDsvFile(filename) ||
       internal.isZipFile(filename);
   };
@@ -1354,7 +1353,6 @@
         }
       }
       model.updated({select: true});
-
     }
 
     function clearQueuedFiles() {
@@ -1451,9 +1449,8 @@
     }
 
 
-    // TODO: support .cpg
     function isShapefilePart(name) {
-      return /\.(shp|shx|dbf|prj)$/i.test(name);
+      return /\.(shp|shx|dbf|prj|cpg)$/i.test(name);
     }
 
     function readImportOpts() {
@@ -2131,7 +2128,7 @@
 
     // init settings menu
     new SimpleButton(menu.findChild('.submit-btn').addClass('default-btn')).on('click', onSubmit);
-    new SimpleButton(menu.findChild('.cancel-btn')).on('click', function() {
+    new SimpleButton(menu.findChild('.close2-btn')).on('click', function() {
       if (el.visible()) {
         // cancel just hides menu if slider is visible
         menu.hide();
@@ -3159,7 +3156,7 @@
     var layersArr = [];
     var toggleBtn = null; // checkbox <input> for toggling layer selection
     var exportBtn = gui.container.findChild('.export-btn');
-    new SimpleButton(menu.findChild('.cancel-btn')).on('click', gui.clearMode);
+    new SimpleButton(menu.findChild('.close2-btn')).on('click', gui.clearMode);
 
     if (!GUI.exportIsSupported()) {
       exportBtn.on('click', function() {
@@ -9764,7 +9761,7 @@
     var menu = gui.container.findChild('.basemap-options');
     // var hideBtn = new SimpleButton(menu.findChild('.hide-btn'));
     var fadeBtn = new SimpleButton(menu.findChild('.fade-btn'));
-    var closeBtn = new SimpleButton(menu.findChild('.close-btn'));
+    var closeBtn = new SimpleButton(menu.findChild('.close2-btn'));
     var clearBtn = new SimpleButton(menu.findChild('.clear-btn'));
     var list = menu.findChild('.basemap-styles');
     var container = gui.container.findChild('.basemap-container');

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.5.117";
+  var VERSION = "0.5.118";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -17215,7 +17215,7 @@ ${svg}
   function guessInputFileType(file) {
     var ext = getFileExtension(file || '').toLowerCase(),
         type = null;
-    if (ext == 'dbf' || ext == 'shp' || ext == 'prj' || ext == 'shx' || ext == 'kml') {
+    if (ext == 'dbf' || ext == 'shp' || ext == 'prj' || ext == 'shx' || ext == 'kml' || ext == 'cpg') {
       type = ext;
     } else if (/json$/.test(ext)) {
       type = 'json';
@@ -21088,6 +21088,10 @@ ${svg}
     parser.command('colors')
       .describe('print list of color scheme names');
 
+    parser.command('comment')
+      .describe('add a comment to the sequence of commands')
+      .flag('multi_arg');
+
     parser.command('encodings')
       .describe('print list of supported text encodings (for .dbf import)');
 
@@ -21516,11 +21520,12 @@ ${svg}
 
       // Show a sample of decoded text if non-ascii-range text has been found
       if (encoding && samples.length > 0) {
+        msg = "Detected DBF text encoding: " + encoding + (encoding in encodingNames ? " (" + encodingNames[encoding] + ")" : "");
+        message(msg);
         msg = decodeSamples(encoding, samples);
         msg = formatStringsAsGrid(msg.split('\n'));
         msg = "\nSample text containing non-ascii characters:" + (msg.length > 60 ? '\n' : '') + msg;
-        msg = "Detected DBF text encoding: " + encoding + (encoding in encodingNames ? " (" + encodingNames[encoding] + ")" : "") + msg;
-        message(msg);
+        verbose(msg);
       }
       return encoding;
     }
@@ -23612,6 +23617,10 @@ ${svg}
     if (obj.prj) {
       dataset.info.prj = obj.prj.content;
     }
+    if (obj.cpg) {
+      // TODO: consider using the input encoding as the default output encoding
+      dataset.info.cpg = obj.cpg.content;
+    }
     return dataset;
   }
 
@@ -24061,6 +24070,7 @@ ${svg}
     clearStash();  // prevent errors from overwriting stash
     stashVar('current_command', cmd.name);
     stashVar('DEBUG', job.settings.DEBUG || cmd.debug);
+    stashVar('VERBOSE', job.settings.VERBOSE || cmd.verbose);
     stashVar('QUIET', job.settings.QUIET || cmd.quiet);
     stashVar('defs', job.defs);
     stashVar('input_files', job.input_files);
@@ -30487,6 +30497,9 @@ ${svg}
       targetDataset.arcs = mergedDataset.arcs;
       // dissolve clip layer shapes (to remove overlaps and other topological issues
       // that might confuse the clipping function)
+      // use a data-free copy of the clip lyr, so data records are not dissolved
+      // (this avoids triggering an unnecessary and expensive DBF read operation in some cases).
+      clipLyr = utils.defaults({data: null}, clipLyr);
       clipLyr = dissolvePolygonLayer2(clipLyr, mergedDataset, {quiet: true, silent: true});
 
     } else {
@@ -30888,6 +30901,8 @@ ${svg}
     getColorizerFunction: getColorizerFunction
   });
 
+  cmd.comment = function() {}; // no-op, so -comment doesn't trigger a parsing error
+
   function expressionUsesGeoJSON(exp) {
     return exp.includes('this.geojson');
   }
@@ -39802,7 +39817,7 @@ ${svg}
   function commandAcceptsEmptyTarget(name) {
     return name == 'graticule' || name == 'i' || name == 'help' ||
       name == 'point-grid' || name == 'shape' || name == 'rectangle' ||
-      name == 'include' || name == 'print' || name == 'if' || name == 'elif' ||
+      name == 'include' || name == 'print' || name == 'comment' || name == 'if' || name == 'elif' ||
       name == 'else' || name == 'endif';
   }
 
@@ -39910,6 +39925,9 @@ ${svg}
       } else if (name == 'colorizer') {
         outputLayers = cmd.colorizer(opts);
 
+      } else if (name == 'comment') {
+        // no-op
+
       } else if (name == 'dashlines') {
         applyCommandToEachLayer(cmd.dashlines, targetLayers, targetDataset, opts);
 

package/www/page.css

@@ -222,7 +222,7 @@ body {
 }
 
 .export-options .option-menu .advanced-options {
-	width: 175px;
+	width: 195px;
 }
 
 /* --- Main area ------------- */
@@ -456,11 +456,12 @@ body.dragover #import-options-drop-area .drop-area {
 .info-box,.popup {
 	border-radius: 9px;
 	/* border: 1px solid #ddd; */
-	box-shadow: 0 4px 6px rgba(0,0,0,0.35);
+	box-shadow: 0 3px 6px rgba(0,0,0,0.35);
 	background-color: #fff;
 }
 
 .info-box {
+	min-width: 230px;
 	word-wrap: break-word;
 	text-align: left;
 	margin-top: 12px;
@@ -472,13 +473,16 @@ body.dragover #import-options-drop-area .drop-area {
 }
 
 .info-box h3 {
-	font-size: 1.2em;
+	font-size: 19px;
+	line-height: 1.1;
 	padding: 0;
-	margin: 0 0 0.2em 0;
+	margin: 0 0 0.3em 0;
+	font-weight: normal;
 }
 
 .info-box h4 {
 	font-size: 1em;
+	font-weight: normal;
 	margin: 0 0 1px 0;
 }
 
@@ -491,9 +495,11 @@ body.dragover #import-options-drop-area .drop-area {
 	padding: 0 0 9px 0;
 }
 
-.option-menu input {
+.option-menu input[type="radio"],
+.option-menu input[type="checkbox"] 
+{
 	position: relative;
-	top: 2px;
+	top: 1px;
 	width: 12px;
 	height: 12px;
 }
@@ -720,6 +726,28 @@ body.simplify .layer-control-btn {
 
 img.close-btn {
 	opacity: 0.2;
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	z-index: 2;
+}
+
+.close2-btn {
+	display: inline-block;
+	background-color: #f1f1f1;
+	background-image: url("images/close2.png");
+	background-size: cover;
+	float: right;
+	height:  18px;
+	width:  18px;
+	margin-top: 2px;
+	margin-right: -5px;
+	cursor: pointer;
+	border-radius: 4px;
+}
+
+.close2-btn:hover {
+	background-color: #ddd;
 }
 
 .pin-all img {
@@ -1016,6 +1044,7 @@ img.close-btn:hover,
 }
 
 .basemap-styles {
+	margin: 0 -2px;
 	white-space: nowrap;
 }
 
@@ -1040,19 +1069,14 @@ img.close-btn:hover,
 
 .basemap-styles > div:nth-child(even) {
 	position: relative;
-	left:  6px;
-	margin-left: 2px;
+	margin-left: 10px;
 }
 
 .basemap-style-btn img {
 	display: block;
-	left: -2px;
 	position:  relative;
 	border: 2px solid transparent;
-	/*width:  120px;
-	height:  90px;*/
-	width:  96px;
-	height:  72px;
+	width:  108px;
 }
 
 div.basemap-style-btn.active img {
@@ -1064,6 +1088,10 @@ div.basemap-style-btn.active img {
 	border: 2px solid #ead683;
 }
 
+.basemap-style-label {
+	margin-left: 2px;
+}
+
 .mapbox-improve-map {
 	display: none;
 }