Merge remote-tracking branch 'origin/master' into localization-dev

styles/default.json

@@ -261,12 +261,10 @@
   "#texture": {
     "opacity": null,
     "filter": null,
-    "mask": "url(#land)"
-  },
-  "#textureImage": {
-    "x": 0,
-    "y": 0,
-    "src": "https://i2.wp.com/azgaar.files.wordpress.com/2021/10/marble-big.jpg"
+    "mask": "url(#land)",
+    "data-x": 0,
+    "data-y": 0,
+    "data-href": "./images/textures/marble-big.jpg"
   },
   "#zones": {
     "opacity": 0.6,
@@ -288,13 +286,24 @@
     "href": "./images/pattern1.png",
     "opacity": 0.2
   },
-  "#terrs": {
-    "opacity": null,
+  "#terrs > #oceanHeights": {
+    "data-render": 0,
+    "opacity": 1,
+    "scheme": "bright",
+    "terracing": 0,
+    "skip": 0,
+    "relax": 1,
+    "curve": "curveBasisClosed",
+    "filter": null,
+    "mask": null
+  },
+  "#terrs > #landHeights": {
+    "opacity": 1,
     "scheme": "bright",
     "terracing": 0,
     "skip": 5,
     "relax": 0,
-    "curve": 0,
+    "curve": "curveBasisClosed",
     "filter": null,
     "mask": "url(#land)"
   },
@@ -386,5 +395,39 @@
     "opacity": 0.98,
     "fill": "#30426f",
     "filter": null
+  },
+  "#vignette": {
+    "opacity": 0.3,
+    "fill": "#000000",
+    "filter": null
+  },
+  "#vignette-rect": {
+    "x": "0.3%",
+    "y": "0.4%",
+    "width": "99.6%",
+    "height": "99.2%",
+    "rx": "5%",
+    "ry": "5%",
+    "filter": "blur(20px)"
+  },
+  "#scaleBar": {
+    "opacity": 1,
+    "fill": "#353540",
+    "font-size": 10,
+    "data-bar-size": 2,
+    "data-x": 99,
+    "data-y": 99,
+    "data-label": ""
+  },
+  "#scaleBarBack": {
+    "opacity": 0.2,
+    "fill": "#ffffff",
+    "stroke": "#000000",
+    "stroke-width": 1,
+    "filter": "url(#blur5)",
+    "data-top": 20,
+    "data-right": 15,
+    "data-bottom": 15,
+    "data-left": 10
   }
 }