@igo2/geo 16.0.2 → 16.1.1

package/lib/print/print-form/print-form.component.d.ts

@@ -1,11 +1,13 @@
 import { EventEmitter, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
+import { MediaService } from '@igo2/core';
 import { BehaviorSubject } from 'rxjs';
 import { PrintOptions } from '../shared/print.interface';
 import { PrintLegendPosition, PrintOrientation, PrintOutputFormat, PrintPaperFormat, PrintResolution, PrintSaveImageFormat } from '../shared/print.type';
 import * as i0 from "@angular/core";
 export declare class PrintFormComponent implements OnInit {
     private formBuilder;
+    private mediaService;
     form: UntypedFormGroup;
     outputFormats: {
         Pdf: "Pdf";
@@ -25,11 +27,7 @@ export declare class PrintFormComponent implements OnInit {
         landscape: "landscape";
         portrait: "portrait";
     };
-    resolutions: {
-        72: "72";
-        96: "96";
-        150: "150";
-    };
+    resolutions: ("72" | "96" | "150" | "300")[];
     imageFormats: {
         Bmp: "Bmp";
         Gif: "Gif";
@@ -88,7 +86,7 @@ export declare class PrintFormComponent implements OnInit {
     get legendPositionField(): UntypedFormControl;
     submit: EventEmitter<PrintOptions>;
     maxLength: number;
-    constructor(formBuilder: UntypedFormBuilder);
+    constructor(formBuilder: UntypedFormBuilder, mediaService: MediaService);
     ngOnInit(): void;
     handleFormSubmit(data: PrintOptions, isValid: boolean): void;
     toggleImageSaveProp(): void;

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

@@ -22,6 +22,7 @@ export declare class PrintService {
     nbFileToProcess: number;
     activityId: string;
     imgSizeAdded: Array<number>;
+    mapPrintExtent: Array<number>;
     TEXTPDFFONT: {
         titleFont: string;
         titleFontStyle: string;
@@ -33,7 +34,7 @@ export declare class PrintService {
     };
     constructor(http: HttpClient, messageService: MessageService, activityService: ActivityService, languageService: LanguageService, configService: ConfigService);
     print(map: IgoMap, options: PrintOptions): Subject<any>;
-    addGeoRef(doc: any, map: any, width: any, height: any, resolution: any, margins: any): void;
+    addGeoRef(doc: any, width: any, height: any, margins: any): void;
     /**
      * Add measure overlay on the map on the document when the measure layer is present
      * @param  doc - Pdf document where measure tooltip will be added

package/lib/print/shared/print.type.d.ts

@@ -19,12 +19,8 @@ export declare const PrintOrientation: {
     portrait: "portrait";
 };
 export type PrintOrientation = keyof typeof PrintOrientation;
-export declare const PrintResolution: {
-    72: "72";
-    96: "96";
-    150: "150";
-};
-export type PrintResolution = keyof typeof PrintResolution;
+export declare const PrintResolution: readonly ["72", "96", "150", "300"];
+export type PrintResolution = (typeof PrintResolution)[number];
 export declare const PrintSaveImageFormat: {
     Bmp: "Bmp";
     Gif: "Gif";

package/lib/search/search-results/search-results-add-button.component.d.ts

@@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { EntityStore } from '@igo2/common';
 import { MediaService } from '@igo2/core';
 import { BehaviorSubject } from 'rxjs';
-import { DataSourceService } from '../../datasource';
+import { DataSourceService } from '../../datasource/shared/datasource.service';
 import { Feature, FeatureStore } from '../../feature';
 import { LayerService } from '../../layer/shared/layer.service';
 import { IgoMap } from '../../map/shared/map';

package/lib/search/search-results/search-results-item.component.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from '@angular/core';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { SearchResult } from '../shared/search.interfaces';
 import * as i0 from "@angular/core";
 /**

package/lib/search/search-results/search-results.component.d.ts

@@ -3,7 +3,7 @@ import type { TemplateRef } from '@angular/core';
 import { EntityStoreWithStrategy } from '@igo2/common';
 import { ConfigService } from '@igo2/core';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { Research, SearchResult } from '../shared/search.interfaces';
 import { SearchService } from '../shared/search.service';
 import { SearchSource } from '../shared/sources/source';

package/lib/search/shared/search.interfaces.d.ts

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs';
 import { CommonVectorStyleOptions } from '../../style/shared/vector/vector-style.interface';
-import { ReverseSearchOptions, TextSearchOptions } from './sources';
 import { SearchSource } from './sources/source';
+import { ReverseSearchOptions, TextSearchOptions } from './sources/source.interfaces';
 export interface Research {
     request: Observable<SearchResult[]>;
     reverse: boolean;

package/lib/search/shared/sources/cadastre.d.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { LanguageService, StorageService } from '@igo2/core';
 import { Observable } from 'rxjs';
-import { Feature } from '../../../feature';
+import { Feature } from '../../../feature/shared/feature.interfaces';
 import { SearchResult, TextSearch } from '../search.interfaces';
 import { SearchSource } from './source';
 import { SearchSourceOptions, TextSearchOptions } from './source.interfaces';

package/lib/search/shared/sources/coordinates.d.ts

@@ -1,6 +1,6 @@
 import { LanguageService, StorageService } from '@igo2/core';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { Feature } from '../../../feature';
+import { Feature } from '../../../feature/shared/feature.interfaces';
 import { Projection } from '../../../map/shared/projection.interfaces';
 import { ReverseSearch, SearchResult } from '../search.interfaces';
 import { SearchSource } from './source';

package/lib/search/shared/sources/icherche.d.ts

@@ -2,7 +2,7 @@ import { HttpClient, HttpParameterCodec } from '@angular/common/http';
 import { Injector } from '@angular/core';
 import { LanguageService, StorageService } from '@igo2/core';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { Feature } from '../../../feature';
+import { Feature } from '../../../feature/shared/feature.interfaces';
 import { ReverseSearch, SearchResult, TextSearch } from '../search.interfaces';
 import { SearchSource } from './source';
 import { ReverseSearchOptions, SearchSourceOptions, TextSearchOptions } from './source.interfaces';

package/lib/search/shared/sources/icherche.interfaces.d.ts

@@ -1,4 +1,4 @@
-import { FeatureGeometry } from '../../../feature';
+import { FeatureGeometry } from '../../../feature/shared/feature.interfaces';
 export interface IChercheData {
     index: string;
     geometry: FeatureGeometry;

package/lib/search/shared/sources/nominatim.d.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { StorageService } from '@igo2/core';
 import { Observable } from 'rxjs';
-import { Feature } from '../../../feature';
+import { Feature } from '../../../feature/shared/feature.interfaces';
 import { SearchResult, TextSearch } from '../search.interfaces';
 import { SearchSource } from './source';
 import { SearchSourceOptions, TextSearchOptions } from './source.interfaces';

package/lib/search/shared/sources/source.d.ts

@@ -1,6 +1,6 @@
 import { Workspace } from '@igo2/common';
 import { StorageService } from '@igo2/core';
-import { FeatureStore } from '../../../feature';
+import { FeatureStore } from '../../../feature/shared/store';
 import { ISearchSourceParams, SearchSourceOptions, SearchSourceSettings } from './source.interfaces';
 /**
  * Base search source class

package/lib/search/shared/sources/storedqueries.d.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { LanguageService, StorageService } from '@igo2/core';
 import { Observable } from 'rxjs';
-import { Feature } from '../../../feature';
+import { Feature } from '../../../feature/shared/feature.interfaces';
 import { ReverseSearch, SearchResult, TextSearch } from '../search.interfaces';
 import { SearchSource } from './source';
 import { ReverseSearchOptions, SearchSourceOptions, TextSearchOptions } from './source.interfaces';

package/lib/search/shared/sources/storedqueries.interfaces.d.ts

@@ -1,4 +1,4 @@
-import { FeatureGeometry } from '../../../feature';
+import { FeatureGeometry } from '../../../feature/shared/feature.interfaces';
 import { SearchSourceOptions } from './source.interfaces';
 export interface StoredQueriesSearchSourceOptions extends SearchSourceOptions {
     storedquery_id: string;

package/lib/search/shared/sources/workspace.d.ts

@@ -1,6 +1,6 @@
 import { LanguageService, StorageService } from '@igo2/core';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { Feature } from '../../../feature';
+import { Feature } from '../../../feature/shared/feature.interfaces';
 import { SearchResult, TextSearch } from '../search.interfaces';
 import { SearchSource } from './source';
 import { SearchSourceOptions, TextSearchOptions } from './source.interfaces';

package/lib/utils/id-generator.d.ts

@@ -1,4 +1,4 @@
-import { WFSDataSourceOptions } from '../datasource';
+import { WFSDataSourceOptions } from '../datasource/shared/datasources';
 import { AnyDataSourceOptions } from '../datasource/shared/datasources/any-datasource.interface';
 import { DataSourceOptions } from '../datasource/shared/datasources/datasource.interface';
 import { WMSDataSourceOptions } from '../datasource/shared/datasources/wms-datasource.interface';

package/lib/workspace/shared/edition-workspace.d.ts

@@ -7,10 +7,10 @@ import type { default as OlGeometry } from 'ol/geom/Geometry';
 import * as OlStyle from 'ol/style';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { RelationOptions } from '../../datasource/shared';
-import { GeometryType } from '../../draw';
-import { DrawControl } from '../../geometry';
+import { GeometryType } from '../../draw/shared';
+import { DrawControl } from '../../geometry/shared';
 import { ImageLayer, VectorLayer } from '../../layer/shared';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 export interface EditionWorkspaceOptions extends WorkspaceOptions {
     layer: ImageLayer | VectorLayer;
     map: IgoMap;

package/lib/workspace/shared/edition-workspace.service.d.ts

@@ -5,7 +5,7 @@ import { ConfigService, MessageService, StorageService } from '@igo2/core';
 import GeoJSON from 'ol/format/GeoJSON';
 import WKT from 'ol/format/WKT';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { RelationOptions } from '../../datasource';
+import { RelationOptions } from '../../datasource/shared/datasources';
 import { ImageLayer, LayerService, VectorLayer } from '../../layer/shared';
 import { IgoMap, MapBase } from '../../map/shared';
 import { StyleService } from '../../style/style-service/style.service';

package/lib/workspace/shared/feature-workspace.d.ts

@@ -1,7 +1,7 @@
 import { Workspace, WorkspaceOptions } from '@igo2/common';
 import { BehaviorSubject } from 'rxjs';
 import { VectorLayer } from '../../layer/shared';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 export interface FeatureWorkspaceOptions extends WorkspaceOptions {
     layer: VectorLayer;
     map: IgoMap;

package/lib/workspace/shared/feature-workspace.service.d.ts

@@ -1,8 +1,8 @@
 import { ConfigService, StorageService } from '@igo2/core';
 import { BehaviorSubject } from 'rxjs';
-import { CapabilitiesService } from '../../datasource';
+import { CapabilitiesService } from '../../datasource/shared/capabilities.service';
 import { LayerService, VectorLayer } from '../../layer/shared';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { PropertyTypeDetectorService } from '../../utils/propertyTypeDetector/propertyTypeDetector.service';
 import { FeatureWorkspace } from './feature-workspace';
 import * as i0 from "@angular/core";

package/lib/workspace/shared/wfs-workspace.d.ts

@@ -1,7 +1,7 @@
 import { Workspace, WorkspaceOptions } from '@igo2/common';
 import { BehaviorSubject } from 'rxjs';
 import { VectorLayer } from '../../layer/shared';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 export interface WfsWorkspaceOptions extends WorkspaceOptions {
     layer: VectorLayer;
     map: IgoMap;

package/lib/workspace/shared/wfs-workspace.service.d.ts

@@ -1,8 +1,8 @@
 import { ConfigService, StorageService } from '@igo2/core';
 import { BehaviorSubject } from 'rxjs';
-import { CapabilitiesService } from '../../datasource';
+import { CapabilitiesService } from '../../datasource/shared/capabilities.service';
 import { LayerService, VectorLayer } from '../../layer/shared';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { PropertyTypeDetectorService } from '../../utils/propertyTypeDetector';
 import { WfsWorkspace } from './wfs-workspace';
 import * as i0 from "@angular/core";

package/lib/workspace/shared/wms-workspace.service.d.ts

@@ -1,8 +1,8 @@
 import { ConfigService, StorageService } from '@igo2/core';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { CapabilitiesService } from '../../datasource';
+import { CapabilitiesService } from '../../datasource/shared/capabilities.service';
 import { ImageLayer, LayerService } from '../../layer/shared';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { StyleService } from '../../style/style-service/style.service';
 import { PropertyTypeDetectorService } from '../../utils/propertyTypeDetector/propertyTypeDetector.service';
 import { WfsWorkspace } from './wfs-workspace';

package/lib/workspace/shared/workspace.utils.d.ts

@@ -1,7 +1,7 @@
 import { EntityRecord, EntityStoreFilterCustomFuncStrategy, EntityTableButton, EntityTableColumnRenderer, Workspace } from '@igo2/common';
 import { Observable } from 'rxjs';
 import { Feature } from '../../feature/shared/feature.interfaces';
-import { LayerService, VectorLayer } from '../../layer';
+import { LayerService, VectorLayer } from '../../layer/shared';
 import { IgoMap } from '../../map/shared/map';
 import { FeatureWorkspace } from './feature-workspace';
 import { WfsWorkspace } from './wfs-workspace';

package/lib/workspace/workspace-selector/workspace-selector.directive.d.ts

@@ -1,7 +1,7 @@
 import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { WorkspaceSelectorComponent, WorkspaceStore } from '@igo2/common';
 import { ImageLayer, VectorLayer } from '../../layer/shared';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { EditionWorkspaceService } from '../shared/edition-workspace.service';
 import { FeatureWorkspaceService } from '../shared/feature-workspace.service';
 import { WfsWorkspaceService } from '../shared/wfs-workspace.service';

package/lib/workspace/workspace-updator/workspace-updator.directive.d.ts

@@ -1,6 +1,6 @@
 import { OnDestroy, OnInit } from '@angular/core';
 import type { WorkspaceStore } from '@igo2/common';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { EditionWorkspaceService } from '../shared/edition-workspace.service';
 import { FeatureWorkspaceService } from '../shared/feature-workspace.service';
 import { WfsWorkspaceService } from '../shared/wfs-workspace.service';

package/locale/en.geo.json

@@ -510,7 +510,8 @@
             "cadastre": "Cadastre",
             "restArea": "Rest area",
             "cycleStop": "Cycle stop",
-            "cultpatri": "Culture and heritage"
+            "cultpatri": "Culture and heritage",
+            "unites":"Unit number"
           },
           "restrictExtent": {
             "map": "Map extent",
@@ -673,7 +674,8 @@
         "palais-justice": "Courthouses",
         "penitencier-fed": "Federal penitentiaries",
         "penitencier-prov": "Provincial penitentiaries",
-        "polices": "Police station"
+        "polices": "Police station",
+        "unites":"Unit number"
       },
       "measure": {
         "dialog": {
@@ -813,4 +815,4 @@
       }
     }
   }
-}
+}

package/locale/fr.geo.json

@@ -510,7 +510,8 @@
             "cadastre": "Cadastre",
             "restArea": "Halte routière",
             "cycleStop": "Halte cyclable",
-            "cultpatri": "Culture et patrimoine"
+            "cultpatri": "Culture et patrimoine",
+            "unites":"Numéro d'unite"
           },
           "restrictExtent": {
             "map": "Étendue de la carte",
@@ -674,7 +675,8 @@
         "palais-justice": "Palais de justice",
         "penitencier-fed": "Pénitenciers fédéraux",
         "penitencier-prov": "Pénitenciers provinciaux",
-        "polices": "Poste de police"
+        "polices": "Poste de police",
+        "unites":"Numéro d'unite"
       },
       "measure": {
         "dialog": {
@@ -814,4 +816,4 @@
       }
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "16.0.2",
+  "version": "16.1.1",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [
@@ -16,30 +16,30 @@
     "url": "https://github.com/infra-geo-ouverte/igo2-lib/issues"
   },
   "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "esm2022": "./esm2022/igo2-geo.mjs",
+      "esm": "./esm2022/igo2-geo.mjs",
+      "default": "./fesm2022/igo2-geo.mjs"
+    },
     "./style": {
       "sass": "./style/style.scss"
     },
     "./theming": {
-      "sass": "./geo-theme.scss"
+      "sass": "./src/geo-theme.scss"
     },
     "./package.json": {
       "default": "./package.json"
-    },
-    ".": {
-      "types": "./index.d.ts",
-      "esm2022": "./esm2022/igo2-geo.mjs",
-      "esm": "./esm2022/igo2-geo.mjs",
-      "default": "./fesm2022/igo2-geo.mjs"
     }
   },
   "dependencies": {
-    "ts-cacheable": "^1.0.6",
-    "ts-md5": "^1.3.0",
     "@turf/helpers": "^6.5.0",
     "@turf/line-intersect": "^6.5.0",
     "@turf/point-on-feature": "^6.5.0",
-    "tslib": "^2.6.0",
     "nosleep.js": "^0.12.0",
+    "ts-cacheable": "^1.0.6",
+    "ts-md5": "^1.3.0",
+    "tslib": "^2.6.0",
     "windows-1252": "^3.0.4"
   },
   "peerDependencies": {
@@ -49,32 +49,29 @@
     "@angular/forms": "^16.2.5",
     "@angular/material": "^16.2.4",
     "@angular/platform-browser": "^16.2.5",
-    "@igo2/common": "^16.0.2",
-    "@igo2/core": "^16.0.2",
-    "@igo2/utils": "^16.0.2",
+    "@igo2/common": "^16.1.1",
+    "@igo2/core": "^16.1.1",
+    "@igo2/utils": "^16.1.1",
     "@mat-datetimepicker/core": "~12.0.0",
-    "flexsearch": "0.7.21",
-    "ol": "^7.5.2",
-    "ol-mapbox-style": "^12.0.0",
-    "proj4": "^2.9.0",
-    "rxjs": "^7.8.0",
-    "striptags": "^3.2.0",
-    "ngx-indexed-db": "^11.0.2"
-  },
-  "optionalDependencies": {
     "file-saver": "^2.0.2",
+    "flexsearch": "0.7.21",
     "html2canvas": "^1.4.1",
     "jspdf": "^2.5.1",
+    "jspdf-autotable": "^3.5.29",
     "jszip": "^3.10.1",
-    "moment": "^2.29.4"
+    "moment": "^2.29.4",
+    "ngx-color-picker": "^14.0.0",
+    "ngx-indexed-db": "^11.0.2",
+    "ol-mapbox-style": "^12.0.0",
+    "ol": "^7.5.2",
+    "proj4": "^2.9.0",
+    "rxjs": "^7.8.0",
+    "striptags": "^3.2.0"
   },
   "engines": {
     "node": ">=18.10.0"
   },
   "module": "fesm2022/igo2-geo.mjs",
   "typings": "index.d.ts",
-  "sideEffects": false,
-  "scripts": {
-
-  }
-}
+  "sideEffects": false
+}

package/{lib → src/lib}/search/search-bar/search-bar.theming.scss

@@ -37,5 +37,6 @@
 
   igo-search-bar {
     @include mat.form-field-density($theme);
+    @include mat.icon-button-density($theme);
   }
 }

package/src/style/style.scss

@@ -0,0 +1 @@
+@import 'ol/ol';