Merge pull request kitodo#6236 from thomaslow/refactor-detail-map-and…

…-fix-5796 Refactor detail map view, update OpenLayers and remember image zoom
effective-webwork · Nov 5, 2024 · abc71c5 · abc71c5
2 parents d5189df + faddf2a
commit abc71c5
Show file tree

Hide file tree

Showing 12 changed files with 715 additions and 208 deletions.
diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/GalleryPanel.java b/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/GalleryPanel.java
@@ -859,7 +859,7 @@ private void selectMedia(String physicalDivisionOrder, String stripeIndex, Strin
         String scrollScripts = "scrollToSelectedTreeNode();scrollToSelectedPaginationRow();";
         if (GalleryViewMode.PREVIEW.equals(galleryViewMode)) {
             PrimeFaces.current().executeScript(
-                    "checkScrollPosition();initializeImage();metadataEditor.gallery.mediaView.update();" + scrollScripts);
+                    "checkScrollPosition();metadataEditor.detailMap.update();metadataEditor.gallery.mediaView.update();" + scrollScripts);
         } else {
             PrimeFaces.current().executeScript(scrollScripts);
         }

diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css b/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css
@@ -3365,6 +3365,9 @@ Column content
     left: 16px;
     position: absolute;
     top: 16px;
+    display: flex;
+    flex-direction: column;
+    align-items: start;
 }
 
 #map .ol-overlaycontainer-stopevent > .ol-zoom.ol-unselectable.ol-control {
@@ -3386,6 +3389,7 @@ Column content
 }
 
 #map .ol-control {
+    display: inline-block;
     background: transparent;
     padding: 0;
     position: static;

diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_editor.js b/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_editor.js
@@ -14,7 +14,7 @@
 /*eslint new-cap: ["error", { "capIsNewExceptionPattern": "^PF" }]*/
 /*eslint complexity: ["error", 10]*/
 
-var metadataEditor = {};
+var metadataEditor = metadataEditor || {};
 
 metadataEditor.metadataTree = {
 
@@ -1147,7 +1147,7 @@ metadataEditor.shortcuts = {
             case "PREVIEW":
                 initialize();
                 scrollToSelectedThumbnail();
-                changeToMapView();
+                metadataEditor.detailMap.update();
                 break;
         }
     }