From 2f728da83036bb17e6a72a5b6f08a97e8b771d46 Mon Sep 17 00:00:00 2001 From: alecarn <133774929+alecarn@users.noreply.github.com> Date: Tue, 7 Nov 2023 10:07:44 -0500 Subject: [PATCH 1/2] fix(geo): print - remove 300 PPI resolution (#1489) * fix(geo): print - remove 300 PPI resolution - Add traduction for resolution unit measure --- .../src/lib/print/print-form/print-form.component.html | 8 ++++++-- packages/geo/src/lib/print/shared/print.type.ts | 2 +- packages/geo/src/locale/en.geo.json | 1 + packages/geo/src/locale/fr.geo.json | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) 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 index cb94cd5b0a..5f0632dc68 100644 --- 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 @@
- {{ 'igo.geo.printForm.resolution' | translate }} + {{ 'igo.geo.printForm.resolution' | translate }} ({{ + 'igo.geo.printForm.resolutionUnit' | translate + }}) - {{ resolution.value + ' PPI' }} + {{ resolution.value }} diff --git a/packages/geo/src/lib/print/shared/print.type.ts b/packages/geo/src/lib/print/shared/print.type.ts index de2c26088c..bed6449870 100644 --- 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 index 250b4a6e24..187f494bd4 100644 --- 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 index 326d1858ac..d3509f2dc8 100644 --- 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", From b6fa8886b2048c45db781f7c10b4fa082d018732 Mon Sep 17 00:00:00 2001 From: Alexandre Caron Date: Tue, 7 Nov 2023 10:29:20 -0500 Subject: [PATCH 2/2] 16.0.2 --- CHANGELOG.md | 9 +++++++++ package-lock.json | 4 ++-- package.json | 2 +- packages/auth/package.json | 6 +++--- packages/common/package.json | 6 +++--- packages/context/package.json | 12 ++++++------ packages/core/package.json | 4 ++-- packages/core/src/lib/config/version.ts | 4 ++-- packages/geo/package.json | 8 ++++---- packages/integration/package.json | 6 +++--- packages/utils/package.json | 2 +- 11 files changed, 36 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72fd4fe1da..c29a13cd66 100644 --- 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 index 35c890019a..afecf507c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@igo/demo", - "version": "16.0.1", + "version": "16.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@igo/demo", - "version": "16.0.1", + "version": "16.0.2", "license": "MIT", "workspaces": [ "./packages/*" diff --git a/package.json b/package.json index fde39789fb..e2d758b503 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "workspaces": [ "./packages/*" ], - "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 index 6e12e660aa..a975239d47 100644 --- 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": ["igo"], @@ -26,8 +26,8 @@ "@angular/forms": "^16.2.5", "@angular/material": "^16.2.4", "@angular/router": "^16.2.5", - "@igo2/core": "^16.0.1", - "@igo2/utils": "^16.0.1", + "@igo2/core": "^16.0.2", + "@igo2/utils": "^16.0.2", "rxjs": "^7.5.6", "@azure/msal-angular": "^3.0.4" }, diff --git a/packages/common/package.json b/packages/common/package.json index 6777185b7b..3fe581afa4 100644 --- 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": ["igo"], @@ -27,8 +27,8 @@ "@angular/material": "^16.2.4", "@angular/platform-browser": "^16.2.5", "@floating-ui/utils": "^0.1.4", - "@igo2/core": "^16.0.1", - "@igo2/utils": "^16.0.1", + "@igo2/core": "^16.0.2", + "@igo2/utils": "^16.0.2", "angular-shepherd": "16.0.0", "scroll-into-view-if-needed": "^3.0.0", "typy": "^3.3.0", diff --git a/packages/context/package.json b/packages/context/package.json index 8968c8b91a..96884f610d 100644 --- 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": ["igo"], @@ -20,11 +20,11 @@ "@angular/forms": "^16.2.5", "@angular/material": "^16.2.4", "@angular/platform-browser": "^16.2.5", - "@igo2/auth": "^16.0.1", - "@igo2/common": "^16.0.1", - "@igo2/core": "^16.0.1", - "@igo2/utils": "^16.0.1", - "@igo2/geo": "^16.0.1", + "@igo2/auth": "^16.0.2", + "@igo2/common": "^16.0.2", + "@igo2/core": "^16.0.2", + "@igo2/utils": "^16.0.2", + "@igo2/geo": "^16.0.2", "ol": "^7.5.2", "rxjs": "^7.8.0" }, diff --git a/packages/core/package.json b/packages/core/package.json index 9cbe33d856..0ec8fb906f 100644 --- 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": ["igo"], @@ -43,7 +43,7 @@ "@angular/core": "^16.2.5", "@angular/platform-browser": "^16.2.5", "@angular/router": "^16.2.5", - "@igo2/utils": "^16.0.1", + "@igo2/utils": "^16.0.2", "rxjs": "^7.8.0", "ngx-indexed-db": "^11.0.2", "ngx-toastr": "^17.0.0" diff --git a/packages/core/src/lib/config/version.ts b/packages/core/src/lib/config/version.ts index 9d9f68134e..875c9f2413 100644 --- 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 index 8754371fa1..80c5297820 100644 --- 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": ["igo"], @@ -38,9 +38,9 @@ "@angular/forms": "^16.2.5", "@angular/material": "^16.2.4", "@angular/platform-browser": "^16.2.5", - "@igo2/common": "^16.0.1", - "@igo2/core": "^16.0.1", - "@igo2/utils": "^16.0.1", + "@igo2/common": "^16.0.2", + "@igo2/core": "^16.0.2", + "@igo2/utils": "^16.0.2", "@mat-datetimepicker/core": "~12.0.0", "flexsearch": "0.7.21", "ol": "^7.5.2", diff --git a/packages/integration/package.json b/packages/integration/package.json index 10c855c83d..34567d3688 100644 --- 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": ["igo"], @@ -16,8 +16,8 @@ "peerDependencies": { "@angular/common": "^16.2.5", "@angular/core": "^16.2.5", - "@igo2/geo": "16.0.1", - "@igo2/context": "16.0.1", + "@igo2/geo": "16.0.2", + "@igo2/context": "16.0.2", "jspdf": "^2.5.1", "jspdf-autotable": "^3.5.29", "rxjs": "^7.8.0" diff --git a/packages/utils/package.json b/packages/utils/package.json index 0ed81384fd..7d2e5b8efb 100644 --- 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": ["igo"],