Skip to content

Commit 6478343

Browse files
authored
Merge pull request #89 from SenteraLLC/generic-xmp
Universal XMP Tags
2 parents f686835 + dc1174a commit 6478343

File tree

3 files changed

+8
-22
lines changed

3 files changed

+8
-22
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pycqa/isort
3-
rev: 5.13.2
3+
rev: 7.0.0
44
hooks:
55
- id: isort
66
args: ["--profile", "black"]

imgparse/xmp_tags.py

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
class XMPTags:
55
"""
6-
Generic tags defaulting to an empty string.
6+
Generic tags defaulting to an empty string or a common default.
77
8-
If a sensor isn't supported for a given tag, the empty string will cause a KeyError
8+
If a sensor isn't supported for a given tag, the empty string or common default will cause a KeyError
99
to be thrown, the same as if a valid tag wasn't found.
1010
"""
1111

@@ -14,12 +14,12 @@ class XMPTags:
1414
PITCH: str = ""
1515
YAW: str = ""
1616
FOCAL_LEN: str = ""
17-
WAVELENGTH_CENTRAL: str = ""
18-
WAVELENGTH_FWHM: str = ""
19-
BANDNAME: str = ""
17+
WAVELENGTH_CENTRAL: str = "Camera:CentralWavelength"
18+
WAVELENGTH_FWHM: str = "Camera:WavelengthFWHM"
19+
BANDNAME: str = "Camera:BandName"
2020
LRF_ALT: str = ""
2121
LRF_ALT2: str = "" # See SenteraTags below
22-
ILS: str = ""
22+
ILS: str = "Camera:SunSensor"
2323
HOMEPOINT_LAT: str = ""
2424
HOMEPOINT_LON: str = ""
2525
PRINCIPAL_POINT: str = ""
@@ -39,12 +39,8 @@ class SenteraTags(XMPTags):
3939
PITCH = "Camera:Pitch"
4040
YAW = "Camera:Yaw"
4141
FOCAL_LEN = "Camera:PerspectiveFocalLength"
42-
WAVELENGTH_CENTRAL = "Camera:CentralWavelength"
43-
WAVELENGTH_FWHM = "Camera:WavelengthFWHM"
44-
BANDNAME = "Camera:BandName"
4542
LRF_ALT = "Sentera:AltimeterCalculatedAGL"
4643
LRF_ALT2 = "Sentera:AltimeterCalcuatedAGL" # l was left out in Quad v1.0.0
47-
ILS = "Camera:SunSensor"
4844
HOMEPOINT_LAT = "SENTERA:HomePointLatitude"
4945
HOMEPOINT_LON = "SENTERA:HomePointLongitude"
5046
PRINCIPAL_POINT = "Camera:PrincipalPoint"
@@ -61,11 +57,7 @@ class DJITags(XMPTags):
6157
PITCH = "drone-dji:GimbalPitchDegree"
6258
YAW = "drone-dji:GimbalYawDegree"
6359
FOCAL_LEN = "drone-dji:CalibratedFocalLength"
64-
WAVELENGTH_CENTRAL = "Camera:CentralWavelength"
65-
WAVELENGTH_FWHM = "Camera:WavelengthFWHM"
66-
BANDNAME = "Camera:BandName"
6760
SELF_DATA = "drone-dji:SelfData"
68-
ILS = "Camera:SunSensor"
6961
IRRADIANCE = "Camera:Irradiance"
7062
CAPTURE_UUID = "drone-dji:CaptureUUID"
7163
DEWARP_FLAG = "drone-dji:DewarpFlag"
@@ -75,17 +67,11 @@ class DJITags(XMPTags):
7567
class MicaSenseTags(XMPTags):
7668
"""MicaSense XMP Tags."""
7769

78-
WAVELENGTH_CENTRAL = "Camera:CentralWavelength"
79-
WAVELENGTH_FWHM = "Camera:WavelengthFWHM"
80-
BANDNAME = "Camera:BandName"
8170
CAPTURE_UUID = "MicaSense:CaptureId"
8271
IRRADIANCE = "Camera:Irradiance"
8372

8473

8574
class ParrotTags(XMPTags):
8675
"""Parrot XMP Tags."""
8776

88-
WAVELENGTH_CENTRAL = "Camera:CentralWavelength"
89-
WAVELENGTH_FWHM = "Camera:WavelengthFWHM"
90-
BANDNAME = "Camera:BandName"
9177
CAPTURE_UUID = "Camera:CaptureUUID"

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "imgparse"
3-
version = "2.0.7"
3+
version = "2.0.8"
44
description = "Python image-metadata-parser utilities"
55
authors = []
66
include = [

0 commit comments

Comments
 (0)