geopic-tag-reader 1.0.4__py3-none-any.whl → 1.0.6__py3-none-any.whl

geopic_tag_reader/__init__.py

@@ -1,4 +1,5 @@
 """
 GeoPicTagReader
 """
-__version__ = "1.0.4"
+
+__version__ = "1.0.6"

geopic_tag_reader/camera.py

@@ -25,19 +25,25 @@ EQUIRECTANGULAR_MODELS: Dict[str, List[str]] = {
 }
 
 
-def is_360(make: Optional[str], model: Optional[str]) -> bool:
+def is_360(make: Optional[str] = None, model: Optional[str] = None, width: Optional[str] = None, height: Optional[str] = None) -> bool:
     """
-    Checks if given camera is equirectangular (360°) based on its make and model.
+    Checks if given camera is equirectangular (360°) based on its make, model and dimensions (width, height).
 
-    >>> is_360(None, None)
+    >>> is_360()
     False
-    >>> is_360("GoPro", None)
+    >>> is_360("GoPro")
     False
     >>> is_360("GoPro", "Max 360")
     True
+    >>> is_360("GoPro", "Max 360", "2048", "1024")
+    True
+    >>> is_360("GoPro", "Max 360", "1024", "768")
+    False
     """
 
     if not make or not model:
         return False
 
-    return any(model.startswith(potentialModel) for potentialModel in EQUIRECTANGULAR_MODELS.get(make, []))
+    return any(model.startswith(potentialModel) for potentialModel in EQUIRECTANGULAR_MODELS.get(make, [])) and (
+        (width is None or height is None) or int(width) == 2 * int(height)
+    )

geopic_tag_reader/reader.py

@@ -281,7 +281,7 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
     if isExifTagUsable(data, "Xmp.GPano.ProjectionType"):
         pic_type = data["Xmp.GPano.ProjectionType"]
     # 360° based on known models
-    elif camera.is_360(make, model):
+    elif camera.is_360(make, model, data.get("Exif.Photo.PixelXDimension"), data.get("Exif.Photo.PixelYDimension")):
         pic_type = "equirectangular"
     # Flat by default
     else:
@@ -473,7 +473,7 @@ def decodeGPSDateTime(data: dict, group: str) -> Tuple[Optional[datetime.datetim
 
     if d is None and isExifTagUsable(data, f"{group}.GPSDateStamp"):
         try:
-            dateRaw = data[f"{group}.GPSDateStamp"].replace(":", "-").replace("\x00", "")
+            dateRaw = data[f"{group}.GPSDateStamp"].replace(":", "-").replace("\x00", "").replace("/", "-")
 
             # Time
             if isExifTagUsable(data, f"{group}.GPSTimeStamp", List[Fraction]):

{geopic_tag_reader-1.0.4.dist-info → geopic_tag_reader-1.0.6.dist-info}/METADATA

@@ -1,22 +1,21 @@
 Metadata-Version: 2.1
 Name: geopic-tag-reader
-Version: 1.0.4
+Version: 1.0.6
 Summary: GeoPicTagReader
 Author-email: Adrien PAVIE <panieravide@riseup.net>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
-Requires-Dist: typer ~= 0.9.0
-Requires-Dist: xmltodict ~= 0.13.0
+Requires-Dist: typer ~= 0.12
+Requires-Dist: xmltodict ~= 0.13
 Requires-Dist: pyexiv2 == 2.8.3
 Requires-Dist: flit ~= 3.8.0 ; extra == "build"
-Requires-Dist: black ~= 22.8.0 ; extra == "dev"
-Requires-Dist: mypy ~= 1.0.0 ; extra == "dev"
+Requires-Dist: black ~= 24.3 ; extra == "dev"
+Requires-Dist: mypy ~= 1.9 ; extra == "dev"
 Requires-Dist: pytest ~= 7.2.0 ; extra == "dev"
-Requires-Dist: pytest-datafiles ~= 2.0.1 ; extra == "dev"
-Requires-Dist: typer-cli-forked ~= 0.0.14 ; extra == "dev"
+Requires-Dist: pytest-datafiles ~= 3.0 ; extra == "dev"
 Requires-Dist: lazydocs ~= 0.4.8 ; extra == "dev"
-Requires-Dist: types-xmltodict ~= 0.13.0 ; extra == "dev"
+Requires-Dist: types-xmltodict ~= 0.13 ; extra == "dev"
 Requires-Dist: pre-commit ~= 3.3.3 ; extra == "dev"
 Requires-Dist: timezonefinder == 6.2.0 ; extra == "write-exif"
 Requires-Dist: pytz ~= 2023.3 ; extra == "write-exif"

geopic_tag_reader-1.0.6.dist-info/RECORD

@@ -0,0 +1,12 @@
+geopic_tag_reader/__init__.py,sha256=AB9t1irfcb0A7j8MHsCnqxKwAll8VkwJKfgEAPE4Jw4,47
+geopic_tag_reader/camera.py,sha256=2Sr0jAt3RXUWazYMnkwF6J6lVnKvSp7Ac8g7yOHehVA,1643
+geopic_tag_reader/main.py,sha256=LohJW0xX0A8DAbcUR_BnJ2UvN4qo6yydzOGtq3zIArA,3129
+geopic_tag_reader/model.py,sha256=rsWVE3T1kpNsKXX8iv6xb_3PCVY6Ea7iU9WOqUgXklU,129
+geopic_tag_reader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+geopic_tag_reader/reader.py,sha256=PK1mN7TFFC8V70-pU_EM6cTESNcAed1GydHWUkqkT3A,21325
+geopic_tag_reader/writer.py,sha256=L13ewadZhZic13k66FsQvqGQ_s512nssKvvSwZp4Ggg,8680
+geopic_tag_reader-1.0.6.dist-info/entry_points.txt,sha256=c9YwjCNhxveDf-61_aSRlzcpoutvM6KQCerlzaVt_JU,64
+geopic_tag_reader-1.0.6.dist-info/LICENSE,sha256=oHWDwXkJJb9zJzThMN3F9Li4yFhz1qxOUByouY7L3bI,1070
+geopic_tag_reader-1.0.6.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+geopic_tag_reader-1.0.6.dist-info/METADATA,sha256=US7A6UqzLzwlLvtCiHWPQszwLTNtNt_Pzka6DLJBbmg,6375
+geopic_tag_reader-1.0.6.dist-info/RECORD,,

geopic_tag_reader-1.0.4.dist-info/RECORD

@@ -1,12 +0,0 @@
-geopic_tag_reader/__init__.py,sha256=bH9bSIKTRmkGaoNiRbBRpdRBGwnd87d6eDd3fTBNF2U,46
-geopic_tag_reader/camera.py,sha256=hhQRhMU_UIhkLZ0LF1800OOlX4q92AZm8saMSjeMzic,1351
-geopic_tag_reader/main.py,sha256=LohJW0xX0A8DAbcUR_BnJ2UvN4qo6yydzOGtq3zIArA,3129
-geopic_tag_reader/model.py,sha256=rsWVE3T1kpNsKXX8iv6xb_3PCVY6Ea7iU9WOqUgXklU,129
-geopic_tag_reader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geopic_tag_reader/reader.py,sha256=3b929DF4ArjRhsJFhvp_ebpWgNXSNvoEeYSEQ8PxFRk,21227
-geopic_tag_reader/writer.py,sha256=L13ewadZhZic13k66FsQvqGQ_s512nssKvvSwZp4Ggg,8680
-geopic_tag_reader-1.0.4.dist-info/entry_points.txt,sha256=c9YwjCNhxveDf-61_aSRlzcpoutvM6KQCerlzaVt_JU,64
-geopic_tag_reader-1.0.4.dist-info/LICENSE,sha256=oHWDwXkJJb9zJzThMN3F9Li4yFhz1qxOUByouY7L3bI,1070
-geopic_tag_reader-1.0.4.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-geopic_tag_reader-1.0.4.dist-info/METADATA,sha256=sQgQ9-yn-TutQua0vOGHg0OXQ-mTe0X7kNur1qsbD1o,6445
-geopic_tag_reader-1.0.4.dist-info/RECORD,,