feat: updated models (#93)

* feat: updated models * fix: remove numeric length from maxResolutionMeter * fix: incloded in bast db type override * feat: added product bbox field * fix: change resolution filed db type to varchar
MapColonies · Oct 10, 2021 · 7ccb8cd · 7ccb8cd
1 parent 3c02cb8
commit 7ccb8cd
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 15 deletions.
diff --git a/src/models/layerMetadata/enums.ts b/src/models/layerMetadata/enums.ts
@@ -4,10 +4,12 @@ export enum SensorType {
   // eslint-disable-next-line
   Pan_Sharpen = 'Pan_Sharpen',
   OTHER = 'OTHER',
+  UNDEFINED = 'UNDEFINED',
 }
 
 export enum ProductType {
   ORTHOPHOTO = 'Orthophoto',
+  ORTHOPHOTO_HISTORY = 'OrthophotoHistory',
   RASTER_MAP = 'RasterMap',
   VECTOR_MAP = 'VectorMap',
   VECTOR = 'Vector',

diff --git a/src/models/layerMetadata/layerMetadata.ts b/src/models/layerMetadata/layerMetadata.ts
@@ -202,8 +202,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
   //#region COMMON: creationDate
   @pycsw({
     profile: 'mc_raster',
-    xmlElement: 'mc:creationDate',
-    queryableField: 'mc:creationDate',
+    xmlElement: 'mc:creationDateUTC',
+    queryableField: 'mc:creationDateUTC',
     pycswField: 'pycsw:CreationDate',
   })
   @catalogDB({
@@ -252,8 +252,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
   //#region COMMON: updateDate
   @pycsw({
     profile: 'mc_raster',
-    xmlElement: 'mc:updateDate',
-    queryableField: 'mc:updateDate',
+    xmlElement: 'mc:updateDateUTC',
+    queryableField: 'mc:updateDateUTC',
     pycswField: 'pycsw:UpdateDate',
   })
   @catalogDB({
@@ -282,8 +282,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
   //#region COMMON: sourceDateStart
   @pycsw({
     profile: 'mc_raster',
-    xmlElement: 'mc:imagingTime_begin',
-    queryableField: 'mc:imagingTime_begin',
+    xmlElement: 'mc:imagingTime_beginUTC',
+    queryableField: 'mc:imagingTime_beginUTC',
     pycswField: 'pycsw:TempExtent_begin',
   })
   @catalogDB({
@@ -312,8 +312,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
   //#region COMMON: sourceDateEnd
   @pycsw({
     profile: 'mc_raster',
-    xmlElement: 'mc:imagingTime_end',
-    queryableField: 'mc:imagingTime_end',
+    xmlElement: 'mc:imagingTime_endUTC',
+    queryableField: 'mc:imagingTime_endUTC',
     pycswField: 'pycsw:TempExtent_end',
   })
   @catalogDB({
@@ -342,8 +342,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
   //#region COMMON: accuracyCE90
   @pycsw({
     profile: 'mc_raster',
-    xmlElement: 'mc:horizontalAccuracyCE90',
-    queryableField: 'mc:horizontalAccuracyCE90',
+    xmlElement: 'mc:minHorizontalAccuracyCE90',
+    queryableField: 'mc:minHorizontalAccuracyCE90',
     pycswField: 'pycsw:horizontalAccuracyCE90',
   })
   @catalogDB({
@@ -371,8 +371,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
   //#region COMMON: sensorType    //sensors
   @pycsw({
     profile: 'mc_raster',
-    xmlElement: 'mc:sensorType',
-    queryableField: 'mc:sensorType',
+    xmlElement: 'mc:sensors',
+    queryableField: 'mc:sensors',
     pycswField: 'pycsw:sensorType',
   })
   @catalogDB({
@@ -552,14 +552,14 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
   //#region RASTER: resolution
   @pycsw({
     profile: 'mc_raster',
-    xmlElement: 'mc:resolution',
-    queryableField: 'mc:resolution',
+    xmlElement: 'mc:maxResolutionDeg',
+    queryableField: 'mc:maxResolutionDeg',
     pycswField: 'pycsw:Resolution',
   })
   @catalogDB({
     column: {
       name: 'resolution',
-      type: 'real', // check if 'decimal' type is needed
+      type: 'text',
     },
   })
   @inputDataMapping({
@@ -578,6 +578,35 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
   //#endregion
   public resolution: number | undefined = undefined;
 
+  //#region RASTER: maxResolutionMeter
+  @pycsw({
+    profile: 'mc_raster',
+    xmlElement: 'mc:maxResolutionMeter',
+    queryableField: 'mc:maxResolutionMeter',
+    pycswField: 'pycsw:maxResolutionMeter',
+  })
+  @catalogDB({
+    column: {
+      name: 'max_resolution_meter',
+      type: 'varchar', // varchar(10) as pycsw only support unicode/binary values
+    },
+  })
+  @inputDataMapping({
+    dataFile: DataFileType.SHAPE_METADATA,
+    valuePath: 'features[0].properties.Resolution',
+  })
+  @tsTypes({
+    mappingType: TsTypes.NUMBER,
+  })
+  @graphql({
+    nullable: true,
+  })
+  @fieldConfig({
+    category: FieldCategory.MAIN,
+  })
+  //#endregion
+  public maxResolutionMeter: number | undefined = undefined;
+
   //#region RASTER: rms
   @pycsw({
     profile: 'mc_raster',
@@ -701,6 +730,9 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       type: 'text',
       nullable: true,
     },
+    field: {
+      overrideType: TsTypes.STRING,
+    },
   })
   @tsTypes({
     mappingType: TsTypes.STRING_ARRAY,
@@ -710,6 +742,48 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
   })
   //#endregion
   public includedInBests: string[] | undefined = undefined;
+
+  //#region RASTER: rawProductData
+  @catalogDB({
+    column: {
+      name: 'raw_product_data',
+      type: 'jsonb',
+    },
+  })
+  @inputDataMapping({
+    isCustomLogic: true,
+    dataFile: DataFileType.PRODUCT,
+    valuePath: '*** entire product shape file geo json ***',
+  })
+  @tsTypes({
+    mappingType: TsTypes.OBJECT,
+  })
+  //#endregion
+  public rawProductData: GeoJSON | undefined = undefined;
+
+  //#region RASTER: productBoundingBox
+  @pycsw({
+    profile: 'mc_raster',
+    xmlElement: 'mc:productBBox',
+    queryableField: 'mc:productBBox',
+    pycswField: 'pycsw:productBBox',
+  })
+  @catalogDB({
+    column: {
+      name: 'product_bbox',
+      type: 'varchar', // VARCHAR(255)
+      nullable: true,
+    },
+  })
+  @tsTypes({
+    mappingType: TsTypes.STRING,
+  })
+  @graphql({
+    nullable: true,
+  })
+  //#endregion
+  public productBoundingBox: string | undefined = undefined;
+
   //#endregion
 
   public static getPyCSWMapping(prop: string): IPYCSWMapping | undefined {

diff --git a/src/yaml/updateLayerMetadata.yaml b/src/yaml/updateLayerMetadata.yaml
@@ -30,6 +30,7 @@ components:
           type: string
           enum:
             - Orthophoto
+            - OrthophotoHistory
             - RasterMap
             - VectorMap
             - Vector
@@ -75,6 +76,9 @@ components:
         resolution:
           type: number
           description: Resolution of tiff files
+        maxResolutionMeter:
+          type: number
+          description: max (rounded) resolution of layer in meters/pixel
         accuracyCE90:
           type: number
           description: Horizontal Accuracy
@@ -87,6 +91,7 @@ components:
               - RGB
               - Pan_Sharpen
               - OTHER
+              - UNDEFINED
           description: The sensor type
         region:
           type: string
@@ -99,6 +104,11 @@ components:
           $ref: geojson.yaml#/components/schemas/Geometry
         layerPolygonParts:
           $ref: geojson.yaml#/components/schemas/FeatureCollection
+        rawProductData:
+          $ref: geojson.yaml#/components/schemas/FeatureCollection
+        productBoundingBox:
+          type: string
+
     updateStatusLayerMetadata:
       type: object
       description: Metadata for layer status