mapshaper 0.6.54 → 0.6.55

package/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.54";
+  var VERSION = "0.6.55";
 
 
   var utils = /*#__PURE__*/Object.freeze({

package/package.json

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

package/www/index.html

@@ -308,9 +308,10 @@ encoding=big5</span>. Click to see all options.</div></div></div></div>
 	<div class="mshp-main-map main-area map-area">
 		<div class="coordinate-info colored-text selectable"></div>
 		<div class="intersection-display">
-			<div class="intersection-check text-btn colored-text">Check line intersections</div>
-			<div class="intersection-count">0 line intersections</div>
+			<span class="intersection-check text-btn colored-text">Check line intersections</span><span class="intersection-count">0 line intersections</span>
+			<img class="close-btn" src="images/close.png">
 			<div class="repair-btn text-btn colored-text">Repair</div>
+			
 		</div>
 		<div class="map-layers"></div>
 		<div class="basemap-container"><div class="basemap"></div></div>

package/www/mapshaper-gui.js

@@ -654,8 +654,9 @@
     },
 
     show: function(css) {
+      var tag = this.el && this.el.tagName;
       if (!this.visible()) {
-        this.css('display:block;');
+        this.css('display', tag == 'SPAN' ? 'inline-block' : 'block');
         this._hidden = false;
       }
       return this;
@@ -3561,7 +3562,10 @@
         repairBtn = el.findChild(".repair-btn"),
         _simplifiedXX, // saved simplified intersections, for repair
         _unsimplifiedXX, // saved unsimplified intersection data, for performance
-        _disabled = false;
+        _disabled = false,
+        _on = false;
+
+    el.findChild('.close-btn').on('click', dismissForever);
 
     gui.on('simplify_drag_start', function() {
       if (intersectionsAreOn()) {
@@ -3570,19 +3574,20 @@
     });
 
     gui.on('simplify_drag_end', function() {
-      updateAsync();
+      updateSync('simplify_drag_end');
     });
 
     checkBtn.on('click', function() {
       checkBtn.hide();
-      refreshSync();
+      _on = true;
+      updateSync();
     });
 
     repairBtn.on('click', function() {
       var e = model.getActiveLayer();
       if (!_simplifiedXX || !e.dataset.arcs) return;
-      var xx = _simplifiedXX = internal.repairIntersections(e.dataset.arcs, _simplifiedXX);
-      showIntersections(xx, e.layer, e.dataset.arcs);
+      _simplifiedXX = internal.repairIntersections(e.dataset.arcs, _simplifiedXX);
+      showIntersections(_simplifiedXX, e.layer, e.dataset.arcs);
       repairBtn.hide();
       model.updated({repair: true});
       gui.session.simplificationRepair();
@@ -3593,7 +3598,8 @@
         reset(); // need this?
         return;
       }
-      var needRefresh = e.flags.simplify_method || e.flags.simplify || e.flags.repair;
+      var needRefresh = e.flags.simplify_method || e.flags.simplify ||
+        e.flags.repair || e.flags.clean;
       if (needRefresh) {
         updateAsync();
       } else if (e.flags.simplify_amount) {
@@ -3608,17 +3614,18 @@
     });
 
     function intersectionsAreOn() {
-      return !!(_simplifiedXX || _unsimplifiedXX);
+      return _on && !_disabled;
     }
 
-    function clearSavedData() {
+    function turnOff() {
+      hide();
+      _on = false;
       _simplifiedXX = null;
       _unsimplifiedXX = null;
     }
 
     function reset() {
-      clearSavedData();
-      hide();
+      turnOff();
       if (_disabled) {
         return;
       }
@@ -3633,8 +3640,7 @@
 
     function dismissForever() {
       _disabled = true;
-      clearSavedData();
-      hide();
+      turnOff();
     }
 
     function hide() {
@@ -3645,12 +3651,11 @@
     // Update intersection display, after a short delay so map can redraw after previous
     // operation (e.g. simplification change)
     function updateAsync() {
-      if (intersectionsAreOn()) {
-        setTimeout(refreshSync, 10);
-      }
+      setTimeout(updateSync, 10);
     }
 
-    function refreshSync() {
+    function updateSync(action) {
+      if (!intersectionsAreOn()) return;
       var e = model.getActiveLayer();
       var arcs = e.dataset && e.dataset.arcs;
       var intersectionOpts = {
@@ -3661,13 +3666,14 @@
         return;
       }
       if (arcs.getRetainedInterval() > 0) {
+        // simplification
         _simplifiedXX = internal.findSegmentIntersections(arcs, intersectionOpts);
       } else {
         // no simplification
-        _simplifiedXX = null; // clear old simplified XX
-        if (!_unsimplifiedXX) {
-          // save intersections at 0 simplification, to avoid recalculating
-          // every time the simplification slider is set to 100% or the layer is selected at 100%
+        _simplifiedXX = null; // clear any old simplified XX
+        if (_unsimplifiedXX && action == 'simplify_drag_end') {
+          // re-use previously generated intersection data (optimization)
+        } else {
           _unsimplifiedXX = internal.findSegmentIntersections(arcs, intersectionOpts);
         }
       }
@@ -3675,7 +3681,7 @@
     }
 
     function showIntersections(xx, lyr, arcs) {
-      var pointLyr, count = 0;
+      var pointLyr, count = 0, html;
       el.show();
       readout.show();
       checkBtn.hide();
@@ -3685,12 +3691,13 @@
       }
       if (count == 0) {
         map.setIntersectionLayer(null);
-        readout.html('<span class="icon black"></span>No self-intersections');
+        html = '<span class="icon black"></span>No self-intersections';
       } else {
         map.setIntersectionLayer(pointLyr, {layers:[pointLyr]});
-        readout.html(utils$1.format('<span class="icon"></span>%s line intersection%s <img class="close-btn" src="images/close.png">', count, utils$1.pluralSuffix(count)));
-        readout.findChild('.close-btn').on('click', dismissForever);
+        html = utils$1.format('<span class="icon"></span>%s line intersection%s', count, utils$1.pluralSuffix(count));
       }
+      readout.html(html);
+
       if (_simplifiedXX && count > 0) {
         repairBtn.show();
       } else {

package/www/mapshaper.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var VERSION = "0.6.54";
+  var VERSION = "0.6.55";
 
 
   var utils = /*#__PURE__*/Object.freeze({

package/www/page.css

@@ -959,10 +959,6 @@ img.close-btn:hover,
 	left: 13px;
 }
 
-.intersection-count {
-	vertical-align: middle;
-}
-
 .intersection-check {
 	display: none;
 }
@@ -979,13 +975,13 @@ img.close-btn:hover,
 	background-color: black;
 }
 
-.intersection-count .close-btn {
+.intersection-display .close-btn {
 	width: 16px;
 	height: 16px;
 	cursor: pointer;
 	position: relative;
 	top: 4px;
-	margin-left: 2px;
+	margin-left: 1px;
 }
 
 /*.intersection-display .text-btn.disabled {