Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

info: show GeoTiff tags in their own section

Browse source
This commit is contained in:
Thibault Deckers 2021-03-18 12:05:16 +09:00
parent bc19f12805
commit cc61e93c74
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt
View file

@ -18,6 +18,7 @@ import com.adobe.internal.xmp.properties.XMPPropertyInfo
import com.bumptech.glide.load.resource.bitmap.TransformationUtils import com.bumptech.glide.load.resource.bitmap.TransformationUtils
import com.drew.imaging.ImageMetadataReader import com.drew.imaging.ImageMetadataReader
import com.drew.lang.Rational import com.drew.lang.Rational
import com.drew.metadata.Tag
import com.drew.metadata.exif.* import com.drew.metadata.exif.*
import com.drew.metadata.file.FileTypeDirectory import com.drew.metadata.file.FileTypeDirectory
import com.drew.metadata.gif.GifAnimationDirectory import com.drew.metadata.gif.GifAnimationDirectory
@ -125,17 +126,29 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
metadataMap[dirName] = dirMap metadataMap[dirName] = dirMap
// tags // tags
val tags = dir.tags
if (mimeType == MimeTypes.TIFF && (dir is ExifIFD0Directory || dir is ExifThumbnailDirectory)) { if (mimeType == MimeTypes.TIFF && (dir is ExifIFD0Directory || dir is ExifThumbnailDirectory)) {
dirMap.putAll(dir.tags.map { fun tagMapper(it: Tag): Pair<String, String> {
val name = if (it.hasTagName()) { val name = if (it.hasTagName()) {
it.tagName it.tagName
} else { } else {
TiffTags.getTagName(it.tagType) ?: it.tagName TiffTags.getTagName(it.tagType) ?: it.tagName
} }
Pair(name, it.description) return Pair(name, it.description)
}) }
if (dir is ExifIFD0Directory && dir.isGeoTiff()) {
// split GeoTIFF tags in their own directory
val byGeoTiff = tags.groupBy { TiffTags.isGeoTiffTag(it.tagType) }
metadataMap["GeoTIFF"] = HashMap<String, String>().apply {
byGeoTiff[true]?.map { tagMapper(it) }?.let { putAll(it) }
}
byGeoTiff[false]?.map { tagMapper(it) }?.let { dirMap.putAll(it) }
} else { } else {
dirMap.putAll(dir.tags.map { Pair(it.tagName, it.description) }) dirMap.putAll(tags.map { tagMapper(it) })
}
} else {
dirMap.putAll(tags.map { Pair(it.tagName, it.description) })
} }
if (dir is XmpDirectory) { if (dir is XmpDirectory) {
try { try {

11
android/app/src/main/kotlin/deckers/thibault/aves/metadata/TiffTags.kt
View file

@ -110,6 +110,15 @@ object TiffTags {
// Count = variable // Count = variable
const val TAG_ORIGINAL_RAW_FILE_NAME = 0xc68b const val TAG_ORIGINAL_RAW_FILE_NAME = 0xc68b
private val geotiffTags = listOf(
TAG_GEO_ASCII_PARAMS,
TAG_GEO_DOUBLE_PARAMS,
TAG_GEO_KEY_DIRECTORY,
TAG_MODEL_PIXEL_SCALE,
TAG_MODEL_TIEPOINT,
TAG_MODEL_TRANSFORMATION,
)
private val tagNameMap = hashMapOf( private val tagNameMap = hashMapOf(
TAG_X_POSITION to "X Position", TAG_X_POSITION to "X Position",
TAG_Y_POSITION to "Y Position", TAG_Y_POSITION to "Y Position",
@ -132,6 +141,8 @@ object TiffTags {
TAG_ORIGINAL_RAW_FILE_NAME to "Original Raw File Name", TAG_ORIGINAL_RAW_FILE_NAME to "Original Raw File Name",
) )
fun isGeoTiffTag(tag: Int) = geotiffTags.contains(tag)
fun getTagName(tag: Int): String? { fun getTagName(tag: Int): String? {
return tagNameMap[tag] return tagNameMap[tag]
} }