geopic-tag-reader 1.0.4__tar.gz → 1.0.6__tar.gz

{geopic_tag_reader-1.0.4 → geopic_tag_reader-1.0.6}/CHANGELOG.md

@@ -1,4 +1,5 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
@@ -6,130 +7,154 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.6] - 2024-04-02
+
+### Changed
+
+- Bump some dependencies, the most important one being [typer](https://typer.tiangolo.com/) since it removes the need for typer-cli.
+
+## [1.0.5] - 2024-03-06
+
+### Fixed
+
+- Automatic detection of 360° pictures based on make and model also checks for image dimensions (to avoid false positive, when 360° camera can also take flat pictures).
+- Slash character in GPS date stamp was not correctly interpreted.
 
 ## [1.0.4] - 2024-02-12
 
 ### Changed
-- When using date/time not coming from GPS, offset time EXIF field are also read (`Exif.Photo.OffsetTimeOriginal` or `Exif.Photo.OffsetTime` depending on used date/time EXIF tag).
 
+- When using date/time not coming from GPS, offset time EXIF field are also read (`Exif.Photo.OffsetTimeOriginal` or `Exif.Photo.OffsetTime` depending on used date/time EXIF tag).
 
 ## [1.0.3] - 2023-12-18
 
 ### Added
+
 - Support reading date from EXIF fields `Exif.Image.DateTime` and `Xmp.GPano.SourceImageCreateTime`.
 - Auto-detect if a picture is 360° based on make and model.
 
 ### Fixed
-- Avoid failures for pictures with invalid offset for maker notes (due to PyExiv2 log level).
 
+- Avoid failures for pictures with invalid offset for maker notes (due to PyExiv2 log level).
 
 ## [1.0.2] - 2023-11-20
 
 ### Added
+
 - A warning is thrown when microseconds values between decimal seconds and sub-second time fields are not matching.
 
 ### Changed
-- Fraction values for date, time and GPS coordinates are supported.
 
+- Fraction values for date, time and GPS coordinates are supported.
 
 ## [1.0.1] - 2023-11-17
 
 ### Fixed
-- `DateTimeOriginal` field wasn't correctly read when seconds value was decimal.
 
+- `DateTimeOriginal` field wasn't correctly read when seconds value was decimal.
 
 ## [1.0.0] - 2023-10-18
 
 ### Added
+
 - Add subseconds to written metadata
 - Read altitude in metadata
 - Write direction and altitude metadata
 - Add `additional_exif` tags in `writePictureMetadata`
 
 ### Changed
-- EXIF list of tags now uses the [Exiv2](https://exiv2.org/metadata.html) notation (example `Exif.Image.Artist`) in returned data. To do this, pyexiv2 dependency is always necessary, and Pillow dependency has been removed. As a consequence, `readPictureMetadata` function __now takes in input `bytes`__ read from picture file instead of Pillow image. This is a breaking change.
-- Use overriden metadata is available to localize overriden capture_time
 
+- EXIF list of tags now uses the [Exiv2](https://exiv2.org/metadata.html) notation (example `Exif.Image.Artist`) in returned data. To do this, pyexiv2 dependency is always necessary, and Pillow dependency has been removed. As a consequence, `readPictureMetadata` function **now takes in input `bytes`** read from picture file instead of Pillow image. This is a breaking change.
+- Use overriden metadata is available to localize overriden capture_time
 
 ## [0.4.1] - 2023-09-08
 
 ### Added
-- Latitude and longitude values are checked to verify they fit into WGS84 projection bounds (-180, -90, 180, 90).
 
+- Latitude and longitude values are checked to verify they fit into WGS84 projection bounds (-180, -90, 180, 90).
 
 ## [0.4.0] - 2023-09-01
 
 ### Added
+
 - When a picture does not contain a mandatory exif tag (coordinates or datetime), a `PartialExifException` is thrown containing some information about what has been parsed and what is missing.
 
 ## [0.3.1] - 2023-07-31
 
 ### Added
+
 - A way to write exif lon/lat and type tags.
 
 ## [0.3.0] - 2023-07-31
 
 ### Added
+
 - Support of any date/time separator for EXIF tag `DateTimeOriginal`
 - A way to write exif tags. To use this, you need to install this library with the extra `[write-exif]`.
 
-
 ## [0.2.0] - 2023-07-13
 
 ### Added
+
 - Support of cropped equirectangular panoramas
 
 ### Changed
+
 - Support python 3.8
 
 ## [0.1.3]
 
 ### Changed
+
 - Bump [Typer](typer.tiangolo.com/) version, and use fork of [Typer-cli](https://gitlab.com/geovisio/infra/typer-cli)
 
 ## [0.1.2]
 
 ### Added
-- Full typing support ([PEP 484](https://peps.python.org/pep-0484/) and [PEP 561](https://peps.python.org/pep-0561/))
 
+- Full typing support ([PEP 484](https://peps.python.org/pep-0484/) and [PEP 561](https://peps.python.org/pep-0561/))
 
 ## [0.1.1]
 
 ### Added
-- Support of Mapillary tags stored in EXIF tag `ImageDescription`
 
+- Support of Mapillary tags stored in EXIF tag `ImageDescription`
 
 ## [0.1.0]
 
 ### Added
+
 - If GPS Date or time can't be read, fallbacks to Original Date EXIF tag associated with a reader warning
 - New EXIF tags are supported: `GPSDateTime`
 
 ### Changed
+
 - `tag_reader:warning` property has been moved from EXIF, and is now available as a direct property named `tagreader_warnings` of `GeoPicTags` class
 - Reader now supports `GPSLatitude` and `GPSLongitude` stored as decimal values instead of tuple
 - Reader now supports reading `FocalLength` written in `NUMBER/NUMBER` format
 - If EXIF tags for heading `PoseHeadingDegrees` and `GPSImgDirection` have contradicting values, we use by default `GPSImgDirection` value and issue a warning, instead of raising an error
 
 ### Fixed
-- EXIF tag `SubsecTimeOriginal` was not correctly read due to a typo
 
+- EXIF tag `SubsecTimeOriginal` was not correctly read due to a typo
 
 ## [0.0.2] - 2023-05-10
 
 ### Added
+
 - EXIF tag `UserComment` is now read and available in raw `exif` tags
 - If not set, `GPSLatitudeRef` defaults to North and `GPSLongitudeRef` defaults to East
 - A new `tag_reader:warning` property lists non-blocking warnings raised while reading EXIF tags
 
-
 ## [0.0.1] - 2023-03-31
 
 ### Added
-- EXIF tag reading methods extracted from [GeoVisio API](https://gitlab.com/geovisio/api)
 
+- EXIF tag reading methods extracted from [GeoVisio API](https://gitlab.com/geovisio/api)
 
-[Unreleased]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.4...main
+[Unreleased]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.6...main
+[1.0.6]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.5...1.0.6
+[1.0.5]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.4...1.0.5
 [1.0.4]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.3...1.0.4
 [1.0.3]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.2...1.0.3
 [1.0.2]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.1...1.0.2

{geopic_tag_reader-1.0.4 → geopic_tag_reader-1.0.6}/Makefile

@@ -14,7 +14,7 @@ fmt: ## Format code
 ci: type-check fmt test ## Run all check like the ci
 
 docs:  ## Generates documentation from Typer embedded docs
-	python -m typer_cli ./geopic_tag_reader/main.py utils docs --name geopic-tag-reader --output docs/CLI_USAGE.md
+	python -m typer ./geopic_tag_reader/main.py utils docs --name geopic-tag-reader --output docs/CLI_USAGE.md
 	lazydocs --overview-file API_USAGE.md --ignored-modules main --output-path docs/ geopic_tag_reader/
 
 help: ## Print this help message

{geopic_tag_reader-1.0.4 → geopic_tag_reader-1.0.6}/PKG-INFO

@@ -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.4 → geopic_tag_reader-1.0.6}/docs/API_USAGE.md

@@ -11,7 +11,7 @@
 
 ## Classes
 
-- [`model.PictureType`](./model.md#class-picturetype)
+- [`model.PictureType`](./model.md#class-picturetype): An enumeration.
 - [`reader.CropValues`](./reader.md#class-cropvalues): Cropped equirectangular pictures metadata
 - [`reader.GeoPicTags`](./reader.md#class-geopictags): Tags associated to a geolocated picture
 - [`reader.InvalidExifException`](./reader.md#class-invalidexifexception): Exception for invalid EXIF information from image
@@ -24,7 +24,7 @@
 
 ## Functions
 
-- [`camera.is_360`](./camera.md#function-is_360): Checks if given camera is equirectangular (360°) based on its make and model.
+- [`camera.is_360`](./camera.md#function-is_360): Checks if given camera is equirectangular (360°) based on its make, model and dimensions (width, height).
 - [`reader.decodeDateTimeOriginal`](./reader.md#function-decodedatetimeoriginal)
 - [`reader.decodeGPSDateTime`](./reader.md#function-decodegpsdatetime)
 - [`reader.decodeLatLon`](./reader.md#function-decodelatlon): Reads GPS info from given group to get latitude/longitude as float coordinates

{geopic_tag_reader-1.0.4 → geopic_tag_reader-1.0.6}/docs/Install.md

@@ -5,7 +5,7 @@ GeoPicTagReader can be installed using two methods:
 - From [PyPI](https://pypi.org/project/geopic-tag-reader/), the Python central package repository
 - Using this [Git repository](https://gitlab.com/geovisio/geo-picture-tag-reader)
 
-GeoPicTagReader is compatible with all python version >= 3.8.
+GeoPicTagReader is compatible with all python version >= 3.8. Note that, due to [Pyexiv2 dependency on a recent GLIBC version](https://github.com/LeoHsiao1/pyexiv2/issues/120), you have to make sure to run on a recent, up-to-date operating system.
 
 ## From PyPI
 

{geopic_tag_reader-1.0.4 → geopic_tag_reader-1.0.6}/docs/camera.md

@@ -18,15 +18,22 @@
 ## <kbd>function</kbd> `is_360`
 
 ```python
-is_360(make: Optional[str], model: Optional[str]) → bool
+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)``` False ``` is_360("GoPro", "Max 360")```
+``` 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
 
 
 

{geopic_tag_reader-1.0.4 → geopic_tag_reader-1.0.6}/docs/model.md

@@ -14,9 +14,7 @@
 <a href="../geopic_tag_reader/model.py#L4"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>class</kbd> `PictureType`
-
-
-
+An enumeration. 
 
 
 

{geopic_tag_reader-1.0.4 → geopic_tag_reader-1.0.6}/geopic_tag_reader/__init__.py

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

{geopic_tag_reader-1.0.4 → geopic_tag_reader-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-1.0.4 → geopic_tag_reader-1.0.6}/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 → geopic_tag_reader-1.0.6}/pyproject.toml

@@ -8,8 +8,8 @@ license = {file = "LICENSE"}
 classifiers = ["License :: OSI Approved :: MIT License"]
 dynamic = ["version", "description"]
 dependencies = [
-    "typer ~= 0.9.0",
-    "xmltodict ~= 0.13.0",
+    "typer ~= 0.12",
+    "xmltodict ~= 0.13",
     "pyexiv2 == 2.8.3",
 ]
 requires-python = ">=3.8"
@@ -22,14 +22,12 @@ geopic-tag-reader="geopic_tag_reader.main:app"
 
 [project.optional-dependencies]
 dev = [
-    "black ~= 22.8.0",
-    "mypy ~= 1.0.0",
+    "black ~= 24.3",
+    "mypy ~= 1.9",
     "pytest ~= 7.2.0",
-    "pytest-datafiles ~= 2.0.1",
-    "typer-cli-forked ~= 0.0.14", # fork dependency needed until https://github.com/tiangolo/typer-cli/pull/120 is merged.
-    #"typer-cli ~= 0.0.13",
+    "pytest-datafiles ~= 3.0",
     "lazydocs ~= 0.4.8",
-    "types-xmltodict ~= 0.13.0",
+    "types-xmltodict ~= 0.13",
     "pre-commit ~= 3.3.3",
 ]
 build = ["flit ~= 3.8.0"]

{geopic_tag_reader-1.0.4 → geopic_tag_reader-1.0.6}/tests/test_reader.py

@@ -143,7 +143,7 @@ def test_readPictureMetadata_noHeading(datafiles):
 
 @pytest.mark.datafiles(os.path.join(FIXTURE_DIR, "img_Ricoh_Theta.jpg"))
 def test_readPictureMetadata_ricoh_theta(datafiles):
-    for f in datafiles.listdir():
+    for f in datafiles.iterdir():
         result = reader.readPictureMetadata(openImg(str(f)))
         assertGeoPicTagsEquals(
             result,
@@ -162,7 +162,7 @@ def test_readPictureMetadata_ricoh_theta(datafiles):
 
 @pytest.mark.datafiles(os.path.join(FIXTURE_DIR, "img_V4MPack.jpg"))
 def test_readPictureMetadata_v4mpack(datafiles):
-    for f in datafiles.listdir():
+    for f in datafiles.iterdir():
         result = reader.readPictureMetadata(openImg(str(f)))
         assertGeoPicTagsEquals(
             result,
@@ -540,6 +540,26 @@ def test_readPictureMetadata_ricoh_noproj(datafiles):
     )
 
 
+@pytest.mark.datafiles(os.path.join(FIXTURE_DIR, "gopromax_flat.jpg"))
+def test_readPictureMetadata_gopromax_flat(datafiles):
+    result = reader.readPictureMetadata(openImg(str(datafiles) + "/gopromax_flat.jpg"))
+
+    assertGeoPicTagsEquals(
+        result,
+        {
+            "lat": 47.22555109997222,
+            "lon": -1.5631604999722222,
+            "ts": 1708173992.0,
+            "heading": None,
+            "type": "flat",
+            "make": "GoPro",
+            "model": "Max",
+            "focal_length": 3,
+            "altitude": 78,
+        },
+    )
+
+
 @pytest.mark.datafiles(os.path.join(FIXTURE_DIR, "broken_makernotes.jpg"))
 def test_readPictureMetadata_broken_makernotes(datafiles):
     result = reader.readPictureMetadata(openImg(str(datafiles) + "/broken_makernotes.jpg"))
@@ -579,3 +599,27 @@ def test_readPictureMetadata_datetime_offset(datafiles):
             "altitude": 79,
         },
     )
+
+
+@pytest.mark.datafiles(os.path.join(FIXTURE_DIR, "gps_date_slash.jpg"))
+def test_readPictureMetadata_gps_date_slash(datafiles):
+    result = reader.readPictureMetadata(openImg(str(datafiles) + "/gps_date_slash.jpg"))
+
+    assertGeoPicTagsEquals(
+        result,
+        {
+            "lat": 43.42541569992266,
+            "lon": 1.3766216000638112,
+            "ts": 1686640500.0,
+            "heading": None,
+            "type": "flat",
+            "make": None,
+            "model": None,
+            "focal_length": None,
+            "altitude": None,
+            "tagreader_warnings": [
+                "GPSLatitudeRef not found, assuming GPSLatitudeRef is North",
+                "GPSLongitudeRef not found, assuming GPSLongitudeRef is East",
+            ],
+        },
+    )