Merge branches 'next' and 'master' of https://github.com/infra-geo-ou…

…verte/igo2-lib into next
infra-geo-ouverte · Nov 7, 2023 · 5bdacf5 · 5bdacf5
2 parents f0e6d9d + b6fa888
commit 5bdacf5
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [16.0.2](https://github.com/infra-geo-ouverte/igo2-lib/compare/v16.0.1...v16.0.2) (2023-11-07)
+
+
+### Bug Fixes
+
+* **geo:** print - remove 300 PPI resolution ([#1489](https://github.com/infra-geo-ouverte/igo2-lib/issues/1489)) ([2f728da](https://github.com/infra-geo-ouverte/igo2-lib/commit/2f728da83036bb17e6a72a5b6f08a97e8b771d46))
+
+
+
 ## [16.0.1](https://github.com/infra-geo-ouverte/igo2-lib/compare/v16.0.0...v16.0.1) (2023-11-06)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "packages/*",
     "projects/*"
   ],
-  "version": "16.0.1",
+  "version": "16.0.2",
   "description": "IGO Library",
   "author": "IGO Community",
   "license": "MIT",

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/auth",
-  "version": "16.0.1",
+  "version": "16.0.2",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/common",
-  "version": "16.0.1",
+  "version": "16.0.2",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [

diff --git a/packages/context/package.json b/packages/context/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/context",
-  "version": "16.0.1",
+  "version": "16.0.2",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/core",
-  "version": "16.0.1",
+  "version": "16.0.2",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [

diff --git a/packages/core/src/lib/config/version.ts b/packages/core/src/lib/config/version.ts
@@ -6,6 +6,6 @@ export interface Version {
 }
 
 export const version: Version = {
-  lib: '16.0.1',
-  releaseDate: 1699287709018
+  lib: '16.0.2',
+  releaseDate: 1699370754368
 };
diff --git a/packages/geo/package.json b/packages/geo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "16.0.1",
+  "version": "16.0.2",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [

diff --git a/packages/geo/src/lib/print/print-form/print-form.component.html b/packages/geo/src/lib/print/print-form/print-form.component.html
@@ -181,7 +181,11 @@
 
   <div class="igo-input-container">
     <mat-form-field>
-      <mat-label>{{ 'igo.geo.printForm.resolution' | translate }}</mat-label>
+      <mat-label
+        >{{ 'igo.geo.printForm.resolution' | translate }} ({{
+          'igo.geo.printForm.resolutionUnit' | translate
+        }})</mat-label
+      >
       <mat-select
         formControlName="resolution"
         placeholder="{{ 'igo.geo.printForm.resolution' | translate }}"
@@ -190,7 +194,7 @@
           *ngFor="let resolution of resolutions | keyvalue"
           [value]="resolution.key"
         >
-          {{ resolution.value + ' PPI' }}
+          {{ resolution.value }}
         </mat-option>
       </mat-select>
     </mat-form-field>

diff --git a/packages/geo/src/lib/print/shared/print.type.ts b/packages/geo/src/lib/print/shared/print.type.ts
@@ -19,7 +19,7 @@ export type PrintPaperFormat = keyof typeof PrintPaperFormat;
 export const PrintOrientation = strEnum(['landscape', 'portrait']);
 export type PrintOrientation = keyof typeof PrintOrientation;
 
-export const PrintResolution = strEnum(['72', '96', '150', '300']);
+export const PrintResolution = strEnum(['72', '96', '150']); // For now, we remove the 300 dpi because there is too much instability on iOS and slow device.
 export type PrintResolution = keyof typeof PrintResolution;
 
 export const PrintSaveImageFormat = strEnum([

diff --git a/packages/geo/src/locale/en.geo.json b/packages/geo/src/locale/en.geo.json
@@ -330,6 +330,7 @@
         "portrait": "Portrait",
         "projection": "Projection",
         "resolution": "Resolution",
+        "resolutionUnit": "PPI",
         "saveBtn": "Save",
         "scale": "Scale",
         "showProjection": "Show projection",

diff --git a/packages/geo/src/locale/fr.geo.json b/packages/geo/src/locale/fr.geo.json
@@ -330,6 +330,7 @@
         "portrait": "Portrait",
         "projection": "Projection",
         "resolution": "Résolution",
+        "resolutionUnit": "PPP",
         "saveBtn": "Sauvegarder",
         "scale": "Échelle",
         "showProjection": "Afficher la projection",

diff --git a/packages/integration/package.json b/packages/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/integration",
-  "version": "16.0.1",
+  "version": "16.0.2",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/utils",
-  "version": "16.0.1",
+  "version": "16.0.2",
   "description": "IGO Library",
   "author": "IGO Community",
   "keywords": [