Merge branch 'upstream' into dev-submaps

modules/ui/layers.js

@@ -1481,6 +1481,12 @@ function drawRivers() {
 
   const riverPaths = pack.rivers.map(({cells, points, i, widthFactor, sourceWidth}) => {
     if (!cells || cells.length < 2) return;
+
+    if (points && points.length !== cells.length) {
+      console.error(`River ${i} has ${cells.length} cells, but only ${points.length} points defined. Resetting points data`);
+      points = undefined;
+    }
+
     const meanderedPoints = addMeandering(cells, points);
     const path = getRiverPath(meanderedPoints, widthFactor, sourceWidth);
     return `<path id="river${i}" d="${path}"/>`;

modules/ui/notes-editor.js

@@ -86,8 +86,8 @@ function editNotes(id, name) {
         selector: "#notesLegend",
         height: "90%",
         menubar: false,
-        plugins: `autolink lists link charmap print formatpainter casechange code fullscreen image link media table paste hr checklist wordcount`,
-        toolbar: `code | undo redo | bold italic strikethrough | forecolor backcolor | formatpainter removeformat | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image media table | fontselect fontsizeselect | blockquote hr casechange checklist charmap | print fullscreen`,
+        plugins: `autolink lists link charmap print code fullscreen image link media table paste hr wordcount`,
+        toolbar: `code | undo redo | removeformat | bold italic strikethrough | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image media table | fontselect fontsizeselect | blockquote hr charmap | print fullscreen`,
         media_alt_source: false,
         media_poster: false,
         setup: editor => {

modules/ui/options.js

@@ -105,7 +105,7 @@ function showSupporters() {
     Jonathan Williams,ojacid .,Brian Wilson,A Patreon of the Ahts,Shubham Jakhotiya,www15o,Jan Bundesmann,Angelique Badger,Joshua Xiong,Moist mongol,
     Frank Fewkes,jason baldrick,Game Master Pro,Andrew Kircher,Preston Mitchell,Chris Kohut,Emarandzeb,Trentin Bergeron,Damon Gallaty,Pleaseworkforonce,
     Jordan,William Markus,Sidr Dim,Alexander Whittaker,The Next Level,Patrick Valverde,Markus Peham,Daniel Cooper,the Beagles of Neorbus,Marley Moule,
-    Maximilian Schielke,Johnathan Xavier Hutchinson,Ele,Rita`;
+    Maximilian Schielke,Johnathan Xavier Hutchinson,Ele,Rita,Randy Ross,John Wick,RedSpaz,cameron cannon,Ian Grau-Fay,Kyle Barrett,Charlotte Wiland`;
 
   const array = supporters
     .replace(/(?:\r\n|\r|\n)/g, "")
@@ -579,17 +579,18 @@ function randomizeOptions() {
 function randomizeHeightmapTemplate() {
   const templates = {
     volcano: 3,
-    highIsland: 22,
+    highIsland: 19,
     lowIsland: 9,
-    continents: 19,
-    archipelago: 23,
+    continents: 16,
+    archipelago: 18,
     mediterranean: 5,
     peninsula: 3,
     pangea: 5,
     isthmus: 2,
     atoll: 1,
     shattered: 7,
-    taklamakan: 1
+    taklamakan: 1,
+    oldWorld: 11
   };
   document.getElementById("templateInput").value = rw(templates);
 }

modules/ui/tools.js

@@ -706,14 +706,16 @@ function addMarkerOnClick() {
   const point = d3.mouse(this);
   const x = rn(point[0], 2);
   const y = rn(point[1], 2);
-  const i = markers.length ? last(markers).i + 1 : 0;
 
+  // Find the current cell
+  const cell = findCell(point[0], point[1]);
+
+  // Find the currently selected marker to use as a base
   const isMarkerSelected = markers.length && elSelected?.node()?.parentElement?.id === "markers";
   const selectedMarker = isMarkerSelected ? markers.find(marker => marker.i === +elSelected.attr("id").slice(6)) : null;
   const baseMarker = selectedMarker || {icon: "❓"};
-  const marker = {...baseMarker, i, x, y};
+  const marker = Markers.add({...baseMarker, x, y, cell});
 
-  markers.push(marker);
   const markersElement = document.getElementById("markers");
   const rescale = +markersElement.getAttribute("rescale");
   markersElement.insertAdjacentHTML("beforeend", drawMarker(marker, rescale));