surface: added support for browserOptions in introspection

mapproxy/src/mapproxy/generator/surface.cpp

@@ -88,6 +88,16 @@ bool SurfaceBase::Introspection::operator!=(const Introspection &other) const
     if (geodata != other.geodata) { return true; }
     if (position != other.position) { return true; }
 
+    if (browserOptions.empty() != other.browserOptions.empty()) {
+        return true;
+    }
+    if (!browserOptions.empty()
+        && (boost::any_cast<const Json::Value&>(browserOptions)
+            != boost::any_cast<const Json::Value&>(other.browserOptions)))
+    {
+        return true;
+    }
+
     return false;
 }
 
@@ -115,6 +125,12 @@ void SurfaceBase::SurfaceDefinition::parse(const Json::Value &value)
             introspection.position
                 = vr::positionFromJson(jintrospection["position"]);
         }
+
+        if (jintrospection.isMember("browserOptions")) {
+            introspection.browserOptions
+                = Json::check(jintrospection["browserOptions"]
+                              , Json::objectValue);
+        }
     }
 }
 
@@ -135,6 +151,12 @@ void SurfaceBase::SurfaceDefinition::build(Json::Value &value) const
         if (introspection.position) {
             jintrospection["position"] = vr::asJson(*introspection.position);
         }
+
+        if (!introspection.browserOptions.empty()) {
+            jintrospection["browserOptions"]
+                = boost::any_cast<const Json::Value&>
+                (introspection.browserOptions);
+        }
     }
 }
 
@@ -596,6 +618,10 @@ SurfaceBase::extraProperties(const SurfaceDefinition &def) const
         extra.position = *def.introspection.position;
     }
 
+    // browser options (must be Json::Value!)
+    extra.browserOptions = def.introspection.browserOptions;
+
+
     return extra;
 }
 

mapproxy/src/mapproxy/generator/surface.hpp

@@ -50,6 +50,7 @@ class SurfaceBase : public Generator {
         Resource::Id::list tms;
         Resource::Id::list geodata;
         boost::optional<vr::Position> position;
+        boost::any browserOptions;
 
         bool empty() const;
         bool operator!=(const Introspection &other) const;