wip

maplibre · Dec 9, 2024 · 767d431 · 767d431
1 parent a58e8b9
commit 767d431
Show file tree

Hide file tree

Showing 78 changed files with 381 additions and 472 deletions.
diff --git a/martin/result.png b/martin/result.png
diff --git a/martin/src/cog/mod.rs b/martin/src/cog/mod.rs
diff --git a/tests/expected/auto/catalog_auto.json b/tests/expected/auto/catalog_auto.json
@@ -92,21 +92,6 @@
       "name": "Geography Class",
       "description": "One of the example maps that comes with TileMill - a bright & colorful world map that blends retro and high-tech with its folded paper texture and interactive flag tooltips. "
     },
-    "gray_f32": {
-      "content_type": "image/png"
-    },
-    "gray_f64": {
-      "content_type": "image/png"
-    },
-    "gray_u16": {
-      "content_type": "image/png"
-    },
-    "gray_u32": {
-      "content_type": "image/png"
-    },
-    "gray_u8": {
-      "content_type": "image/png"
-    },
     "json": {
       "content_type": "application/json",
       "name": "Dummy json data"
@@ -140,22 +125,13 @@
       "content_type": "application/x-protobuf",
       "description": "public.points_empty_srid.geom"
     },
-    "rgb_u16": {
-      "content_type": "image/png"
-    },
-    "rgb_u32": {
-      "content_type": "image/png"
-    },
     "rgb_u8": {
       "content_type": "image/png"
     },
-    "rgba_u16": {
-      "content_type": "image/png"
-    },
-    "rgba_u32": {
+    "rgba_u8": {
       "content_type": "image/png"
     },
-    "rgba_u8": {
+    "rgba_u8_nodata": {
       "content_type": "image/png"
     },
     "stamen_toner__raster_CC-BY-ODbL_z3": {

diff --git a/tests/expected/auto/gray_f32_0_0_0.png b/tests/expected/auto/gray_f32_0_0_0.png
diff --git a/tests/expected/auto/gray_f32_0_0_0.png.txt b/tests/expected/auto/gray_f32_0_0_0.png.txt
diff --git a/tests/expected/auto/gray_f32_2_0_0.png b/tests/expected/auto/gray_f32_2_0_0.png
diff --git a/tests/expected/auto/gray_f32_2_0_0.png.txt b/tests/expected/auto/gray_f32_2_0_0.png.txt
diff --git a/tests/expected/auto/gray_f32_2_1_1.png b/tests/expected/auto/gray_f32_2_1_1.png
diff --git a/tests/expected/auto/gray_f32_2_1_1.png.txt b/tests/expected/auto/gray_f32_2_1_1.png.txt
diff --git a/tests/expected/auto/gray_f64_0_0_0.png b/tests/expected/auto/gray_f64_0_0_0.png
diff --git a/tests/expected/auto/gray_f64_0_0_0.png.txt b/tests/expected/auto/gray_f64_0_0_0.png.txt
diff --git a/tests/expected/auto/gray_f64_2_0_0.png b/tests/expected/auto/gray_f64_2_0_0.png
diff --git a/tests/expected/auto/gray_f64_2_0_0.png.txt b/tests/expected/auto/gray_f64_2_0_0.png.txt
diff --git a/tests/expected/auto/gray_f64_2_1_1.png b/tests/expected/auto/gray_f64_2_1_1.png
diff --git a/tests/expected/auto/gray_f64_2_1_1.png.txt b/tests/expected/auto/gray_f64_2_1_1.png.txt
diff --git a/tests/expected/auto/gray_u16_0_0_0.png b/tests/expected/auto/gray_u16_0_0_0.png
diff --git a/tests/expected/auto/gray_u16_0_0_0.png.txt b/tests/expected/auto/gray_u16_0_0_0.png.txt
diff --git a/tests/expected/auto/gray_u16_2_0_0.png b/tests/expected/auto/gray_u16_2_0_0.png
diff --git a/tests/expected/auto/gray_u16_2_0_0.png.txt b/tests/expected/auto/gray_u16_2_0_0.png.txt
diff --git a/tests/expected/auto/gray_u16_2_1_1.png b/tests/expected/auto/gray_u16_2_1_1.png
diff --git a/tests/expected/auto/gray_u16_2_1_1.png.txt b/tests/expected/auto/gray_u16_2_1_1.png.txt
diff --git a/tests/expected/auto/gray_u32_0_0_0.png b/tests/expected/auto/gray_u32_0_0_0.png
diff --git a/tests/expected/auto/gray_u32_0_0_0.png.txt b/tests/expected/auto/gray_u32_0_0_0.png.txt
diff --git a/tests/expected/auto/gray_u32_2_0_0.png b/tests/expected/auto/gray_u32_2_0_0.png
diff --git a/tests/expected/auto/gray_u32_2_0_0.png.txt b/tests/expected/auto/gray_u32_2_0_0.png.txt
diff --git a/tests/expected/auto/gray_u32_2_1_1.png b/tests/expected/auto/gray_u32_2_1_1.png
diff --git a/tests/expected/auto/gray_u32_2_1_1.png.txt b/tests/expected/auto/gray_u32_2_1_1.png.txt
diff --git a/tests/expected/auto/gray_u8_0_0_0.png b/tests/expected/auto/gray_u8_0_0_0.png
diff --git a/tests/expected/auto/gray_u8_0_0_0.png.txt b/tests/expected/auto/gray_u8_0_0_0.png.txt
diff --git a/tests/expected/auto/gray_u8_2_0_0.png b/tests/expected/auto/gray_u8_2_0_0.png
diff --git a/tests/expected/auto/gray_u8_2_0_0.png.txt b/tests/expected/auto/gray_u8_2_0_0.png.txt
diff --git a/tests/expected/auto/gray_u8_2_1_1.png b/tests/expected/auto/gray_u8_2_1_1.png
diff --git a/tests/expected/auto/gray_u8_2_1_1.png.txt b/tests/expected/auto/gray_u8_2_1_1.png.txt
diff --git a/tests/expected/auto/rgb_u16.json b/tests/expected/auto/rgb_u16.json
diff --git a/tests/expected/auto/rgb_u16_0_0_0.png b/tests/expected/auto/rgb_u16_0_0_0.png
diff --git a/tests/expected/auto/rgb_u16_0_0_0.png.txt b/tests/expected/auto/rgb_u16_0_0_0.png.txt
diff --git a/tests/expected/auto/rgb_u16_2_0_0.png b/tests/expected/auto/rgb_u16_2_0_0.png
diff --git a/tests/expected/auto/rgb_u16_2_0_0.png.txt b/tests/expected/auto/rgb_u16_2_0_0.png.txt
diff --git a/tests/expected/auto/rgb_u16_2_1_1.png b/tests/expected/auto/rgb_u16_2_1_1.png
diff --git a/tests/expected/auto/rgb_u16_2_1_1.png.txt b/tests/expected/auto/rgb_u16_2_1_1.png.txt
diff --git a/tests/expected/auto/rgb_u32.json b/tests/expected/auto/rgb_u32.json
diff --git a/tests/expected/auto/rgb_u32_0_0_0.png b/tests/expected/auto/rgb_u32_0_0_0.png
diff --git a/tests/expected/auto/rgb_u32_0_0_0.png.txt b/tests/expected/auto/rgb_u32_0_0_0.png.txt
diff --git a/tests/expected/auto/rgb_u32_2_0_0.png b/tests/expected/auto/rgb_u32_2_0_0.png
diff --git a/tests/expected/auto/rgb_u32_2_0_0.png.txt b/tests/expected/auto/rgb_u32_2_0_0.png.txt
diff --git a/tests/expected/auto/rgb_u32_2_1_1.png b/tests/expected/auto/rgb_u32_2_1_1.png
diff --git a/tests/expected/auto/rgb_u32_2_1_1.png.txt b/tests/expected/auto/rgb_u32_2_1_1.png.txt
diff --git a/tests/expected/auto/rgba_u16.json b/tests/expected/auto/rgba_u16.json
diff --git a/tests/expected/auto/rgba_u16_0_0_0.png b/tests/expected/auto/rgba_u16_0_0_0.png
diff --git a/tests/expected/auto/rgba_u16_0_0_0.png.txt b/tests/expected/auto/rgba_u16_0_0_0.png.txt
diff --git a/tests/expected/auto/rgba_u16_2_0_0.png b/tests/expected/auto/rgba_u16_2_0_0.png
diff --git a/tests/expected/auto/rgba_u16_2_0_0.png.txt b/tests/expected/auto/rgba_u16_2_0_0.png.txt
diff --git a/tests/expected/auto/rgba_u16_2_1_1.png b/tests/expected/auto/rgba_u16_2_1_1.png
diff --git a/tests/expected/auto/rgba_u16_2_1_1.png.txt b/tests/expected/auto/rgba_u16_2_1_1.png.txt
diff --git a/tests/expected/auto/rgba_u32.json b/tests/expected/auto/rgba_u32.json
diff --git a/tests/expected/auto/rgba_u32_0_0_0.png b/tests/expected/auto/rgba_u32_0_0_0.png
diff --git a/tests/expected/auto/rgba_u32_0_0_0.png.txt b/tests/expected/auto/rgba_u32_0_0_0.png.txt
diff --git a/tests/expected/auto/rgba_u32_2_0_0.png b/tests/expected/auto/rgba_u32_2_0_0.png
diff --git a/tests/expected/auto/rgba_u32_2_0_0.png.txt b/tests/expected/auto/rgba_u32_2_0_0.png.txt
diff --git a/tests/expected/auto/rgba_u32_2_1_1.png b/tests/expected/auto/rgba_u32_2_1_1.png
diff --git a/tests/expected/auto/rgba_u32_2_1_1.png.txt b/tests/expected/auto/rgba_u32_2_1_1.png.txt
diff --git a/tests/expected/auto/rgba_u8_nodata.json b/tests/expected/auto/rgba_u8_nodata.json
@@ -0,0 +1,6 @@
+{
+  "tilejson": "3.0.0",
+  "tiles": [
+    "http://localhost:3111/rgba_u8_nodata/{z}/{x}/{y}"
+  ]
+}
diff --git a/tests/expected/auto/rgba_u8_nodata_0_0_0.png b/tests/expected/auto/rgba_u8_nodata_0_0_0.png
diff --git a/tests/expected/auto/rgba_u8_nodata_0_0_0.png.txt b/tests/expected/auto/rgba_u8_nodata_0_0_0.png.txt
@@ -0,0 +1 @@
+tests/output/auto/rgba_u8_nodata_0_0_0.png: PNG image data, 512 x 512, 8-bit/color RGBA, non-interlaced
diff --git a/tests/expected/auto/rgba_u8_nodata_1_0_0.png b/tests/expected/auto/rgba_u8_nodata_1_0_0.png
diff --git a/tests/expected/auto/rgba_u8_nodata_1_0_0.png.txt b/tests/expected/auto/rgba_u8_nodata_1_0_0.png.txt
@@ -0,0 +1 @@
+tests/output/auto/rgba_u8_nodata_1_0_0.png: PNG image data, 512 x 512, 8-bit/color RGBA, non-interlaced
diff --git a/tests/expected/auto/save_config.yaml b/tests/expected/auto/save_config.yaml
@@ -245,17 +245,9 @@ cog:
   - tests/fixtures/pmtiles
   - tests/fixtures/cog
   sources:
-    gray_f32: tests/fixtures/cog/gray_f32.tif
-    gray_f64: tests/fixtures/cog/gray_f64.tif
-    gray_u16: tests/fixtures/cog/gray_u16.tif
-    gray_u32: tests/fixtures/cog/gray_u32.tif
-    gray_u8: tests/fixtures/cog/gray_u8.tif
-    rgb_u16: tests/fixtures/cog/rgb_u16.tif
-    rgb_u32: tests/fixtures/cog/rgb_u32.tif
     rgb_u8: tests/fixtures/cog/rgb_u8.tif
-    rgba_u16: tests/fixtures/cog/rgba_u16.tif
-    rgba_u32: tests/fixtures/cog/rgba_u32.tif
     rgba_u8: tests/fixtures/cog/rgba_u8.tif
+    rgba_u8_nodata: tests/fixtures/cog/rgba_u8_nodata.tif
 sprites: tests/fixtures/sprites/src1
 fonts:
 - tests/fixtures/fonts/overpass-mono-regular.ttf

diff --git a/tests/fixtures/cog/gray_f32.tif b/tests/fixtures/cog/gray_f32.tif
diff --git a/tests/fixtures/cog/gray_f64.tif b/tests/fixtures/cog/gray_f64.tif
diff --git a/tests/fixtures/cog/gray_u16.tif b/tests/fixtures/cog/gray_u16.tif
diff --git a/tests/fixtures/cog/gray_u32.tif b/tests/fixtures/cog/gray_u32.tif
diff --git a/tests/fixtures/cog/gray_u8.tif b/tests/fixtures/cog/gray_u8.tif
diff --git a/tests/fixtures/cog/rgb_u16.tif b/tests/fixtures/cog/rgb_u16.tif
diff --git a/tests/fixtures/cog/rgb_u32.tif b/tests/fixtures/cog/rgb_u32.tif
diff --git a/tests/fixtures/cog/rgba_u16.tif b/tests/fixtures/cog/rgba_u16.tif
diff --git a/tests/fixtures/cog/rgba_u32.tif b/tests/fixtures/cog/rgba_u32.tif
diff --git a/tests/fixtures/cog/rgba_u8_nodata.tif b/tests/fixtures/cog/rgba_u8_nodata.tif
diff --git a/tests/test.sh b/tests/test.sh
@@ -287,50 +287,14 @@ test_png rgb_u8_0_0_0 rgb_u8/0/0/0
 test_png rgb_u8_3_0_0 rgb_u8/3/0/0
 test_png rgb_u8_3_1_1 rgb_u8/3/1/1
 
-test_jsn rgb_u16       rgb_u16
-test_png rgb_u16_0_0_0 rgb_u16/0/0/0
-test_png rgb_u16_2_0_0 rgb_u16/2/0/0
-test_png rgb_u16_2_1_1 rgb_u16/2/1/1
-
-test_jsn rgb_u32       rgb_u32
-test_png rgb_u32_0_0_0 rgb_u32/0/0/0
-test_png rgb_u32_2_0_0 rgb_u32/2/0/0
-test_png rgb_u32_2_1_1 rgb_u32/2/1/1
-
 test_jsn rgba_u8       rgba_u8
 test_png rgba_u8_0_0_0 rgba_u8/0/0/0
 test_png rgba_u8_3_0_0 rgba_u8/3/0/0
 test_png rgba_u8_3_1_1 rgba_u8/3/1/1
 
-test_jsn rgba_u16       rgba_u16
-test_png rgba_u16_0_0_0 rgba_u16/0/0/0
-test_png rgba_u16_2_0_0 rgba_u16/2/0/0
-test_png rgba_u16_2_1_1 rgba_u16/2/1/1
-
-test_jsn rgba_u32       rgba_u32
-test_png rgba_u32_0_0_0 rgba_u32/0/0/0
-test_png rgba_u32_2_0_0 rgba_u32/2/0/0
-test_png rgba_u32_2_1_1 rgba_u32/2/1/1
-
-test_png gray_u8_0_0_0 gray_u8/0/0/0
-test_png gray_u8_2_0_0 gray_u8/2/0/0
-test_png gray_u8_2_1_1 gray_u8/2/1/1
-
-test_png gray_u16_0_0_0 gray_u16/0/0/0
-test_png gray_u16_2_0_0 gray_u16/2/0/0
-test_png gray_u16_2_1_1 gray_u16/2/1/1
-
-test_png gray_u32_0_0_0 gray_u32/0/0/0
-test_png gray_u32_2_0_0 gray_u32/2/0/0
-test_png gray_u32_2_1_1 gray_u32/2/1/1
-
-test_png gray_f32_0_0_0 gray_f32/0/0/0
-test_png gray_f32_2_0_0 gray_f32/2/0/0
-test_png gray_f32_2_1_1 gray_f32/2/1/1
-
-test_png gray_f64_0_0_0 gray_f64/0/0/0
-test_png gray_f64_2_0_0 gray_f64/2/0/0
-test_png gray_f64_2_1_1 gray_f64/2/1/1
+test_jsn rgba_u8_nodata       rgba_u8_nodata
+test_png rgba_u8_nodata_0_0_0 rgba_u8_nodata/0/0/0
+test_png rgba_u8_nodata_1_0_0 rgba_u8_nodata/1/0/0
 
 >&2 echo "***** Test server response for table source with empty SRID *****"
 test_pbf points_empty_srid_0_0_0  points_empty_srid/0/0/0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		tests/output/auto/rgba_u8_nodata_0_0_0.png: PNG image data, 512 x 512, 8-bit/color RGBA, non-interlaced
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		tests/output/auto/rgba_u8_nodata_1_0_0.png: PNG image data, 512 x 512, 8-bit/color RGBA, non-interlaced