get default map layer/layers values from registry setting and then fr…

…om static defaults as fallback.

src/collective/collectionfilter/interfaces.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 from collective.collectionfilter import _
 from collective.collectionfilter import utils
+from plone.api.portal import get_registry_record as getrec
 from plone.app.z3cform.widget import RelatedItemsFieldWidget
 from plone.autoform.directives import widget
 from zope import schema
 from zope.interface import Interface
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 
+
 try:
     from plone.formwidget.geolocation.vocabularies import default_map_layer
     from plone.formwidget.geolocation.vocabularies import default_map_layers
@@ -186,6 +188,18 @@ class ICollectionFilterBrowserLayer(IDefaultBrowserLayer):
 
 if HAS_GEOLOCATION:
 
+    def map_layer_default():
+        return getrec(
+            name='geolocation.default_map_layer',
+            default=default_map_layer
+        )
+
+    def map_layers_default():
+        return getrec(
+            name='geolocation.map_layers',
+            default=default_map_layers
+        )
+
     class ICollectionMapsSchema(ICollectionFilterBaseSchema):
         """ schema for maps filtering
         """
@@ -208,7 +222,7 @@ class ICollectionMapsSchema(ICollectionFilterBaseSchema):
                 default=u'Set the default map layer'
             ),
             required=False,
-            default=default_map_layer,
+            defaultFactory=map_layer_default,
             vocabulary='plone.formwidget.geolocation.vocabularies.map_layers'
         )
 
@@ -218,6 +232,6 @@ class ICollectionMapsSchema(ICollectionFilterBaseSchema):
                 u'help_map_layers',
                 default=u'Set the available map layers'),
             required=False,
-            default=default_map_layers,
+            defaultFactory=map_layers_default,
             missing_value=[],
             value_type=schema.Choice(vocabulary='plone.formwidget.geolocation.vocabularies.map_layers'))  # noqa: E501