wip

TerriaJS · May 13, 2024 · 545cf4b · 545cf4b
1 parent d06645c
commit 545cf4b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/lib/Models/Catalog/Ows/NcWMSGetMetadataStratum.ts b/lib/Models/Catalog/Ows/NcWMSGetMetadataStratum.ts
@@ -24,25 +24,19 @@ export default class NcWMSGetMetadataStratum extends LoadableStratum(
     url: string,
     palettes?: WebMapServiceAvailablePaletteTraits[]
   ): Promise<NcWMSGetMetadataStratum> {
-    const paletteResult: WebMapServiceAvailablePaletteTraits[] = [];
     if (url) {
       const response = await fetch(url);
       const data = await response.json();
-      const npalettes = data.palettes;
-      npalettes.forEach((palette: any) => {
-        paletteResult.push({
-          name: palette,
-          title: palette,
-          abstract: palette
-        });
-      });
+      const paletteResult = data.palettes.map((palette: any) => ({
+        name: palette,
+        title: palette,
+        abstract: palette
+      }));
 
-      palettes = paletteResult; // Initialize the 'palettes' array if it is undefined
+      palettes = paletteResult;
     }
 
-    const nc = new NcWMSGetMetadataStratum(url, palettes);
-
-    return nc;
+    return new NcWMSGetMetadataStratum(url, palettes);
   }
 
   duplicateLoadableStratum(newModel: BaseModel): this {

diff --git a/lib/Models/Catalog/Ows/WebMapServiceCatalogItem.ts b/lib/Models/Catalog/Ows/WebMapServiceCatalogItem.ts
@@ -849,13 +849,11 @@ class WebMapServiceCatalogItem
       return super.selectableDimensions;
     }
 
-    const paletteDimensions = this.paletteDimensions;
-
     return filterOutUndefined([
       ...super.selectableDimensions,
       ...this.wmsDimensionSelectableDimensions,
       ...this.styleSelectableDimensions,
-      ...paletteDimensions
+      ...this.paletteDimensions
     ]);
   }
 

diff --git a/lib/Traits/TraitsClasses/WebMapServiceCatalogItemTraits.ts b/lib/Traits/TraitsClasses/WebMapServiceCatalogItemTraits.ts
@@ -177,7 +177,6 @@ export class GetFeatureInfoFormat extends ModelTraits {
   format?: string;
 }
 
-@traitClass({})
 export class NcWMSGetMetadataStratumTraits extends mixTraits(MappableTraits) {
   @primitiveTrait({
     name: "Item ID",