CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-12 16:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

cache panoramax sequence data (prev/next links)

Browse Source 
to allow more snappy scrolling through the photos of a sequence using the prev/next buttons
the cache is primed with information for "most of" the selected sequence, see also https://gitlab.com/panoramax/server/api/-/issues/268
This commit is contained in:
Martin Raifer
2025-05-21 16:55:18 +02:00
parent 3c9d232d41
commit 2dc64f0fef
1 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
modules/services/panoramax.js
View File

@@ -15,6 +15,7 @@ import { services } from './';
const apiUrl = 'https://api.panoramax.xyz/';
const tileUrl = apiUrl + 'api/map/{z}/{x}/{y}.mvt';
const imageDataUrl = apiUrl + 'api/collections/{collectionId}/items/{itemId}';
const sequenceDataUrl = apiUrl + 'api/collections/{collectionId}/items?limit=1000';
const userIdUrl = apiUrl + 'api/users/search?q={username}';
const usernameURL = apiUrl + 'api/users/{userId}';
const viewerUrl = apiUrl;
@@ -258,7 +259,7 @@ export default {
_cache = {
images: { rtree: new RBush(), forImageId: {} },
sequences: { rtree: new RBush(), lineString: {} },
sequences: { rtree: new RBush(), lineString: {}, items: {} },
users: {},
mockSequences: { rtree: new RBush(), lineString: {} },
requests: { loaded: {}, inflight: {} }
@@ -585,21 +586,47 @@ export default {
/**
* Fetches the data for a specific image
* @param {*} collection_id
* @param {*} image_id
* @param {*} collectionId
* @param {*} imageId
* @returns The fetched image data
*/
getImageData: async function(collection_id, image_id) {
const requestUrl = imageDataUrl.replace('{collectionId}', collection_id)
.replace('{itemId}', image_id);
getImageData: async function(collectionId, imageId) {
const cache = _cache.sequences.items;
if (cache[collectionId]) {
const cached = cache[collectionId]
.find(d => d.id === imageId);
if (cached) return cached;
} else {
// prime the cache with data from sequence
const response = await fetch(sequenceDataUrl
.replace('{collectionId}', collectionId),
{ method: 'GET' });
const response = await fetch(requestUrl, { method: 'GET' });
if (!response.ok) {
throw new Error(response.status + ' ' + response.statusText);
if (!response.ok) {
throw new Error(response.status + ' ' + response.statusText);
}
const data = (await response.json()).features;
cache[collectionId] = data;
}
const data = await response.json();
return data;
const result = cache[collectionId]
.find(d => d.id === imageId);
if (result) return result;
// not found in sequence: retry to load single item data
// ideally, we'd use the `withPicture` parameter, but it is buggy:
// https://gitlab.com/panoramax/server/api/-/issues/268
const itemResponse = await fetch(imageDataUrl
.replace('{collectionId}', collectionId)
.replace('{itemId}', imageId),
{ method: 'GET' });
if (!itemResponse.ok) {
throw new Error(itemResponse.status + ' ' + itemResponse.statusText);
}
const itemData = await itemResponse.json();
cache[collectionId].push(itemData);
return itemData;
},
ensureViewerLoaded: function(context) {