union cascaded outside of loop

Author: Tahira Ullah

.gitignore

@@ -120,6 +120,8 @@ mapswipe_workers/config/configuration.json
 # don´t upload data dir
 data/
 
+mapswipe-data/
+
 # don't upload app config for project managers dashboard
 app.js
 

mapswipe_workers/mapswipe_workers/definitions.py

@@ -13,7 +13,7 @@
 LOGGING_FILE_PATH = os.path.join(DATA_PATH, "mapswipe_workers.log")
 
 # number of geometries for project geometries
-featureNumber = 2
+MAX_INPUT_GEOMETRIES = 2
 
 LOGGING_CONFIG = {
     "version": 1,

mapswipe_workers/mapswipe_workers/project_types/tile_map_service_grid/project.py

@@ -2,7 +2,12 @@
 import os
 
 from mapswipe_workers.project_types.base.project import BaseProject
-from mapswipe_workers.definitions import DATA_PATH, CustomError, logger, featureNumber
+from mapswipe_workers.definitions import (
+    DATA_PATH,
+    CustomError,
+    logger,
+    MAX_INPUT_GEOMETRIES,
+)
 from mapswipe_workers.project_types.tile_map_service_grid.group import Group
 from mapswipe_workers.utils import tile_grouping_functions as grouping_functions
 from mapswipe_workers.project_types.base.tile_server import BaseTileServer
@@ -59,14 +64,16 @@ def validate_geometries(self):
             raise CustomError(f"Empty file. ")
 
         # check if more than 1 geometry is provided
-        elif layer.GetFeatureCount() > featureNumber:
+        elif layer.GetFeatureCount() > MAX_INPUT_GEOMETRIES:
             logger.warning(
                 f"{self.projectId}"
                 f" - validate geometry - "
-                f"Input file contains more than {featureNumber} geometries. "
-                f"Make sure to provide less than {featureNumber} geometries."
+                f"Input file contains more than {MAX_INPUT_GEOMETRIES} geometries. "
+                f"Make sure to provide less than {MAX_INPUT_GEOMETRIES} geometries."
+            )
+            raise CustomError(
+                f"Input file contains more than {MAX_INPUT_GEOMETRIES} geometries. "
             )
-            raise CustomError(f"Input file contains more than 10 geometries. ")
 
         project_area = 0
         geometry_collection = ogr.Geometry(ogr.wkbMultiPolygon)
@@ -76,13 +83,10 @@ def validate_geometries(self):
             geom_name = feat_geom.GetGeometryName()
             # add geometry to geometry collection
             if geom_name == "MULTIPOLYGON":
-                for multi in feat_geom:
-                    geometry_collection.AddGeometry(multi)
-                dissolved_geometry = geometry_collection.UnionCascaded()
-                wkt_geometry_collection = dissolved_geometry.ExportToWkt()
+                for singlepart_polygon in feat_geom:
+                    geometry_collection.AddGeometry(singlepart_polygon)
             if geom_name == "POLYGON":
                 geometry_collection.AddGeometry(feat_geom)
-                wkt_geometry_collection = geometry_collection.ExportToWkt()
             if not feat_geom.IsValid():
                 logger.warning(
                     f"{self.projectId}"
@@ -144,6 +148,9 @@ def validate_geometries(self):
             f"{self.projectId}" f" - validate geometry - " f"input geometry is correct."
         )
 
+        dissolved_geometry = geometry_collection.UnionCascaded()
+        wkt_geometry_collection = dissolved_geometry.ExportToWkt()
+
         return wkt_geometry_collection
 
     def create_groups(self):

mapswipe_workers/mapswipe_workers/utils/tile_grouping_functions.py

@@ -400,6 +400,9 @@ def extent_to_groups(infile, zoom, groupSize):
     # TODO: add this line once properly working
     groups_dict, overlaps_total = adjust_overlapping_groups(raw_groups_dict, zoom)
 
+    if overlaps_total == 0:
+        groups_dict = groups_dict
+
     return groups_dict
 
 

mapswipe_workers/tests/unittests/test_groups_overlap.py

@@ -18,84 +18,6 @@ def test_project_geometries_intersection(self):
             groups_with_overlaps, "groups_with_overlaps.geojson"
         )
 
-        # remove groups within other groups
-        groups_with_overlaps_2 = t.remove_groups_within_other_groups(
-            groups_with_overlaps, zoom
-        )
-        t.vertical_groups_as_geojson(
-            groups_with_overlaps, "groups_with_overlaps2.geojson"
-        )
-
-        # TODO: remove once implemented in real function
-        groups, overlaps_total = t.adjust_overlapping_groups(
-            groups_with_overlaps_2, zoom
-        )
-        t.vertical_groups_as_geojson(groups, "groups.geojson")
-
-        groups_2, overlaps_total_2 = t.adjust_overlapping_groups(groups, zoom)
-        t.vertical_groups_as_geojson(groups_2, "groups_2.geojson")
-
-        # we expect 117 groups
-        self.assertEqual(len(groups_2), 117)
-
-    '''
-    def test_project_geometries_within(self):
-        zoom = 18
-        project_extent_file = os.path.join(
-            self.test_dir, "fixtures/completeness/project_geometries_within.geojson"
-        )
-
-        groups_with_overlaps = t.extent_to_groups(project_extent_file, zoom, 100)
-        t.vertical_groups_as_geojson(
-            groups_with_overlaps, "groups_with_overlaps.geojson"
-        )
-
-        # remove groups within other groups
-        groups_with_overlaps_2 = t.remove_groups_within_other_groups(
-            groups_with_overlaps, zoom
-        )
-        t.vertical_groups_as_geojson(
-            groups_with_overlaps, "groups_with_overlaps2.geojson"
-        )
-
-        # TODO: remove once implemented in real function
-        groups, overlaps_total = t.adjust_overlapping_groups(
-            groups_with_overlaps_2, zoom
-        )
-        t.vertical_groups_as_geojson(groups, "groups.geojson")
-
-        groups_2, overlaps_total_2 = t.adjust_overlapping_groups(groups, zoom)
-        t.vertical_groups_as_geojson(groups_2, "groups_2.geojson")
-
-        groups_3, overlaps_total_3 = t.adjust_overlapping_groups(groups_2, zoom)
-        t.vertical_groups_as_geojson(groups_3, "groups_3.geojson")
-
-        # we expect 64 groups
-        self.assertEqual(len(groups_3), 64)
-
-    """
-    def test_project_geometries_very_small_and_close(self):
-        project_extent_file = os.path.join(
-            self.test_dir,
-            "fixtures/completeness/project_geometries_very_small_and_close.geojson"
-        )
-
-        groups_with_overlaps = t.extent_to_groups(project_extent_file, 18, 100)
-        t.vertical_groups_as_geojson(
-            groups_with_overlaps, "groups_with_overlaps.geojson"
-        )
-
-        groups = t.adjust_overlapping_groups(groups_with_overlaps)
-
-        # save files for visual inspection in qgis
-        t.vertical_groups_as_geojson(groups, "groups.geojson")
-
-        # TODO: add correct assertion, what is the expected output?
-        # we expect 64 groups
-        #self.assertEqual(len(groups), 64)
-    """
-'''
-
 
 if __name__ == "__main__":
     unittest.main()

postgres/scripts/changeGeomType.sql

@@ -0,0 +1 @@
+ALTER TABLE projects ALTER COLUMN geom SET DATA TYPE geometry;