feat: updated shp maping (#79)

* feat: updated shp maping * fix: update filed names in test
MapColonies · Jul 1, 2021 · cef3882 · cef3882
1 parent 0dfa791
commit cef3882
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 40 deletions.
diff --git a/src/models/layerMetadata/decorators/property/shp.decorator.ts b/src/models/layerMetadata/decorators/property/shp.decorator.ts
@@ -1,22 +1,24 @@
 import 'reflect-metadata';
 
-const shpMappingMetadataKey = Symbol('shpmapping');
+const inputDataMappingMetadataKey = Symbol('inputDataMapping');
 
-export interface IShpMapping {
-  shpFile: ShapeFileType;
+export interface IDataMapping {
+  dataFile: DataFileType;
   valuePath: string;
+  isCustomLogic?: boolean;
 }
 
-export enum ShapeFileType {
+export enum DataFileType {
   FILES = 'Files',
   PRODUCT = 'Product',
   SHAPE_METADATA = 'ShapeMetadata',
+  TFW = 'TFW',
 }
 
-export function shpMapping(shpmapping: IShpMapping): PropertyDecorator {
-  return Reflect.metadata(shpMappingMetadataKey, shpmapping);
+export function inputDataMapping(dataMapping: IDataMapping): PropertyDecorator {
+  return Reflect.metadata(inputDataMappingMetadataKey, dataMapping);
 }
 
-export function getShpMapping<T>(target: T, propertyKey: string): IShpMapping | undefined {
-  return Reflect.getMetadata(shpMappingMetadataKey, target, propertyKey) as IShpMapping;
+export function getInputDataMapping<T>(target: T, propertyKey: string): IDataMapping | undefined {
+  return Reflect.getMetadata(inputDataMappingMetadataKey, target, propertyKey) as IDataMapping;
 }
diff --git a/src/models/layerMetadata/index.ts b/src/models/layerMetadata/index.ts
@@ -1,7 +1,7 @@
 export * from './layerMetadata';
 export * from './layerMetadata-StatusFields';
 
-export { IShpMapping, ShapeFileType } from './decorators/property/shp.decorator';
+export { IDataMapping, DataFileType } from './decorators/property/shp.decorator';
 export { TsTypes, IDescribeTsType, PropertiesTypes } from './decorators/property/tsTypes.decorator';
 export { IPYCSWMapping } from './decorators/property/csw.decorator';
 export { IColumnProps } from './decorators/property/catalogDB.decorator';

diff --git a/src/models/layerMetadata/layerMetadata.ts b/src/models/layerMetadata/layerMetadata.ts
@@ -11,7 +11,7 @@ import {
 import { RecordType } from '../pycsw/coreEnums';
 import { IMetadataCommonModel } from './interfaces/metadataCommonModel';
 import { getPyCSWMapping, IPYCSWMapping, pycsw } from './decorators/property/csw.decorator';
-import { getShpMapping, IShpMapping, ShapeFileType, shpMapping } from './decorators/property/shp.decorator';
+import { getInputDataMapping, IDataMapping, DataFileType, inputDataMapping } from './decorators/property/shp.decorator';
 import { getCatalogDBMapping, ICatalogDBMapping, catalogDB } from './decorators/property/catalogDB.decorator';
 import { getTsTypesMapping, ITsTypesMapping, tsTypes, TsTypes } from './decorators/property/tsTypes.decorator';
 import { SensorType } from './enums';
@@ -25,7 +25,7 @@ export interface ILayerMetadata {
   rms: number | undefined;
   scale: string | undefined;
 }
-export interface IPropSHPMapping extends IShpMapping, ITsTypesMapping {
+export interface IPropSHPMapping extends IDataMapping, ITsTypesMapping {
   prop: string;
 }
 
@@ -101,6 +101,10 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       nullable: true,
     },
   })
+  @inputDataMapping({
+    dataFile: DataFileType.SHAPE_METADATA,
+    valuePath: 'features[0].properties.SourceName',
+  })
   @tsTypes({
     mappingType: TsTypes.STRING,
   })
@@ -126,8 +130,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       nullable: true,
     },
   })
-  @shpMapping({
-    shpFile: ShapeFileType.SHAPE_METADATA,
+  @inputDataMapping({
+    dataFile: DataFileType.SHAPE_METADATA,
     valuePath: 'features[0].properties.Dsc',
   })
   @tsTypes({
@@ -256,9 +260,10 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       type: 'timestamp without time zone',
     },
   })
-  @shpMapping({
-    shpFile: ShapeFileType.SHAPE_METADATA,
-    valuePath: 'features[0].properties.UpdateDate',
+  @inputDataMapping({
+    isCustomLogic: true,
+    dataFile: DataFileType.SHAPE_METADATA,
+    valuePath: '***max(features[].properties.UpdateDate)***',
   })
   @tsTypes({
     mappingType: TsTypes.DATE,
@@ -285,6 +290,11 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       type: 'timestamp without time zone',
     },
   })
+  @inputDataMapping({
+    isCustomLogic: true,
+    dataFile: DataFileType.SHAPE_METADATA,
+    valuePath: '***min(features[].properties.UpdateDate)***',
+  })
   @tsTypes({
     mappingType: TsTypes.DATE,
   })
@@ -310,6 +320,11 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       type: 'timestamp without time zone',
     },
   })
+  @inputDataMapping({
+    isCustomLogic: true,
+    dataFile: DataFileType.SHAPE_METADATA,
+    valuePath: '***max(features[].properties.UpdateDate)***',
+  })
   @tsTypes({
     mappingType: TsTypes.DATE,
   })
@@ -335,8 +350,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       type: 'real',
     },
   })
-  @shpMapping({
-    shpFile: ShapeFileType.SHAPE_METADATA,
+  @inputDataMapping({
+    dataFile: DataFileType.SHAPE_METADATA,
     valuePath: 'features[0].properties.Ep90',
   })
   @tsTypes({
@@ -367,9 +382,10 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       overrideType: TsTypes.STRING,
     },
   })
-  @shpMapping({
-    shpFile: ShapeFileType.SHAPE_METADATA,
-    valuePath: 'features[0].properties.SensorType',
+  @inputDataMapping({
+    isCustomLogic: true,
+    dataFile: DataFileType.SHAPE_METADATA,
+    valuePath: '***features[].properties.SensorType***',
   })
   @tsTypes({
     mappingType: TsTypes.SENSORTYPE_ARRAY,
@@ -426,6 +442,11 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       nullable: false,
     },
   })
+  @inputDataMapping({
+    isCustomLogic: true,
+    dataFile: DataFileType.SHAPE_METADATA,
+    valuePath: '***features[0].properties.Source.Split(-)[0]***',
+  })
   @tsTypes({
     mappingType: TsTypes.STRING,
   })
@@ -450,6 +471,11 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       nullable: true,
     },
   })
+  @inputDataMapping({
+    isCustomLogic: true,
+    dataFile: DataFileType.SHAPE_METADATA,
+    valuePath: '***features[0].properties.Source.Split(-)[1]***',
+  })
   @tsTypes({
     mappingType: TsTypes.STRING,
   })
@@ -476,6 +502,10 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       nullable: true,
     },
   })
+  @inputDataMapping({
+    dataFile: DataFileType.PRODUCT,
+    valuePath: 'features[0].properties.Type',
+  })
   @tsTypes({
     mappingType: TsTypes.STRING,
   })
@@ -525,9 +555,9 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       type: 'real', // check if 'decimal' type is needed
     },
   })
-  @shpMapping({
-    shpFile: ShapeFileType.SHAPE_METADATA,
-    valuePath: 'features[0].properties.Resolution',
+  @inputDataMapping({
+    dataFile: DataFileType.TFW,
+    valuePath: '[0]',
   })
   @tsTypes({
     mappingType: TsTypes.NUMBER,
@@ -555,8 +585,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       nullable: true,
     },
   })
-  @shpMapping({
-    shpFile: ShapeFileType.SHAPE_METADATA,
+  @inputDataMapping({
+    dataFile: DataFileType.SHAPE_METADATA,
     valuePath: 'features[0].properties.Rms',
   })
   @tsTypes({
@@ -582,8 +612,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       nullable: true,
     },
   })
-  @shpMapping({
-    shpFile: ShapeFileType.SHAPE_METADATA,
+  @inputDataMapping({
+    dataFile: DataFileType.SHAPE_METADATA,
     valuePath: 'features[0].properties.Scale',
   })
   @tsTypes({
@@ -609,8 +639,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       nullable: true,
     },
   })
-  @shpMapping({
-    shpFile: ShapeFileType.SHAPE_METADATA,
+  @inputDataMapping({
+    dataFile: DataFileType.SHAPE_METADATA,
     valuePath: 'features[0].geometry',
   })
   @tsTypes({
@@ -636,6 +666,11 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
       nullable: true,
     },
   })
+  @inputDataMapping({
+    isCustomLogic: true,
+    dataFile: DataFileType.SHAPE_METADATA,
+    valuePath: '***entire geo json feature collection***',
+  })
   @tsTypes({
     mappingType: TsTypes.OBJECT,
   })
@@ -650,8 +685,8 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
     return getPyCSWMapping<LayerMetadata>(new LayerMetadata(), prop);
   }
 
-  public static getShpMapping(prop: string): IShpMapping | undefined {
-    return getShpMapping<LayerMetadata>(new LayerMetadata(), prop);
+  public static getShpMapping(prop: string): IDataMapping | undefined {
+    return getInputDataMapping<LayerMetadata>(new LayerMetadata(), prop);
   }
 
   public static getCatalogDBMapping(prop: string): ICatalogDBMapping | undefined {
@@ -694,13 +729,13 @@ export class LayerMetadata implements ILayerMetadata, IMetadataCommonModel {
     return ret;
   }
 
-  public static getShpMappings(): IPropSHPMapping[] {
+  public static getShpMappings(includeCustomLogic = false): IPropSHPMapping[] {
     const ret = [];
     const layer = new LayerMetadata();
     for (const prop in layer) {
-      const shpMap = getShpMapping<LayerMetadata>(layer, prop);
+      const shpMap = getInputDataMapping<LayerMetadata>(layer, prop);
       const tsTypesMap = getTsTypesMapping<LayerMetadata>(layer, prop);
-      if (shpMap && tsTypesMap) {
+      if (shpMap && tsTypesMap && (includeCustomLogic || shpMap.isCustomLogic === undefined || !shpMap.isCustomLogic)) {
         ret.push({
           prop: prop,
           ...shpMap,

diff --git a/tests/unit/layerMetadata.spec.ts b/tests/unit/layerMetadata.spec.ts
@@ -1,4 +1,4 @@
-import { LayerMetadata, IPYCSWMapping, IShpMapping, IPropPYCSWMapping, IPropSHPMapping, Pycsw3DCatalogRecord } from '../../src/models';
+import { LayerMetadata, IPYCSWMapping, IDataMapping, IPropPYCSWMapping, IPropSHPMapping, Pycsw3DCatalogRecord } from '../../src/models';
 import { ICatalogDBMapping } from '../../src/models/layerMetadata/decorators/property/catalogDB.decorator';
 import { PycswLayerCatalogRecord } from '../../src/models/layerMetadata/pycswLayerCatalogRecord';
 
@@ -20,15 +20,15 @@ describe('LayerMetadata class static methods', () => {
 
   it('getShpMapping(): mapped to SHAPE prop', () => {
     const PROPERTY_NAME = 'footprint';
-    const shpMapping: IShpMapping | undefined = LayerMetadata.getShpMapping(PROPERTY_NAME);
+    const shpMapping: IDataMapping | undefined = LayerMetadata.getShpMapping(PROPERTY_NAME);
 
-    expect(shpMapping).toHaveProperty('shpFile');
+    expect(shpMapping).toHaveProperty('dataFile');
     expect(shpMapping).toHaveProperty('valuePath');
   });
 
   it('getShpMapping(): NOT mapped to SHAPE prop', () => {
     const PROPERTY_NAME = 'dummy_footprint';
-    const shpMapping: IShpMapping | undefined = LayerMetadata.getShpMapping(PROPERTY_NAME);
+    const shpMapping: IDataMapping | undefined = LayerMetadata.getShpMapping(PROPERTY_NAME);
 
     expect(shpMapping).toBeUndefined();
   });
@@ -48,7 +48,7 @@ describe('LayerMetadata class static methods', () => {
 
     expect(shpMappings.length).toBeGreaterThan(0);
     expect(shpMappings[0]).toHaveProperty('prop');
-    expect(shpMappings[0]).toHaveProperty('shpFile');
+    expect(shpMappings[0]).toHaveProperty('dataFile');
     expect(shpMappings[0]).toHaveProperty('valuePath');
     expect(shpMappings[0]).toHaveProperty('mappingType');
   });