mapshaper 0.6.74 → 0.6.76

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,15 +13189,11 @@
     return findVertexIds(p2.x, p2.y, arcs);
   }
 
-
-  function snapVerticesToPoint(ids, p, arcs, final) {
+  function snapVerticesToPoint(ids, p, arcs) {
     var data = arcs.getVertexData();
     ids.forEach(function(idx) {
-      if (final) {
-        // recalculate bounding box for arc
-        arcs.updateArcBounds(findArcIdFromVertexId(idx, data.ii));
-      }
       setVertexCoords(p[0], p[1], idx, arcs);
+      arcs.updateArcBounds(findArcIdFromVertexId(idx, data.ii));
     });
   }
 
@@ -19955,8 +19956,8 @@
   }
 
   function parseScalebarUnits(str) {
-    var isMiles = /miles?$/.test(str.toLowerCase());
-    var isKm = /(k\.m\.|km|kilometers?|kilometres?)$/.test(str.toLowerCase());
+    var isMiles = /(miles?|mi[.]?|英里)$/.test(str.toLowerCase());
+    var isKm = /(k\.m\.|km|kilometers?|kilom.tres?|公里)$/.test(str.toLowerCase());
     var units = isMiles && 'mile' || isKm && 'km' || '';
     return units;
   }
@@ -23046,28 +23047,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 +23085,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 +23155,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 +26676,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 +37809,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 +37859,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 +42404,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 +42492,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 +42524,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 +45522,7 @@ ${svg}
     });
   }
 
-  var version = "0.6.74";
+  var version = "0.6.76";
 
   // 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 +46199,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.76",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",

package/www/index.html

@@ -39,7 +39,7 @@
 	<svg id="pointer-icon" version="1.1" xmlns="http://www.w3.org/2000/svg" width="15" height="22" viewBox="0 0 15 20"><rect x="7.4126" y="11.0354" width="3.9102" height="7.9841" transform="translate(-5.8889 6.0377) rotate(-27.5536)" fill="#30d4ef"/><polygon points="2.57 2.086 2.718 16.056 13.944 10.198 2.57 2.086" fill="#30d4ef"/></svg>
 
 	<!-- adjusted height -->
-	<svg id="ribbon-icon" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="15" height="26" viewBox="0 0 15 20">
+	<svg id="ribbon-icon" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="15" height="25" viewBox="0 1 15 20">
 	  <polygon points="8 14.5 13 19 13 4 3 4 3 19 8 14.5" fill="#30d4ef"/>
 	</svg>
  
@@ -112,34 +112,30 @@
 	</div>
 </div>
 
-<div class="box-tool-options main-area popup-dialog">
-	<div class="info-box controls">
-		<div>
-			<div class="select-btn btn dialog-btn">Select</div>
-			<div class="clip-btn btn dialog-btn">Clip</div>
-			<div class="erase-btn btn dialog-btn">Erase</div>
-			<div class="rect-btn btn dialog-btn">Rectangle</div>
-			<div class="frame-btn btn dialog-btn">Frame</div>
-			<div class="info-btn btn dialog-btn">Coords</div>
-			<!-- <div class="zoom-btn btn dialog-btn">Zoom In</div> -->
-			<div class="cancel-btn btn dialog-btn">Cancel</div>
-		</div>
+
+<div class="box-tool-options sidebar-buttons">
+	<div>
+		<div class="select-btn btn sidebar-btn">Select</div>
+		<div class="clip-btn btn sidebar-btn">Clip</div>
+		<div class="erase-btn btn sidebar-btn">Erase</div>
+		<div class="rect-btn btn sidebar-btn">Rectangle</div>
+		<div class="frame-btn btn sidebar-btn">Frame</div>
+		<div class="info-btn btn sidebar-btn">Coords</div>
 		<div class="box-coords selectable"></div>
+		<div class="cancel-btn btn sidebar-btn">Cancel</div>
 	</div>
 </div>
 
-<div class="selection-tool-options main-area popup-dialog">
-	<div class="info-box">
-		<div>
-			<div class="delete-btn btn dialog-btn">Delete</div>
-			<div class="filter-btn btn dialog-btn">Keep</div>
-			<div class="duplicate-btn btn dialog-btn">Duplicate</div>
-			<div class="split-btn btn dialog-btn">Split</div>
-			<div class="coords-btn btn dialog-btn toggle-btn">Coords</div>
-			<div class="data-btn btn dialog-btn toggle-btn">Edit data</div>
-			<div class="cancel-btn btn dialog-btn">Clear</div>
-		</div>
+<div class="selection-tool-options sidebar-buttons">
+	<div>
+		<div class="delete-btn btn sidebar-btn">Delete</div>
+		<div class="filter-btn btn sidebar-btn">Keep</div>
+		<div class="duplicate-btn btn sidebar-btn">Duplicate</div>
+		<div class="split-btn btn sidebar-btn">Split</div>
+		<div class="coords-btn btn sidebar-btn toggle-btn">Coords</div>
 		<div class="box-coords selectable"></div>
+		<div class="data-btn btn sidebar-btn toggle-btn">Edit data</div>
+		<div class="cancel-btn btn sidebar-btn">Clear</div>
 	</div>
 </div>
 
@@ -304,9 +300,9 @@ encoding=big5</span>. Click to see all options.</div></div></div></div>
 	</div> <!-- .info-box -->
 </div> <!-- import-options -->
 
-
 <!-- TODO: remove #mshp-main-page without causing the map to jitter when resized -->
 <div id="mshp-main-page">
+
 	<div class="console main-area console-area">
 		<div class="console-window"><div class="console-buffer selectable"></div></div>
 	</div>