From 811b54d74c9a0f9c9b802b0e887a8732f4efe0a2 Mon Sep 17 00:00:00 2001
From: Roi Cohen <213414225+roicohen326@users.noreply.github.com>
Date: Wed, 24 Jun 2026 16:47:14 +0300
Subject: [PATCH 1/2] feat: add keywords to base LayerMetadata class

---
 .../layerMetadata/layerRASTERMetadata.ts      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/models/layerMetadata/layerRASTERMetadata.ts b/src/models/layerMetadata/layerRASTERMetadata.ts
index 38a9a990..c7e41ffb 100644
--- a/src/models/layerMetadata/layerRASTERMetadata.ts
+++ b/src/models/layerMetadata/layerRASTERMetadata.ts
@@ -1050,6 +1050,33 @@ export class LayerMetadata implements RasterLayerMetadata {
   //#endregion
   public productBoundingBox: string | undefined = undefined;
 
+  //#region CORE: keywords
+  @pycsw({
+    profile: 'mc_raster',
+    xmlElement: 'mc:keywords',
+    queryableField: 'mc:keywords',
+    pycswField: 'pycsw:Keywords',
+  })
+  @catalogDB({
+    column: {
+      name: 'keywords',
+      type: 'text',
+      nullable: true,
+    },
+  })
+  @tsTypes({
+    mappingType: TsTypes.STRING,
+  })
+  @graphql({
+    nullable: true,
+  })
+  @fieldConfig({
+    category: FieldCategory.GENERAL,
+    isManuallyEditable: true,
+  })
+  //#endregion
+  public keywords: string | undefined = undefined;
+
   //#region RASTER: dispalyPath
   @catalogDB({
     column: {

From 799c715784195784c1cf7cf40a3ba5eba0356e78 Mon Sep 17 00:00:00 2001
From: Roi Cohen <213414225+roicohen326@users.noreply.github.com>
Date: Sun, 28 Jun 2026 09:43:44 +0300
Subject: [PATCH 2/2] fix: remove redundant keywords declaration from
 PycswLayerCatalogRecord

---
 .../layerMetadata/pycswLayerCatalogRecord.ts  | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/src/models/layerMetadata/pycswLayerCatalogRecord.ts b/src/models/layerMetadata/pycswLayerCatalogRecord.ts
index 914f1e5a..8513ee7a 100644
--- a/src/models/layerMetadata/pycswLayerCatalogRecord.ts
+++ b/src/models/layerMetadata/pycswLayerCatalogRecord.ts
@@ -154,33 +154,6 @@ export class PycswLayerCatalogRecord extends LayerMetadata implements IPycswCore
   //#endregion
   public wkbGeometry: string | undefined = undefined;
 
-  //#region CORE: keywords
-  @pycsw({
-    profile: 'mc_raster',
-    xmlElement: 'mc:keywords',
-    queryableField: 'mc:keywords',
-    pycswField: 'pycsw:Keywords',
-  })
-  @catalogDB({
-    column: {
-      name: 'keywords',
-      type: 'text',
-      nullable: true,
-    },
-  })
-  @tsTypes({
-    mappingType: TsTypes.STRING,
-  })
-  @graphql({
-    nullable: true,
-  })
-  @fieldConfig({
-    category: FieldCategory.GENERAL,
-    isManuallyEditable: true,
-  })
-  //#endregion
-  public keywords: string | undefined = undefined;
-
   //#region CORE: anyTextTsvector
   @catalogDB({
     column: {