mapshaper 0.6.10 → 0.6.11

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.10";
+  var VERSION = "0.6.11";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -7311,15 +7311,18 @@
           // replacing content so ArrayBuffers can be gc'd
           obj.content = cli.convertArrayBuffer(obj.content); // convert to Buffer
         }
+        if (opts.gzip) {
+          path = path + '.gz';
+          obj.content = require$1('zlib').gzipSync(obj.content);
+        }
         if (opts.output) {
           opts.output.push({filename: path, content: obj.content});
-        } else {
-          if (!opts.force && inputFiles.indexOf(path) > -1) {
-            stop('Need to use the "-o force" option to overwrite input files.');
-          }
-          cli.writeFile(path, obj.content);
-          message("Wrote " + path);
+          return;
+        }      if (!opts.force && inputFiles.indexOf(path) > -1) {
+          stop('Need to use the "-o force" option to overwrite input files.');
         }
+        cli.writeFile(path, obj.content);
+        message("Wrote " + path);
       });
     }
     if (cb) cb(null);
@@ -19346,6 +19349,10 @@ ${svg}
         describe: 'allow overwriting input files',
         type: 'flag'
       })
+      .option('gzip', {
+        describe: 'apply gzip compression to output files',
+        type: 'flag'
+      })
       .option('dry-run', {
         // describe: 'do not output any files'
         type: 'flag'
@@ -23800,6 +23807,19 @@ ${svg}
     } else if (fileType) { // string type, e.g. kml, geojson
       content = cli.readFile(path, encoding || 'utf-8', cache);
 
+    } else if (getFileExtension(path) == 'gz') {
+      var pathgz = path;
+      path = pathgz.replace(/\.gz$/, '');
+      fileType = guessInputFileType(path);
+      if (!fileType) {
+        stop('Unrecognized file type:', path);
+      }
+      // TODO: consider using a temp file, to support incremental reading
+      content = require('zlib').gunzipSync(cli.readFile(pathgz));
+      if (fileType == 'json' || fileType == 'text') {
+        content = trimBOM(decodeString(content, encoding || 'utf-8'));
+      }
+
     } else { // type can't be inferred from filename -- try reading as text
       content = cli.readFile(path, encoding || 'utf-8', cache);
       fileType = guessInputContentType(content);

package/package.json

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

package/www/mapshaper-gui.js

@@ -6936,7 +6936,7 @@
 
     el.hide();
 
-    gui.on('map_navigation', function() {
+    gui.on('map_rendered', function() {
       if (!_on) return;
       redraw();
     });
@@ -7060,7 +7060,7 @@
   function coordsToPix(bbox, ext) {
     var a = ext.translateCoords(bbox[0], bbox[1]);
     var b = ext.translateCoords(bbox[2], bbox[3]);
-    return [a[0], b[1], b[0], a[1]];
+    return [Math.round(a[0]), Math.round(b[1]), Math.round(b[0]), Math.round(a[1])];
   }
 
   function pixToCoords(bbox, ext) {
@@ -7100,21 +7100,29 @@
   }
 
   function showHandles(handles, props) {
-    var SIZE = 6; // should match .handle size in page.css
+    var scaledSize = Math.ceil(Math.min(props.width, props.height) / 5);
+    var HANDLE_SIZE = Math.min(scaledSize, 7);
     handles.forEach(function(handle) {
       var top = 0,
           left = 0;
       if (handle.col == 'center') {
-        left += props.width / 2 - SIZE / 2;
+        left += props.width / 2 - HANDLE_SIZE / 2;
       } else if (handle.col == 'right') {
-        left += props.width - SIZE;
+        left += props.width - HANDLE_SIZE + 1;
+      } else {
+        left -= 1;
       }
       if (handle.row == 'center') {
-        top += props.height / 2 - SIZE / 2;
+        top += props.height / 2 - HANDLE_SIZE / 2;
       } else if (handle.row == 'bottom') {
-        top += props.height - SIZE;
+        top += props.height - HANDLE_SIZE + 1;
+      } else {
+        top -= 1;
       }
+
       handle.el.css({
+        width: HANDLE_SIZE,
+        height: HANDLE_SIZE,
         top: top,
         left: left
       });
@@ -7158,11 +7166,6 @@
       ext.home();
     });
 
-    ext.on('change', function() {
-      // kludge so controls (e.g. HighlightBox) can initialize before map is ready
-      gui.dispatchEvent('map_navigation');
-    });
-
     zoomTween.on('change', function(e) {
       ext.zoomToExtent(e.value, _fx, _fy);
     });
@@ -10602,6 +10605,7 @@
       _stack.drawOverlayLayer(_overlayLyr, action);
       // draw furniture
       _stack.drawFurnitureLayers(furnitureLayers, action);
+      gui.dispatchEvent('map_rendered');
     }
   }
 

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.10";
+  var VERSION = "0.6.11";
 
 
   var utils = /*#__PURE__*/Object.freeze({
@@ -7311,15 +7311,18 @@
           // replacing content so ArrayBuffers can be gc'd
           obj.content = cli.convertArrayBuffer(obj.content); // convert to Buffer
         }
+        if (opts.gzip) {
+          path = path + '.gz';
+          obj.content = require$1('zlib').gzipSync(obj.content);
+        }
         if (opts.output) {
           opts.output.push({filename: path, content: obj.content});
-        } else {
-          if (!opts.force && inputFiles.indexOf(path) > -1) {
-            stop('Need to use the "-o force" option to overwrite input files.');
-          }
-          cli.writeFile(path, obj.content);
-          message("Wrote " + path);
+          return;
+        }      if (!opts.force && inputFiles.indexOf(path) > -1) {
+          stop('Need to use the "-o force" option to overwrite input files.');
         }
+        cli.writeFile(path, obj.content);
+        message("Wrote " + path);
       });
     }
     if (cb) cb(null);
@@ -19346,6 +19349,10 @@ ${svg}
         describe: 'allow overwriting input files',
         type: 'flag'
       })
+      .option('gzip', {
+        describe: 'apply gzip compression to output files',
+        type: 'flag'
+      })
       .option('dry-run', {
         // describe: 'do not output any files'
         type: 'flag'
@@ -23800,6 +23807,19 @@ ${svg}
     } else if (fileType) { // string type, e.g. kml, geojson
       content = cli.readFile(path, encoding || 'utf-8', cache);
 
+    } else if (getFileExtension(path) == 'gz') {
+      var pathgz = path;
+      path = pathgz.replace(/\.gz$/, '');
+      fileType = guessInputFileType(path);
+      if (!fileType) {
+        stop('Unrecognized file type:', path);
+      }
+      // TODO: consider using a temp file, to support incremental reading
+      content = require('zlib').gunzipSync(cli.readFile(pathgz));
+      if (fileType == 'json' || fileType == 'text') {
+        content = trimBOM(decodeString(content, encoding || 'utf-8'));
+      }
+
     } else { // type can't be inferred from filename -- try reading as text
       content = cli.readFile(path, encoding || 'utf-8', cache);
       fileType = guessInputContentType(content);

package/www/page.css

@@ -1249,8 +1249,6 @@ div.basemap-style-btn.active img {
 	/* cursor: pointer; */
 	background: #cc6acc;
 	pointer-events: all;
-	width: 6px;
-	height: 6px;
 }
 
 /* Simplification control ------------ */