Add options for Custom Geometry Source types to enable clipping and wrapping geometry (#11041)

2 files changed, 22 insertions, 0 deletions

diff --git a/include/mbgl/style/conversion/custom_geometry_source_options.hpp b/include/mbgl/style/conversion/custom_geometry_source_options.hpp
index 73b141e799..dedecd1aa4 100644
--- a/include/mbgl/style/conversion/custom_geometry_source_options.hpp
+++ b/include/mbgl/style/conversion/custom_geometry_source_options.hpp
@@ -54,6 +54,26 @@ struct Converter<CustomGeometrySource::Options> {
             }
         }
 
+        const auto wrapValue = objectMember(value, "wrap");
+        if (wrapValue) {
+            if (toBool(*wrapValue)) {
+                options.tileOptions.wrap = static_cast<bool>(*toBool(*wrapValue));
+            } else {
+                error = { "CustomGeometrySource TileOptions wrap value must be a boolean" };
+                return {};
+            }
+        }
+
+        const auto clipValue = objectMember(value, "clip");
+        if (clipValue) {
+            if (toBool(*clipValue)) {
+                options.tileOptions.clip = static_cast<double>(*toBool(*clipValue));
+            } else {
+                error = { "CustomGeometrySource TileOptiosn clip value must be a boolean" };
+                return {};
+            }
+        }
+
         return { options };
     }
 
diff --git a/include/mbgl/style/sources/custom_geometry_source.hpp b/include/mbgl/style/sources/custom_geometry_source.hpp
index a0b990b44b..9daeeb3819 100644
--- a/include/mbgl/style/sources/custom_geometry_source.hpp
+++ b/include/mbgl/style/sources/custom_geometry_source.hpp
@@ -25,6 +25,8 @@ public:
         double tolerance = 0.375;
         uint16_t tileSize = util::tileSize;
         uint16_t buffer = 128;
+        bool clip = false;
+        bool wrap = false;
     };
 
     struct Options {