diff --git a/tests/geometry/multipoint.json b/tests/geometry/multipoint.json
new file mode 100644
index 0000000..4cd0b6d
--- /dev/null
+++ b/tests/geometry/multipoint.json
@@ -0,0 +1,27 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": { "point": "multi" },
+      "geometry": {
+        "type": "MultiPoint",
+        "coordinates": [
+          [
+            -79.453125,
+            49.38237278700955
+          ], [
+            11.6015625,
+            52.05249047600099
+          ], [
+            -60.46875,
+            -7.01366792756663
+          ], [
+            23.90625,
+            -12.554563528593656
+          ]
+        ]
+      }
+    }
+  ]
+}
diff --git a/tests/geometry/out/-z3.json b/tests/geometry/out/-z3.json
index 84d3c69..354066c 100644
--- a/tests/geometry/out/-z3.json
+++ b/tests/geometry/out/-z3.json
@@ -1,9 +1,9 @@
 { "type": "FeatureCollection", "properties": {
-"bounds": "-1.406250,-23.563987,102.000000,59.900000",
+"bounds": "-79.453125,-23.563987,102.000000,59.900000",
 "center": "22.500000,20.489949,3",
 "description": "tests/geometry/out/-z3.json.check.mbtiles",
 "format": "pbf",
-"json": "{\"vector_layers\": [ { \"id\": \"bare\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 3, \"fields\": {} }, { \"id\": \"geometrycollection\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 3, \"fields\": {\"collection\": \"Boolean\"} } ] }",
+"json": "{\"vector_layers\": [ { \"id\": \"bare\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 3, \"fields\": {} }, { \"id\": \"geometrycollection\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 3, \"fields\": {\"collection\": \"Boolean\"} }, { \"id\": \"multipoint\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 3, \"fields\": {\"point\": \"String\"} } ] }",
 "maxzoom": "3",
 "minzoom": "0",
 "name": "tests/geometry/out/-z3.json.check.mbtiles",
@@ -19,8 +19,16 @@
 ,
 { "type": "FeatureCollection", "properties": { "layer": "geometrycollection" }, "features": [
 { "type": "Feature", "properties": { "collection": true }, "geometry": { "type": "LineString", "coordinates": [ [ 100.986328, 0.000000 ], [ 101.953125, 1.054628 ] ] } }
+] }
 ,
-{ "type": "Feature", "properties": { "collection": true }, "geometry": { "type": "Point", "coordinates": [ 99.931641, 0.000000 ] } }
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "MultiPoint", "coordinates": [ [ -79.453125, 49.382373 ], [ 11.601562, 52.052490 ], [ -60.468750, -7.013668 ], [ 23.906250, -12.554564 ] ] } }
+] }
+] }
+,
+{ "type": "FeatureCollection", "properties": { "zoom": 1, "x": 0, "y": 1 }, "features": [
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ -60.468750, -7.013668 ] } }
 ] }
 ] }
 ,
@@ -30,6 +38,10 @@
 ,
 { "type": "Feature", "properties": {  }, "geometry": { "type": "LineString", "coordinates": [ [ -1.406250, 28.921631 ], [ 0.000000, 28.420391 ], [ 3.515625, 27.098254 ] ] } }
 ] }
+,
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ -79.453125, 49.382373 ] } }
+] }
 ] }
 ,
 { "type": "FeatureCollection", "properties": { "zoom": 1, "x": 1, "y": 1 }, "features": [
@@ -39,8 +51,10 @@
 ,
 { "type": "FeatureCollection", "properties": { "layer": "geometrycollection" }, "features": [
 { "type": "Feature", "properties": { "collection": true }, "geometry": { "type": "LineString", "coordinates": [ [ 100.986328, 0.000000 ], [ 101.997070, 1.010690 ] ] } }
+] }
 ,
-{ "type": "Feature", "properties": { "collection": true }, "geometry": { "type": "Point", "coordinates": [ 99.975586, 0.000000 ] } }
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ 23.906250, -12.554564 ] } }
 ] }
 ] }
 ,
@@ -53,8 +67,16 @@
 ,
 { "type": "FeatureCollection", "properties": { "layer": "geometrycollection" }, "features": [
 { "type": "Feature", "properties": { "collection": true }, "geometry": { "type": "LineString", "coordinates": [ [ 100.986328, 0.000000 ], [ 101.997070, 1.010690 ] ] } }
+] }
 ,
-{ "type": "Feature", "properties": { "collection": true }, "geometry": { "type": "Point", "coordinates": [ 99.975586, 0.000000 ] } }
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ 11.601562, 52.052490 ] } }
+] }
+] }
+,
+{ "type": "FeatureCollection", "properties": { "zoom": 2, "x": 1, "y": 2 }, "features": [
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ -60.468750, -7.013668 ] } }
 ] }
 ] }
 ,
@@ -62,12 +84,20 @@
 { "type": "FeatureCollection", "properties": { "layer": "bare" }, "features": [
 { "type": "Feature", "properties": {  }, "geometry": { "type": "LineString", "coordinates": [ [ -1.406250, 28.921631 ], [ 0.000000, 28.401065 ], [ 1.757812, 27.741885 ] ] } }
 ] }
+,
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ -79.453125, 49.382373 ] } }
+] }
 ] }
 ,
 { "type": "FeatureCollection", "properties": { "zoom": 2, "x": 2, "y": 2 }, "features": [
 { "type": "FeatureCollection", "properties": { "layer": "bare" }, "features": [
 { "type": "Feature", "properties": {  }, "geometry": { "type": "LineString", "coordinates": [ [ 24.916992, 1.757537 ], [ 24.741211, 0.000000 ], [ 22.148438, -23.563987 ] ] } }
 ] }
+,
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ 23.906250, -12.554564 ] } }
+] }
 ] }
 ,
 { "type": "FeatureCollection", "properties": { "zoom": 2, "x": 2, "y": 1 }, "features": [
@@ -76,6 +106,10 @@
 ,
 { "type": "Feature", "properties": {  }, "geometry": { "type": "LineString", "coordinates": [ [ -1.406250, 28.921631 ], [ 0.000000, 28.401065 ], [ 26.718750, 17.999632 ], [ 24.741211, 0.000000 ], [ 24.543457, -1.757537 ] ] } }
 ] }
+,
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ 11.601562, 52.052490 ] } }
+] }
 ] }
 ,
 { "type": "FeatureCollection", "properties": { "zoom": 2, "x": 3, "y": 2 }, "features": [
@@ -94,6 +128,18 @@
 ] }
 ] }
 ,
+{ "type": "FeatureCollection", "properties": { "zoom": 3, "x": 2, "y": 4 }, "features": [
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ -60.468750, -7.013668 ] } }
+] }
+] }
+,
+{ "type": "FeatureCollection", "properties": { "zoom": 3, "x": 2, "y": 2 }, "features": [
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ -79.453125, 49.382373 ] } }
+] }
+] }
+,
 { "type": "FeatureCollection", "properties": { "zoom": 3, "x": 3, "y": 3 }, "features": [
 { "type": "FeatureCollection", "properties": { "layer": "bare" }, "features": [
 { "type": "Feature", "properties": {  }, "geometry": { "type": "LineString", "coordinates": [ [ -1.406250, 28.921631 ], [ 0.000000, 28.401065 ], [ 0.878906, 28.071980 ] ] } }
@@ -104,6 +150,10 @@
 { "type": "FeatureCollection", "properties": { "layer": "bare" }, "features": [
 { "type": "Feature", "properties": {  }, "geometry": { "type": "LineString", "coordinates": [ [ 24.829102, 0.878872 ], [ 24.730225, 0.000000 ], [ 22.148438, -23.563987 ] ] } }
 ] }
+,
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ 23.906250, -12.554564 ] } }
+] }
 ] }
 ,
 { "type": "FeatureCollection", "properties": { "zoom": 3, "x": 4, "y": 3 }, "features": [
@@ -116,6 +166,10 @@
 { "type": "FeatureCollection", "properties": { "layer": "bare" }, "features": [
 { "type": "Feature", "properties": {  }, "geometry": { "type": "LineString", "coordinates": [ [ 2.460938, 46.080852 ], [ 43.242188, 59.905468 ] ] } }
 ] }
+,
+{ "type": "FeatureCollection", "properties": { "layer": "multipoint" }, "features": [
+{ "type": "Feature", "properties": { "point": "multi" }, "geometry": { "type": "Point", "coordinates": [ 11.601562, 52.052490 ] } }
+] }
 ] }
 ,
 { "type": "FeatureCollection", "properties": { "zoom": 3, "x": 6, "y": 4 }, "features": [