refactor(add-data): Consistent naming of useTiles prop

hslayers · Oct 15, 2024 · a61770c · a61770c
1 parent 773c702
commit a61770c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/projects/hslayers/components/add-data/common/url/details/details.component.html b/projects/hslayers/components/add-data/common/url/details/details.component.html
@@ -88,14 +88,14 @@
     <div class="capabilities_input d-flex flex-column">
       @if (type === 'wms') {
       <label class="capabilities_label control-label"> <input type="checkbox" class="me-1 checkbox-lg" name="useTiles"
-          [(ngModel)]="data.use_tiles" />
+          [(ngModel)]="data.useTiles" />
         {{'ADDLAYERS.useTiles' | translateHs }}
       </label>
       }
     </div>
   </div>
   @if (type === 'wms' || type === 'arcgis') {
-  <p class="col-sm-12 alert alert-warning" [hidden]="data.use_tiles">
+  <p class="col-sm-12 alert alert-warning" [hidden]="data.useTiles">
     {{'ADDLAYERS.considerUsingTiles' | translateHs }}
   </p>
   }

diff --git a/projects/hslayers/services/add-data/url/arcgis.service.ts b/projects/hslayers/services/add-data/url/arcgis.service.ts
@@ -55,7 +55,7 @@ export class HsUrlArcGisService implements HsUrlTypeServiceModel {
       map_projection: '',
       tile_size: 512,
       use_resampling: false,
-      use_tiles: true,
+      useTiles: true,
       table: {
         trackBy: 'id',
         nameProperty: 'name',

diff --git a/projects/hslayers/services/add-data/url/wms.service.ts b/projects/hslayers/services/add-data/url/wms.service.ts
@@ -64,7 +64,7 @@ export class HsUrlWmsService implements HsUrlTypeServiceModel {
       map_projection: '',
       tile_size: 512,
       use_resampling: false,
-      use_tiles: true,
+      useTiles: true,
       visible: true,
       table: {
         trackBy: 'Name',
@@ -475,10 +475,9 @@ export class HsUrlWmsService implements HsUrlTypeServiceModel {
       },
       crossOrigin: 'anonymous',
     };
-    const USE_TILES = options.useTiles ?? this.data.use_tiles;
-    const source: ImageWMS | TileWMS = !USE_TILES
-      ? new ImageWMS(sourceOptions)
-      : new TileWMS(sourceOptions);
+    const source: ImageWMS | TileWMS = this.data.useTiles
+      ? new TileWMS(sourceOptions)
+      : new ImageWMS(sourceOptions);
     const metadata =
       this.hsWmsGetCapabilitiesService.getMetadataObjectWithUrls(layer);
     const view = this.hsMapService.getMap().getView();
@@ -518,10 +517,10 @@ export class HsUrlWmsService implements HsUrlTypeServiceModel {
      */
     layerOptions['capsExtentSet'] = !!layerOptions.extent;
 
-    const new_layer = USE_TILES
+    const new_layer = this.data.useTiles
       ? new Tile(layerOptions as TileOptions<TileSource>)
       : new ImageLayer(layerOptions as ImageOptions<ImageSource>);
-    this.hsMapService.proxifyLayerLoader(new_layer, USE_TILES);
+    this.hsMapService.proxifyLayerLoader(new_layer, this.data.useTiles);
     return new_layer;
   }
 

diff --git a/projects/hslayers/types/add-data/data-object.type.ts b/projects/hslayers/types/add-data/data-object.type.ts
@@ -36,7 +36,7 @@ export type UrlDataObject = {
   tile_size?: number;
   title?: string;
   use_resampling?: boolean;
-  use_tiles?: boolean;
+  useTiles?: boolean;
   version?: string;
   visible?: boolean;
   table: {