style(LM): Fix typos, prefer named imports

hslayers · Feb 19, 2024 · 9d93575 · 9d93575
1 parent 4a103d3
commit 9d93575
Show file tree

Hide file tree

Showing 19 changed files with 70 additions and 68 deletions.
diff --git a/...hslayers/components/layer-manager/editor/layer-editor-sub-layer-checkboxes.component.html b/...hslayers/components/layer-manager/editor/layer-editor-sub-layer-checkboxes.component.html
@@ -23,7 +23,7 @@
                         [ngClass]="{'hs-checkmark':withChildren[subLayer.Name],'hs-uncheckmark':!withChildren[subLayer.Name]}"
                         [attr.for]="'hs-sublayers-' + subLayer.Name + '-' + app "></label>
                     <div (click)="toggleExpanded()" style="cursor:pointer"
-                        [ngClass]="{'grayed': hsLayerManagerVisiblityService.currentResolution >= subLayer.maxResolution}">
+                        [ngClass]="{'grayed': hsLayerManagerVisibilityService.currentResolution >= subLayer.maxResolution}">
                         {{subLayer.Title || subLayer.Name}}
                         <button type="button" class="btn btn-sm p-0" style="font-size: 0.6rem;">
                             <i [ngClass]="{'icon-chevron-down': expanded, 'icon-chevron-right': !expanded}"></i>
@@ -34,7 +34,7 @@
                     <label class="form-check-label m-0" [ngClass]="{
                             'hs-checkmark':checkedSubLayers[subLayer.Name],
                             'hs-uncheckmark':!checkedSubLayers[subLayer.Name], 
-                            'grayed': (hsLayerManagerVisiblityService.currentResolution > subLayer.maxResolution) }"
+                            'grayed': (hsLayerManagerVisibilityService.currentResolution > subLayer.maxResolution) }"
                         [attr.for]="'hs-sublayers-' + subLayer.Name + '-' + app ">{{subLayer.Title ||
                         subLayer.Name}}</label>
                 </div>
@@ -55,4 +55,4 @@
         </div>
 
     </div>
-</div>
+</div>
diff --git a/...s/hslayers/components/layer-manager/editor/layer-editor-sub-layer-checkboxes.component.ts b/...s/hslayers/components/layer-manager/editor/layer-editor-sub-layer-checkboxes.component.ts
@@ -7,7 +7,7 @@ import {
 } from './layer-editor-sub-layer.service';
 import {
   HsLayerManagerService,
-  HsLayerManagerVisiblityService,
+  HsLayerManagerVisibilityService,
 } from 'hslayers-ng/shared/layer-manager';
 
 @Component({
@@ -22,7 +22,7 @@ export class HsLayerEditorSubLayerCheckboxesComponent implements OnInit {
   withChildren: KeyBooleanDict;
   constructor(
     public HsLayerEditorSublayerService: HsLayerEditorSublayerService,
-    public hsLayerManagerVisiblityService: HsLayerManagerVisiblityService,
+    public hsLayerManagerVisibilityService: HsLayerManagerVisibilityService,
     public HsLayerManagerService: HsLayerManagerService,
     private hsConfig: HsConfig,
   ) {}

diff --git a/projects/hslayers/components/layer-manager/editor/layer-editor-sub-layer.service.ts b/projects/hslayers/components/layer-manager/editor/layer-editor-sub-layer.service.ts
@@ -3,7 +3,7 @@ import {Injectable} from '@angular/core';
 import {HsLayerDescriptor} from 'hslayers-ng/types';
 import {
   HsLayerManagerService,
-  HsLayerManagerVisiblityService,
+  HsLayerManagerVisibilityService,
 } from 'hslayers-ng/shared/layer-manager';
 import {HsLayerSelectorService} from 'hslayers-ng/shared/layer-manager';
 import {HsLayerUtilsService} from 'hslayers-ng/shared/utils';
@@ -27,7 +27,7 @@ export class HsLayerEditorSublayerService {
     public HsLayerManagerService: HsLayerManagerService,
     private HsLayerUtilsService: HsLayerUtilsService,
     private hsLayerSelectorService: HsLayerSelectorService,
-    private hsLayerManagerVisiblityService: HsLayerManagerVisiblityService,
+    private hsLayerManagerVisibilityService: HsLayerManagerVisibilityService,
   ) {
     this.hsLayerSelectorService.layerSelected.subscribe((layer) => {
       this.resetSublayers(layer);
@@ -120,14 +120,14 @@ export class HsLayerEditorSublayerService {
       params.LAYERS = `show:${params.LAYERS}`;
     }
     if (params.LAYERS == '' || params.LAYERS == 'show:') {
-      this.hsLayerManagerVisiblityService.changeLayerVisibility(
+      this.hsLayerManagerVisibilityService.changeLayerVisibility(
         !layer.visible,
         layer,
       );
       return;
     }
     if (layer.visible == false) {
-      this.hsLayerManagerVisiblityService.changeLayerVisibility(
+      this.hsLayerManagerVisibilityService.changeLayerVisibility(
         !layer.visible,
         layer,
       );

diff --git a/projects/hslayers/components/layer-manager/gallery/layer-manager-gallery.component.html b/projects/hslayers/components/layer-manager/gallery/layer-manager-gallery.component.html
@@ -42,11 +42,11 @@
             </div>
             <div (click)="toggleBasemap()">
                 <div style="height: 4.5em; width: 100%; background: white"
-                    [ngClass]="{'active': !hsLayerManagerVisiblityService.baselayersVisible}"></div>
+                    [ngClass]="{'active': !hsLayerManagerVisibilityService.baselayersVisible}"></div>
                 <a class="dropdown-item flex-grow-1 d-flex align-items-center text-truncate"
-                    [ngClass]="{'active': !hsLayerManagerVisiblityService.baselayersVisible}">{{'LAYERMANAGER.baseMapGallery.noBaseMap'
+                    [ngClass]="{'active': !hsLayerManagerVisibilityService.baselayersVisible}">{{'LAYERMANAGER.baseMapGallery.noBaseMap'
                     | translateHs }}</a>
             </div>
         </div>
     </div>
-</div>
+</div>
diff --git a/projects/hslayers/components/layer-manager/gallery/layer-manager-gallery.component.ts b/projects/hslayers/components/layer-manager/gallery/layer-manager-gallery.component.ts
@@ -7,7 +7,7 @@ import {HsGuiOverlayBaseComponent} from 'hslayers-ng/common/panels';
 import {HsLayerDescriptor} from 'hslayers-ng/types';
 import {
   HsLayerManagerService,
-  HsLayerManagerVisiblityService,
+  HsLayerManagerVisibilityService,
   HsLayerSelectorService,
 } from 'hslayers-ng/shared/layer-manager';
 import {HsLayerUtilsService} from 'hslayers-ng/shared/utils';
@@ -32,7 +32,7 @@ export class HsLayerManagerGalleryComponent extends HsGuiOverlayBaseComponent {
     public hsLayerManagerService: HsLayerManagerService,
     private hsLayerSelectorService: HsLayerSelectorService,
     public hsLayerUtilsService: HsLayerUtilsService,
-    public hsLayerManagerVisiblityService: HsLayerManagerVisiblityService,
+    public hsLayerManagerVisibilityService: HsLayerManagerVisibilityService,
   ) {
     super(hsLayoutService);
   }
@@ -48,7 +48,7 @@ export class HsLayerManagerGalleryComponent extends HsGuiOverlayBaseComponent {
   toggleBasemap(layer?: HsLayerDescriptor): void {
     if (layer) {
       if (!layer.active) {
-        this.hsLayerManagerVisiblityService.changeBaseLayerVisibility(
+        this.hsLayerManagerVisibilityService.changeBaseLayerVisibility(
           true,
           layer,
         );
@@ -63,7 +63,10 @@ export class HsLayerManagerGalleryComponent extends HsGuiOverlayBaseComponent {
       this.dropdown.close();
       this.hsLayerSelectorService.currentLayer = null;
 
-      this.hsLayerManagerVisiblityService.changeBaseLayerVisibility(null, null);
+      this.hsLayerManagerVisibilityService.changeBaseLayerVisibility(
+        null,
+        null,
+      );
     }
   }
   expandMenu(layer: HsLayerDescriptor): void {

diff --git a/projects/hslayers/components/layer-manager/layer-manager.component.html b/projects/hslayers/components/layer-manager/layer-manager.component.html
@@ -54,7 +54,7 @@
                     </div>
                     <div class="p-0">
                         <button type="button" class="btn btn-sm hs-btn-baselayers" (click)="changeBaseLayerVisibility()"
-                            [ngClass]="hsLayerManagerVisiblityService.baselayersVisible ? 'hs-checkmark' : 'hs-uncheckmark'"></button>
+                            [ngClass]="hsLayerManagerVisibilityService.baselayersVisible ? 'hs-checkmark' : 'hs-uncheckmark'"></button>
                     </div>
                 </div>
             </li>
@@ -65,7 +65,7 @@
                     <div class="p-0">
                         <button type="button" class="btn btn-sm btn-light hs-lm-item-visibility"
                             (click)="changeBaseLayerVisibility($event, layer);"
-                            [ngClass]="(hsLayerManagerVisiblityService.baselayersVisible && layer.visible) ? 'hs-checkmark' : 'hs-uncheckmark'"></button>
+                            [ngClass]="(hsLayerManagerVisibilityService.baselayersVisible && layer.visible) ? 'hs-checkmark' : 'hs-uncheckmark'"></button>
                     </div>
                     <ng-template #abstractTooltip>
                         <span [innerHtml]="hsLayerManagerService.makeSafeAndTranslate('LAYERS', layer.abstract)"></span>
@@ -87,7 +87,7 @@
             </li>
         </ul>
 
-        <ul class="list-group hs-lm-baselayerlist" [hidden]="!(hsLayerManagerService.data.terrainlayers.length > 0)">
+        <ul class="list-group hs-lm-baselayerlist" [hidden]="!(hsLayerManagerService.data.terrainLayers.length > 0)">
             <li class="list-group-item hs-lm-item hs-lm-header clearfix list-group-item-primary">
                 <div class="d-flex">
                     <div class="p-0 flex-grow-1 hs-lm-item-title">
@@ -97,7 +97,7 @@
                 </div>
             </li>
             <li class="list-group-item hs-lm-item"
-                *ngFor="let layer of hsLayerManagerService.data.terrainlayers | filter:baselayerFilter"
+                *ngFor="let layer of hsLayerManagerService.data.terrainLayers | filter:baselayerFilter"
                 (click)="changeTerrainLayerVisibility($event, layer)" (mouseenter)="hovering=true"
                 (mouseleave)="hovering=false" [ngClass]="{'hovering': (hovering && !layer.active)}">
                 <div class="d-flex ">
@@ -108,7 +108,7 @@
                     </div> -->
                     <div class="p-0">
                         <button type="button" class="btn btn-sm btn-light hs-lm-item-visibility"
-                            [ngClass]="(hsLayerManagerVisiblityService.baselayersVisible && layer.visible) ? 'hs-checkmark' : 'hs-uncheckmark'"></button>
+                            [ngClass]="(hsLayerManagerVisibilityService.baselayersVisible && layer.visible) ? 'hs-checkmark' : 'hs-uncheckmark'"></button>
                     </div>
                     <ng-template #abstractTooltip>
                         <span [innerHtml]="hsLayerManagerService.makeSafeAndTranslate('LAYERS', layer.abstract)"></span>
@@ -167,4 +167,4 @@
             [hidden]="!hsLayerSelectorService.currentLayer" class="hs-layerpanel w-100">
         </hs-layer-editor>
     </div>
-</div>
+</div>
diff --git a/projects/hslayers/components/layer-manager/layer-manager.component.ts b/projects/hslayers/components/layer-manager/layer-manager.component.ts
@@ -21,7 +21,7 @@ import {HsLayerListService} from './logical-list/layer-manager-layerlist.service
 import {HsLayerManagerRemoveAllDialogComponent} from './dialogs/remove-all-dialog.component';
 import {
   HsLayerManagerService,
-  HsLayerManagerVisiblityService,
+  HsLayerManagerVisibilityService,
   HsLayerSelectorService,
 } from 'hslayers-ng/shared/layer-manager';
 import {HsLayerSynchronizerService} from 'hslayers-ng/shared/save-map';
@@ -135,7 +135,7 @@ export class HsLayerManagerComponent
     public hsSidebarService: HsSidebarService,
     private HsRemoveLayerDialogService: HsRemoveLayerDialogService,
     public hsLayerSelectorService: HsLayerSelectorService,
-    public hsLayerManagerVisiblityService: HsLayerManagerVisiblityService,
+    public hsLayerManagerVisibilityService: HsLayerManagerVisibilityService,
   ) {
     super(hsLayoutService);
     this.hsEventBusService.layerRemovals
@@ -195,21 +195,21 @@ export class HsLayerManagerComponent
   }
 
   changeBaseLayerVisibility(e?, layer?: Layer<Source>) {
-    return this.hsLayerManagerVisiblityService.changeBaseLayerVisibility(
+    return this.hsLayerManagerVisibilityService.changeBaseLayerVisibility(
       e,
       layer,
     );
   }
 
   changeTerrainLayerVisibility(e, layer: Layer<Source>) {
-    return this.hsLayerManagerVisiblityService.changeTerrainLayerVisibility(
+    return this.hsLayerManagerVisibilityService.changeTerrainLayerVisibility(
       e,
       layer,
     );
   }
 
   changeLayerVisibility(toWhat: boolean, layer: HsLayerDescriptor) {
-    return this.hsLayerManagerVisiblityService.changeLayerVisibility(
+    return this.hsLayerManagerVisibilityService.changeLayerVisibility(
       toWhat,
       layer,
     );
@@ -220,7 +220,7 @@ export class HsLayerManagerComponent
   }
 
   activateTheme(e) {
-    return this.hsLayerManagerVisiblityService.activateTheme(e);
+    return this.hsLayerManagerVisibilityService.activateTheme(e);
   }
 
   baselayerFilter = (item): boolean => {
@@ -235,7 +235,7 @@ export class HsLayerManagerComponent
   toggleVisibilityForAll(): void {
     this.allLayersVisible = !this.allLayersVisible;
     this.hsLayerManagerService.data.layers.forEach((l) => {
-      this.hsLayerManagerVisiblityService.changeLayerVisibility(
+      this.hsLayerManagerVisibilityService.changeLayerVisibility(
         this.allLayersVisible,
         l,
       );
@@ -302,7 +302,7 @@ export class HsLayerManagerComponent
    * @param layer - Selected layer
    */
   isLayerInResolutionInterval(layer: Layer<Source>): boolean {
-    return this.hsLayerManagerVisiblityService.isLayerInResolutionInterval(
+    return this.hsLayerManagerVisibilityService.isLayerInResolutionInterval(
       layer,
     );
   }

diff --git a/...cts/hslayers/components/layer-manager/logical-list/layer-manager-layerlist.component.html b/...cts/hslayers/components/layer-manager/logical-list/layer-manager-layerlist.component.html
@@ -8,7 +8,7 @@
                 <div class="p-0" [ngClass]="getExclusive(layer.layer) ? 'exclusive' : ''">
                     <!-- TODO: Remove function call from template -->
                     <button type="button" class="btn btn-sm btn-light hs-lm-item-visibility"
-                        (click)="hsLayerManagerVisiblityService.changeLayerVisibility(!layer.visible, layer);hsLayerListService.toggleSublayersVisibility(layer);$event.stopPropagation()"
+                        (click)="hsLayerManagerVisibilityService.changeLayerVisibility(!layer.visible, layer);hsLayerListService.toggleSublayersVisibility(layer);$event.stopPropagation()"
                         [ngClass]="layer.visible ? 'hs-checkmark' : 'hs-uncheckmark'"></button>
                 </div>
                 <ng-template #abstractTooltip>
@@ -62,4 +62,4 @@
             </hs-layer-manager-time-editor>
         </li>
     </ul>
-</div>
+</div>
diff --git a/projects/hslayers/components/layer-manager/logical-list/layer-manager-layerlist.component.ts b/projects/hslayers/components/layer-manager/logical-list/layer-manager-layerlist.component.ts
@@ -8,7 +8,7 @@ import {HsLayerDescriptor} from 'hslayers-ng/types';
 import {HsLayerListService} from './layer-manager-layerlist.service';
 import {
   HsLayerManagerService,
-  HsLayerManagerVisiblityService,
+  HsLayerManagerVisibilityService,
   HsLayerSelectorService,
 } from 'hslayers-ng/shared/layer-manager';
 import {HsLayerUtilsService} from 'hslayers-ng/shared/utils';
@@ -39,7 +39,7 @@ export class HsLayerListComponent implements OnInit, OnDestroy {
     public hsEventBusService: HsEventBusService,
     public hsLayerUtilsService: HsLayerUtilsService,
     public hsLayerListService: HsLayerListService,
-    public hsLayerManagerVisiblityService: HsLayerManagerVisiblityService,
+    public hsLayerManagerVisibilityService: HsLayerManagerVisibilityService,
   ) {
     this.layerManagerUpdatesSubscription =
       this.hsEventBusService.layerManagerUpdates.subscribe(() => {

diff --git a/projects/hslayers/shared/add-data/public-api.ts b/projects/hslayers/shared/add-data/public-api.ts
@@ -17,4 +17,4 @@ export * from './catalogue/catalogue-map.service';
 
 export * from './vector/vector.service';
 export * from './vector/vector-upload.service';
-export * from './vector/vector.utils.service';
+export * from './vector/vector-utils.service';
diff --git a/projects/hslayers/shared/add-data/vector/vector-upload.service.ts b/projects/hslayers/shared/add-data/vector/vector-upload.service.ts
@@ -7,7 +7,7 @@ import {PROJECTIONS as epsg4326Aliases} from 'ol/proj/epsg4326';
 import {HsLogService} from 'hslayers-ng/shared/log';
 import {HsMapService} from 'hslayers-ng/shared/map';
 
-import {HsAddDataVectorUtilsService} from './vector.utils.service';
+import {HsAddDataVectorUtilsService} from './vector-utils.service';
 
 @Injectable({
   providedIn: 'root',

diff --git a/...d/add-data/vector/vector.utils.service.ts → ...d/add-data/vector/vector-utils.service.ts b/...d/add-data/vector/vector.utils.service.ts → ...d/add-data/vector/vector-utils.service.ts
diff --git a/projects/hslayers/shared/add-data/vector/vector.service.ts b/projects/hslayers/shared/add-data/vector/vector.service.ts
@@ -24,7 +24,7 @@ import {
 } from 'hslayers-ng/common/layman';
 import {setDefinition} from 'hslayers-ng/common/extensions';
 
-import {HsAddDataVectorUtilsService} from './vector.utils.service';
+import {HsAddDataVectorUtilsService} from './vector-utils.service';
 import {HsVectorLayerOptions} from 'hslayers-ng/types';
 import {VectorLayerDescriptor} from 'hslayers-ng/types';
 import {VectorSourceDescriptor} from 'hslayers-ng/types';

diff --git a/projects/hslayers/shared/compositions/compositions-parser.service.ts b/projects/hslayers/shared/compositions/compositions-parser.service.ts
@@ -25,7 +25,7 @@ import {HsEventBusService} from 'hslayers-ng/shared/event-bus';
 import {HsLanguageService} from 'hslayers-ng/shared/language';
 import {
   HsLayerManagerService,
-  HsLayerManagerVisiblityService,
+  HsLayerManagerVisibilityService,
 } from 'hslayers-ng/shared/layer-manager';
 import {HsLayoutService} from 'hslayers-ng/shared/layout';
 import {HsLogService} from 'hslayers-ng/shared/log';
@@ -88,7 +88,7 @@ export class HsCompositionsParserService {
     private hsCommonLaymanService: HsCommonLaymanService,
     private hsLayerManagerService: HsLayerManagerService,
     private hsToastService: HsToastService,
-    private HsLayerManagerVisiblityService: HsLayerManagerVisiblityService,
+    private HsLayerManagerVisibilityService: HsLayerManagerVisibilityService,
   ) {
     /**
      * Composition opened -> request its descriptor
@@ -450,7 +450,7 @@ export class HsCompositionsParserService {
                   lyr,
                   true,
                 );
-              this.HsLayerManagerVisiblityService.changeBaseLayerVisibility(
+              this.HsLayerManagerVisibilityService.changeBaseLayerVisibility(
                 true,
                 layerDescriptor,
               );

diff --git a/projects/hslayers/shared/layer-manager/layer-manager-copy-layer.service.ts b/projects/hslayers/shared/layer-manager/layer-manager-copy-layer.service.ts
@@ -1,8 +1,8 @@
-import VectorLayer from 'ol/layer/Vector';
-import VectorSource from 'ol/source/Vector';
-import {Cluster} from 'ol/source';
 import {Injectable} from '@angular/core';
 
+import {Cluster, Vector as VectorSource} from 'ol/source';
+import {Vector as VectorLayer} from 'ol/layer';
+
 import {HsAddDataOwsService} from 'hslayers-ng/shared/add-data';
 import {HsLayerManagerUtilsService} from './layer-manager-utils.service';
 import {HsLayerSelectorService} from './layer-selector.service';

diff --git a/projects/hslayers/shared/layer-manager/layer-manager-utils.service.ts b/projects/hslayers/shared/layer-manager/layer-manager-utils.service.ts
@@ -1,11 +1,10 @@
 import {Injectable} from '@angular/core';
 import {Subject} from 'rxjs';
 
-import {Cluster, Source} from 'ol/source';
+import {Cluster, Source, Vector as VectorSource} from 'ol/source';
+import {GeoJSON} from 'ol/format';
 import {Layer} from 'ol/layer';
 
-import VectorSource from 'ol/source/Vector';
-import {GeoJSON} from 'ol/format';
 import {HsConfig} from 'hslayers-ng/config';
 import {HsLayerDescriptor} from 'hslayers-ng/types';
 import {HsLayerSelectorService} from './layer-selector.service';
@@ -47,7 +46,7 @@ export class HsLayerManagerUtilsService {
   }
 
   /**
-    Generates downloadable geoJSON for vector layer.
+    Generates downloadable GeoJSON for vector layer.
     Features are also transformed into the EPSG:4326 projection
   */
   saveGeoJson(): void {