Do not try to deserialize the geojson attribute.

Author: progval

ppp_datamodel/nodes/__init__.py

@@ -3,7 +3,7 @@
 from .abstractnode import AbstractNode
 from .triple import Triple
 from .missing import Missing
-from .resource import Resource
+from .resource import *
 from .sentence import Sentence
 from .list import List
 from .list_operators import Union, Intersection, And, Or, First, Last, Sort

ppp_datamodel/nodes/abstractnode.py

@@ -116,16 +116,22 @@ def from_json(cls, data):
     def from_dict(cls, data):
         cls._test_can_import_json(data)
 
-        # Create node instances
-        conv = lambda v: cls.from_dict(v) if isinstance(v, dict) else v
-        data = {k.replace('-', '_'): conv(v) for (k, v) in data.items()}
+        # Find a class that will deserialize the dict as specifically
+        # as possible
         while True:
             cls2 = cls._select_class(data)
             if cls is cls2:
                 break
             cls = cls2
+        conv = (lambda k,v: cls.deserialize_attribute(k, v)
+                            if isinstance(v, dict) else v)
+        data = {k.replace('-', '_'): conv(k,v) for (k, v) in data.items()}
         return cls(**data)
 
+    @classmethod
+    def deserialize_attribute(cls, key, value):
+        return AbstractNode.from_dict(value)
+
     @classmethod
     def _select_class(cls, data):
         return TYPE_TO_CLASS[data['type']]

ppp_datamodel/nodes/resource.py

@@ -3,6 +3,9 @@
 from ..log import logger
 from .abstractnode import register, AbstractNode
 
+__all__ = ['Resource', 'StringResource', 'MathLatexResource',
+           'BooleanResource', 'TimeResource', 'GeojsonResource']
+
 EXTRA_ATTRIBUTES = {
         'string': ('language',),
         'boolean': (),
@@ -28,7 +31,7 @@ class Resource(AbstractNode):
 
     @classmethod
     def _select_class(cls, data):
-        type_ = data.get('value_type', 'string')
+        type_ = data.get('value-type', 'string')
         if type_ not in VALUE_TYPE_TO_CLASS:
             logger.warning('Unknown value-type: %s' % type_)
             type_ = 'string'
@@ -96,3 +99,14 @@ def _parse_value(value, attributes):
     def _format_value(value):
         return value
 
+@register_valuetype
+class GeojsonResource(Resource):
+    _value_type = 'geo-json'
+    _possible_attributes = Resource._possible_attributes + ('geojson',)
+
+    @classmethod
+    def deserialize_attribute(cls, key, value):
+        if key == 'geojson':
+            return value
+        else:
+            super().deserialize_attribute(key, value)

tests/test_resource.py

@@ -1,4 +1,5 @@
 from ppp_datamodel import AbstractNode, Triple, Resource, Missing
+from ppp_datamodel import BooleanResource
 
 from unittest import TestCase
 
@@ -16,6 +17,7 @@ def testValueType(self):
     def testBoolean(self):
         d = {'type': 'resource', 'value': 'true', 'value-type': 'boolean'}
         o = AbstractNode.from_dict(d)
+        self.assertIsInstance(o, BooleanResource)
         self.assertEqual(o.value, True)
         self.assertEqual(o.as_dict(), d)
 
@@ -24,3 +26,16 @@ def testTime(self):
         o = AbstractNode.from_dict(d)
         self.assertEqual(o.value, '2010-05-08T23:41:54.000Z')
 
+    def testGeojson(self):
+        d = {
+                "type": "resource",
+                "value": "+125.6, +10.1",
+                "geojson": {
+                    "type": "Feature",
+                    "geometry": {"type": "Point", "coordinates": [125.6, 10.1]},
+                    "properties": {"name": "Dinagat Islands"}
+                },
+                "value-type": "geo-json"
+            }
+        o = AbstractNode.from_dict(d)
+        self.assertEqual(o.geojson['type'], 'Feature')