mapshaper 0.5.112 → 0.5.115

package/package.json

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

package/www/mapshaper-gui.js

@@ -8211,13 +8211,16 @@
     var styleIndex = {
           opacity: 'opacity',
           r: 'radius',
-          fill: 'fillColor',
-          stroke: 'strokeColor',
+          'fill': 'fillColor',
           'fill-pattern': 'fillPattern',
+          'fill-opacity': 'fillOpacity',
+          'stroke': 'strokeColor',
           'stroke-width': 'strokeWidth',
           'stroke-dasharray': 'lineDash',
           'stroke-opacity': 'strokeOpacity',
-          'fill-opacity': 'fillOpacity'
+          'stroke-linecap': 'lineCap',
+          'stroke-linejoin': 'lineJoin',
+          'stroke-miterlimit': 'miterLimit'
         },
         // array of field names of relevant svg display properties
         fields = getCanvasStyleFields(lyr).filter(function(f) {return f in styleIndex;}),
@@ -9057,14 +9060,17 @@
           // (tests on Chrome showed much faster rendering of 1px lines)
           strokeWidth = strokeWidth < 1 ? 1 : strokeWidth * pixRatio;
         }
-        ctx.lineCap = 'round';
-        ctx.lineJoin = 'round';
+        ctx.lineCap = style.lineCap || 'round';
+        ctx.lineJoin = style.lineJoin || 'round';
         ctx.lineWidth = strokeWidth * lineScale;
         ctx.strokeStyle = style.strokeColor;
         if (style.lineDash){
           ctx.lineCap = 'butt';
           ctx.setLineDash(style.lineDash.split(' '));
         }
+        if (style.miterLimit) {
+          ctx.miterLimit = style.miterLimit;
+        }
       }
 
       if (style.fillPattern) {
@@ -9192,7 +9198,7 @@
     }
     obj.properties.transform = getSvgFurnitureTransform(ext);
     obj.properties.class = 'mapshaper-svg-furniture';
-    obj.children = internal.importFurniture(internal.getFurnitureLayerData(lyr), frame);
+    obj.children = internal.importFurniture(internal.getFrameLayerData(lyr), frame);
     return internal.svg.stringify(obj);
   }
 
@@ -9956,6 +9962,7 @@
       clearBtn.active(!off);
       if (off) {
         hide();
+        extentNote.hide();
         return;
       }
 
@@ -10327,7 +10334,7 @@
 
     function getFrameData() {
       var frameLyr = internal.findFrameLayer(model);
-      return frameLyr && internal.getFurnitureLayerData(frameLyr) || null;
+      return frameLyr && internal.getFrameLayerData(frameLyr) || null;
     }
 
     function clearAllDisplayArcs() {