chore(*): formatting

infra-geo-ouverte · Oct 19, 2023 · d500cbb · d500cbb
1 parent de068e2
commit d500cbb
Show file tree

Hide file tree

Showing 22 changed files with 88 additions and 73 deletions.
diff --git a/demo/src/environments/environment.prod.ts b/demo/src/environments/environment.prod.ts
@@ -1,5 +1,5 @@
-import { EnvironmentOptions } from '@igo2/integration';
 import { CatalogQueryFormatTypes, ICatalog, TooltipType } from '@igo2/geo';
+import { EnvironmentOptions } from '@igo2/integration';
 
 export const environment: EnvironmentOptions = {
   production: true,

diff --git a/demo/src/environments/environment.ts b/demo/src/environments/environment.ts
@@ -1,5 +1,5 @@
+import { CatalogQueryFormatTypes, ICatalog, TooltipType } from '@igo2/geo';
 import { EnvironmentOptions } from '@igo2/integration';
-import { TooltipType, CatalogQueryFormatTypes, ICatalog } from '@igo2/geo';
 
 export const environment: EnvironmentOptions = {
   production: false,
@@ -296,7 +296,7 @@ export const environment: EnvironmentOptions = {
         order: 2,
         enabled: true,
         params: {
-          limit: '8',
+          limit: '8'
         },
         showAdvancedSettings: true
       },

diff --git a/packages/auth/src/lib/shared/admin.guard.ts b/packages/auth/src/lib/shared/admin.guard.ts
@@ -7,8 +7,8 @@ import {
 
 import { ConfigService } from '@igo2/core';
 
-import { AuthService } from './auth.service';
 import { AuthOptions } from './auth.interface';
+import { AuthService } from './auth.service';
 
 @Injectable({
   providedIn: 'root'

diff --git a/packages/auth/src/lib/shared/auth.guard.ts b/packages/auth/src/lib/shared/auth.guard.ts
@@ -7,8 +7,8 @@ import {
 
 import { ConfigService } from '@igo2/core';
 
-import { AuthService } from './auth.service';
 import { AuthOptions } from './auth.interface';
+import { AuthService } from './auth.service';
 
 @Injectable({
   providedIn: 'root'

diff --git a/packages/auth/src/lib/shared/auth.interceptor.ts b/packages/auth/src/lib/shared/auth.interceptor.ts
@@ -12,12 +12,12 @@ import { ConfigService } from '@igo2/core';
 import { Observable } from 'rxjs';
 import { Md5 } from 'ts-md5';
 
-import { TokenService } from './token.service';
 import {
   AuthByKeyOptions,
   AuthOptions,
   WithCredentialsOptions
 } from './auth.interface';
+import { TokenService } from './token.service';
 
 @Injectable({
   providedIn: 'root'

diff --git a/packages/auth/src/lib/shared/logged.guard.ts b/packages/auth/src/lib/shared/logged.guard.ts
@@ -7,8 +7,8 @@ import {
 
 import { ConfigService } from '@igo2/core';
 
-import { AuthService } from './auth.service';
 import { AuthOptions } from './auth.interface';
+import { AuthService } from './auth.service';
 
 @Injectable({
   providedIn: 'root'

diff --git a/packages/auth/src/lib/shared/profils.guard.ts b/packages/auth/src/lib/shared/profils.guard.ts
@@ -9,8 +9,8 @@ import { ConfigService } from '@igo2/core';
 
 import { map } from 'rxjs/operators';
 
-import { AuthService } from './auth.service';
 import { AuthOptions } from './auth.interface';
+import { AuthService } from './auth.service';
 
 @Injectable({
   providedIn: 'root'

diff --git a/packages/common/src/lib/color-picker-form-field/color-picker-form-field.module.ts b/packages/common/src/lib/color-picker-form-field/color-picker-form-field.module.ts
@@ -1,12 +1,13 @@
+import { OverlayModule } from '@angular/cdk/overlay';
+import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
-import { CommonModule } from '@angular/common';
-import { OverlayModule } from '@angular/cdk/overlay';
-import { ColorChromeModule } from 'ngx-color/chrome';
-import { MatButtonModule } from '@angular/material/button';
+
 import { TranslateModule } from '@ngx-translate/core';
+import { ColorChromeModule } from 'ngx-color/chrome';
 
 import { ColorPickerFormFieldComponent } from './color-picker-form-field.component';
 

diff --git a/packages/context/src/lib/environment/environment.interface.ts b/packages/context/src/lib/environment/environment.interface.ts
@@ -1,6 +1,7 @@
+import { AuthOptions } from '@igo2/auth';
 import { ImportExportServiceOptions } from '@igo2/geo';
+
 import { ContextServiceOptions } from '../context-manager';
-import { AuthOptions } from '@igo2/auth';
 
 export interface EnvironmentOptions {
   auth?: AuthOptions;

diff --git a/packages/core/src/lib/message/shared/message.service.ts b/packages/core/src/lib/message/shared/message.service.ts
@@ -313,7 +313,7 @@ export class MessageService {
         if (k) {
           const value = titleInterpolateParams[k];
           translatedTitlenterpolateParams[k] =
-            typeof value === "string"
+            typeof value === 'string'
               ? this.languageService.translate.instant(value)
               : value;
         }

diff --git a/packages/geo/src/lib/catalog/shared/catalog.interface.ts b/packages/geo/src/lib/catalog/shared/catalog.interface.ts
@@ -3,7 +3,11 @@ import { EntityState } from '@igo2/common';
 import { TooltipType } from '../../layer';
 import { QueryFormat } from '../../query';
 import { MetadataLayerOptions } from './../../metadata/shared/metadata.interface';
-import { CatalogItemType, CatalogQueryFormatTypes, TypeCatalogStrings } from './catalog.enum';
+import {
+  CatalogItemType,
+  CatalogQueryFormatTypes,
+  TypeCatalogStrings
+} from './catalog.enum';
 
 export interface AddedChangeEmitter {
   added: boolean;

diff --git a/packages/geo/src/lib/datasource/shared/datasources/wms-wfs.utils.ts b/packages/geo/src/lib/datasource/shared/datasources/wms-wfs.utils.ts
@@ -1,10 +1,10 @@
+import { Extent } from 'ol/extent';
 import * as OlFormat from 'ol/format';
 import olFormatGML2 from 'ol/format/GML2';
 import olFormatGML3 from 'ol/format/GML3';
 import olFormatGML32 from 'ol/format/GML32';
 import olFormatOSMXML from 'ol/format/OSMXML';
 import olProjection from 'ol/proj/Projection';
-import { Extent } from 'ol/extent';
 
 import { OgcFilterWriter } from '../../../filter/shared/ogc-filter';
 import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';

diff --git a/packages/geo/src/lib/environment/environment.interface.ts b/packages/geo/src/lib/environment/environment.interface.ts
@@ -1,4 +1,6 @@
 import { DOMOptions, DepotOptions } from '@igo2/common';
+
+import { CatalogServiceOptions } from '../catalog';
 import { OptionsApiOptions } from '../datasource';
 import { DirectionsSourceOptions } from '../directions';
 import { DrawOptions } from '../draw/shared/draw.interface';
@@ -15,7 +17,6 @@ import {
   StoredQueriesSearchSourceOptions
 } from '../search';
 import { OverlayStyleOptions } from '../style';
-import { CatalogServiceOptions } from '../catalog';
 
 export interface EnvironmentOptions {
   catalog?: CatalogServiceOptions;

diff --git a/packages/geo/src/lib/filter/shared/ogc-filter.ts b/packages/geo/src/lib/filter/shared/ogc-filter.ts
@@ -1,5 +1,6 @@
 import { ObjectUtils, uuid } from '@igo2/utils';
 
+import { Extent } from 'ol/extent';
 import olFormatWFS, { WriteGetFeatureOptions } from 'ol/format/WFS';
 import olFormatWKT from 'ol/format/WKT';
 import * as olfilter from 'ol/format/filter';
@@ -21,7 +22,6 @@ import {
   OgcSelectorBundle,
   SelectorGroup
 } from './ogc-filter.interface';
-import { Extent } from 'ol/extent';
 
 export class OgcFilterWriter {
   private filterSequence: OgcInterfaceFilterOptions[] = [];

diff --git a/packages/geo/src/lib/search/shared/sources/icherche.ts b/packages/geo/src/lib/search/shared/sources/icherche.ts
@@ -309,38 +309,39 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
             }
           ]
         } satisfies SearchSourceSettings,
-        showAdvancedParams && {
-          type: 'radiobutton',
-          title: 'ecmax',
-          name: 'ecmax',
-          values: [
-            {
-              title: '10 %',
-              value: 10,
-              enabled: ecmax === 10
-            },
-            {
-              title: '30 %',
-              value: 30,
-              enabled: ecmax === 30 || !ecmax
-            },
-            {
-              title: '50 %',
-              value: 50,
-              enabled: ecmax === 50
-            },
-            {
-              title: '75 %',
-              value: 75,
-              enabled: ecmax === 75
-            },
-            {
-              title: '100 %',
-              value: 100,
-              enabled: ecmax === 100
-            }
-          ]
-        } satisfies SearchSourceSettings,
+        showAdvancedParams &&
+          ({
+            type: 'radiobutton',
+            title: 'ecmax',
+            name: 'ecmax',
+            values: [
+              {
+                title: '10 %',
+                value: 10,
+                enabled: ecmax === 10
+              },
+              {
+                title: '30 %',
+                value: 30,
+                enabled: ecmax === 30 || !ecmax
+              },
+              {
+                title: '50 %',
+                value: 50,
+                enabled: ecmax === 50
+              },
+              {
+                title: '75 %',
+                value: 75,
+                enabled: ecmax === 75
+              },
+              {
+                title: '100 %',
+                value: 100,
+                enabled: ecmax === 100
+              }
+            ]
+          } satisfies SearchSourceSettings),
         {
           type: 'radiobutton',
           title: 'restrictExtent',

diff --git a/packages/geo/src/lib/workspace/shared/feature-workspace.service.ts b/packages/geo/src/lib/workspace/shared/feature-workspace.service.ts
@@ -19,14 +19,17 @@ import {
 import { LayerService, VectorLayer } from '../../layer/shared';
 import { GeoWorkspaceOptions } from '../../layer/shared/layers/layer.interface';
 import { IgoMap } from '../../map/shared';
+import {
+  FeatureCommonVectorStyleOptions,
+  OverlayStyleOptions
+} from '../../style';
 import { getCommonVectorSelectedStyle } from '../../style/shared/vector/commonVectorStyle';
 import { PropertyTypeDetectorService } from '../../utils/propertyTypeDetector/propertyTypeDetector.service';
 import { FeatureWorkspace } from './feature-workspace';
 import {
   createFilterInMapExtentOrResolutionStrategy,
   createTableTemplate
 } from './workspace.utils';
-import { FeatureCommonVectorStyleOptions, OverlayStyleOptions } from '../../style';
 
 @Injectable({
   providedIn: 'root'

diff --git a/packages/geo/src/lib/workspace/shared/wfs-workspace.service.ts b/packages/geo/src/lib/workspace/shared/wfs-workspace.service.ts
@@ -18,14 +18,17 @@ import {
 import { LayerService, VectorLayer } from '../../layer/shared';
 import { GeoWorkspaceOptions } from '../../layer/shared/layers/layer.interface';
 import { IgoMap } from '../../map/shared';
+import {
+  FeatureCommonVectorStyleOptions,
+  OverlayStyleOptions
+} from '../../style';
 import { getCommonVectorSelectedStyle } from '../../style/shared/vector/commonVectorStyle';
 import { PropertyTypeDetectorService } from '../../utils/propertyTypeDetector';
 import { WfsWorkspace } from './wfs-workspace';
 import {
   createFilterInMapExtentOrResolutionStrategy,
   createTableTemplate
 } from './workspace.utils';
-import { FeatureCommonVectorStyleOptions, OverlayStyleOptions } from '../../style';
 
 @Injectable({
   providedIn: 'root'

diff --git a/packages/geo/src/lib/workspace/shared/wms-workspace.service.ts b/packages/geo/src/lib/workspace/shared/wms-workspace.service.ts
@@ -29,17 +29,17 @@ import { GeoWorkspaceOptions } from '../../layer/shared/layers/layer.interface';
 import { IgoMap } from '../../map/shared';
 import { QueryableDataSourceOptions } from '../../query/shared/query.interfaces';
 import { getCommonVectorSelectedStyle } from '../../style/shared/vector/commonVectorStyle';
+import {
+  FeatureCommonVectorStyleOptions,
+  OverlayStyleOptions
+} from '../../style/shared/vector/vector-style.interface';
 import { StyleService } from '../../style/style-service/style.service';
 import { PropertyTypeDetectorService } from '../../utils/propertyTypeDetector/propertyTypeDetector.service';
 import { WfsWorkspace } from './wfs-workspace';
 import {
   createFilterInMapExtentOrResolutionStrategy,
   createTableTemplate
 } from './workspace.utils';
-import {
-  FeatureCommonVectorStyleOptions,
-  OverlayStyleOptions
-} from '../../style/shared/vector/vector-style.interface';
 
 @Injectable({
   providedIn: 'root'

diff --git a/packages/geo/src/locale/en.geo.json b/packages/geo/src/locale/en.geo.json
@@ -645,14 +645,14 @@
         "geographie": "Natural sites",
         "parc": "Parks",
         "secteur": "Sector",
-        "sites-archeologiques":"Complete archaeological sites (centroid and reservation)",
-        "sites-archeologiques-partiel-s":"Archaeological sites - surface area (partial)",
-        "zones-inf-archeologique":"Archaeological information zones",
-        "grille-borden":"Grille borden",
-        "immeubles-patrimoniaux":"Heritage buildings (classified and cited)",
-        "immeubles-patrimoniaux-s":"Protected land and protection area (of listed heritage buildings)",
-        "sites-patrimoniaux-declares":"Heritage sites (classified, declared, national)",
-        "sites-patrimoniaux":"Heritage sites cited",
+        "sites-archeologiques": "Complete archaeological sites (centroid and reservation)",
+        "sites-archeologiques-partiel-s": "Archaeological sites - surface area (partial)",
+        "zones-inf-archeologique": "Archaeological information zones",
+        "grille-borden": "Grille borden",
+        "immeubles-patrimoniaux": "Heritage buildings (classified and cited)",
+        "immeubles-patrimoniaux-s": "Protected land and protection area (of listed heritage buildings)",
+        "sites-patrimoniaux-declares": "Heritage sites (classified, declared, national)",
+        "sites-patrimoniaux": "Heritage sites cited",
         "service-garde": "Child care",
         "public": "Public schools",
         "prive": "Private school",

diff --git a/packages/geo/src/locale/fr.geo.json b/packages/geo/src/locale/fr.geo.json
@@ -646,14 +646,14 @@
         "geographie": "Lieux naturels",
         "parc": "Parcs",
         "secteur": "Secteurs",
-        "sites-archeologiques":"Sites archéologiques complet (centroide et réservation)",
-        "sites-archeologiques-partiel-s":"Sites archéologiques - surfacique (partiel)",
-        "zones-inf-archeologique":"Zones d'information archéologiques",
-        "grille-borden":"Grille borden",
-        "immeubles-patrimoniaux":"Immeubles patrimoniaux (classés et cités)",
-        "immeubles-patrimoniaux-s":"Terrain protégé et aire de protection (d'immeuble patrimoniaux classé)",
-        "sites-patrimoniaux-declares":"Sites patrimoniaux (classés,déclarés,nationaux)",
-        "sites-patrimoniaux":"Sites patrimoniaux cités",
+        "sites-archeologiques": "Sites archéologiques complet (centroide et réservation)",
+        "sites-archeologiques-partiel-s": "Sites archéologiques - surfacique (partiel)",
+        "zones-inf-archeologique": "Zones d'information archéologiques",
+        "grille-borden": "Grille borden",
+        "immeubles-patrimoniaux": "Immeubles patrimoniaux (classés et cités)",
+        "immeubles-patrimoniaux-s": "Terrain protégé et aire de protection (d'immeuble patrimoniaux classé)",
+        "sites-patrimoniaux-declares": "Sites patrimoniaux (classés,déclarés,nationaux)",
+        "sites-patrimoniaux": "Sites patrimoniaux cités",
         "service-garde": "Services de garde",
         "public": "Écoles publiques",
         "prive": "Écoles privées",

diff --git a/packages/integration/src/lib/about/about-tool/about-tool.component.ts b/packages/integration/src/lib/about/about-tool/about-tool.component.ts
@@ -7,6 +7,7 @@ import { ConfigService, LanguageService, version } from '@igo2/core';
 
 import { of } from 'rxjs';
 import type { Observable } from 'rxjs';
+
 import { AllEnvironmentOptions } from '../../environment';
 
 @ToolComponent({

diff --git a/packages/integration/src/lib/environment/environment.interface.ts b/packages/integration/src/lib/environment/environment.interface.ts
@@ -1,6 +1,6 @@
 import { EnvironmentOptions as AuthEnvironmentOptions } from '@igo2/auth';
-import { EnvironmentOptions as ContextEnvironmentOptions } from '@igo2/context';
 import { EnvironmentOptions as CommonEnvironmentOptions } from '@igo2/common';
+import { EnvironmentOptions as ContextEnvironmentOptions } from '@igo2/context';
 import {
   BaseEnvironmentOptions,
   EnvironmentOptions as CoreEnvironmentOptions