Remove full mimetype from format.json

koordinates · Apr 20, 2023 · 2b89c54 · 2b89c54
1 parent 2511189
commit 2b89c54
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/kart/raster/metadata_util.py b/kart/raster/metadata_util.py
@@ -139,9 +139,7 @@ def extract_raster_tile_metadata(raster_tile_path):
     is_cog = not errors
 
     format_json = {
-        # TODO: Maybe the whole mimetype isn't needed here - no more information is conveyed by this mimetype
-        # than by the string "geotiff"... or maybe there's some benefit to using the mimetype.
-        "fileType": "image/tiff; application=geotiff",
+        "fileType": "geotiff",
         "profile": "cloud-optimized" if is_cog else None,
     }
 
@@ -340,3 +338,16 @@ def extract_format(tile_format):
         if "format" in tile_format:
             return tile_format["format"]
     return tile_format
+
+
+def get_format_summary(format_info):
+    """
+    Given format info as stored in format.json, return a short string summary such as: geotiff/cog
+    """
+    if "format.json" in format_info:
+        format_info = format_info["format.json"]
+
+    format_summary = format_info["fileType"]
+    if format_info["profile"]:
+        format_summary += f"/{format_info['profile']}"
+    return format_summary
diff --git a/tests/data/raster/aerial.tgz b/tests/data/raster/aerial.tgz
diff --git a/tests/data/raster/elevation.tgz b/tests/data/raster/elevation.tgz
diff --git a/tests/data/raster/erosion.tgz b/tests/data/raster/erosion.tgz
diff --git a/tests/raster/test_imports.py b/tests/raster/test_imports.py
@@ -121,7 +121,7 @@ def test_import_single_non_cog_geotiff(
                 assert r.stdout.splitlines()[6:] == AERIAL_CRS_DIFF + [
                     "+++ aerial:meta:format.json",
                     "+ {",
-                    '+   "fileType": "image/tiff; application=geotiff"',
+                    '+   "fileType": "geotiff"',
                     "+ }",
                 ] + AERIAL_SCHEMA_DIFF + [
                     "+++ aerial:tile:aerial",
@@ -138,7 +138,7 @@ def test_import_single_non_cog_geotiff(
                 assert r.stdout.splitlines()[6:] == AERIAL_CRS_DIFF + [
                     "+++ aerial:meta:format.json",
                     "+ {",
-                    '+   "fileType": "image/tiff; application=geotiff",',
+                    '+   "fileType": "geotiff",',
                     '+   "profile": "cloud-optimized"',
                     "+ }",
                 ] + AERIAL_SCHEMA_DIFF + [
@@ -196,7 +196,7 @@ def test_import_single_cogtiff(
             assert r.stdout.splitlines()[6:] == AERIAL_CRS_DIFF + [
                 "+++ aerial:meta:format.json",
                 "+ {",
-                '+   "fileType": "image/tiff; application=geotiff",',
+                '+   "fileType": "geotiff",',
                 '+   "profile": "cloud-optimized"',
                 "+ }",
             ] + AERIAL_SCHEMA_DIFF + [
@@ -337,7 +337,7 @@ def test_import_single_geotiff_with_rat(
                 "+ ",
                 "+++ erorisk_silcdb4:meta:format.json",
                 "+ {",
-                '+   "fileType": "image/tiff; application=geotiff",',
+                '+   "fileType": "geotiff",',
                 '+   "profile": "cloud-optimized"',
                 "+ }",
                 "+++ erorisk_silcdb4:meta:schema.json",