mapshaper 0.6.74 → 0.6.75

package/mapshaper.js

@@ -749,7 +749,7 @@
   }
 
   function getGenericComparator(asc) {
-    asc = asc !== false;
+    asc = asc !== false && asc != 'descending'; // ascending is the default
     return function(a, b) {
       var retn = 0;
       if (b == null) {
@@ -1362,13 +1362,13 @@
   }
 
   // Format an array of (preferably short) strings in columns for console logging.
-  function formatStringsAsGrid(arr) {
+  function formatStringsAsGrid(arr, width) {
     // TODO: variable column width
     var longest = arr.reduce(function(len, str) {
           return Math.max(len, str.length);
         }, 0),
         colWidth = longest + 2,
-        perLine = Math.floor(80 / colWidth) || 1;
+        perLine = Math.floor((width || 80) / colWidth) || 1;
     return arr.reduce(function(memo, name, i) {
       var col = i % perLine;
       if (i > 0 && col === 0) memo += '\n';
@@ -3720,8 +3720,6 @@
   }
   var require$1 = f;
 
-  // import { createRequire } from "module";
-
   var iconv = require$1('iconv-lite');
 
   // import iconv from 'iconv-lite';
@@ -4289,6 +4287,10 @@
     return layerHasPaths(lyr) || layerHasPoints(lyr);
   }
 
+  function layerIsGeometric(lyr) {
+    return !!lyr.geometry_type; // only checks type, includes empty layers
+  }
+
   function layerHasPaths(lyr) {
     return (lyr.geometry_type == 'polygon' || lyr.geometry_type == 'polyline') &&
       layerHasNonNullShapes(lyr);
@@ -4552,6 +4554,7 @@
     getLayerDataTable: getLayerDataTable,
     layerHasNonNullData: layerHasNonNullData,
     layerHasGeometry: layerHasGeometry,
+    layerIsGeometric: layerIsGeometric,
     layerHasPaths: layerHasPaths,
     layerHasPoints: layerHasPoints,
     layerIsRectangle: layerIsRectangle,
@@ -5493,6 +5496,8 @@
       initLegacyArcs(arguments[0]);  // want to phase this out
     } else if (arguments.length == 3) {
       initXYData.apply(this, arguments);
+    } else if (arguments.length === 0) {
+      initLegacyArcs([]); // empty collection
     } else {
       error("ArcCollection() Invalid arguments");
     }
@@ -13184,7 +13189,6 @@
     return findVertexIds(p2.x, p2.y, arcs);
   }
 
-
   function snapVerticesToPoint(ids, p, arcs, final) {
     var data = arcs.getVertexData();
     ids.forEach(function(idx) {
@@ -23046,28 +23050,30 @@ ${svg}
   // @samples Array of buffers containing sample text fields
   // TODO: Improve reliability and number of detectable encodings.
   function detectEncoding(samples) {
-    var encoding = null;
-    var utf8 = looksLikeUtf8(samples);
-    var win1252 = looksLikeWin1252(samples);
-    if (utf8 == 2 || utf8 > win1252) {
-      encoding = 'utf8';
-    } else if (win1252 > 0) {
-      encoding = 'win1252';
-    } else {
-      encoding = 'latin1'; // the original Shapefile encoding, using as an (imperfect) fallback
-    }
-
-    return {
-      encoding: encoding,
-      confidence: Math.max(utf8, win1252)
-    };
+    // score each encoding as 2 (high confidence) 1 (low confidence) or 0 (fail)
+    var candidates = [{
+      // latin1 is the original Shapefile encoding, using as an imperfect fallback
+      // (sorts to the top only if all other encodings score 0)
+      encoding: 'latin1',
+      confidence: 0
+    },{
+      encoding: 'win1252',
+      confidence: looksLikeWin1252(samples)
+    }, {
+      encoding: 'utf8',
+      confidence: looksLikeUtf8(samples)
+    }, {
+      encoding: 'gb18030',
+      confidence: looksLikeGB18030(samples)
+    }];
+    utils.sortOn(candidates, 'confidence', 'descending');
+    return candidates[0];
   }
 
-  // Convert an array of text samples to a single string using a given encoding
   function decodeSamples(enc, samples) {
     return samples.map(function(buf) {
       return decodeString(buf, enc).trim();
-    }).join('\n');
+    });
   }
 
   // Win1252 is the same as Latin1, except it replaces a block of control
@@ -23082,45 +23088,67 @@ ${svg}
   //
   function looksLikeWin1252(samples) {
         //common l.c. ascii chars
-    var ascii = 'abcdefghijklmnopqrstuvwxyz0123456789.()\'"?+-\n,:;/|_$% ',
-        // common extended + NBS (found in the wild)
-        extended = 'ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿ°–±’‘' + '\xA0',
-        str = decodeSamples('win1252', samples),
-        asciiScore = getCharScore(str, ascii),
-        totalScore = getCharScore(str, extended + ascii);
-    return totalScore > 0.98 && asciiScore >= 0.8 && 2 ||
-      totalScore > 0.97 && asciiScore >= 0.6 && 1 || 0;
+    var commonAscii = 'abcdefghijklmnopqrstuvwxyz0123456789.()\'"?+-\n,:;/|_$% ',
+        // more common extended chars + NBS (found in the wild)
+        moreChars = 'ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿ°–±’‘' + '\xA0',
+        str = decodeSamples('win1252', samples).join(''),
+        commonAsciiPct = calcCharPct(str, commonAscii),
+        expandedPct = calcCharPct(str, moreChars) + commonAsciiPct;
+    var high = expandedPct > 0.98 && commonAsciiPct >= 0.8;
+    var low = expandedPct > 0.97 && commonAsciiPct >= 0.6;
+    return getScore(high, low);
   }
 
-  // Reject string if it contains the "replacement character" after decoding to UTF-8
   function looksLikeUtf8(samples) {
-    // Remove the byte sequence for the utf-8-encoded replacement char before decoding,
-    // in case the file is in utf-8, but contains some previously corrupted text.
-    // samples = samples.map(internal.replaceUtf8ReplacementChar);
-    var str = decodeSamples('utf8', samples);
-    var count = (str.match(/\ufffd/g) || []).length;
-    var score = 1 - count / str.length;
-    return score == 1 && 2 || score > 0.97 && 1 || 0;
-  }
-
-  // function replaceUtf8ReplacementChar(buf) {
-  //   var isCopy = false;
-  //   for (var i=0, n=buf.length; i<n; i++) {
-  //     // Check for UTF-8 encoded replacement char (0xEF 0xBF 0xBD)
-  //     if (buf[i] == 0xef && i + 2 < n && buf[i+1] == 0xbf && buf[i+2] == 0xbd) {
-  //       if (!isCopy) {
-  //         buf = utils.createBuffer(buf);
-  //         isCopy = true;
-  //       }
-  //       buf[i] = buf[i+1] = buf[i+2] = 63; // ascii question mark
-  //     }
-  //   }
-  //   return buf;
-  // }
+    // Reject string if it contains the "replacement character" after decoding
+    // as utf-8
+    var str = decodeSamples('utf8', samples).join('');
+    var invalidPct = getInvalidPct(str);
+    var high = invalidPct == 0;
+    var low = invalidPct < 0.03;
+    return getScore(high, low);
+  }
+
+  function looksLikeGB18030(samples) {
+    // from Jun Da's frequency table
+    var commonHanZi = '的一了是不我他在人有这来个说上你们到地大着子那就也时道中出得为里下她要么去可以过和看之然后会自没小好生天而起对能还事想都心只家面样把国多又于头年手发如什开前当所无知老但见长已军从方声儿回意作话两点现很成身情十用些走经同进动己三行种向日明女正问此学太打间分因给本眼定二气力被门真法外听实其高先几笑再主将山战才口文最部第它西与全白者便相住公使东等边信像斯机光次感神却死理名重四做别叫王并水月果何位怎马常觉海张少处亲安特美呢色原直望命由候吧让应尔难关许车平师民夫书新接吗路利世比放活快总立队更花爱清五内金带工风克任至指往入空德吃表连解教思飞物电受今完林干代告兵加认通找远非性脸体轻记目令变似反南场跟必石拉士报李火且满该孩字红象即结言员房件万条提写或坐北早失离步陈乎请转近切黑深城办倒各父传音站官半男击合阿英决怕杀未形及算青黄落刚百论谁突交团度义罗始强紧敌八母钱极片化流管惊每题晚虽政兴答司妈夜越啊奇达谈武友数领朝保服曾拿则哪格尽根急语容喜求衣留双影刻制随冷九苦量备布照周故准客船江系姐争功怪星断句龙竟视界讲取古六静底精七河久绝阳识哈台确息期整伤忙娘终剑送计愿欢微您沉装敢云脚消若复收千木乐毛华集树弟皇响希诉号巴穿线汉攻呀警派刘酒雷停史阵错建足显丽另包势破亮首志观病热跑业治田冲运约暗待共院仍区害元哥围屋胡产室调类细议爷注易务众帝市摇乱密姑斗除式示睛楼造朋社持慢般皮京况块忽脑校甚查土怀福单联赶背统喝疑支血饭灵够章群威举兰游器察嘴痛铁掉宝历改推枪念参术帮党据品须居称旁退梦科岁低严引吉睡爸呼追局露维苏证村挥独节谢香亚波角案读图左掌假跳究楚余鬼钟座礼展玉肯既止守广考恩异料段尼画续米草胜存唐医程弹烟商顾招宗堂野初府激雨尚渐诗顿伯孙际沙雪板闻导致护春态基设耳简婚幸味右买演权卡继依恶庄炮亦虎州刀球需兄闪笔否烈玩啦逃排仅弄具散默景顶郑洋丝卫速侠差贵君习妇助恐救湖莫窗险顺封佛委旧印伙妹副宫洞永罪松责组防艺营班试鲁宋靠索灯介翻喊纪秘妻纸银略充戏担某杨射魔遇鱼陆级坏忘乡鲜哭费抓叶醒族纳床咱桌境列午振抱专毫店街怒托剧置秋藏赵划普岛较承脱革忍伸份免齐抗猛园临犯食架选歌按败良隐养属洛朱狂修坚压寻旅谋温探资端投泪阴换药麻施丈冰雄著绿职负短模荣遗农叹川毒吴蒋卖范禁杂富秀县祖梅谷凡刺登蓝奶缓姓牛价规篇劳质婆仙馆摆舞层狗占墙善熟验肉臣状呆圣懂袋唱值迷替归巨讨毕批镇吸森拍灭握伊杰勒卷偷奔省谓危付伦休厅预迎罢恨博亡欲悲宣标闹岸';
+    var str = decodeSamples('gb18030', samples).join('');
+    // Almost all the common Unicode Hanzi are in this range (along with many more uncommon ones)
+    var chineseStr = str.replace(/[^\u4e00-\u9fa5]/g, '');
+    var chinesePct = chineseStr.length / str.length;
+    var commonAsciiStr = extractCommonAsciiChars(str);
+    var commonAsciiPct = commonAsciiStr.length / str.length;
+    // Some encodings get converted almost completely into valid (but mostly
+    // uncommon) Chinese characters by the gb18030 converter.
+    // To guard against this, we're requiring that a certain percentage of
+    // characters be on a list of the most common characters.
+    var commonHanZiPct = calcCharPct(chineseStr, commonHanZi);
+    // check for non-convertible characters
+    var invalidPct = getInvalidPct(str);
+    var high = chinesePct > 0.5 && (chinesePct + commonAsciiPct) > 0.9 &&
+        invalidPct === 0 && commonHanZiPct > 0.25;
+    var low = chinesePct > 0.3 && (chinesePct + commonAsciiPct) > 0.8 &&
+        commonHanZiPct > 0.15;
+    return getScore(high, low);
+  }
+
+  function getScore(high, low) {
+    return high && 2 || low && 1 || 0;
+  }
+
+  function getInvalidPct(str) {
+    // count occurences of the "replacement" character
+    var invalidCount = (str.match(/\ufffd/g) || []).length;
+    return invalidCount / str.length;
+  }
+
+  function extractCommonAsciiChars(str) {
+    return str.replace(/[^a-zA-Z0-9.()'"?+\n,:;/|_$% -]/g, '');
+  }
 
   // Calc percentage of chars in a string that are present in a second string
   // @chars String of chars to look for in @str
-  function getCharScore(str, chars) {
+  function calcCharPct(str, chars) {
     var index = {},
         count = 0;
     str = str.toLowerCase();
@@ -23130,9 +23158,16 @@ ${svg}
     for (i=0, n=str.length; i<n; i++) {
       count += index[str[i]] || 0;
     }
-    return count / str.length;
+    return count / str.length || 0;
   }
 
+  var EncodingDetection = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    detectEncodingFromBOM: detectEncodingFromBOM,
+    detectEncoding: detectEncoding,
+    decodeSamples: decodeSamples
+  });
+
   // Convert a string containing delimited text data into a dataset object
   function importDelim(str, opts) {
     return importDelim2({content: str}, opts);
@@ -26644,25 +26679,19 @@ ${svg}
         var info = detectEncoding(samples);
         encoding = info.encoding;
         if (info.confidence < 2) {
-          msg = 'Warning: Unable to auto-detect the text encoding of a DBF file with high confidence.';
+          msg = 'Warning: Unable to auto-detect the DBF file text encoding with high confidence.';
           msg += '\n\nDefaulting to: ' + encoding + (encoding in encodingNames ? ' (' + encodingNames[encoding] + ')' : '');
-          msg += '\n\nSample of how non-ascii text was imported:';
-          msg += '\n' + formatStringsAsGrid(decodeSamples(encoding, samples).split('\n'));
-          msg += decodeSamples(encoding, samples);
+          msg += '\n\nSample of how non-ascii text was imported:\n';
+          if (runningInBrowser()) {
+            msg += '<pre>' + formatStringsAsGrid(decodeSamples(encoding, samples), 50) + '</pre>';
+          } else {
+            msg += formatStringsAsGrid(decodeSamples(encoding, samples));
+          }
           msg += '\n\n' + ENCODING_PROMPT + '\n';
           message(msg);
         }
       }
 
-      // 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;
-      //   verbose(msg);
-      // }
       return encoding;
     }
 
@@ -37783,7 +37812,7 @@ ${svg}
       filteredLyr = copyLayer(filteredLyr);
     }
 
-    if (opts.verbose !== false) {
+    if (opts.verbose !== false && !opts.quiet) {
       message(utils.format('Retained %,d of %,d features', getFeatureCount(filteredLyr), n));
     }
 
@@ -37833,14 +37862,15 @@ ${svg}
   }
 
   function combineFilters(a, b) {
-    return (a && b && function(id) {
+    return a && b ? function(id) {
         return a(id) && b(id);
-      }) || a || b;
+      } : (a || b);
   }
 
-  cmd.evaluateEachFeature = function(lyr, dataset, exp, opts) {
+  cmd.evaluateEachFeature = function(lyr, dataset, expArg, opts) {
     var n = getFeatureCount(lyr),
         arcs = dataset.arcs,
+        exp = expArg || '',
         compiled, filter;
 
     var exprOpts = {
@@ -42377,6 +42407,9 @@ ${svg}
     candidates.forEach(function(candId) {
       var hit;
       if (candId == absId) return; // ignore self-intersections
+      if (absArcId(candId) >= arcs.size()) {
+        return;
+      }
       hit = geom.getPointToPathInfo(endpoint.point[0], endpoint.point[1], [candId], arcs);
       if (hit && hit.distance <= maxGapLen && (!target || hit.distance < target.distance)) {
         target = hit;
@@ -42462,7 +42495,9 @@ ${svg}
     // if (opts.gap_tolerance) {
       //opts = utils.defaults({snap_interval: opts.gap_tolerance * 0.1}, opts);
     // }
-    addIntersectionCuts(dataset, opts);
+    if (!opts.no_cuts) {
+      addIntersectionCuts(dataset, opts);
+    }
     return layers.map(function(lyr) {
       if (lyr.geometry_type != 'polyline') stop("Expected a polyline layer");
       if (opts.from_rings) {
@@ -42492,7 +42527,12 @@ ${svg}
   }
 
   function createPolygonLayer(lyr, dataset, opts) {
-    var nodes = closeUndershoots(lyr, dataset, opts);
+    var nodes;
+    if (opts.no_cuts) {
+      nodes = new NodeCollection(dataset.arcs);
+    } else {
+      nodes = closeUndershoots(lyr, dataset, opts);
+    }
     // ignore arcs that don't belong to this layer
     nodes.setArcFilter(getArcPresenceTest(lyr.shapes, nodes.arcs));
     var data = buildPolygonMosaic(nodes);
@@ -45485,7 +45525,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.74";
+  var version = "0.6.75";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.
@@ -46162,6 +46202,7 @@ ${svg}
     DelimExport,
     DelimImport,
     DelimReader,
+    EncodingDetection,
     Encodings,
     Explode,
     Export,

package/package.json

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

package/www/mapshaper-gui.js

@@ -1144,10 +1144,18 @@
       return self;
     };
 
-    self.close = function() {
-      if (el) el.remove();
+    self.close = function(action) {
+      var ms = 0;
+      var _el = el;
+      if (action == 'fade' && _el) {
+        ms = 1000;
+        _el.addClass('fade-out');
+      }
       if (_close) _close();
       el = _cancel = _close = null;
+      setTimeout(function() {
+        if (_el) _el.remove();
+      }, ms);
     };
     return self;
   }
@@ -1753,6 +1761,9 @@
       }],
       info: {}
     };
+    if (type == 'polygon' || type == 'point') {
+      dataset.arcs = new internal.ArcCollection();
+    }
     if (crsInfo) {
       internal.setDatasetCrsInfo(dataset, crsInfo);
     }
@@ -2426,7 +2437,10 @@
     }
 
     function error() {
-      stop.apply(null, utils$1.toArray(arguments));
+      var msg = GUI.formatMessageArgs(arguments);
+      console.error(msg);
+      gui.alert('An unkown error occured');
+      throw new Error(msg);
     }
 
     function message() {
@@ -2807,7 +2821,7 @@
       strokeWidth: 1.2,
       vertices: true,
       vertex_overlay_color: o.hit_type == 'vertex' ? violet : black,
-      vertex_overlay_scale: o.hit_type == 'vertex' ? 2.4 : 1.7,
+      vertex_overlay_scale: o.hit_type == 'vertex' ? 2.5 : 2,
       vertex_overlay: o.hit_coordinates || null,
       selected_points: o.selected_points || null,
       fillColor: null
@@ -3025,6 +3039,11 @@
     return internal.getUnfilteredArcCoords(arcId, target.source.dataset.arcs);
   }
 
+  function getLastVertexCoords(target) {
+    var arcs = target.source.dataset.arcs;
+    return internal.getVertexCoords(arcs.getPointCount() - 1, arcs);
+  }
+
   function getLastArcLength(target) {
     var arcId = target.source.dataset.arcs.size() - 1;
     return internal.getUnfilteredArcLength(arcId, target.source.dataset.arcs);
@@ -4920,13 +4939,10 @@
       return internal.getLayerSourceFile(lyr, dataset);
     }
 
-
     function isPinnable(lyr) {
-      return internal.layerHasGeometry(lyr) || internal.layerHasFurniture(lyr);
+      return internal.layerIsGeometric(lyr) || internal.layerHasFurniture(lyr);
     }
 
-
-
     function rowHTML(c1, c2, cname) {
       return utils$1.format('<div class="row%s"><div class="col1">%s</div>' +
         '<div class="col2">%s</div></div>', cname ? ' ' + cname : '', c1, c2);
@@ -5205,10 +5221,10 @@
 
     gui.on('path_extend', function(e) {
       var redo = function() {
-        gui.dispatchEvent('redo_path_extend', {p: e.p});
+        gui.dispatchEvent('redo_path_extend', {p: e.p, shapes: e.shapes2});
       };
       var undo = function() {
-        gui.dispatchEvent('undo_path_extend');
+        gui.dispatchEvent('undo_path_extend', {shapes: e.shapes1});
       };
       addHistoryState(undo, redo);
     });
@@ -5543,22 +5559,23 @@
       if (!o || !o.layer) {
         return menus.standard; // TODO: more sensible handling of missing layer
       }
-      if (!internal.layerHasGeometry(o.layer)) {
+      if (!o.layer.geometry_type) {
         return menus.table;
       }
       if (internal.layerHasLabels(o.layer)) {
         return menus.labels;
       }
-      if (internal.layerHasPoints(o.layer)) {
+      if (o.layer.geometry_type == 'point') {
         return menus.points;
       }
-      if (internal.layerHasPaths(o.layer) && o.layer.geometry_type == 'polyline') {
+      if (o.layer.geometry_type == 'polyline') {
         return menus.lines;
       }
-      if (internal.layerHasPaths(o.layer) && o.layer.geometry_type == 'polygon') {
+      if (o.layer.geometry_type == 'polygon') {
         return internal.layerOnlyHasRectangles(o.layer, o.dataset.arcs) ?
           menus.rectangles : menus.polygons;
       }
+
       return menus.standard;
     }
 
@@ -5908,13 +5925,13 @@
   }
 
   // Format an array of (preferably short) strings in columns for console logging.
-  function formatStringsAsGrid(arr) {
+  function formatStringsAsGrid(arr, width) {
     // TODO: variable column width
     var longest = arr.reduce(function(len, str) {
           return Math.max(len, str.length);
         }, 0),
         colWidth = longest + 2,
-        perLine = Math.floor(80 / colWidth) || 1;
+        perLine = Math.floor((width || 80) / colWidth) || 1;
     return arr.reduce(function(memo, name, i) {
       var col = i % perLine;
       if (i > 0 && col === 0) memo += '\n';
@@ -6575,7 +6592,7 @@
   }
 
   function getGenericComparator(asc) {
-    asc = asc !== false;
+    asc = asc !== false && asc != 'descending'; // ascending is the default
     return function(a, b) {
       var retn = 0;
       if (b == null) {
@@ -9710,12 +9727,14 @@
     var prevClickEvent;
     var prevHoverEvent;
     var initialArcCount = -1;
+    var initialShapeCount = -1;
     var drawingId = -1; // feature id of path being drawn
+    var sessionCount = 0;
     var alert;
     var _dragging = false;
 
     function active() {
-      return !!alert;
+      return initialArcCount >= 0;
     }
 
     function dragging() {
@@ -9753,7 +9772,7 @@
       appendNewPath(target, e.p1, e.p2);
       deleteLastVertex(target); // second vertex is a placeholder
       gui.undo.redo(); // add next vertex in the path
-      gui.model.updated({arc_count: true});
+      fullRedraw();
     });
 
     gui.on('undo_path_add', function(e) {
@@ -9769,8 +9788,28 @@
       } else {
         appendVertex$1(target, e.p);
       }
+      if (e.shapes) {
+        replaceShapes(e.shapes);
+      }
     });
 
+    function replaceShapes(shapes) {
+      var target = hit.getHitTarget();
+      var records = target.layer.data?.getRecords();
+      var prevLen = target.layer.shapes.length;
+      var newLen = initialShapeCount + shapes.length;
+      var recordCount = records?.length || 0;
+      target.layer.shapes = target.layer.shapes.slice(0, initialShapeCount).concat(shapes);
+      while (records && records.length > newLen) {
+        records.pop();
+      }
+      while (records && records.length < newLen) {
+        appendNewDataRecord(target.layer);
+      }
+    }
+
+
+
     gui.on('undo_path_extend', function(e) {
       var target = hit.getHitTarget();
       if (drawing() && prevHoverEvent) {
@@ -9782,75 +9821,70 @@
       if (getLastArcLength(target) < 2) {
         gui.undo.undo(); // remove the path
       }
+      if (e.shapes) {
+        replaceShapes(e.shapes);
+      }
     });
 
     function turnOn() {
       var target = hit.getHitTarget();
-      var pathStr = polygonMode() ? 'closed paths' : 'paths';
+      initialArcCount = target.arcs.size();
+      initialShapeCount = target.layer.shapes.length;
+      if (sessionCount === 0) {
+        showInstructions();
+      }
+      sessionCount++;
+    }
+
+    function showInstructions() {
       var isMac = navigator.userAgent.includes('Mac');
       var symbol = isMac ? '⌘' : '^';
+      var pathStr = polygonMode() ? 'closed paths' : 'paths';
       var msg = `Instructions: Click on the map to draw ${pathStr}. Drag vertices to reshape a path. Type ${symbol}Z/${symbol}Y to undo/redo.`;
-      initialArcCount = hit.getHitTarget().arcs.size();
-      alert = showPopupAlert(msg, null, {non_blocking: true, max_width: '360px'});
+        alert = showPopupAlert(msg, null, {
+          non_blocking: true, max_width: '360px'});
     }
 
     function turnOff() {
-      finishPath();
+      var removed = 0;
+      finishCurrentPath();
       if (polygonMode()) {
-        finishPolygons();
+        removed = removeOpenPolygons();
       }
       clearDrawingInfo();
-      alert.close();
-      alert = null;
+      if (alert) {
+        alert.close();
+        alert = null;
+      }
       initialArcCount = -1;
+      initialShapeCount = -1;
       if (gui.interaction.getMode() == 'drawing') {
         // mode change was not initiated by interactive menu -- turn off interactivity
         gui.interaction.turnOff();
       }
-    }
-
-    function finish() {
-      if (polygonMode()) {
-        finishPolygons();
+      if (removed > 0) {
+        fullRedraw();
       }
     }
 
-    function finishPolygons() {
-      // step1: make a polyline layer containing just newly drawn paths
+    // returns number of removed shapes
+    function removeOpenPolygons() {
       var target = hit.getHitTarget();
-      var newShapeCount = target.arcs.size() - initialArcCount;
-      if (newShapeCount <= 0) return; // no paths added
-      var polygonLyr = target.source.layer;
-      var polygonRecords = polygonLyr.data ? polygonLyr.data.getRecords() : null;
-      var initialShapeCount = polygonLyr.shapes.length - newShapeCount;
-      var templateRecord;
-      if (polygonRecords) {
-        // use one of the newly created records as a template (they should all be the same)
-        templateRecord = polygonRecords.pop();
-        polygonRecords.splice(initialShapeCount); // remove new records
-      }
-      var polylineLyr = {
-        geometry_type: 'polyline',
-        shapes: polygonLyr.shapes.splice(initialShapeCount) // move new shapes to polyline layer
-      };
-
-      // step2: convert polylines to polygons
-      //
-      // create a temp dataset containing both layers (so original arcs are preserved)
-      var tmp = Object.assign({}, target.source.dataset);
-      tmp.layers = tmp.layers.concat(polylineLyr);
-      var outputLayers = mapshaper.cmd.polygons([polylineLyr], tmp, {});
-
-      // step3: add new polygons to the original polygons
-      outputLayers[0].shapes.forEach(function(shp) {
-        var rec = polygonRecords ? internal.copyRecord(templateRecord) : null;
-        polygonLyr.shapes.push(shp);
-        if (polygonRecords) {
-          polygonRecords.push(rec);
+      var arcs = target.source.dataset.arcs;
+      var n = target.layer.shapes.length;
+      // delete open paths (should only occur on single-arc shapes)
+      for (var i=initialShapeCount; i<n; i++) {
+        var shp = target.layer.shapes[i];
+        if (!geom.pathIsClosed(shp[0], arcs)) {
+          target.layer.shapes[i] = null;
         }
-      });
+      }
+      // removes polygons with wrong winding order and null geometry
+      mapshaper.cmd.filterFeatures(target.layer, arcs, {remove_empty: true, quiet: true});
+      return n - target.layer.shapes.length;
+    }
 
-      // step4: update map
+    function fullRedraw() {
       gui.model.updated({arc_count: true});
     }
 
@@ -9863,6 +9897,9 @@
 
     hit.on('dragstart', function(e) {
       if (!active() || drawing() || !hoverVertexInfo) return;
+      if (alert) {
+        alert.close('fade');
+      }
       e.originalEvent.stopPropagation();
       _dragging = true;
       if (hoverVertexInfo.type == 'interpolated') {
@@ -9903,12 +9940,10 @@
     // double-click finishes a path (when drawing)
     hit.on('dblclick', function(e) {
       if (!active()) return;
+      // double click finishes a path
+      // note: if the preceding 'click' finished the path, this does not fire
       if (drawing()) {
-        // double click finishes a path
-        // before: dblclick is preceded by two clicks, need another vertex delete
-        // now: second click is suppressed
-        // deleteLastVertex(hit.getHitTarget());
-        finishPath();
+        finishCurrentPath();
         e.originalEvent.stopPropagation(); // prevent dblclick zoom
         return;
       }
@@ -9920,7 +9955,7 @@
       if (!active() || dragging()) return;
       if (drawing()) {
         if (!e.overMap) {
-          finishPath();
+          finishCurrentPath();
           return;
         }
         if (gui.keyboard.shiftIsPressed()) {
@@ -9948,27 +9983,27 @@
       if (!active()) return;
       if (detectDoubleClick(e)) return; // ignore second click of a dblclick
       var p = pixToDataCoords(e.x, e.y);
-      if (drawing() && hoverVertexInfo) {
-        // finish the path if a vertex is highlighted
-        p = hoverVertexInfo.point;
-        extendPath(p);
-        finishPath();
-      } else if (drawing()) {
-        extendPath(p);
+      if (drawing()) {
+        extendCurrentPath(hoverVertexInfo?.point || p);
+        // extendCurrentPath(p); // just extend to current mouse position (not hover vertex)
       } else if (gui.keyboard.shiftIsPressed()) {
         deleteActiveVertex(e);
       } else {
-        startPath(p);
+        startNewPath(p);
+        if (alert) {
+          alert.close('fade');
+        }
       }
       prevClickEvent = e;
     });
 
     // esc key finishes a path
     gui.keyboard.on('keydown', function(e) {
-      if (active() && e.keyName == 'esc') {
-        finishPath();
+      if (active() && (e.keyName == 'esc' || e.keyName == 'enter')) {
+        e.stopPropagation();
+        finishCurrentPath();
       }
-    });
+    }, null, 10);
 
     // detect second 'click' event of a double-click action
     function detectDoubleClick(evt) {
@@ -10036,7 +10071,7 @@
       thisEvt.y = snapped.y;
     }
 
-    function finishPath() {
+    function finishCurrentPath() {
       if (!drawing()) return;
       var target = hit.getHitTarget();
       if (getLastArcLength(target) <= 2) { // includes hover point
@@ -10045,27 +10080,44 @@
         deleteLastVertex(target);
       }
       clearDrawingInfo();
-      gui.model.updated({arc_count: true});
+      fullRedraw();
     }
 
     // p: [x, y] source data coordinates
-    function startPath(p2) {
+    function startNewPath(p2) {
       var target = hit.getHitTarget();
-      var p1 = hoverVertexInfo ? hoverVertexInfo.point : p2;
+      var p1 = hoverVertexInfo?.point || p2;
       appendNewPath(target, p1, p2);
       gui.dispatchEvent('path_add', {target, p1, p2});
       drawingId = target.layer.shapes.length - 1;
       hit.setDrawingId(drawingId);
     }
 
-    // p: [x, y] source data coordinates
-    function extendPath(p) {
+    // p: [x, y] source data coordinates of new point on path
+    function extendCurrentPath(p) {
       var target = hit.getHitTarget();
-      if (getLastArcLength(target) >= 2) {
+      var shapes1, shapes2;
+      // finish the path if a vertex is selected (but not an interpolated point)
+      var finish = hoverVertexInfo?.type == 'vertex';
+      if (getLastArcLength(target) < 2) {
+        error$1('Defective path');
+      }
+      if (finish && polygonMode()) {
+        shapes1 = target.layer.shapes.slice(initialShapeCount);
+        shapes2 = tryToClosePath(shapes1);
+      }
+      if (shapes2) {
+        replaceShapes(shapes2);
+        gui.dispatchEvent('path_extend', {target, p, shapes1, shapes2});
+        clearDrawingInfo();
+        fullRedraw();
+
+      } else {
+        appendVertex$1(target, p);
         gui.dispatchEvent('path_extend', {target, p});
+        hit.triggerChangeEvent(); // trigger overlay redraw
       }
-      appendVertex$1(target, p);
-      hit.triggerChangeEvent();
+
     }
 
     // p: [x, y] source data coordinates
@@ -10160,6 +10212,55 @@
       return closest;
     }
 
+    // shapes: shapes that have been drawn in the current session
+    //
+    function tryToClosePath(shapes) {
+      var target = hit.getHitTarget();
+      var tmpLyr = {
+        geometry_type: 'polyline',
+        shapes: shapes.concat()
+      };
+      // create a temp dataset containing tmp layer and original layers
+      // (so original arcs are retained)
+      var tmpDataset = Object.assign({}, target.source.dataset);
+      tmpDataset.layers = tmpDataset.layers.concat(tmpLyr);
+      // NOTE: added "no_cuts" option to prevent polygons function from modifying
+      // arcs, which would break undo/redo and cause other problems
+      var outputLyr = mapshaper.cmd.polygons([tmpLyr], tmpDataset, {no_cuts: true})[0];
+      var isOpenPath = getOpenPathTest(outputLyr.shapes);
+      var shapes2 = [];
+      shapes.forEach(function(shp) {
+        if (isOpenPath(shp)) {
+          shapes2.push(shp);
+        }
+      });
+      return shapes2.concat(outputLyr.shapes);
+    }
+
+    // Returns a function for testing if a shape is an unclosed path, and doesn't
+    // overlap with an array of polygon shapes
+    // polygons: array of polygon shapes
+    function getOpenPathTest(polygons) {
+      var arcs = [];
+      internal.forEachArcId(polygons, function(arcId) {
+        if (arcId < 0) arcId = ~arcId;
+        arcs.push(arcId);
+      });
+      return function(shp) {
+        // assume that compound shapes are already polygons
+        var isOpen = false;
+        if (shapeHasOneFwdArc(shp)) {
+          var arcId = shp[0][0];
+          if (arcId < 0) arcId = ~arcId;
+          isOpen = !arcs.includes(arcId);
+        }
+        return isOpen;
+      };
+    }
+
+    function shapeHasOneFwdArc(shp) {
+      return shp.length == 1 && shp[0].length == 1 && shp[0][0] >= 0;
+    }
   }
 
   function initPointDrawing(gui, ext, hit) {
@@ -10756,8 +10857,8 @@
   function getArcsForRendering(obj, ext) {
     var dataset = obj.source.dataset;
     var sourceArcs = dataset.arcs;
-    if (obj.geographic && dataset.displayArcs) {
-      return dataset.displayArcs.getScaledArcs(ext);
+    if (obj.geographic && dataset.gui?.displayArcs) {
+      return dataset.gui.displayArcs.getScaledArcs(ext);
     }
     return obj.arcs;
   }
@@ -11877,10 +11978,10 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
     //if (!lyr.geographic || !sourceCRS) {
     // let getDisplayLayer() handle case of unprojectable source
     if (!lyr.geographic) {
-      return lyr;
+      return;
     }
     if (lyr.dynamic_crs && internal.crsAreEqual(sourceCRS, lyr.dynamic_crs)) {
-      return lyr;
+      return;
     }
     lyr2 = getDisplayLayer(lyr.source.layer, lyr.source.dataset, {crs: displayCRS});
     // kludge: copy projection-related properties to original layer
@@ -11916,7 +12017,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
     var displayCRS = opts.crs || null;
     // display arcs may have been generated when another layer in the dataset was converted for display... re-use if available
-    var displayArcs = dataset.displayArcs || null;
+    var displayArcs = dataset.gui?.displayArcs || null;
     var sourceCRS;
     var emptyArcs;
 
@@ -11933,7 +12034,8 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
     // Assume that dataset.displayArcs is in the display CRS
     // (it must be deleted upstream if reprojection is needed)
-    if (!obj.empty && dataset.arcs && !displayArcs) {
+    // if (!obj.empty && dataset.arcs && !displayArcs) {
+    if (dataset.arcs && !displayArcs) {
       // project arcs, if needed
       if (needReprojectionForDisplay(sourceCRS, displayCRS)) {
         displayArcs = projectArcsForDisplay(dataset.arcs, sourceCRS, displayCRS);
@@ -11943,7 +12045,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       }
 
       enhanceArcCollectionForDisplay(displayArcs);
-      dataset.displayArcs = displayArcs; // stash these in the dataset for other layers to use
+      dataset.gui = {displayArcs}; // stash these in the dataset for other layers to use
     }
 
     if (internal.layerHasFurniture(layer)) {
@@ -11955,14 +12057,14 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       // treating furniture layers (other than frame) as tabular for now,
       // so there is something to show if they are selected
       // obj.tabular = obj.furniture_type != 'frame';
-    } else if (obj.empty) {
-      obj.layer = {shapes: []}; // ideally we should avoid empty layers
-    } else if (!layer.geometry_type) {
-      obj.tabular = true;
-    } else {
+    } else if (layer.geometry_type) {
       obj.geographic = true;
       obj.layer = layer;
       obj.arcs = displayArcs;
+    } else if (!obj.empty) {
+      obj.tabular = true;
+    } else {
+      obj.layer = {shapes: []}; // ideally we should avoid empty layers
     }
 
     if (obj.tabular) {
@@ -12387,13 +12489,13 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
       updateFullBounds();
     };
 
-    function getGlobalStyleOptions() {
+    function getGlobalStyleOptions(opts) {
       var mode = gui.state.interaction_mode;
-      return {
+      return Object.assign({
         darkMode: !!gui.state.dark_basemap,
         outlineMode: mode == 'vertices',
         interactionMode: mode
-      };
+      }, opts);
     }
 
     // Refresh map display in response to data changes, layer selection, etc.
@@ -12408,7 +12510,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
       if (arcsMayHaveChanged(e.flags)) {
         // regenerate filtered arcs the next time they are needed for rendering
-        // delete e.dataset.displayArcs;
+        // delete e.dataset.gui.displayArcs
         clearAllDisplayArcs();
 
         // reset simplification after projection (thresholds have changed)
@@ -12585,7 +12687,7 @@ GUI and setting the size and crop of SVG output.</p><div><input type="text" clas
 
     function clearAllDisplayArcs() {
       model.getDatasets().forEach(function(o) {
-        delete o.displayArcs;
+        delete o.gui;
       });
     }
 

package/www/mapshaper.js

@@ -749,7 +749,7 @@
   }
 
   function getGenericComparator(asc) {
-    asc = asc !== false;
+    asc = asc !== false && asc != 'descending'; // ascending is the default
     return function(a, b) {
       var retn = 0;
       if (b == null) {
@@ -1362,13 +1362,13 @@
   }
 
   // Format an array of (preferably short) strings in columns for console logging.
-  function formatStringsAsGrid(arr) {
+  function formatStringsAsGrid(arr, width) {
     // TODO: variable column width
     var longest = arr.reduce(function(len, str) {
           return Math.max(len, str.length);
         }, 0),
         colWidth = longest + 2,
-        perLine = Math.floor(80 / colWidth) || 1;
+        perLine = Math.floor((width || 80) / colWidth) || 1;
     return arr.reduce(function(memo, name, i) {
       var col = i % perLine;
       if (i > 0 && col === 0) memo += '\n';
@@ -3720,8 +3720,6 @@
   }
   var require$1 = f;
 
-  // import { createRequire } from "module";
-
   var iconv = require$1('iconv-lite');
 
   // import iconv from 'iconv-lite';
@@ -4289,6 +4287,10 @@
     return layerHasPaths(lyr) || layerHasPoints(lyr);
   }
 
+  function layerIsGeometric(lyr) {
+    return !!lyr.geometry_type; // only checks type, includes empty layers
+  }
+
   function layerHasPaths(lyr) {
     return (lyr.geometry_type == 'polygon' || lyr.geometry_type == 'polyline') &&
       layerHasNonNullShapes(lyr);
@@ -4552,6 +4554,7 @@
     getLayerDataTable: getLayerDataTable,
     layerHasNonNullData: layerHasNonNullData,
     layerHasGeometry: layerHasGeometry,
+    layerIsGeometric: layerIsGeometric,
     layerHasPaths: layerHasPaths,
     layerHasPoints: layerHasPoints,
     layerIsRectangle: layerIsRectangle,
@@ -5493,6 +5496,8 @@
       initLegacyArcs(arguments[0]);  // want to phase this out
     } else if (arguments.length == 3) {
       initXYData.apply(this, arguments);
+    } else if (arguments.length === 0) {
+      initLegacyArcs([]); // empty collection
     } else {
       error("ArcCollection() Invalid arguments");
     }
@@ -13184,7 +13189,6 @@
     return findVertexIds(p2.x, p2.y, arcs);
   }
 
-
   function snapVerticesToPoint(ids, p, arcs, final) {
     var data = arcs.getVertexData();
     ids.forEach(function(idx) {
@@ -23046,28 +23050,30 @@ ${svg}
   // @samples Array of buffers containing sample text fields
   // TODO: Improve reliability and number of detectable encodings.
   function detectEncoding(samples) {
-    var encoding = null;
-    var utf8 = looksLikeUtf8(samples);
-    var win1252 = looksLikeWin1252(samples);
-    if (utf8 == 2 || utf8 > win1252) {
-      encoding = 'utf8';
-    } else if (win1252 > 0) {
-      encoding = 'win1252';
-    } else {
-      encoding = 'latin1'; // the original Shapefile encoding, using as an (imperfect) fallback
-    }
-
-    return {
-      encoding: encoding,
-      confidence: Math.max(utf8, win1252)
-    };
+    // score each encoding as 2 (high confidence) 1 (low confidence) or 0 (fail)
+    var candidates = [{
+      // latin1 is the original Shapefile encoding, using as an imperfect fallback
+      // (sorts to the top only if all other encodings score 0)
+      encoding: 'latin1',
+      confidence: 0
+    },{
+      encoding: 'win1252',
+      confidence: looksLikeWin1252(samples)
+    }, {
+      encoding: 'utf8',
+      confidence: looksLikeUtf8(samples)
+    }, {
+      encoding: 'gb18030',
+      confidence: looksLikeGB18030(samples)
+    }];
+    utils.sortOn(candidates, 'confidence', 'descending');
+    return candidates[0];
   }
 
-  // Convert an array of text samples to a single string using a given encoding
   function decodeSamples(enc, samples) {
     return samples.map(function(buf) {
       return decodeString(buf, enc).trim();
-    }).join('\n');
+    });
   }
 
   // Win1252 is the same as Latin1, except it replaces a block of control
@@ -23082,45 +23088,67 @@ ${svg}
   //
   function looksLikeWin1252(samples) {
         //common l.c. ascii chars
-    var ascii = 'abcdefghijklmnopqrstuvwxyz0123456789.()\'"?+-\n,:;/|_$% ',
-        // common extended + NBS (found in the wild)
-        extended = 'ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿ°–±’‘' + '\xA0',
-        str = decodeSamples('win1252', samples),
-        asciiScore = getCharScore(str, ascii),
-        totalScore = getCharScore(str, extended + ascii);
-    return totalScore > 0.98 && asciiScore >= 0.8 && 2 ||
-      totalScore > 0.97 && asciiScore >= 0.6 && 1 || 0;
+    var commonAscii = 'abcdefghijklmnopqrstuvwxyz0123456789.()\'"?+-\n,:;/|_$% ',
+        // more common extended chars + NBS (found in the wild)
+        moreChars = 'ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿ°–±’‘' + '\xA0',
+        str = decodeSamples('win1252', samples).join(''),
+        commonAsciiPct = calcCharPct(str, commonAscii),
+        expandedPct = calcCharPct(str, moreChars) + commonAsciiPct;
+    var high = expandedPct > 0.98 && commonAsciiPct >= 0.8;
+    var low = expandedPct > 0.97 && commonAsciiPct >= 0.6;
+    return getScore(high, low);
   }
 
-  // Reject string if it contains the "replacement character" after decoding to UTF-8
   function looksLikeUtf8(samples) {
-    // Remove the byte sequence for the utf-8-encoded replacement char before decoding,
-    // in case the file is in utf-8, but contains some previously corrupted text.
-    // samples = samples.map(internal.replaceUtf8ReplacementChar);
-    var str = decodeSamples('utf8', samples);
-    var count = (str.match(/\ufffd/g) || []).length;
-    var score = 1 - count / str.length;
-    return score == 1 && 2 || score > 0.97 && 1 || 0;
-  }
-
-  // function replaceUtf8ReplacementChar(buf) {
-  //   var isCopy = false;
-  //   for (var i=0, n=buf.length; i<n; i++) {
-  //     // Check for UTF-8 encoded replacement char (0xEF 0xBF 0xBD)
-  //     if (buf[i] == 0xef && i + 2 < n && buf[i+1] == 0xbf && buf[i+2] == 0xbd) {
-  //       if (!isCopy) {
-  //         buf = utils.createBuffer(buf);
-  //         isCopy = true;
-  //       }
-  //       buf[i] = buf[i+1] = buf[i+2] = 63; // ascii question mark
-  //     }
-  //   }
-  //   return buf;
-  // }
+    // Reject string if it contains the "replacement character" after decoding
+    // as utf-8
+    var str = decodeSamples('utf8', samples).join('');
+    var invalidPct = getInvalidPct(str);
+    var high = invalidPct == 0;
+    var low = invalidPct < 0.03;
+    return getScore(high, low);
+  }
+
+  function looksLikeGB18030(samples) {
+    // from Jun Da's frequency table
+    var commonHanZi = '的一了是不我他在人有这来个说上你们到地大着子那就也时道中出得为里下她要么去可以过和看之然后会自没小好生天而起对能还事想都心只家面样把国多又于头年手发如什开前当所无知老但见长已军从方声儿回意作话两点现很成身情十用些走经同进动己三行种向日明女正问此学太打间分因给本眼定二气力被门真法外听实其高先几笑再主将山战才口文最部第它西与全白者便相住公使东等边信像斯机光次感神却死理名重四做别叫王并水月果何位怎马常觉海张少处亲安特美呢色原直望命由候吧让应尔难关许车平师民夫书新接吗路利世比放活快总立队更花爱清五内金带工风克任至指往入空德吃表连解教思飞物电受今完林干代告兵加认通找远非性脸体轻记目令变似反南场跟必石拉士报李火且满该孩字红象即结言员房件万条提写或坐北早失离步陈乎请转近切黑深城办倒各父传音站官半男击合阿英决怕杀未形及算青黄落刚百论谁突交团度义罗始强紧敌八母钱极片化流管惊每题晚虽政兴答司妈夜越啊奇达谈武友数领朝保服曾拿则哪格尽根急语容喜求衣留双影刻制随冷九苦量备布照周故准客船江系姐争功怪星断句龙竟视界讲取古六静底精七河久绝阳识哈台确息期整伤忙娘终剑送计愿欢微您沉装敢云脚消若复收千木乐毛华集树弟皇响希诉号巴穿线汉攻呀警派刘酒雷停史阵错建足显丽另包势破亮首志观病热跑业治田冲运约暗待共院仍区害元哥围屋胡产室调类细议爷注易务众帝市摇乱密姑斗除式示睛楼造朋社持慢般皮京况块忽脑校甚查土怀福单联赶背统喝疑支血饭灵够章群威举兰游器察嘴痛铁掉宝历改推枪念参术帮党据品须居称旁退梦科岁低严引吉睡爸呼追局露维苏证村挥独节谢香亚波角案读图左掌假跳究楚余鬼钟座礼展玉肯既止守广考恩异料段尼画续米草胜存唐医程弹烟商顾招宗堂野初府激雨尚渐诗顿伯孙际沙雪板闻导致护春态基设耳简婚幸味右买演权卡继依恶庄炮亦虎州刀球需兄闪笔否烈玩啦逃排仅弄具散默景顶郑洋丝卫速侠差贵君习妇助恐救湖莫窗险顺封佛委旧印伙妹副宫洞永罪松责组防艺营班试鲁宋靠索灯介翻喊纪秘妻纸银略充戏担某杨射魔遇鱼陆级坏忘乡鲜哭费抓叶醒族纳床咱桌境列午振抱专毫店街怒托剧置秋藏赵划普岛较承脱革忍伸份免齐抗猛园临犯食架选歌按败良隐养属洛朱狂修坚压寻旅谋温探资端投泪阴换药麻施丈冰雄著绿职负短模荣遗农叹川毒吴蒋卖范禁杂富秀县祖梅谷凡刺登蓝奶缓姓牛价规篇劳质婆仙馆摆舞层狗占墙善熟验肉臣状呆圣懂袋唱值迷替归巨讨毕批镇吸森拍灭握伊杰勒卷偷奔省谓危付伦休厅预迎罢恨博亡欲悲宣标闹岸';
+    var str = decodeSamples('gb18030', samples).join('');
+    // Almost all the common Unicode Hanzi are in this range (along with many more uncommon ones)
+    var chineseStr = str.replace(/[^\u4e00-\u9fa5]/g, '');
+    var chinesePct = chineseStr.length / str.length;
+    var commonAsciiStr = extractCommonAsciiChars(str);
+    var commonAsciiPct = commonAsciiStr.length / str.length;
+    // Some encodings get converted almost completely into valid (but mostly
+    // uncommon) Chinese characters by the gb18030 converter.
+    // To guard against this, we're requiring that a certain percentage of
+    // characters be on a list of the most common characters.
+    var commonHanZiPct = calcCharPct(chineseStr, commonHanZi);
+    // check for non-convertible characters
+    var invalidPct = getInvalidPct(str);
+    var high = chinesePct > 0.5 && (chinesePct + commonAsciiPct) > 0.9 &&
+        invalidPct === 0 && commonHanZiPct > 0.25;
+    var low = chinesePct > 0.3 && (chinesePct + commonAsciiPct) > 0.8 &&
+        commonHanZiPct > 0.15;
+    return getScore(high, low);
+  }
+
+  function getScore(high, low) {
+    return high && 2 || low && 1 || 0;
+  }
+
+  function getInvalidPct(str) {
+    // count occurences of the "replacement" character
+    var invalidCount = (str.match(/\ufffd/g) || []).length;
+    return invalidCount / str.length;
+  }
+
+  function extractCommonAsciiChars(str) {
+    return str.replace(/[^a-zA-Z0-9.()'"?+\n,:;/|_$% -]/g, '');
+  }
 
   // Calc percentage of chars in a string that are present in a second string
   // @chars String of chars to look for in @str
-  function getCharScore(str, chars) {
+  function calcCharPct(str, chars) {
     var index = {},
         count = 0;
     str = str.toLowerCase();
@@ -23130,9 +23158,16 @@ ${svg}
     for (i=0, n=str.length; i<n; i++) {
       count += index[str[i]] || 0;
     }
-    return count / str.length;
+    return count / str.length || 0;
   }
 
+  var EncodingDetection = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    detectEncodingFromBOM: detectEncodingFromBOM,
+    detectEncoding: detectEncoding,
+    decodeSamples: decodeSamples
+  });
+
   // Convert a string containing delimited text data into a dataset object
   function importDelim(str, opts) {
     return importDelim2({content: str}, opts);
@@ -26644,25 +26679,19 @@ ${svg}
         var info = detectEncoding(samples);
         encoding = info.encoding;
         if (info.confidence < 2) {
-          msg = 'Warning: Unable to auto-detect the text encoding of a DBF file with high confidence.';
+          msg = 'Warning: Unable to auto-detect the DBF file text encoding with high confidence.';
           msg += '\n\nDefaulting to: ' + encoding + (encoding in encodingNames ? ' (' + encodingNames[encoding] + ')' : '');
-          msg += '\n\nSample of how non-ascii text was imported:';
-          msg += '\n' + formatStringsAsGrid(decodeSamples(encoding, samples).split('\n'));
-          msg += decodeSamples(encoding, samples);
+          msg += '\n\nSample of how non-ascii text was imported:\n';
+          if (runningInBrowser()) {
+            msg += '<pre>' + formatStringsAsGrid(decodeSamples(encoding, samples), 50) + '</pre>';
+          } else {
+            msg += formatStringsAsGrid(decodeSamples(encoding, samples));
+          }
           msg += '\n\n' + ENCODING_PROMPT + '\n';
           message(msg);
         }
       }
 
-      // 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;
-      //   verbose(msg);
-      // }
       return encoding;
     }
 
@@ -37783,7 +37812,7 @@ ${svg}
       filteredLyr = copyLayer(filteredLyr);
     }
 
-    if (opts.verbose !== false) {
+    if (opts.verbose !== false && !opts.quiet) {
       message(utils.format('Retained %,d of %,d features', getFeatureCount(filteredLyr), n));
     }
 
@@ -37833,14 +37862,15 @@ ${svg}
   }
 
   function combineFilters(a, b) {
-    return (a && b && function(id) {
+    return a && b ? function(id) {
         return a(id) && b(id);
-      }) || a || b;
+      } : (a || b);
   }
 
-  cmd.evaluateEachFeature = function(lyr, dataset, exp, opts) {
+  cmd.evaluateEachFeature = function(lyr, dataset, expArg, opts) {
     var n = getFeatureCount(lyr),
         arcs = dataset.arcs,
+        exp = expArg || '',
         compiled, filter;
 
     var exprOpts = {
@@ -42377,6 +42407,9 @@ ${svg}
     candidates.forEach(function(candId) {
       var hit;
       if (candId == absId) return; // ignore self-intersections
+      if (absArcId(candId) >= arcs.size()) {
+        return;
+      }
       hit = geom.getPointToPathInfo(endpoint.point[0], endpoint.point[1], [candId], arcs);
       if (hit && hit.distance <= maxGapLen && (!target || hit.distance < target.distance)) {
         target = hit;
@@ -42462,7 +42495,9 @@ ${svg}
     // if (opts.gap_tolerance) {
       //opts = utils.defaults({snap_interval: opts.gap_tolerance * 0.1}, opts);
     // }
-    addIntersectionCuts(dataset, opts);
+    if (!opts.no_cuts) {
+      addIntersectionCuts(dataset, opts);
+    }
     return layers.map(function(lyr) {
       if (lyr.geometry_type != 'polyline') stop("Expected a polyline layer");
       if (opts.from_rings) {
@@ -42492,7 +42527,12 @@ ${svg}
   }
 
   function createPolygonLayer(lyr, dataset, opts) {
-    var nodes = closeUndershoots(lyr, dataset, opts);
+    var nodes;
+    if (opts.no_cuts) {
+      nodes = new NodeCollection(dataset.arcs);
+    } else {
+      nodes = closeUndershoots(lyr, dataset, opts);
+    }
     // ignore arcs that don't belong to this layer
     nodes.setArcFilter(getArcPresenceTest(lyr.shapes, nodes.arcs));
     var data = buildPolygonMosaic(nodes);
@@ -45485,7 +45525,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.74";
+  var version = "0.6.75";
 
   // Parse command line args into commands and run them
   // Function takes an optional Node-style callback. A Promise is returned if no callback is given.
@@ -46162,6 +46202,7 @@ ${svg}
     DelimExport,
     DelimImport,
     DelimReader,
+    EncodingDetection,
     Encodings,
     Explode,
     Export,

package/www/page.css

@@ -40,6 +40,20 @@ body {
 	cursor: default;
 }
 
+.fade-out {
+  animation: fadeOut ease forwards 0.6s;
+}
+
+@keyframes fadeOut {
+  0% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+
+
 .selectable,.selectable * {
 	user-select: default;
 	-webkit-user-select: text;