From d36352bd8d51c9dd8c7a11d1d2f6e275e85eabea Mon Sep 17 00:00:00 2001 From: davivcu Date: Sat, 28 Sep 2024 18:11:21 +0200 Subject: [PATCH 1/2] moving custom style css from compiled css to static --- src/index.html | 1 + src/styles.scss | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index c312330f6..28389f867 100644 --- a/src/index.html +++ b/src/index.html @@ -6,6 +6,7 @@ + diff --git a/src/styles.scss b/src/styles.scss index f5b60081f..9b0fb6042 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -4,7 +4,6 @@ @import "./assets/scss/themes"; @import "./assets/scss/mixins"; @import "./assets/scss/bootstrapOverrides"; -@import "./assets/config/custom-styles.css"; @font-face { font-family: "Junicode"; From 8635afbe815c1bd447da55fe8a4ddd1aa691faa3 Mon Sep 17 00:00:00 2001 From: davivcu Date: Sat, 28 Sep 2024 19:55:21 +0200 Subject: [PATCH 2/2] Added max zoom level for images in edition_config --- src/app/app.config.ts | 1 + src/app/components/osd/osd.component.ts | 2 +- src/assets/config/edition_config.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/app.config.ts b/src/app/app.config.ts index 8a29002df..e2784e15c 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -181,6 +181,7 @@ export interface EditionConfig { }>; startingFromDefinitiveLayer: boolean; defaultImageZoomLevel: number; + maxImageZoomLevel: number; showSubstitutionMarker: boolean; multiPageEngineForCriticalEdition: boolean; } diff --git a/src/app/components/osd/osd.component.ts b/src/app/components/osd/osd.component.ts index 9744f44e6..d7dd29455 100644 --- a/src/app/components/osd/osd.component.ts +++ b/src/app/components/osd/osd.component.ts @@ -168,7 +168,7 @@ export class OsdComponent implements AfterViewInit, OnDestroy { const commonOptions = { visibilityRatio: 0.66, minZoomLevel: 0.3, - maxZoomLevel: 1, + maxZoomLevel: AppConfig.evtSettings.edition.maxImageZoomLevel, defaultZoomLevel: AppConfig.evtSettings.edition.defaultImageZoomLevel, sequenceMode: true, prefixUrl: 'assets/osd/images/', diff --git a/src/assets/config/edition_config.json b/src/assets/config/edition_config.json index 7be4141d9..19344c215 100644 --- a/src/assets/config/edition_config.json +++ b/src/assets/config/edition_config.json @@ -170,5 +170,6 @@ } }, "defaultImageZoomLevel": 0.8, + "maxImageZoomLevel": 2, "multiPageEngineForCriticalEdition": false } \ No newline at end of file