feat(layer): use generics for source and client config

terrestris · Aug 19, 2024 · 0970dd2 · 0970dd2
1 parent 15909c1
commit 0970dd2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/src/model/Layer.ts b/src/model/Layer.ts
@@ -59,37 +59,43 @@ export interface SearchConfig {
 }
 
 export interface DefaultLayerClientConfig {
-  minResolution?: number;
-  maxResolution?: number;
-  hoverable?: boolean;
-  searchable?: boolean;
-  searchConfig?: SearchConfig;
-  propertyConfig?: DefaultLayerPropertyConfig[];
-  featureInfoFormConfig?: PropertyFormTabConfig<PropertyFormItemReadConfig>[];
-  editFormConfig?: PropertyFormTabConfig<PropertyFormItemEditDefaultConfig |
-    PropertyFormItemEditReferenceTableConfig>[];
   crossOrigin?: string;
-  opacity?: number;
   downloadConfig?: DownloadConfig[];
+  editFormConfig?: PropertyFormTabConfig<PropertyFormItemEditDefaultConfig |
+    PropertyFormItemEditReferenceTableConfig>[];
   editable?: boolean;
+  featureInfoFormConfig?: PropertyFormTabConfig<PropertyFormItemReadConfig>[];
+  hoverable?: boolean;
+  maxResolution?: number;
+  minResolution?: number;
+  opacity?: number;
+  propertyConfig?: DefaultLayerPropertyConfig[];
+  searchConfig?: SearchConfig;
+  searchable?: boolean;
 }
 
-export interface LayerArgs extends BaseEntityArgs {
+export interface LayerArgs<
+  D extends DefaultLayerClientConfig,
+  S extends DefaultLayerSourceConfig
+> extends BaseEntityArgs {
   name: string;
-  clientConfig?: DefaultLayerClientConfig;
-  sourceConfig: DefaultLayerSourceConfig;
+  clientConfig?: D;
+  sourceConfig: S;
   features?: FeatureCollection;
   type: LayerType;
 }
 
-export default class Layer extends BaseEntity {
+export default class Layer<
+  D extends DefaultLayerClientConfig = DefaultLayerClientConfig,
+  S extends DefaultLayerSourceConfig = DefaultLayerSourceConfig,
+> extends BaseEntity {
   name: string;
-  clientConfig?: DefaultLayerClientConfig;
-  sourceConfig: DefaultLayerSourceConfig;
+  clientConfig?: D;
+  sourceConfig: S;
   features?: FeatureCollection;
   type: LayerType;
 
-  constructor({id, created, modified, clientConfig, features, name, sourceConfig, type}: LayerArgs) {
+  constructor({id, created, modified, clientConfig, features, name, sourceConfig, type}: LayerArgs<D, S>) {
     super({id, created, modified});
 
     this.name = name;

diff --git a/src/parser/SHOGunApplicationUtil.ts b/src/parser/SHOGunApplicationUtil.ts
@@ -47,7 +47,10 @@ export interface SHOGunApplicationUtilOpts {
   client?: SHOGunAPIClient;
 }
 
-class SHOGunApplicationUtil<T extends Application, S extends Layer> {
+class SHOGunApplicationUtil<
+  T extends Application,
+  S extends Layer
+> {
 
   private readonly client: SHOGunAPIClient | undefined;