mapshaper 0.5.109 → 0.5.112

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mapshaper",
-	"version": "0.5.109",
+	"version": "0.5.112",
 	"description": "A tool for editing vector datasets for mapping and GIS.",
 	"keywords": [
 		"shapefile",
@@ -27,7 +27,7 @@
 		"prepublishOnly": "npm test; ./pre-publish",
 		"postpublish": "./release_web_ui; ./release_github_version",
 		"browserify_old": "browserify -r sync-request -r mproj -r buffer -r iconv-lite -r fs -r flatbush -r rw -r path -r d3-scale-chromatic -r d3-color -r d3-interpolate -o www/modules.js",
-		"browserify": "browserify -r sync-request -r mproj -r buffer -r iconv-lite -r fs -r flatbush -r rw -r path -r d3-scale-chromatic -r d3-color -r d3-interpolate -r kdbush -o www/modules.js",
+		"browserify": "browserify -r sync-request -r mproj -r buffer -r iconv-lite -r fs -r flatbush -r rw -r path -r d3-scale-chromatic -r d3-color -r d3-interpolate -r kdbush -r @tmcw/togeojson -o www/modules.js",
 		"watch": "rollup --config --watch",
 		"dev": "rollup --config --watch"
 	},
@@ -41,6 +41,8 @@
 		"!.DS_Store"
 	],
 	"dependencies": {
+		"@tmcw/togeojson": "^4.7.0",
+		"@xmldom/xmldom": "^0.8.2",
 		"commander": "7.0.0",
 		"cookies": "^0.8.0",
 		"d3-color": "2.0.0",

package/www/index.html

@@ -156,6 +156,9 @@
 		<div class="basemap-styles"></div>
 		<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> -->
 		</div>
 	</div>
 </div>

package/www/mapshaper-gui.js

@@ -1107,7 +1107,7 @@
 
   utils$1.inherit(Checkbox, EventDispatcher);
 
-  function SimpleButton(ref) {
+  function xSimpleButton(ref) {
     var _el = El(ref),
         _self = this,
         _active = !_el.hasClass('disabled');
@@ -1134,7 +1134,31 @@
     }
   }
 
-  utils$1.inherit(SimpleButton, EventDispatcher);
+  //utils.inherit(SimpleButton, EventDispatcher);
+
+  function SimpleButton(ref) {
+    var _el = El(ref),
+        _active = !_el.hasClass('disabled');
+
+    _el.active = function(a) {
+      if (a === void 0) return _active;
+      if (a !== _active) {
+        _active = a;
+        _el.toggleClass('disabled');
+      }
+      return _el;
+    };
+
+    // this.node = function() {return _el.node();};
+
+    function isVisible() {
+      var el = _el.node();
+      return el.offsetParent !== null;
+    }
+    return _el;
+  }
+
+  // utils.inherit(SimpleButton, EventDispatcher);
 
   // @cb function(<FileList>)
   function DropControl(gui, el, cb) {
@@ -1376,7 +1400,7 @@
     async function expandFiles(files) {
       var files2 = [], expanded;
       for (var f of files) {
-        if (internal.isZipFile(f.name)) {
+        if (internal.isZipFile(f.name) || /\.kmz$/.test(f.name)) {
           expanded = await readZipFile(f);
           files2 = files2.concat(expanded);
         } else {
@@ -2861,8 +2885,9 @@
           prevArcs = active.dataset.arcs,
           prevTable = active.layer.data,
           prevTableSize = prevTable ? prevTable.size() : 0,
-          prevArcCount = prevArcs ? prevArcs.size() : 0;
-      internal.runParsedCommands(commands, model, function(err) {
+          prevArcCount = prevArcs ? prevArcs.size() : 0,
+          job = new internal.Job(model);
+      internal.runParsedCommands(commands, job, function(err) {
         var flags = getCommandFlags(commands),
             active2 = model.getActiveLayer(),
             postArcs = active2.dataset.arcs,
@@ -2872,10 +2897,6 @@
             sameTable = prevTable == postTable && prevTableSize == postTableSize,
             sameArcs = prevArcs == postArcs && postArcCount == prevArcCount;
 
-        // restore default logging options, in case they were changed by the command
-        internal.setStateVar('QUIET', false);
-        internal.setStateVar('VERBOSE', false);
-
         // kludge to signal map that filtered arcs need refreshing
         // TODO: find a better solution, outside the console
         if (!sameArcs) {
@@ -2922,7 +2943,7 @@
 
     function consoleMessage() {
       var msg = GUI.formatMessageArgs(arguments);
-      if (internal.loggingEnabled() && !internal.getStateVar('QUIET')) {
+      if (internal.loggingEnabled()) {
         toLog(msg, 'console-message');
       }
     }
@@ -4396,51 +4417,28 @@
 
   var Buffer = require('buffer').Buffer; // works with browserify
 
-  var context = createContext(); // command context (persist for the current command cycle)
-
-  function runningInBrowser() {
-    return typeof window !== 'undefined' && typeof window.document !== 'undefined';
-  }
-
-  function getStateVar(key) {
-    return context[key];
-  }
+  // This module provides a way for multiple jobs to run together asynchronously
+  // while keeping job-level context variables (like "defs") separate.
 
-  function setStateVar(key, val) {
-    context[key] = val;
-  }
+  var stash = {};
 
-  function createContext() {
-    return {
-      DEBUG: false,
-      QUIET: false,
-      VERBOSE: false,
-      defs: {},
-      input_files: []
-    };
+  function stashVar(key, val) {
+    if (key in stash) {
+      error('Tried to replace a stashed variable:', key);
+    }
+    stash[key] = val;
   }
 
-  // Install a new set of context variables, clear them when an async callback is called.
-  // @cb callback function to wrap
-  // returns wrapped callback function
-  function createAsyncContext(cb) {
-    context = createContext();
-    return function() {
-      cb.apply(null, utils.toArray(arguments));
-      // clear context after cb(), so output/errors can be handled in current context
-      context = createContext();
-    };
+  function getStashedVar(key) {
+    if (key in stash === false) {
+      return undefined; // to support running commands in tests
+      // error('Tried to read a nonexistent variable from the stash:', key);
+    }
+    return stash[key];
   }
 
-  // Save the current context, restore it when an async callback is called
-  // @cb callback function to wrap
-  // returns wrapped callback function
-  function preserveContext(cb) {
-    var ctx = context;
-    return function() {
-      context = ctx;
-      cb.apply(null, utils.toArray(arguments));
-    };
+  function clearStash() {
+    stash = {};
   }
 
   var LOGGING = false;
@@ -4522,13 +4520,13 @@
 
   function verbose() {
     // verbose can be set globally with the -verbose command or separately for each command
-    if (getStateVar('VERBOSE') || getStateVar('verbose')) {
+    if (getStashedVar('VERBOSE')) {
       message.apply(null, arguments);
     }
   }
 
   function debug() {
-    if (getStateVar('DEBUG') || getStateVar('debug')) {
+    if (getStashedVar('DEBUG')) {
       logArgs(arguments);
     }
   }
@@ -4608,7 +4606,7 @@
 
   function messageArgs(args) {
     var arr = utils.toArray(args);
-    var cmd = getStateVar('current_command');
+    var cmd = getStashedVar('current_command');
     if (cmd && cmd != 'help') {
       arr.unshift('[' + cmd + ']');
     }
@@ -4616,7 +4614,7 @@
   }
 
   function logArgs(args) {
-    if (!LOGGING || getStateVar('QUIET') || !utils.isArrayLike(args)) return;
+    if (!LOGGING || getStashedVar('QUIET') || !utils.isArrayLike(args)) return;
     var msg = formatLogArgs(args);
     if (STDOUT) console.log(msg);
     else console.error(msg);
@@ -5994,13 +5992,13 @@
     var records = lyr.data.getRecords();
     var symbols = lyr.shapes.map(function(shp, i) {
       var d = records[i];
-      var obj = type == 'label' ? internal.svg.importStyledLabel(d) :
-          internal.svg.importSymbol(d['svg-symbol']);
+      var obj = internal.svg.renderPoint(d);
       if (!obj || !shp) return null;
+      obj.properties.class = 'mapshaper-svg-symbol';
       obj.properties.transform = getSvgSymbolTransform(shp[0], ext);
       obj.properties['data-id'] = i;
       return obj;
-    });
+    }).filter(Boolean);
     var obj = internal.getEmptyLayerForSVG(lyr, {});
     obj.children = symbols;
     return internal.svg.stringify(obj);
@@ -7585,7 +7583,10 @@
       if (!active(e)) return;
       var textNode = getTextTarget3(e);
       var table = hit.getTargetDataTable();
-      if (!textNode || !table) return false;
+      if (!textNode || !table) {
+        activeId = -1;
+        return false;
+      }
       activeId = e.id;
       activeRecord = getLabelRecordById(activeId);
       downEvt = e;
@@ -7593,7 +7594,7 @@
     });
 
     hit.on('drag', function(e) {
-      if (!active(e)) return;
+      if (!active(e) || activeId == -1) return;
       if (e.id != activeId) {
         error$1("Mismatched hit ids:", e.id, activeId);
       }
@@ -7613,7 +7614,7 @@
     });
 
     hit.on('dragend', function(e) {
-      if (!active(e)) return;
+      if (!active(e) || activeId == -1) return;
       gui.dispatchEvent('label_dragend', {FID: e.id});
       activeId = -1;
       activeRecord = null;
@@ -7686,7 +7687,7 @@
 
     // update symbol by re-rendering it
     function updateSymbol2(node, d, id) {
-      var o = internal.svg.importStyledLabel(d); // TODO: symbol support
+      var o = internal.svg.renderStyledLabel(d); // TODO: symbol support
       var activeLayer = hit.getHitTarget().layer;
       var xy = activeLayer.shapes[id][0];
       var g = document.createElementNS('http://www.w3.org/2000/svg', 'g');
@@ -8898,8 +8899,7 @@
     if (mapScale < 0.5) {
       s *= Math.pow(mapScale + 0.5, 0.35);
     } else if (mapScale > 100) {
-      if (!internal.getStateVar('DEBUG')) // thin lines for debugging
-        s *= Math.pow(mapScale - 99, 0.10);
+      s *= Math.pow(mapScale - 99, 0.10);
     }
     return s;
   }
@@ -9238,12 +9238,14 @@
     function reposition(target, type, ext) {
       var container = el.findChild('.' + target.svg_id).node();
       var elements;
-      if (type == 'label' || type == 'symbol') {
-        elements = type == 'label' ? container.getElementsByTagName('text') :
-            El.findAll('.mapshaper-svg-symbol', container);
+      if (type == 'symbol') {
+        elements = El.findAll('.mapshaper-svg-symbol', container);
         repositionSymbols(elements, target.layer, ext);
       } else if (type == 'furniture') {
         repositionFurniture(container, target.layer, ext);
+      } else {
+        // container.getElementsByTagName('text')
+        error('Unsupported symbol type:', type);
       }
     }
 
@@ -9273,14 +9275,15 @@
         _svg.clear();
       }
       layers.forEach(function(lyr) {
-        var svgType = getSvgLayerType(lyr.layer);
-        if (!svgType || svgType == 'label') { // svg labels may have canvas dots
+        var isSvgLayer = internal.layerHasSvgSymbols(lyr.layer) || internal.layerHasLabels(lyr.layer);
+        //if (!svgType || svgType == 'label') { // svg labels may have canvas dots
+        if (!isSvgLayer) { // svg labels may have canvas dots
           drawCanvasLayer(lyr, _mainCanv);
         }
-        if (svgType && action == 'nav') {
-          _svg.reposition(lyr, svgType);
-        } else if (svgType) {
-          _svg.drawLayer(lyr, svgType);
+        if (isSvgLayer && action == 'nav') {
+          _svg.reposition(lyr, 'symbol');
+        } else if (isSvgLayer) {
+          _svg.drawLayer(lyr, 'symbol');
         }
       });
     };
@@ -9332,9 +9335,9 @@
 
     function getSvgLayerType(layer) {
       var type = null;
-      if (internal.layerHasLabels(layer)) {
-        type = 'label';
-      } else if (internal.layerHasSvgSymbols(layer)) {
+      if (internal.layerHasSvgSymbols(layer)) {
+        type = 'symbol'; // also label + symbol
+      } else if (internal.layerHasLabels(layer)) {
         type = 'symbol';
       }
       return type;
@@ -9753,6 +9756,10 @@
 
   function Basemap(gui, ext) {
     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 clearBtn = new SimpleButton(menu.findChild('.clear-btn'));
     var list = menu.findChild('.basemap-styles');
     var container = gui.container.findChild('.basemap-container');
     var basemapBtn = gui.container.findChild('.basemap-btn');
@@ -9764,6 +9771,7 @@
     var map;
     var activeStyle;
     var loading = false;
+    var faded = false;
 
     if (params) {
       init();
@@ -9774,11 +9782,35 @@
     function init() {
       gui.addMode('basemap', turnOn, turnOff, basemapBtn);
 
-      new SimpleButton(menu.findChild('.close-btn')).on('click', function() {
+      closeBtn.on('click', function() {
         gui.clearMode();
         turnOff();
       });
 
+      // hideBtn.on('mousedown', function() {
+      //   if (activeStyle) {
+      //     mapEl.css('visibility', 'hidden');
+      //     hidden = true;
+      //   }
+      // })
+      clearBtn.on('click', function() {
+        if (activeStyle) {
+          updateStyle(null);
+          updateButtons();
+        }
+      });
+      fadeBtn.on('click', function() {
+        if (faded) {
+          mapEl.css('opacity', 1);
+          faded = false;
+          fadeBtn.text('Fade');
+        } else if (activeStyle) {
+          mapEl.css('opacity', 0.35);
+          faded = true;
+          fadeBtn.text('Unfade');
+        }
+      });
+
       gui.on('map_click', function() {
         // close menu if user click on the map
         if (gui.getMode() == 'basemap') gui.clearMode();
@@ -9801,13 +9833,14 @@
       // gui.state.dark_basemap = style && style.dark || false;
       if (!style) {
         gui.map.setDisplayCRS(null);
-        hide();
+        refresh();
       } else if (map) {
         map.setStyle(style.url);
         refresh();
       } else {
         initMap();
       }
+
     }
 
     function updateButtons() {
@@ -9917,12 +9950,15 @@
     }
 
     function refresh() {
-      if (!enabled() || !map || loading || !activeStyle) return;
       var crs = gui.map.getDisplayCRS();
-      if (!crsIsUsable(crs)) {
+      var off = !crs || !enabled() || !map || loading || !activeStyle;
+      fadeBtn.active(!off);
+      clearBtn.active(!off);
+      if (off) {
         hide();
         return;
       }
+
       if (!internal.isWebMercator(crs)) {
         gui.map.setDisplayCRS(internal.getCRS('webmercator'));
       }