0ct0pu5/immich
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix linter errors

Browse source
This commit is contained in:
Matthias Rupp 2023-05-01 21:26:03 -11:00
parent f49e122361
commit 71c7438a79
4 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
web/package-lock.json generated
View file

@ -33,6 +33,7 @@
"@types/cookie": "^0.5.1",
"@types/justified-layout": "^4.1.0",
"@types/leaflet": "^1.9.1",
"@types/leaflet.markercluster": "^1.5.1",
"@types/lodash-es": "^4.17.6",
"@types/luxon": "^3.2.0",
"@typescript-eslint/eslint-plugin": "^5.53.0",
@ -3624,6 +3625,15 @@
"@types/geojson": "*"
}
},
"node_modules/@types/leaflet.markercluster": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.5.1.tgz",
"integrity": "sha512-gzJzP10qO6Zkts5QNVmSAEDLYicQHTEBLT9HZpFrJiSww9eDAs5OWHvIskldf41MvDv1gbMukuEBQEawHn+wtA==",
"dev": true,
"dependencies": {
"@types/leaflet": "*"
}
},
"node_modules/@types/lodash": {
"version": "4.14.191",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz",
@ -14070,6 +14080,15 @@
"@types/geojson": "*"
}
},
"@types/leaflet.markercluster": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.5.1.tgz",
"integrity": "sha512-gzJzP10qO6Zkts5QNVmSAEDLYicQHTEBLT9HZpFrJiSww9eDAs5OWHvIskldf41MvDv1gbMukuEBQEawHn+wtA==",
"dev": true,
"requires": {
"@types/leaflet": "*"
}
},
"@types/lodash": {
"version": "4.14.191",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz",

1
web/package.json
View file

@ -29,6 +29,7 @@
"@types/cookie": "^0.5.1",
"@types/justified-layout": "^4.1.0",
"@types/leaflet": "^1.9.1",
"@types/leaflet.markercluster": "^1.5.1",
"@types/lodash-es": "^4.17.6",
"@types/luxon": "^3.2.0",
"@typescript-eslint/eslint-plugin": "^5.53.0",

18
web/src/lib/components/shared-components/leaflet/asset-marker-cluster.svelte
View file

@ -1,8 +1,8 @@
<script lang="ts" context="module">
import { createContext } from '$lib/utils/context';
import { MarkerClusterGroup, MarkerClusterSpiderfyEvent } from 'leaflet.markercluster';
// @ts-ignore
const { get: getContext, set: setClusterContext } = createContext<() => L.MarkerClusterGroup>();
const { get: getContext, set: setClusterContext } = createContext<() => MarkerClusterGroup>();
export const getClusterContext = () => {
return getContext()();
@ -11,7 +11,6 @@
<script lang="ts">
import { onDestroy, onMount } from 'svelte';
import 'leaflet.markercluster';
import { getMapContext } from './map.svelte';
import { MapMarkerResponseDto, getFileUrl } from '@api';
import L from 'leaflet';
@ -46,14 +45,13 @@
export let markers: MapMarkerResponseDto[];
const map = getMapContext();
// @ts-ignore
let cluster: L.MarkerClusterGroup;
let cluster: MarkerClusterGroup;
setClusterContext(() => cluster);
onMount(() => {
// @ts-ignore
cluster = new L.MarkerClusterGroup({
cluster = new MarkerClusterGroup({
showCoverageOnHover: false,
zoomToBoundsOnClick: false,
spiderfyOnMaxZoom: false,
@ -62,10 +60,8 @@
spiderfyDistanceMultiplier: 3
});
// @ts-ignore
cluster.on('clusterclick', (event) => {
// @ts-ignore
const ids = event.layer.getAllChildMarkers().map(marker => marker.getAssetId());
cluster.on('clusterclick', (event: MarkerClusterSpiderfyEvent) => {
const ids = event.layer.getAllChildMarkers().map((marker: AssetMarker) => marker.getAssetId());
dispatch('view', { assets: ids });
});

8
web/src/lib/components/shared-components/leaflet/tile-layer.svelte
View file

@ -1,16 +1,22 @@
<script lang="ts" context="module">
type TileLayerFilterOptions = TileLayerOptions & { filter: string[] };
</script>
<script lang="ts">
import { onDestroy, onMount } from 'svelte';
import 'leaflet.tilelayer.colorfilter';
import { TileLayer, type TileLayerOptions } from 'leaflet';
import { getMapContext } from './map.svelte';
import L from 'leaflet';
export let urlTemplate: string;
export let options: any | undefined = undefined;
export let options: TileLayerFilterOptions | undefined = undefined;
let tileLayer: TileLayer;
const map = getMapContext();
onMount(() => {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
tileLayer = new L.tileLayer.colorFilter(urlTemplate, options).addTo(map);
});