Add the shape, aka geometry to the response of a perceel.

Closes-Issue: #122
OnroerendErfgoed · Mar 12, 2020 · 39b2070 · 39b2070
1 parent e616e03
commit 39b2070
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/crabpy_pyramid/renderers/capakey.py b/crabpy_pyramid/renderers/capakey.py
@@ -57,7 +57,8 @@ def list_perceel_adapter(obj, request):
         'capakey': obj.capakey,
         'percid': obj.percid
     }
-
+
+
 json_list_renderer.add_adapter(capakey.Gemeente, list_gemeente_adapter)
 json_list_renderer.add_adapter(capakey.Afdeling, list_afdeling_adapter)
 json_list_renderer.add_adapter(capakey.Sectie, list_sectie_adapter)
@@ -135,7 +136,8 @@ def item_perceel_adapter(obj, request):
         'capakey': obj.capakey,
         'percid': obj.percid,
         'centroid': obj.centroid,
-        'bounding_box': obj.bounding_box
+        'bounding_box': obj.bounding_box,
+        'shape': obj.shape
     }
 
 

diff --git a/crabpy_pyramid/tests/renderers/test_capakey.py b/crabpy_pyramid/tests/renderers/test_capakey.py
@@ -1,26 +1,23 @@
 # -*- coding: utf-8 -*-
-'''
+"""
 Tests for the capakey renderers module.
 
 .. versionadded:: 0.1.0
-'''
+"""
 
 from __future__ import unicode_literals
 
-from crabpy_pyramid.renderers.capakey import (
-    json_list_renderer,
-    json_item_renderer
-)
+import json
+import unittest
 
-from crabpy.gateway.capakey import (
-    Gemeente,
-    Afdeling,
-    Sectie,
-    Perceel
-)
+from crabpy.gateway.capakey import Afdeling
+from crabpy.gateway.capakey import Gemeente
+from crabpy.gateway.capakey import Perceel
+from crabpy.gateway.capakey import Sectie
+
+from crabpy_pyramid.renderers.capakey import json_item_renderer
+from crabpy_pyramid.renderers.capakey import json_list_renderer
 
-import unittest
-import json
 
 class CapakeyListTests(unittest.TestCase):
 
@@ -35,7 +32,7 @@ def test_list_gemeenten(self):
             Gemeente(44021, 'Gent'),
             Gemeente(31043, 'Knokke-Heist')
         ]
-        dump = self.renderer(gemeenten,{})
+        dump = self.renderer(gemeenten, {})
         self.assertEquals(
             json.loads(dump),
             [
@@ -49,13 +46,12 @@ def test_list_gemeenten(self):
             ]
         )
 
-
     def test_list_afdelingen(self):
         afdelingen = [
             Afdeling(44021, 'GENT  1 AFD', Gemeente(44021, 'Gent')),
             Afdeling(31043, 'KNOKKE-HEIST  1 AFD', Gemeente(31043, 'Knokke-Heist'))
         ]
-        dump = self.renderer(afdelingen,{})
+        dump = self.renderer(afdelingen, {})
         self.assertEquals(
             json.loads(dump),
             [
@@ -81,7 +77,7 @@ def test_list_secties(self):
         secties = [
             Sectie('A', Afdeling(44021, 'GENT  1 AFD', Gemeente(44021, 'Gent')))
         ]
-        dump = self.renderer(secties,{})
+        dump = self.renderer(secties, {})
         self.assertEquals(
             json.loads(dump),
             [
@@ -227,7 +223,8 @@ def test_item_perceel(self):
             '40613A1154/02C000', '40613_A_1154_C_000_02',
             'capaty', 'cashkey',
             (104893.06375, 196022.244094),
-            (104002.076625, 194168.3415, 105784.050875, 197876.146688)
+            (104002.076625, 194168.3415, 105784.050875, 197876.146688),
+            shape={'shape': 'one'}
         )
         dump = self.renderer(p, {})
         self.assertEquals(
@@ -248,6 +245,10 @@ def test_item_perceel(self):
                 'capakey': '40613A1154/02C000',
                 'percid': '40613_A_1154_C_000_02',
                 'centroid': [104893.06375, 196022.244094],
-                'bounding_box': [104002.076625, 194168.3415, 105784.050875, 197876.146688]
+                'bounding_box': [104002.076625,
+                                 194168.3415,
+                                 105784.050875,
+                                 197876.146688],
+                'shape': {'shape': 'one'}
             }
         )