Merge branch 'v1.96' of https://github.com/Azgaar/Fantasy-Map-Generator into ocean-heightmap

modules/dynamic/auto-update.js

@@ -777,5 +777,37 @@ export function resolveVersionConflicts(version) {
       .attr("mask", "url(#land)");
 
     if (layerIsOn("toggleHeight")) drawHeightmap();
+
+    // v1.96.00 moved scaleBar options from units editor to style
+    d3.select("#scaleBar").remove();
+
+    scaleBar = svg
+      .insert("g", "#viewbox + *")
+      .attr("id", "scaleBar")
+      .attr("opacity", 1)
+      .attr("fill", "#353540")
+      .attr("font-size", 10)
+      .attr("data-size", 2)
+      .attr("data-x", 99)
+      .attr("data-y", 99)
+      .attr("data-label", "");
+
+    scaleBar
+      .append("rect")
+      .attr("id", "scaleBarBack")
+      .attr("opacity", 0.2)
+      .attr("fill", "#ffffff")
+      .attr("stroke", "#000000")
+      .attr("stroke-width", 1)
+      .attr("filter", "url(#blur5)")
+      .attr("data-top", 20)
+      .attr("data-right", 15)
+      .attr("data-bottom", 15)
+      .attr("data-left", 10);
+
+    drawScaleBar(scaleBar, scale);
+    fitScaleBar(scaleBar, svgWidth, svgHeight);
+
+    if (!layerIsOn("toggleScaleBar")) scaleBar.style("display", "none");
   }
 }

modules/dynamic/export-json.js

@@ -88,12 +88,6 @@ function getSettings() {
     heightUnit: heightUnit.value,
     heightExponent: heightExponentInput.value,
     temperatureScale: temperatureScale.value,
-    barSize: barSizeInput.value,
-    barLabel: barLabel.value,
-    barBackOpacity: barBackOpacity.value,
-    barBackColor: barBackColor.value,
-    barPosX: barPosX.value,
-    barPosY: barPosY.value,
     populationRate: populationRate,
     urbanization: urbanization,
     mapSize: mapSizeOutput.value,