merge multiPolygons into dev

Author: Hagellach37

.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
 

manager_dashboard/manager_dashboard/js/forms.js

@@ -161,35 +161,42 @@ function openFile(event) {
           try {
               var text = reader.result;
               var geojsonData = JSON.parse(text)
-
               // check number of features
               numberOfFeatures = geojsonData['features'].length
+
               console.log('number of features: ' + numberOfFeatures)
-              if (numberOfFeatures > 1) {
+              if (numberOfFeatures > 10) {
                 throw 'too many features: ' + numberOfFeatures
               }
               info_output.innerHTML += 'Number of Features: ' + numberOfFeatures + '<br>';
               info_output.style.display = 'block'
 
+              sumArea = 0
               // check input geometry type
-              feature = geojsonData['features'][0]
-              type = turf.getType(feature)
-              console.log('geometry type: ' + type)
-              if (type !== 'Polygon' & type !== 'MultiPolygon') {
-                throw 'wrong geometry type: ' + type
-              }
-              info_output.innerHTML += 'Feature Type: ' + type + '<br>';
-              info_output.style.display = 'block'
+              for (var i =0; i < geojsonData.features.length; i++) {
+                feature = geojsonData.features[i]
+                type = turf.getType(feature)
+                console.log('geometry type: ' + type)
+
+                if (type !== 'Polygon' & type !== 'MultiPolygon') {
+                    throw 'GeoJson contains one or more wrong geometry type(s): ' + type
+                }
+
+                info_output.innerHTML += 'Feature Type: ' + type + '<br>';
+                info_output.style.display = 'block'
+                sumArea += turf.area(feature)/1000000 // area in square kilometers
+               }
 
               // check project size, based on zoom level
               var zoomLevel = parseInt(document.getElementById('zoomLevel').value);
-              area = turf.area(feature)/1000000 // area in square kilometers
               maxArea = (23 - zoomLevel) * (23 - zoomLevel) * 200
-              console.log('project size: ' + area + ' sqkm')
-              if (area > maxArea) {
-                throw 'project is to large: ' + area + ' sqkm; ' + 'max allowed size for this zoom level: ' + maxArea + ' sqkm'
+              console.log('project size: ' + sumArea + ' sqkm')
+
+              if (sumArea > maxArea) {
+                throw 'project is to large: ' + sumArea + ' sqkm; ' + 'max allowed size for this zoom level: ' + maxArea + ' sqkm'
               }
-              info_output.innerHTML += 'Project Size: ' + area + ' sqkm<br>';
+
+              info_output.innerHTML += 'Project Size: ' + sumArea + ' sqkm<br>';
               info_output.style.display = 'block'
 
               // add feature to map

mapswipe_workers/mapswipe_workers/definitions.py

@@ -12,6 +12,9 @@
     os.makedirs(DATA_PATH)
 LOGGING_FILE_PATH = os.path.join(DATA_PATH, "mapswipe_workers.log")
 
+# number of geometries for project geometries
+MAX_INPUT_GEOMETRIES = 10
+
 LOGGING_CONFIG = {
     "version": 1,
     "disable_existing_loggers": True,
@@ -147,7 +150,7 @@ def tutorial(self):
         )
 
         # TODO: implement for arbitrary geometries
-        # from mapswipe_workers.project_types.arbitrary_geometries.arbitrary_geometries_tutorial import (
+        # from mapswipe_workers.project_types.arbitrary_geometries.arbitrary_geometries_tutorial import ( # noqa E501
         #    ArbitraryGeometriesTutorial,
         # )
 

mapswipe_workers/mapswipe_workers/mapswipe_workers.py

@@ -75,6 +75,15 @@ def run_create_projects():
         try:
             # Create a project object using appropriate class (project type).
             project = ProjectType(project_type).constructor(project_draft)
+            # TODO: here the project.geometry attribute is overwritten
+            #  this is super confusing since it's not a geojson anymore
+            #  but this is what we set initially,
+            #  e.g. in tile_map_service_grid/project.py
+            #  project.geometry is set to a list of wkt geometries now
+            #  this can't be handled in postgres,
+            #  postgres expects just a string not an array
+            #  validated_geometries should be called during init already
+            #  for the respective project types
             project.geometry = project.validate_geometries()
             project.create_groups()
             project.calc_required_results()

mapswipe_workers/mapswipe_workers/project_types/base/project.py

@@ -230,7 +230,7 @@ def save_to_postgres(self, project, groups, groupsOfTasks):
             VALUES (
               %s  -- created
               ,%s  -- createdBy
-              ,ST_Force2D(ST_Multi(ST_GeomFromText(%s, 4326)))  -- geometry
+              ,ST_Force2D(ST_GeomFromText(%s, 4326)) -- geometry
               ,%s  -- image
               ,%s  -- isFeatured
               ,%s  -- lookFor

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
+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
@@ -14,6 +19,7 @@ def __init__(self, project_draft: dict):
         super().__init__(project_draft)
         self.project_type = project_draft["projectType"]
         self.groupSize = project_draft["groupSize"]
+        # Note: this will be overwritten by validate_geometry in mapswipe_workers.py
         self.geometry = project_draft["geometry"]
         self.zoomLevel = int(project_draft.get("zoomLevel", 18))
         self.tileServer = vars(BaseTileServer(project_draft["tileServer"]))
@@ -58,19 +64,29 @@ def validate_geometries(self):
             raise CustomError(f"Empty file. ")
 
         # check if more than 1 geometry is provided
-        elif layer.GetFeatureCount() > 1:
+        elif layer.GetFeatureCount() > MAX_INPUT_GEOMETRIES:
             logger.warning(
                 f"{self.projectId}"
                 f" - validate geometry - "
-                f"Input file contains more than one geometry. "
-                f"Make sure to provide exact one input geometry."
+                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 one geometry. ")
 
+        project_area = 0
+        geometry_collection = ogr.Geometry(ogr.wkbMultiPolygon)
         # check if the input geometry is a valid polygon
         for feature in layer:
             feat_geom = feature.GetGeometryRef()
             geom_name = feat_geom.GetGeometryName()
+            # add geometry to geometry collection
+            if geom_name == "MULTIPOLYGON":
+                for singlepart_polygon in feat_geom:
+                    geometry_collection.AddGeometry(singlepart_polygon)
+            if geom_name == "POLYGON":
+                geometry_collection.AddGeometry(feat_geom)
             if not feat_geom.IsValid():
                 logger.warning(
                     f"{self.projectId}"
@@ -91,9 +107,6 @@ def validate_geometries(self):
                 )
                 raise CustomError(f"Invalid geometry type: {geom_name}. ")
 
-            # get geometry as wkt
-            wkt_geometry = feat_geom.ExportToWkt()
-
             # check size of project make sure its smaller than  5,000 sqkm
             # for doing this we transform the geometry
             # into Mollweide projection (EPSG Code 54009)
@@ -105,47 +118,47 @@ def validate_geometries(self):
 
             transform = osr.CoordinateTransformation(source, target)
             feat_geom.Transform(transform)
-            project_area = feat_geom.GetArea() / 1000000
-
-            # calculate max area based on zoom level
-            # for zoom level 18 this will be 5000 square kilometers
-            # max zoom level is 22
-            if self.zoomLevel > 22:
-                raise CustomError(
-                    f"zoom level is to large (max: 22): {self.zoomLevel}."
-                )
+            project_area = +feat_geom.GetArea() / 1000000
 
-            max_area = (23 - int(self.zoomLevel)) * (23 - int(self.zoomLevel)) * 200
+        # calculate max area based on zoom level
+        # for zoom level 18 this will be 5000 square kilometers
+        # max zoom level is 22
+        if self.zoomLevel > 22:
+            raise CustomError(f"zoom level is to large (max: 22): {self.zoomLevel}.")
 
-            if project_area > max_area:
-                logger.warning(
-                    f"{self.projectId}"
-                    f" - validate geometry - "
-                    f"Project is to large: {project_area} sqkm. "
-                    f"Please split your projects into smaller sub-projects and resubmit"
-                )
-                raise CustomError(
-                    f"Project is to large: {project_area} sqkm. "
-                    f"Max area for zoom level {self.zoomLevel} = {max_area} sqkm"
-                )
+        max_area = (23 - int(self.zoomLevel)) * (23 - int(self.zoomLevel)) * 200
+
+        if project_area > max_area:
+            logger.warning(
+                f"{self.projectId}"
+                f" - validate geometry - "
+                f"Project is to large: {project_area} sqkm. "
+                f"Please split your projects into smaller sub-projects and resubmit"
+            )
+            raise CustomError(
+                f"Project is to large: {project_area} sqkm. "
+                f"Max area for zoom level {self.zoomLevel} = {max_area} sqkm"
+            )
 
         del datasource
         del layer
 
         self.validInputGeometries = raw_input_file
-
         logger.info(
             f"{self.projectId}" f" - validate geometry - " f"input geometry is correct."
         )
 
-        return wkt_geometry
+        dissolved_geometry = geometry_collection.UnionCascaded()
+        wkt_geometry_collection = dissolved_geometry.ExportToWkt()
+
+        return wkt_geometry_collection
 
     def create_groups(self):
         """
         The function to create groups from the project extent
         """
         # first step get properties of each group from extent
-        raw_groups = grouping_functions.extent_to_slices(
+        raw_groups = grouping_functions.extent_to_groups(
             self.validInputGeometries, self.zoomLevel, self.groupSize
         )