Fix date and small scene handling

SmilyOrg · Sep 4, 2022 · cd749ae · cd749ae
1 parent e50f101
commit cd749ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/internal/image/exiftool-mostlygeek.go b/internal/image/exiftool-mostlygeek.go
@@ -92,7 +92,8 @@ func (decoder *ExifToolMostlyGeekLoader) DecodeInfo(path string, info *Info) err
 			if strings.Contains(name, "Date") || strings.Contains(name, "Time") {
 				if info.DateTime.IsZero() {
 					info.DateTime, _, _, _ = parseDateTime(value)
-				} else {
+				} else if name != "FileModifyDate" && name != "FileCreateDate" {
+					// Prefer time with timezone if available
 					t, hasTimezone, _, _ := parseDateTime(value)
 					if hasTimezone && info.DateTime.Location() == time.UTC {
 						info.DateTime = t

diff --git a/ui/src/components/TileViewer.vue b/ui/src/components/TileViewer.vue
@@ -158,6 +158,10 @@ export default {
         }
       }
 
+      const sceneSmallerThanViewport =
+        this.scene.bounds.w < element.clientWidth ||
+        this.scene.bounds.h < element.clientHeight;
+
       this.map = new Map({
         target: element,
         // pixelRatio: 1,
@@ -171,10 +175,10 @@ export default {
           enableRotation: false,
           extent,
           smoothExtentConstraint: false,
+          showFullExtent: sceneSmallerThanViewport,
         }),
         controls: [],
       });
-      console.log(this.map.getView().getMinZoom())
       this.map.on("click", event => this.onClick(event));
       this.map.on("movestart", event => this.onMoveStart(event));
       this.map.on("moveend", event => this.onMoveEnd(event));