merge completed... now to fix all the bugs...

This commit is contained in:
howlingsails 2021-12-12 23:02:38 -08:00
commit 87c4d80fbc
3472 changed files with 466748 additions and 6517 deletions

View file

@ -1,23 +1,23 @@
"use strict";
'use strict';
function createRiver() {
if (customization) return;
closeDialogs();
if (!layerIsOn("toggleRivers")) toggleRivers();
if (!layerIsOn('toggleRivers')) toggleRivers();
document.getElementById("toggleCells").dataset.forced = +!layerIsOn("toggleCells");
if (!layerIsOn("toggleCells")) toggleCells();
document.getElementById('toggleCells').dataset.forced = +!layerIsOn('toggleCells');
if (!layerIsOn('toggleCells')) toggleCells();
tip("Click to add river point, click again to remove", true);
debug.append("g").attr("id", "controlCells");
viewbox.style("cursor", "crosshair").on("click", onCellClick);
tip('Click to add river point, click again to remove', true);
debug.append('g').attr('id', 'controlCells');
viewbox.style('cursor', 'crosshair').on('click', onCellClick);
createRiver.cells = [];
const body = document.getElementById("riverCreatorBody");
const body = document.getElementById('riverCreatorBody');
$("#riverCreator").dialog({
title: "Create River",
$('#riverCreator').dialog({
title: 'Create River',
resizable: false,
position: {my: "left top", at: "left+10 top+10", of: "#map"},
position: {my: 'left top', at: 'left+10 top+10', of: '#map'},
close: closeRiverCreator
});
@ -25,14 +25,14 @@ function createRiver() {
modules.createRiver = true;
// add listeners
document.getElementById("riverCreatorComplete").addEventListener("click", addRiver);
document.getElementById("riverCreatorCancel").addEventListener("click", () => $("#riverCreator").dialog("close"));
body.addEventListener("click", function (ev) {
document.getElementById('riverCreatorComplete').addEventListener('click', addRiver);
document.getElementById('riverCreatorCancel').addEventListener('click', () => $('#riverCreator').dialog('close'));
body.addEventListener('click', function (ev) {
const el = ev.target;
const cl = el.classList;
const cell = +el.parentNode.dataset.cell;
if (cl.contains("editFlux")) pack.cells.fl[cell] = +el.value;
else if (cl.contains("icon-trash-empty")) removeCell(cell);
if (cl.contains('editFlux')) pack.cells.fl[cell] = +el.value;
else if (cl.contains('icon-trash-empty')) removeCell(cell);
});
function onCellClick() {
@ -57,19 +57,19 @@ function createRiver() {
}
function removeCell(cell) {
createRiver.cells = createRiver.cells.filter(c => c !== cell);
createRiver.cells = createRiver.cells.filter((c) => c !== cell);
drawCells(createRiver.cells);
body.querySelector(`div[data-cell='${cell}']`)?.remove();
}
function drawCells(cells) {
debug
.select("#controlCells")
.select('#controlCells')
.selectAll(`polygon`)
.data(cells)
.join("polygon")
.attr("points", d => getPackPolygon(d))
.attr("class", "current");
.join('polygon')
.attr('points', (d) => getPackPolygon(d))
.attr('class', 'current');
}
function addRiver() {
@ -77,12 +77,12 @@ function createRiver() {
const {addMeandering, getApproximateLength, getWidth, getOffset, getName, getRiverPath, getBasin} = Rivers;
const riverCells = createRiver.cells;
if (riverCells.length < 2) return tip("Add at least 2 cells", false, "error");
if (riverCells.length < 2) return tip('Add at least 2 cells', false, 'error');
const riverId = rivers.length ? last(rivers).i + 1 : 1;
const parent = cells.r[last(riverCells)] || riverId;
riverCells.forEach(cell => {
riverCells.forEach((cell) => {
if (!cells.r[cell]) cells.r[cell] = riverId;
});
@ -99,27 +99,24 @@ function createRiver() {
const name = getName(mouth);
const basin = getBasin(parent);
rivers.push({i: riverId, source, mouth, discharge, length, width, widthFactor, sourceWidth, parent, cells: riverCells, basin, name, type: "River"});
rivers.push({i: riverId, source, mouth, discharge, length, width, widthFactor, sourceWidth, parent, cells: riverCells, basin, name, type: 'River'});
const id = 'river' + riverId;
// render river
lineGen.curve(d3.curveCatmullRom.alpha(0.1));
viewbox
.select("#rivers")
.append("path")
.attr("id", "river" + riverId)
.attr("d", getRiverPath(meanderedPoints, widthFactor, sourceWidth));
viewbox.select('#rivers').append('path').attr('id', id).attr('d', getRiverPath(meanderedPoints, widthFactor, sourceWidth));
editRiver(riverId);
editRiver(id);
}
function closeRiverCreator() {
body.innerHTML = "";
debug.select("#controlCells").remove();
body.innerHTML = '';
debug.select('#controlCells').remove();
restoreDefaultEvents();
clearMainTip();
const forced = +document.getElementById("toggleCells").dataset.forced;
document.getElementById("toggleCells").dataset.forced = 0;
if (forced && layerIsOn("toggleCells")) toggleCells();
const forced = +document.getElementById('toggleCells').dataset.forced;
document.getElementById('toggleCells').dataset.forced = 0;
if (forced && layerIsOn('toggleCells')) toggleCells();
}
}