mirror of
https://github.com/immich-app/immich.git
synced 2025-01-01 08:31:59 +00:00
feat(web): load original panorama image when zoomed in to 75% or above (#12222)
* feat(web): load original panorama image when zoomed in to 75% or above * add checks that original 360 image is web compatible and better error handling * fix web compatability check typing * fix asset type
This commit is contained in:
parent
bd6c5e1b1c
commit
862d6d9abe
2 changed files with 29 additions and 2 deletions
|
@ -1,11 +1,12 @@
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { getAssetOriginalUrl, getKey } from '$lib/utils';
|
import { getAssetOriginalUrl, getKey } from '$lib/utils';
|
||||||
|
import { isWebCompatibleImage } from '$lib/utils/asset-utils';
|
||||||
import { AssetMediaSize, AssetTypeEnum, viewAsset, type AssetResponseDto } from '@immich/sdk';
|
import { AssetMediaSize, AssetTypeEnum, viewAsset, type AssetResponseDto } from '@immich/sdk';
|
||||||
import type { AdapterConstructor, PluginConstructor } from '@photo-sphere-viewer/core';
|
import type { AdapterConstructor, PluginConstructor } from '@photo-sphere-viewer/core';
|
||||||
import { fade } from 'svelte/transition';
|
import { fade } from 'svelte/transition';
|
||||||
import LoadingSpinner from '../shared-components/loading-spinner.svelte';
|
import LoadingSpinner from '../shared-components/loading-spinner.svelte';
|
||||||
import { t } from 'svelte-i18n';
|
import { t } from 'svelte-i18n';
|
||||||
export let asset: Pick<AssetResponseDto, 'id' | 'type'>;
|
export let asset: { id: string; type: AssetTypeEnum.Video } | AssetResponseDto;
|
||||||
|
|
||||||
const photoSphereConfigs =
|
const photoSphereConfigs =
|
||||||
asset.type === AssetTypeEnum.Video
|
asset.type === AssetTypeEnum.Video
|
||||||
|
@ -27,6 +28,9 @@
|
||||||
const url = URL.createObjectURL(data);
|
const url = URL.createObjectURL(data);
|
||||||
return url;
|
return url;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const originalImageUrl =
|
||||||
|
asset.type === AssetTypeEnum.Image && isWebCompatibleImage(asset) ? getAssetOriginalUrl(asset.id) : null;
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div transition:fade={{ duration: 150 }} class="flex h-full select-none place-content-center place-items-center">
|
<div transition:fade={{ duration: 150 }} class="flex h-full select-none place-content-center place-items-center">
|
||||||
|
@ -34,7 +38,14 @@
|
||||||
{#await Promise.all([loadAssetData(), import('./photo-sphere-viewer-adapter.svelte'), ...photoSphereConfigs])}
|
{#await Promise.all([loadAssetData(), import('./photo-sphere-viewer-adapter.svelte'), ...photoSphereConfigs])}
|
||||||
<LoadingSpinner />
|
<LoadingSpinner />
|
||||||
{:then [data, module, adapter, plugins, navbar]}
|
{:then [data, module, adapter, plugins, navbar]}
|
||||||
<svelte:component this={module.default} panorama={data} plugins={plugins ?? undefined} {navbar} {adapter} />
|
<svelte:component
|
||||||
|
this={module.default}
|
||||||
|
panorama={data}
|
||||||
|
plugins={plugins ?? undefined}
|
||||||
|
{navbar}
|
||||||
|
{adapter}
|
||||||
|
{originalImageUrl}
|
||||||
|
/>
|
||||||
{:catch}
|
{:catch}
|
||||||
{$t('errors.failed_to_load_asset')}
|
{$t('errors.failed_to_load_asset')}
|
||||||
{/await}
|
{/await}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import {
|
import {
|
||||||
Viewer,
|
Viewer,
|
||||||
|
events,
|
||||||
EquirectangularAdapter,
|
EquirectangularAdapter,
|
||||||
type PluginConstructor,
|
type PluginConstructor,
|
||||||
type AdapterConstructor,
|
type AdapterConstructor,
|
||||||
|
@ -9,6 +10,7 @@
|
||||||
import { onDestroy, onMount } from 'svelte';
|
import { onDestroy, onMount } from 'svelte';
|
||||||
|
|
||||||
export let panorama: string | { source: string };
|
export let panorama: string | { source: string };
|
||||||
|
export let originalImageUrl: string | null;
|
||||||
export let adapter: AdapterConstructor | [AdapterConstructor, unknown] = EquirectangularAdapter;
|
export let adapter: AdapterConstructor | [AdapterConstructor, unknown] = EquirectangularAdapter;
|
||||||
export let plugins: (PluginConstructor | [PluginConstructor, unknown])[] = [];
|
export let plugins: (PluginConstructor | [PluginConstructor, unknown])[] = [];
|
||||||
export let navbar = false;
|
export let navbar = false;
|
||||||
|
@ -28,6 +30,20 @@
|
||||||
maxFov: 180,
|
maxFov: 180,
|
||||||
fisheye: true,
|
fisheye: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (originalImageUrl) {
|
||||||
|
const zoomHandler = ({ zoomLevel }: events.ZoomUpdatedEvent) => {
|
||||||
|
// zoomLevel range: [0, 100]
|
||||||
|
if (Math.round(zoomLevel) >= 75) {
|
||||||
|
// Replace the preview with the original
|
||||||
|
viewer.setPanorama(originalImageUrl, { showLoader: false, speed: 150 }).catch(() => {
|
||||||
|
viewer.setPanorama(panorama, { showLoader: false, speed: 0 }).catch(() => {});
|
||||||
|
});
|
||||||
|
viewer.removeEventListener(events.ZoomUpdatedEvent.type, zoomHandler);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
viewer.addEventListener(events.ZoomUpdatedEvent.type, zoomHandler);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
onDestroy(() => {
|
onDestroy(() => {
|
||||||
|
|
Loading…
Reference in a new issue