Include polygons in area detection

1 files changed, 18 insertions, 0 deletions

diff --git a/chimere/models.py b/chimere/models.py
index 7575e1c..a68945a 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -1466,6 +1466,7 @@ class SimpleArea:
         subcat.order as order, subcat.item_type as item_type
         from chimere_subcategory subcat
         inner join chimere_category cat on cat.id=subcat.category_id'''
+
         sql = sql_main + '''
         inner join chimere_marker mark on ST_Contains(%s, mark.point)''' % area
         if equal_status:
@@ -1476,6 +1477,7 @@ class SimpleArea:
         and mc.marker_id=mark.id'''
         sql += where
         subcats = set(SubCategory.objects.raw(sql))
+
         sql = sql_main + '''
         inner join chimere_route rt on (ST_Intersects(%s, rt.route) or
         ST_Contains(%s, rt.route))''' % (area, area)
@@ -1490,6 +1492,22 @@ class SimpleArea:
         # set union behave strangely. Doing it manualy...
         for c in set(SubCategory.objects.raw(sql)):
             subcats.add(c)
+
+        sql = sql_main + '''
+        inner join chimere_polygon pol on (ST_Intersects(%s, pol.polygon) or
+        ST_Contains(%s, pol.polygon))''' % (area, area)
+        if equal_status:
+            sql += ' and pol.status' + equal_status
+        sql += date_condition % {'alias': 'pol'}
+        sql += '''
+        inner join chimere_polygon_categories pc on pc.subcategory_id=subcat.id
+        and pc.polygon_id=pol.id'''
+        sql += where
+        # subcats.union(set(SubCategory.objects.raw(sql)))
+        # set union behave strangely. Doing it manualy...
+        for c in set(SubCategory.objects.raw(sql)):
+            subcats.add(c)
+
         return subcats