- Bump to version 2.0.4.4

mapstore2_adapter/plugins/geonode.py

@@ -555,8 +555,9 @@ def viewer_json(self, viewer, request):
             output: GeoNode JSON Gxp Config
         """
         # MapStore uses x0,y0,x1,y1 ordering of bbox coords
-        if viewer.get('map', None) and viewer['map'].get('bbox'):
+        viewer = to_json(viewer)
+        if viewer.get('map', None) and viewer['map'].get('bbox', None):
             ms2_bbox = viewer['map'].get('bbox')
             config_bbox = [ms2_bbox[0], ms2_bbox[2], ms2_bbox[1], ms2_bbox[3]]
             viewer['map']['bbox'] = config_bbox
-        return to_json(viewer)
+        return viewer

mapstore2_adapter/utils.py

@@ -232,11 +232,9 @@ def get_valid_number(number, default=None, complementar=False):
 
 def to_json(config):
     try:
-        basestring  # noqa
-    except NameError:
-        # Python 3 does not declare basetring anymore
-        basestring = str
-
-    if isinstance(config, basestring):
         return json.loads(config)
-    return config
+    except Exception:
+        try:
+            return json.loads(config.decode())
+        except Exception:
+            return config

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = django-mapstore-adapter
-version = 2.0.4.3
+version = 2.0.4.4
 description = Django MapStore2 Adapter
 author = Alessio Fabiani
 author_email = [email protected]