diff --git a/index.html b/index.html index c3b4e7d3..03e702de 100644 --- a/index.html +++ b/index.html @@ -7683,10 +7683,9 @@ - - - + + @@ -7730,12 +7729,12 @@ - + - + diff --git a/src/modules/activeZooming.js b/src/modules/activeZooming.js index d60438aa..6add464c 100644 --- a/src/modules/activeZooming.js +++ b/src/modules/activeZooming.js @@ -1,4 +1,6 @@ import {rn} from "/src/utils/numberUtils"; +import {drawCoordinates} from "/src/modules/ui/layers"; +import {drawScaleBar} from "/src/modules/measurers"; export function handleZoom(isScaleChanged, isPositionChanged) { viewbox.attr("transform", `translate(${viewX} ${viewY}) scale(${scale})`); diff --git a/src/modules/ocean-layers.js b/src/modules/ocean-layers.js index beee63e0..6a103b9e 100644 --- a/src/modules/ocean-layers.js +++ b/src/modules/ocean-layers.js @@ -7,7 +7,7 @@ import {round} from "/src/utils/stringUtils"; window.OceanLayers = (function () { let cells, vertices, pointsN, used; - const OceanLayers = function OceanLayers() { + function OceanLayers() { const outline = oceanLayers.attr("layers"); if (outline === "none") return; TIME && console.time("drawOceanLayers"); @@ -52,7 +52,7 @@ window.OceanLayers = (function () { } TIME && console.timeEnd("drawOceanLayers"); - }; + } function randomizeOutline() { const limits = []; diff --git a/src/modules/ui/general.js b/src/modules/ui/general.js index 0b203253..c8e227f8 100644 --- a/src/modules/ui/general.js +++ b/src/modules/ui/general.js @@ -2,7 +2,8 @@ import {findCell, findGridCell} from "/src/utils/graphUtils"; import {rn} from "/src/utils/numberUtils"; import {link} from "/src/utils/linkUtils"; import {getCoordinates, toDMS} from "/src/utils/coordinateUtils"; -import {si} from "/src/utils/unitUtils"; +import {si, convertTemperature} from "/src/utils/unitUtils"; +import {stored} from "/src/utils/shorthands"; // fit full-screen map if window is resized window.addEventListener("resize", function (e) { diff --git a/src/modules/ui/layers.js b/src/modules/ui/layers.js index 43987ea4..51f880d0 100644 --- a/src/modules/ui/layers.js +++ b/src/modules/ui/layers.js @@ -172,7 +172,7 @@ function getCurrentPreset() { } // run on map regeneration -function restoreLayers() { +export function restoreLayers() { if (layerIsOn("toggleHeight")) drawHeightmap(); if (layerIsOn("toggleCells")) drawCells(); if (layerIsOn("toggleGrid")) drawGrid(); @@ -1474,7 +1474,7 @@ function toggleCoordinates(event) { } } -function drawCoordinates() { +export function drawCoordinates() { if (!layerIsOn("toggleCoordinates")) return; coordinates.selectAll("*").remove(); // remove every time const steps = [0.5, 1, 2, 5, 10, 15, 30]; // possible steps diff --git a/src/modules/zoom.js b/src/modules/zoom.js index 990b08c5..065e8fbc 100644 --- a/src/modules/zoom.js +++ b/src/modules/zoom.js @@ -1,4 +1,5 @@ import {debounce} from "/src/utils/functionUtils"; +import {handleZoom} from "/src/modules/activeZooming"; // temporary expose to global window.scale = 1;