Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@lucide/svelte": "^1.7.0",
"@openmeteo/file-reader": "^0.0.15",
"@openmeteo/weather-map-layer": "github:open-meteo/weather-map-layer#e65e07029794285a64ec19f5f96e0e0c18a3e539",
"@openmeteo/weather-map-layer": "github:open-meteo/weather-map-layer#12cdd8f1b1316bf9345ab6276498a02c8134b5ad",
"@sveltejs/adapter-static": "^3.0.8",
"@sveltejs/kit": "^2.57.1",
"@sveltejs/vite-plugin-svelte": "^7.0.0",
Expand Down
34 changes: 34 additions & 0 deletions src/lib/components/settings/isobands-settings.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<script lang="ts">
import { toast } from 'svelte-sonner';

import { vectorOptions } from '$lib/stores/vector';

import { Label } from '$lib/components/ui/label';
import { Switch } from '$lib/components/ui/switch';

import { changeOMfileURL } from '$lib/layers';
import { updateUrl } from '$lib/url';

let isobands = $derived($vectorOptions.isobands);
</script>

<div>
<h2 class="text-lg font-bold">Isobands settings</h2>
<div class="mt-3 flex gap-3">
<Switch
id="isobands"
class="cursor-pointer"
bind:checked={$vectorOptions.isobands}
onCheckedChange={() => {
updateUrl('isobands', String(isobands));
changeOMfileURL();
toast.info(
'Isobands turned ' +
(isobands ? 'on' : 'off') +
(isobands ? ' (raster source disabled)' : '')
);
}}
/>
<Label class="cursor-pointer" for="isobands">Isobands {isobands ? 'on' : 'off'}</Label>
</div>
</div>
2 changes: 2 additions & 0 deletions src/lib/components/settings/settings.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import CacheSettings from './cache-settings.svelte';
import ContourSettings from './contour-settings.svelte';
import GridSettings from './grid-settings.svelte';
import IsobandsSettings from './isobands-settings.svelte';
import OpacitySetting from './opacity-setting.svelte';
import PopupSettings from './popup-settings.svelte';
import StateSettings from './state-settings.svelte';
Expand All @@ -22,6 +23,7 @@
<GridSettings />
<ArrowsSettings />
<ContourSettings />
<IsobandsSettings />
<TileSizeSettings />
<PopupSettings />
<WaterClipSetting />
Expand Down
1 change: 1 addition & 0 deletions src/lib/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export const DEFAULT_VECTOR_OPTIONS = {
grid: false,
arrows: true,
contours: false,
isobands: false,
breakpoints: true,
contourInterval: 2
};
Expand Down
50 changes: 47 additions & 3 deletions src/lib/layers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,37 @@ const vectorContourLayer = (): SlotLayer => ({
}
});

const vectorIsobandFillLayer = (): SlotLayer => ({
id: 'omVectorIsobandFillLayer',
opacityProp: 'fill-opacity',
commitOpacity: getRasterOpacity(),
add: (map, sourceId, layerId, beforeLayer) => {
const vectorOptions = get(vO);
if (!vectorOptions.isobands) return;
map.addLayer(
{
id: layerId,
type: 'fill',
source: sourceId,
'source-layer': 'isobands',
paint: {
'fill-opacity': 0,
'fill-opacity-transition': { duration: 2, delay: 0 },
'fill-antialias': false,
'fill-color': [
'rgba',
['get', 'r'],
['get', 'g'],
['get', 'b'],
['/', ['get', 'a'], 255]
]
}
},
beforeLayer
);
}
});

const vectorContourLabelsLayer = (): SlotLayer => ({
id: 'omVectorContourLayerLabels',
opacityProp: 'text-opacity',
Expand Down Expand Up @@ -271,17 +302,28 @@ export const createManagers = (): void => {
toast.warning('Loading raster data might be limited by bandwidth or upstream server speed.')
});

const vectorOptions = get(vO);
vectorManager = new SlotManager(map, {
sourceIdPrefix: 'omVectorSource',
beforeLayer: preferences.clipWater ? BEFORE_LAYER_VECTOR_WATER_CLIP : BEFORE_LAYER_VECTOR,
layerFactory: () => [
vectorIsobandFillLayer(),
vectorArrowLayer(),
vectorGridLayer(),
vectorContourLayer(),
vectorContourLabelsLayer()
],
sourceSpec: (sourceUrl) => ({ url: sourceUrl, type: 'vector' }),
removeDelayMs: 250
removeDelayMs: 250,
...(vectorOptions.isobands
? {
onCommit: () => {
loading.set(false);
refreshPopup();
},
onError: () => loading.set(false)
}
: {})
});
};

Expand All @@ -294,7 +336,8 @@ export const addOmFileLayers = (): void => {
if (!map) return;
const omUrl = getOMUrl();
createManagers();
rasterManager?.update('om://' + omUrl);
const vectorOptions = get(vO);
if (!vectorOptions.isobands) rasterManager?.update('om://' + omUrl);
vectorManager?.update('om://' + omUrl);
};

Expand All @@ -314,6 +357,7 @@ export const changeOMfileURL = (vectorOnly = false, rasterOnly = false): void =>
);
rasterManager?.setBeforeLayer(preferences.hillshade ? HILLSHADE_LAYER : BEFORE_LAYER_RASTER);

if (!vectorOnly) rasterManager?.update('om://' + omUrl);
const vectorOptions = get(vO);
if (!vectorOnly && !vectorOptions.isobands) rasterManager?.update('om://' + omUrl);
if (!rasterOnly) vectorManager?.update('om://' + omUrl);
};
1 change: 1 addition & 0 deletions src/lib/stores/vector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export interface VectorOptions {
grid: boolean;
arrows: boolean;
contours: boolean;
isobands: boolean;
breakpoints: boolean;
contourInterval: number;
}
Expand Down
1 change: 1 addition & 0 deletions src/lib/url.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ export const getOMUrl = () => {
if (vectorOptions.grid) result += '&grid=true';
if (vectorOptions.arrows) result += '&arrows=true';
if (vectorOptions.contours) result += '&contours=true';
if (vectorOptions.isobands) result += '&isobands=true';
if (vectorOptions.contours && !vectorOptions.breakpoints)
result += `&intervals=${vectorOptions.contourInterval}`;

Expand Down