Switch imagery def settings to dedicated endpoints

Author: cyrossignol

components/settings/panel/Imagery.vue

@@ -90,18 +90,20 @@ const { isLead } = useWorkspaceRole();
 const imagerySchemaUrl = import.meta.env.VITE_IMAGERY_SCHEMA;
 const imageryExampleUrl = import.meta.env.VITE_IMAGERY_EXAMPLE_URL;
 
-let imageryListDefInit = '';
-
-if (Array.isArray(workspace.imageryListDef)) {
-  imageryListDefInit = JSON.stringify(workspace.imageryListDef, null, 2);
-}
-
 const imagerySchema = ref<object | undefined>();
-const imageryListDef = ref(imageryListDefInit);
+const imageryListDef = ref('');
 const imageryError = ref<string | null>(null);
 const imagerySaveStatus = ref<{ type: 'success' | 'error'; message: string } | null>(null);
 const isDraggingImagery = ref(false);
 
+onMounted(async () => {
+  const settings = await workspacesClient.getImagerySettings(workspace.id);
+
+  if (Array.isArray(settings.definition)) {
+    imageryListDef.value = JSON.stringify(settings.definition, null, 2);
+  }
+});
+
 function clearImageryMessages() {
   imageryError.value = null;
   imagerySaveStatus.value = null;
@@ -127,8 +129,8 @@ async function saveImageryConfiguration() {
   }
 
   try {
-    await workspacesClient.updateWorkspace(workspace.id, {
-      imageryListDef: imageryResult.data,
+    await workspacesClient.saveImageryDefSettings(workspace.id, {
+      definition: imageryResult.data,
     });
     imagerySaveStatus.value = { type: 'success', message: 'Changes saved.' };
   }

services/workspaces.ts

@@ -5,7 +5,8 @@ import { compareStringAsc } from '~/util/compare';
 import type { ICancelableClient } from '~/services/loading';
 import type { OsmApiClient } from '~/services/osm';
 import type { TdeiAuthStore, TdeiClient } from '~/services/tdei';
-import type { BoundingBox } from '~/types/bbox'
+import type { BoundingBox } from '~/types/bbox';
+import type { ImagerySettings } from '~/types/imagery';
 import type {
   QuestSettings,
   QuestSettingsPatch,
@@ -146,8 +147,14 @@ export class WorkspacesClient extends BaseHttpClient implements ICancelableClien
     await this.#newApi._patch(`workspaces/${id}/quests/long/settings`, settings);
   }
 
-  async saveImageryDefSettings(workspaceId: number, settings: object): Promise<void> {
-    await this.#newApi._patch(`workspaces/${workspaceId}/imagery/settings`, settings);
+  async getImagerySettings(id: WorkspaceId): Promise<ImagerySettings> {
+    const response = await this.#newApi._get(`workspaces/${id}/imagery/settings`);
+
+    return await response.json();
+  }
+
+  async saveImageryDefSettings(id: WorkspaceId, settings: object): Promise<void> {
+    await this.#newApi._patch(`workspaces/${id}/imagery/settings`, settings);
   }
 
   async getTeams(id: WorkspaceId): Promise<WorkspaceTeam[]> {

types/imagery.ts

@@ -0,0 +1,35 @@
+// Each ring is an array of [lon, lat] pairs. The first and last elements must
+// be equal (closed):
+type LinearRing = [number, number][];
+
+type ImagerySourceType = 'tms' | 'wmts' | 'xyz';
+
+interface ImagerySourceAttribution {
+  required: boolean;
+  text: string;
+  url: string;
+}
+
+interface ImagerySourceExtent {
+  max_zoom: number;
+  polygon: LinearRing[];
+}
+
+export interface ImagerySource {
+  attribution: ImagerySourceAttribution;
+  description: string;
+  extent: ImagerySourceExtent;
+  icon: string;
+  id: string;
+  name: string;
+  type: ImagerySourceType;
+  url: string;
+}
+
+export interface ImagerySettings {
+  workspace_id: number;
+  definition: ImagerySource[] | null;
+  modifiedAt: string;
+  modifiedBy: string;
+  modifiedByName: string;
+}