v0.6.46

CHANGELOG.md

@@ -1,5 +1,6 @@
 v0.6.46
 * Added save to clipboard option to web UI export menu.
+* In -each expressions, `this.geojson` setter now accepts nulls and FeatureCollectsions in addition to single Features.
 
 v0.6.45
 * Added -o hoist=<fields> option for moving GeoJSON Feature properties to the root of each Feature.

REFERENCE.md

@@ -586,7 +586,8 @@ All layer types
 - `this.layer_name` Name of the layer, or `""` if layer is unnamed.
 - `this.properties`  Data properties (also available as local variables) (read/write)
 - `this.layer`   Object with "name" and "data" properties
-- `this.geojson` (read/write) Converts each feature to a GeoJSON Feature object.
+- `this.geojson` (getter) Returns each feature as a GeoJSON Feature object.
+- `this.geojson=` (setter) Update target layer with GeoJSON.
 
 Point layers
 - `this.coordinates` An array of [x, y] coordinates with one or more members, or null (read/write)

package.json

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

src/gui/gui-export-control.mjs

@@ -27,7 +27,7 @@ export var ExportControl = function(gui) {
     return;
   }
 
-  new SimpleButton(menu.findChild('.save-btn').addClass('default-btn')).on('click', onExportClick);
+  new SimpleButton(menu.findChild('#export-btn').addClass('default-btn')).on('click', onExportClick);
   gui.addMode('export', turnOn, turnOff, exportBtn);
   gui.keyboard.onMenuSubmit(menu, onExportClick);
   var savePreferenceCheckbox;

src/gui/gui-popup.mjs

@@ -128,8 +128,8 @@ export function Popup(gui, toNext, toPrev) {
     var popup = showPopupAlert('', 'Add field');
     var el = popup.container();
     el.addClass('option-menu');
-    var html = `<input type="text" class="field-name text-input" placeholder="field name"><br>
-    <input type="text" class="field-value text-input" placeholder="value"><br>
+    var html = `<div><input type="text" class="field-name text-input" placeholder="field name"></div>
+    <div><input type="text" class="field-value text-input" placeholder="value"><div>
     <div tabindex="0" class="btn dialog-btn">Apply</div> <span class="inline-checkbox"><input type="checkbox" class="all" />assign value to all records</span>`;
     el.html(html);
 

www/index.html

@@ -156,24 +156,23 @@ <h4>File format</h4>
 		<div class="export-formats option-menu">
 		</div>
 
-		<div style="height:10px"></div>
+		<div style="height:11px"></div>
 
 		<div class="option-menu"><input type="text" class="text-input advanced-options" placeholder="command line options" />
 		<a href="https://github.com/mbloch/mapshaper/wiki/Command-Reference#-o-output" target="_mapshaper_output_docs">
 			<div class="tip-button">?<div class="tip-anchor">
 		<div class="tip">Enter options from the command line interface for
 the -o command. Examples: bbox no-quantization
 precision=0.001. Click to see all options.</div></div></div></a>
-</div>
+
 
 	<!-- 	<div class="option-menu">
 	<input id="ofile-name" class="text-input" type="text" placeholder="output file name" />
 	</div> -->
 		<div><span id="save-preference" style="display: none;"><input type="checkbox"/>choose output directory</span></div>
 		<div><span id="save-to-clipboard" style="display: inline-block;"><input type="checkbox"/>save to clipboard</span></div>
-
-		<div class="save-btn btn dialog-btn">Export</div>
-
+		</div>
+		<div id="export-btn" class="btn dialog-btn" style="margin-top: 4px;">Export</div>
 
 	</div>
 </div>

www/page.css

@@ -235,6 +235,7 @@ body {
 .export-options table {
 	margin: 0;
 	border-collapse: collapse;
+	border-spacing: 0;
 	width: 100%;
 }
 
@@ -280,7 +281,7 @@ body {
 .alert-title {
 	line-height: 1.1;
 	font-weight: bold;
-	margin-bottom: 5px;
+	margin-bottom: 7px;
 }
 
 div.alert-title, div.error-message {
@@ -467,6 +468,7 @@ body.dragover #import-options-drop-area .drop-area {
 	margin: 0 0 5px 0;
 }
 
+
 #mshp-not-supported {
 	display: none;
 	z-index: 100;
@@ -1134,7 +1136,7 @@ img.close-btn:hover,
 
 .basemap-styles > div {
 	display: inline-block;
-	margin-bottom:  8px;
+	margin-bottom:  6px;
 }
 
 .basemap-styles > div:nth-child(even) {