@igo2/geo 16.0.0-rc.1 → 16.0.0-rc.2

package/geo-theme.scss

@@ -1,21 +1,23 @@
-@use './lib/directions/directions.theming.scss' as directions-theme;
-@use './lib/draw/draw.theming.scss' as draw-theme;
-@use './lib/feature/feature.theming.scss' as feature-theme;
-@use './lib/filter/filter.theming.scss' as filter-theme;
-@use './lib/layer/layer.theming.scss' as layer-theme;
-@use './lib/map/map.theming.scss' as map-theme;
-@use './lib/measure/measure.theming.scss' as measure-theme;
-@use './lib/search/search.theming.scss' as search;
-@use './lib/workspace/workspace.theming.scss' as workspace-theme;
-
-@mixin geo-component-themes($theme) {
-  @include directions-theme.igo-directions-theming($theme);
-  @include draw-theme.igo-draw-theming($theme);
-  @include feature-theme.igo-feature-theming($theme);
-  @include filter-theme.igo-filter-theming($theme);
-  @include layer-theme.igo-layer-theming($theme);
-  @include map-theme.igo-map-theming($theme);
-  @include measure-theme.igo-measure-theming($theme);
-  @include search.theme($theme);
-  @include workspace-theme.igo-workspace-theming($theme);
-}
+@use './lib/directions/directions.theming.scss' as directions-theme;
+@use './lib/draw/draw.theming.scss' as draw-theme;
+@use './lib/feature/feature.theming.scss' as feature-theme;
+@use './lib/filter/filter.theming.scss' as filter-theme;
+@use './lib/layer/layer.theming.scss' as layer-theme;
+@use './lib/map/map.theming.scss' as map-theme;
+@use './lib/measure/measure.theming.scss' as measure-theme;
+@use './lib/search/search.theming.scss' as search-theme;
+@use './lib/workspace/workspace.theming.scss' as workspace-theme;
+@use './lib/catalog/catalog.theming.scss' as catalog-theme;
+
+@mixin geo-component-themes($theme) {
+  @include directions-theme.igo-directions-theming($theme);
+  @include draw-theme.igo-draw-theming($theme);
+  @include feature-theme.igo-feature-theming($theme);
+  @include filter-theme.igo-filter-theming($theme);
+  @include layer-theme.igo-layer-theming($theme);
+  @include map-theme.igo-map-theming($theme);
+  @include measure-theme.igo-measure-theming($theme);
+  @include search-theme.theme($theme);
+  @include workspace-theme.igo-workspace-theming($theme);
+  @include catalog-theme.themes($theme);
+}

package/lib/catalog/catalog-browser/catalog-browser-group.component.d.ts

@@ -1,9 +1,9 @@
-import { EventEmitter, OnInit, OnDestroy } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
+import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { EntityStore } from '@igo2/common';
 import type { EntityStateManager } from '@igo2/common';
-import { AddedChangeEmitter, AddedChangeGroupEmitter, Catalog, CatalogItem, CatalogItemGroup, CatalogItemState } from '../shared';
+import { BehaviorSubject } from 'rxjs';
 import { IgoMap } from '../../map/shared';
+import { AddedChangeEmitter, AddedChangeGroupEmitter, Catalog, CatalogItem, CatalogItemGroup, CatalogItemState } from '../shared';
 import * as i0 from "@angular/core";
 /**
  * Catalog browser group item

package/lib/catalog/catalog-browser/catalog-browser-layer.component.d.ts

@@ -1,9 +1,9 @@
-import { EventEmitter, OnInit, OnDestroy } from '@angular/core';
-import { AddedChangeEmitter, CatalogItemLayer } from '../shared';
+import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { LayerService } from '../../layer/shared/layer.service';
 import { Layer } from '../../layer/shared/layers';
 import { IgoMap } from '../../map/shared';
+import { AddedChangeEmitter, CatalogItemLayer } from '../shared';
 import * as i0 from "@angular/core";
 /**
  * Catalog browser layer item

package/lib/catalog/catalog-browser/catalog-browser.component.d.ts

@@ -1,9 +1,9 @@
-import { ChangeDetectorRef, OnInit, OnDestroy } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
+import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
 import { EntityStore } from '@igo2/common';
+import { BehaviorSubject } from 'rxjs';
 import { LayerService } from '../../layer/shared/layer.service';
 import { IgoMap } from '../../map/shared';
-import { Catalog, CatalogItem, CatalogItemState, AddedChangeEmitter, AddedChangeGroupEmitter } from '../shared';
+import { AddedChangeEmitter, AddedChangeGroupEmitter, Catalog, CatalogItem, CatalogItemState } from '../shared';
 import * as i0 from "@angular/core";
 /**
  * Component to browse a catalog's groups and layers and display them on a map.

package/lib/catalog/catalog-browser/catalog-browser.theming.scss

@@ -0,0 +1,22 @@
+@use 'sass:map';
+@use '@angular/material' as mat;
+
+@mixin theme($theme) {
+  @include density($theme);
+}
+
+@mixin density($theme) {
+  $density: mat.get-density-config($theme);
+
+  $theme: map.merge(
+    $theme,
+    (
+      density: $density - 2
+    )
+  );
+
+  igo-catalog-browser {
+    @include mat.icon-button-density($theme);
+    @include mat.list-density($theme);
+  }
+}

package/lib/catalog/catalog-library/add-catalog-dialog.component.d.ts

@@ -1,9 +1,9 @@
-import { LanguageService, ConfigService } from '@igo2/core';
-import { OnInit, OnDestroy } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
+import { OnDestroy, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { BehaviorSubject } from 'rxjs';
+import { MatDialogRef } from '@angular/material/dialog';
 import { EntityStore } from '@igo2/common';
+import { ConfigService, LanguageService } from '@igo2/core';
+import { BehaviorSubject } from 'rxjs';
 import { Catalog } from '../shared/catalog.abstract';
 import * as i0 from "@angular/core";
 export declare class AddCatalogDialogComponent implements OnInit, OnDestroy {

package/lib/catalog/catalog-library/catalog-library.component.d.ts

@@ -1,4 +1,4 @@
-import { EventEmitter, OnInit, OnDestroy } from '@angular/core';
+import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { EntityStore } from '@igo2/common';
 import { MessageService, StorageService } from '@igo2/core';

package/lib/catalog/catalog.theming.scss

@@ -0,0 +1,5 @@
+@use './catalog-browser/catalog-browser.theming.scss' as catalog-browser;
+
+@mixin themes($theme) {
+  @include catalog-browser.theme($theme);
+}

package/lib/catalog/shared/catalog.abstract.d.ts

@@ -1,9 +1,9 @@
 import { Observable } from 'rxjs';
-import { TooltipType } from '../../layer/shared';
 import { TimeFilterOptions } from '../../filter/shared';
+import { TooltipType } from '../../layer/shared';
 import { QueryFormat, QueryHtmlTarget } from '../../query/shared';
-import { ICatalog, CatalogItem, CatalogItemGroup } from './catalog.interface';
 import { TypeCatalogStrings } from './catalog.enum';
+import { CatalogItem, CatalogItemGroup, ICatalog } from './catalog.interface';
 export declare abstract class Catalog implements ICatalog {
     id: string;
     title: string;

package/lib/catalog/shared/catalog.enum.d.ts

@@ -1,3 +1,7 @@
+import { QueryFormat } from '../../query/shared/query.enums';
+export type CatalogQueryFormatTypes = {
+    [key in QueryFormat]: string | string[];
+};
 export declare enum CatalogItemType {
     Layer = "layer",
     Group = "group"

package/lib/catalog/shared/catalog.interface.d.ts

@@ -1,8 +1,8 @@
 import { EntityState } from '@igo2/common';
-import { MetadataLayerOptions } from './../../metadata/shared/metadata.interface';
 import { TooltipType } from '../../layer';
 import { QueryFormat } from '../../query';
-import { CatalogItemType, TypeCatalogStrings } from './catalog.enum';
+import { MetadataLayerOptions } from './../../metadata/shared/metadata.interface';
+import { CatalogItemType, CatalogQueryFormatTypes, TypeCatalogStrings } from './catalog.enum';
 export interface AddedChangeEmitter {
     added: boolean;
     layer: CatalogItemLayer;
@@ -28,7 +28,7 @@ export interface ICatalog {
     regFilters?: string[];
     groupImpose?: CatalogItemGroup;
     groupSeparator?: string;
-    queryFormat?: QueryFormat;
+    queryFormat?: QueryFormat | CatalogQueryFormatTypes;
     queryParams?: {
         [key: string]: string;
     };
@@ -48,7 +48,7 @@ export interface ForcedProperty {
     metadataAbstractAll?: string;
     metadataUrlAll?: string;
 }
-export interface ICompositeCatalog extends ICatalog {
+export interface ICompositeCatalog extends Omit<ICatalog, 'url'> {
     composite: ICatalog[];
 }
 export interface CatalogItem {
@@ -69,8 +69,13 @@ export interface CatalogItemState extends EntityState {
     added?: boolean;
 }
 export interface CatalogServiceOptions {
+    /** @deprecated Use baselayers instead*/
     baseLayers?: boolean;
+    baselayers?: boolean;
+    /** @deprecated Not used anymore*/
+    emailAddress?: string;
+    url?: string;
     sources?: (ICatalog | ICompositeCatalog)[];
+    /** @deprecated Use url instead */
     sourcesUrl?: string;
-    emailAddress?: string;
 }

package/lib/catalog/shared/catalog.service.d.ts

@@ -1,9 +1,9 @@
 import { HttpClient } from '@angular/common/http';
+import { ConfigService, LanguageService, MessageService } from '@igo2/core';
 import { Observable } from 'rxjs';
-import { LanguageService, MessageService, ConfigService } from '@igo2/core';
 import { CapabilitiesService } from '../../datasource';
-import { CatalogItem, CatalogItemGroup } from './catalog.interface';
 import { Catalog } from './catalog.abstract';
+import { CatalogItem, CatalogItemGroup } from './catalog.interface';
 import * as i0 from "@angular/core";
 export declare class CatalogService {
     private http;

package/lib/datasource/shared/capabilities.service.d.ts

@@ -1,8 +1,8 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { MapService } from '../../map/shared/map.service';
-import { WMTSDataSourceOptions, WMSDataSourceOptions, CartoDataSourceOptions, ArcGISRestDataSourceOptions, TileArcGISRestDataSourceOptions, ArcGISRestImageDataSourceOptions } from './datasources';
 import { LegendOptions } from '../../layer/shared/layers/legend.interface';
+import { MapService } from '../../map/shared/map.service';
+import { ArcGISRestDataSourceOptions, ArcGISRestImageDataSourceOptions, CartoDataSourceOptions, TileArcGISRestDataSourceOptions, WMSDataSourceOptions, WMTSDataSourceOptions } from './datasources';
 import * as i0 from "@angular/core";
 export declare enum TypeCapabilities {
     wms = "wms",

package/lib/datasource/shared/datasource.service.d.ts

@@ -1,11 +1,11 @@
-import { Observable, BehaviorSubject } from 'rxjs';
-import { CapabilitiesService } from './capabilities.service';
-import { OptionsService } from './options/options.service';
-import { WFSService } from './datasources/wfs.service';
-import { DataSource, AnyDataSourceOptions } from './datasources';
+import { AuthInterceptor } from '@igo2/auth';
 import { LanguageService, MessageService } from '@igo2/core';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { ProjectionService } from '../../map/shared/projection.service';
-import { AuthInterceptor } from '@igo2/auth';
+import { CapabilitiesService } from './capabilities.service';
+import { AnyDataSourceOptions, DataSource } from './datasources';
+import { WFSService } from './datasources/wfs.service';
+import { OptionsService } from './options/options.service';
 import * as i0 from "@angular/core";
 export declare class DataSourceService {
     private capabilitiesService;

package/lib/datasource/shared/datasources/any-datasource.d.ts

@@ -1,16 +1,16 @@
+import { ArcGISRestDataSource } from './arcgisrest-datasource';
+import { CartoDataSource } from './carto-datasource';
+import { ClusterDataSource } from './cluster-datasource';
 import { DataSource } from './datasource';
-import { OSMDataSource } from './osm-datasource';
-import { XYZDataSource } from './xyz-datasource';
-import { WMSDataSource } from './wms-datasource';
-import { WMTSDataSource } from './wmts-datasource';
-import { WFSDataSource } from './wfs-datasource';
 import { FeatureDataSource } from './feature-datasource';
-import { CartoDataSource } from './carto-datasource';
-import { ArcGISRestDataSource } from './arcgisrest-datasource';
-import { TileArcGISRestDataSource } from './tilearcgisrest-datasource';
-import { WebSocketDataSource } from './websocket-datasource';
+import { ImageArcGISRestDataSource } from './imagearcgisrest-datasource';
 import { MVTDataSource } from './mvt-datasource';
-import { ClusterDataSource } from './cluster-datasource';
+import { OSMDataSource } from './osm-datasource';
+import { TileArcGISRestDataSource } from './tilearcgisrest-datasource';
 import { TileDebugDataSource } from './tiledebug-datasource';
-import { ImageArcGISRestDataSource } from './imagearcgisrest-datasource';
+import { WebSocketDataSource } from './websocket-datasource';
+import { WFSDataSource } from './wfs-datasource';
+import { WMSDataSource } from './wms-datasource';
+import { WMTSDataSource } from './wmts-datasource';
+import { XYZDataSource } from './xyz-datasource';
 export type AnyDataSource = DataSource | OSMDataSource | FeatureDataSource | WFSDataSource | XYZDataSource | TileDebugDataSource | WMTSDataSource | WMSDataSource | CartoDataSource | ArcGISRestDataSource | ImageArcGISRestDataSource | TileArcGISRestDataSource | WebSocketDataSource | MVTDataSource | ClusterDataSource;

package/lib/datasource/shared/datasources/any-datasource.interface.d.ts

@@ -1,15 +1,15 @@
+import { ArcGISRestDataSourceOptions } from './arcgisrest-datasource.interface';
+import { CartoDataSourceOptions } from './carto-datasource.interface';
+import { ClusterDataSourceOptions } from './cluster-datasource.interface';
 import { DataSourceOptions } from './datasource.interface';
-import { OSMDataSourceOptions } from './osm-datasource.interface';
-import { XYZDataSourceOptions } from './xyz-datasource.interface';
-import { WMSDataSourceOptions } from './wms-datasource.interface';
-import { WMTSDataSourceOptions } from './wmts-datasource.interface';
-import { WFSDataSourceOptions } from './wfs-datasource.interface';
 import { FeatureDataSourceOptions } from './feature-datasource.interface';
-import { CartoDataSourceOptions } from './carto-datasource.interface';
-import { ArcGISRestDataSourceOptions } from './arcgisrest-datasource.interface';
-import { TileArcGISRestDataSourceOptions } from './tilearcgisrest-datasource.interface';
+import { ArcGISRestImageDataSourceOptions } from './imagearcgisrest-datasource.interface';
 import { MVTDataSourceOptions } from './mvt-datasource.interface';
-import { ClusterDataSourceOptions } from './cluster-datasource.interface';
+import { OSMDataSourceOptions } from './osm-datasource.interface';
+import { TileArcGISRestDataSourceOptions } from './tilearcgisrest-datasource.interface';
 import { TileDebugDataSourceOptions } from './tiledebug-datasource.interface';
-import { ArcGISRestImageDataSourceOptions } from './imagearcgisrest-datasource.interface';
+import { WFSDataSourceOptions } from './wfs-datasource.interface';
+import { WMSDataSourceOptions } from './wms-datasource.interface';
+import { WMTSDataSourceOptions } from './wmts-datasource.interface';
+import { XYZDataSourceOptions } from './xyz-datasource.interface';
 export type AnyDataSourceOptions = DataSourceOptions | OSMDataSourceOptions | FeatureDataSourceOptions | WFSDataSourceOptions | XYZDataSourceOptions | TileDebugDataSourceOptions | WMTSDataSourceOptions | WMSDataSourceOptions | CartoDataSourceOptions | ArcGISRestDataSourceOptions | ArcGISRestImageDataSourceOptions | TileArcGISRestDataSourceOptions | MVTDataSourceOptions | ClusterDataSourceOptions;

package/lib/datasource/shared/datasources/arcgisrest-datasource.d.ts

@@ -1,8 +1,8 @@
-import olSourceVector from 'ol/source/Vector';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
+import olSourceVector from 'ol/source/Vector';
+import { ArcGISRestDataSourceOptions } from './arcgisrest-datasource.interface';
 import { DataSource } from './datasource';
 import { Legend } from './datasource.interface';
-import { ArcGISRestDataSourceOptions } from './arcgisrest-datasource.interface';
 export declare class ArcGISRestDataSource extends DataSource {
     ol: olSourceVector<OlGeometry>;
     options: ArcGISRestDataSourceOptions;

package/lib/datasource/shared/datasources/carto-datasource.d.ts

@@ -1,7 +1,7 @@
 import olSourceCarto from 'ol/source/CartoDB';
+import { CartoDataSourceOptions } from './carto-datasource.interface';
 import { DataSource } from './datasource';
 import { Legend } from './datasource.interface';
-import { CartoDataSourceOptions } from './carto-datasource.interface';
 export declare class CartoDataSource extends DataSource {
     ol: olSourceCarto;
     options: CartoDataSourceOptions;

package/lib/datasource/shared/datasources/cluster-datasource.d.ts

@@ -1,6 +1,6 @@
 import olSourceCluster from 'ol/source/Cluster';
-import { FeatureDataSource } from './feature-datasource';
 import { ClusterDataSourceOptions } from './cluster-datasource.interface';
+import { FeatureDataSource } from './feature-datasource';
 export declare class ClusterDataSource extends FeatureDataSource {
     options: ClusterDataSourceOptions;
     ol: olSourceCluster;

package/lib/datasource/shared/datasources/cluster-datasource.interface.d.ts

@@ -1,5 +1,5 @@
-import olSourceVector from 'ol/source/Vector';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
+import olSourceVector from 'ol/source/Vector';
 import { FeatureDataSourceOptions } from './feature-datasource.interface';
 export interface ClusterDataSourceOptions extends FeatureDataSourceOptions {
     distance?: number;

package/lib/datasource/shared/datasources/datasource.d.ts

@@ -1,10 +1,10 @@
+import type { default as OlGeometry } from 'ol/geom/Geometry';
+import olClusterSource from 'ol/source/Cluster';
 import olSource from 'ol/source/Source';
 import olVectorSource from 'ol/source/Vector';
-import olClusterSource from 'ol/source/Cluster';
-import type { default as OlGeometry } from 'ol/geom/Geometry';
-import { DataSourceOptions, Legend } from './datasource.interface';
-import { DataService } from './data.service';
 import { LegendMapViewOptions, LegendOptions } from '../../../layer/shared/layers/legend.interface';
+import { DataService } from './data.service';
+import { DataSourceOptions, Legend } from './datasource.interface';
 export declare abstract class DataSource {
     options: DataSourceOptions;
     protected dataService?: DataService;

package/lib/datasource/shared/datasources/datasource.interface.d.ts

@@ -1,8 +1,8 @@
+import type { Type } from 'ol/geom/Geometry';
 import olSource from 'ol/source/Source';
+import { Encoders, Preset, Tokenizer } from 'flexsearch';
 import { DownloadOptions } from '../../../download/shared/download.interface';
 import { OgcFilterOperatorType } from '../../../filter/shared/ogc-filter.enum';
-import type { Type } from 'ol/geom/Geometry';
-import { Encoders, Preset, Tokenizer } from 'flexsearch';
 export interface DataSourceOptions {
     type?: 'wms' | 'wfs' | 'vector' | 'wmts' | 'xyz' | 'osm' | 'tiledebug' | 'carto' | 'arcgisrest' | 'imagearcgisrest' | 'tilearcgisrest' | 'websocket' | 'mvt' | 'cluster';
     optionsFromCapabilities?: boolean;

package/lib/datasource/shared/datasources/feature-datasource.d.ts

@@ -1,5 +1,5 @@
-import olSourceVector from 'ol/source/Vector';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
+import olSourceVector from 'ol/source/Vector';
 import { DataSource } from './datasource';
 import { FeatureDataSourceOptions } from './feature-datasource.interface';
 export declare class FeatureDataSource extends DataSource {

package/lib/datasource/shared/datasources/feature-datasource.interface.d.ts

@@ -1,8 +1,8 @@
-import olSourceVector from 'ol/source/Vector';
 import olFeature from 'ol/Feature';
 import olFormatFeature from 'ol/format/Feature';
-import olSource from 'ol/source/Source';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
+import olSource from 'ol/source/Source';
+import olSourceVector from 'ol/source/Vector';
 import { DataSourceOptions } from './datasource.interface';
 export interface FeatureDataSourceOptions extends DataSourceOptions {
     formatType?: string;

package/lib/datasource/shared/datasources/imagearcgisrest-datasource.interface.d.ts

@@ -1,5 +1,5 @@
-import ImageArcGISRest from 'ol/source/ImageArcGISRest';
 import olAttribution from 'ol/control/Attribution';
+import ImageArcGISRest from 'ol/source/ImageArcGISRest';
 import { DataSourceOptions } from './datasource.interface';
 export interface ArcGISRestImageDataSourceOptions extends DataSourceOptions {
     queryPrecision?: number;

package/lib/datasource/shared/datasources/tiledebug-datasource.interface.d.ts

@@ -1,5 +1,5 @@
-import { DataSourceOptions, TileGridOptions } from './datasource.interface';
 import TileDebug from 'ol/source/TileDebug';
+import { DataSourceOptions, TileGridOptions } from './datasource.interface';
 export interface TileDebugDataSourceOptions extends DataSourceOptions {
     projection?: string;
     wrapX?: boolean;

package/lib/datasource/shared/datasources/websocket-datasource.d.ts

@@ -1,5 +1,5 @@
-import olSourceVector from 'ol/source/Vector';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
+import olSourceVector from 'ol/source/Vector';
 import { FeatureDataSource } from './feature-datasource';
 import { WebSocketDataSourceOptions } from './websocket-datasource.interface';
 export declare class WebSocketDataSource extends FeatureDataSource {

package/lib/datasource/shared/datasources/wfs-datasource.d.ts

@@ -1,16 +1,15 @@
-import olSourceVector from 'ol/source/Vector';
+import { AuthInterceptor } from '@igo2/auth';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
+import olSourceVector from 'ol/source/Vector';
+import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
 import { DataSource } from './datasource';
 import { WFSDataSourceOptions } from './wfs-datasource.interface';
 import { WFSService } from './wfs.service';
-import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
-import { AuthInterceptor } from '@igo2/auth';
 export declare class WFSDataSource extends DataSource {
     options: WFSDataSourceOptions;
     protected wfsService: WFSService;
     private authInterceptor?;
     ol: olSourceVector<OlGeometry>;
-    mostRecentIdCallOGCFilter: number;
     set ogcFilters(value: OgcFiltersOptions);
     get ogcFilters(): OgcFiltersOptions;
     constructor(options: WFSDataSourceOptions, wfsService: WFSService, authInterceptor?: AuthInterceptor);

package/lib/datasource/shared/datasources/wfs-datasource.interface.d.ts

@@ -1,6 +1,6 @@
-import olSourceVector from 'ol/source/Vector';
-import olSource from 'ol/source/Source';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
+import olSource from 'ol/source/Source';
+import olSourceVector from 'ol/source/Vector';
 import { FeatureDataSourceOptions } from './feature-datasource.interface';
 export interface WFSDataSourceOptions extends FeatureDataSourceOptions {
     params: WFSDataSourceOptionsParams;

package/lib/datasource/shared/datasources/wfs.service.d.ts

@@ -1,8 +1,8 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { DataService } from './data.service';
 import { WFSDataSourceOptions } from './wfs-datasource.interface';
 import { WMSDataSourceOptions } from './wms-datasource.interface';
-import { DataService } from './data.service';
 import * as i0 from "@angular/core";
 export declare class WFSService extends DataService {
     private http;

package/lib/datasource/shared/datasources/wms-datasource.d.ts

@@ -1,12 +1,12 @@
 import olSourceImageWMS from 'ol/source/ImageWMS';
+import { BehaviorSubject } from 'rxjs';
+import { TimeFilterOptions } from '../../../filter';
+import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
+import { LegendMapViewOptions } from '../../../layer/shared/layers/legend.interface';
 import { DataSource } from './datasource';
 import { Legend } from './datasource.interface';
-import { TimeFilterableDataSourceOptions, WMSDataSourceOptions } from './wms-datasource.interface';
 import { WFSService } from './wfs.service';
-import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
-import { LegendMapViewOptions } from '../../../layer/shared/layers/legend.interface';
-import { BehaviorSubject } from 'rxjs';
-import { TimeFilterOptions } from '../../../filter';
+import { TimeFilterableDataSourceOptions, WMSDataSourceOptions } from './wms-datasource.interface';
 export interface TimeFilterableDataSource extends WMSDataSource {
     options: TimeFilterableDataSourceOptions;
     timeFilter$: BehaviorSubject<TimeFilterOptions>;

package/lib/datasource/shared/datasources/wms-datasource.interface.d.ts

@@ -1,10 +1,10 @@
+import type { default as OlGeometry } from 'ol/geom/Geometry';
 import olSource from 'ol/source/Source';
 import olSourceVector from 'ol/source/Vector';
-import type { default as OlGeometry } from 'ol/geom/Geometry';
 import type { ServerType } from 'ol/source/wms';
+import { TimeFilterOptions } from '../../../filter';
 import { DataSourceOptions } from './datasource.interface';
 import { WFSDataSourceOptionsParams } from './wfs-datasource.interface';
-import { TimeFilterOptions } from '../../../filter';
 export interface WMSDataSourceOptions extends DataSourceOptions {
     paramsWFS?: WFSDataSourceOptionsParams;
     urlWfs?: string;

package/lib/datasource/shared/datasources/wms-wfs.utils.d.ts

@@ -1,7 +1,8 @@
+import olProjection from 'ol/proj/Projection';
+import { Extent } from 'ol/extent';
+import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
 import { WFSDataSourceOptions } from './wfs-datasource.interface';
 import { WMSDataSourceOptions } from './wms-datasource.interface';
-import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
-import olProjection from 'ol/proj/Projection';
 export declare const defaultEpsg = "EPSG:3857";
 export declare const defaultMaxFeatures = 5000;
 export declare const defaultWfsVersion = "2.0.0";
@@ -16,7 +17,7 @@ export declare const jsonRegex: RegExp;
  * @param ogcFilters  OgcFiltersOptions
  * @returns A string representing the datasource options, based on filter and views
  */
-export declare function buildUrl(options: WFSDataSourceOptions, extent: any, proj: olProjection, ogcFilters: OgcFiltersOptions, randomParam?: boolean): string;
+export declare function buildUrl(options: WFSDataSourceOptions, extent: Extent, proj: olProjection, ogcFilters: OgcFiltersOptions, randomParam?: boolean): string;
 /**
  * This method build/standardize WFS call query params based on the layer property.
  * @param wfsDataSourceOptions  WFSDataSourceOptions The common wfs datasource options interface

package/lib/datasource/shared/options/options-api.providers.d.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { ConfigService } from '@igo2/core';
-import { OptionsService } from './options.service';
 import { OptionsApiService } from './options-api.service';
+import { OptionsService } from './options.service';
 export declare function optionsApiFactory(http: HttpClient, configService: ConfigService): OptionsApiService;
 export declare function provideOptionsApi(): {
     provide: typeof OptionsService;

package/lib/datasource/shared/options/options-api.service.d.ts

@@ -1,8 +1,8 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { ArcGISRestDataSourceOptions, ArcGISRestImageDataSourceOptions, TileArcGISRestDataSourceOptions, WMSDataSourceOptions } from '../datasources';
-import { OptionsService } from './options.service';
 import { OptionsApiOptions } from './options-api.interface';
+import { OptionsService } from './options.service';
 import * as i0 from "@angular/core";
 export declare class OptionsApiService extends OptionsService {
     private http;

package/lib/directions/directions-buttons/directions-buttons.component.d.ts

@@ -1,8 +1,8 @@
 import { LanguageService, MessageService, RouteService } from '@igo2/core';
-import { Subject, BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { DirectionsService } from '../shared';
 import { FeatureWithDirection } from '../shared/directions.interface';
 import { RoutesFeatureStore, StepFeatureStore, StopsStore } from '../shared/store';
-import { DirectionsService } from '../shared';
 import * as i0 from "@angular/core";
 export declare class DirectionsButtonsComponent {
     private languageService;

package/lib/directions/directions-inputs/directions-inputs.component.d.ts

@@ -1,10 +1,10 @@
-import { EventEmitter, OnDestroy } from '@angular/core';
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
-import { Stop } from '../shared/directions.interface';
+import { EventEmitter, OnDestroy } from '@angular/core';
 import { MatAutocomplete } from '@angular/material/autocomplete';
 import { MatOption } from '@angular/material/core';
-import { StopsFeatureStore, StopsStore } from '../shared/store';
 import { LanguageService } from '@igo2/core';
+import { Stop } from '../shared/directions.interface';
+import { StopsFeatureStore, StopsStore } from '../shared/store';
 import * as i0 from "@angular/core";
 export declare class DirectionsInputsComponent implements OnDestroy {
     private languageService;

package/lib/directions/directions-sources/directions-source.interface.d.ts

@@ -1,11 +1,15 @@
-export interface DirectionsSourceOptions {
-    url?: string;
-    reverseUrl?: string;
-    limit?: number;
+export interface DirectionsSourceOptions extends BaseDirectionsSourceOptions {
+    osrm?: OsrmDirectionsSourceOptions;
+    logo?: string;
+}
+export type OsrmDirectionsSourceOptions = BaseDirectionsSourceOptions;
+interface BaseDirectionsSourceOptions {
+    distance?: number;
     enabled?: boolean;
+    limit?: number;
+    logo?: string;
+    reverseUrl?: string;
     type?: string;
-    distance?: number;
-}
-export interface DirectionsSourcesOptions {
-    osrm?: DirectionsSourceOptions;
+    url?: string;
 }
+export {};

package/lib/directions/directions-sources/osrm-directions-source.d.ts

@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs';
 import { ConfigService } from '@igo2/core';
+import { Observable } from 'rxjs';
 import { Direction, DirectionOptions } from '../shared/directions.interface';
 import { DirectionsSource } from './directions-source';
 import * as i0 from "@angular/core";

package/lib/directions/directions.component.d.ts

@@ -1,12 +1,12 @@
 import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
 import { LanguageService } from '@igo2/core';
 import * as olInteraction from 'ol/interaction';
-import { Stop } from './shared/directions.interface';
 import { Subject } from 'rxjs';
-import { DirectionsService } from './shared/directions.service';
+import { QueryService } from '../query/shared/query.service';
 import { SearchService } from '../search/shared/search.service';
+import { Stop } from './shared/directions.interface';
+import { DirectionsService } from './shared/directions.service';
 import { RoutesFeatureStore, StepFeatureStore, StopsFeatureStore, StopsStore } from './shared/store';
-import { QueryService } from '../query/shared/query.service';
 import * as i0 from "@angular/core";
 export declare class DirectionsComponent implements OnInit, OnDestroy {
     private cdRef;