[Fixes GeoNode#14136] Fixes the support for creation of dataset with generic Geometry type (GeoNode#14137)

* [Fixes GeoNode#14136] Fixes the support for creation of dataset with generic Geometry type

* [Fixes GeoNode#14136] added review suggestions

Author: sijandh35

geonode/upload/handlers/common/vector.py

@@ -33,7 +33,7 @@
 import logging
 import os
 from subprocess import PIPE, Popen
-from typing import List, Optional, Tuple
+from typing import List, Optional, Tuple, Union
 import shlex
 from celery import chord, group
 from django.db import transaction
@@ -78,6 +78,7 @@
 from geonode.upload.registry import feature_validators_registry
 from django.core.exceptions import ValidationError
 
+
 logger = logging.getLogger("importer")
 
 
@@ -605,7 +606,7 @@ def find_alternate_by_dataset(self, _exec_obj, layer_name, should_be_overwritten
 
     def setup_dynamic_model(
         self,
-        layer: ogr.Layer,
+        layer: Union[ogr.Layer, str],
         execution_id: str,
         should_be_overwritten: bool,
         username: str,
@@ -619,7 +620,7 @@ def setup_dynamic_model(
             - celery_group -> the celery group of the field creation
         """
 
-        layer_name = self.fixup_name(self._extract_layer(layer).GetName())
+        layer_name = self.fixup_name(layer if isinstance(layer, str) else self._extract_layer(layer).GetName())
         _exec_obj = orchestrator.get_execution_object(execution_id)
 
         is_dynamic_model_managed = _exec_obj.input_params.get("is_dynamic_model_managed", False)
@@ -768,7 +769,7 @@ def promote_to_multi(self, geometry_name):
             "Multi" not in geometry_name
             and "Point" not in geometry_name
             and "3D" not in geometry_name
-            and geometry_name != "Unknown (any)"
+            and geometry_name not in ("Unknown (any)", "Geometry")
         ):
             return f"Multi {geometry_name.title()}"
         return geometry_name

geonode/upload/handlers/empty_dataset/tests.py

@@ -154,7 +154,12 @@ def test__define_dynamic_layer_schema(self):
             expected_schema = [
                 {"name": "field_int", "class_name": "django.db.models.IntegerField", "null": False},
                 {"name": "field_str", "class_name": "django.db.models.CharField", "null": False},
-                {"name": "geom", "class_name": None, "dim": 2, "authority": "EPSG:4326"},
+                {
+                    "name": "geom",
+                    "class_name": "django.contrib.gis.db.models.fields.GeometryField",
+                    "dim": 2,
+                    "authority": "EPSG:4326",
+                },
                 {"name": "fid", "class_name": "django.db.models.BigAutoField", "null": False, "primary_key": True},
             ]
             output_schema = self.handler._define_dynamic_layer_schema(None, execution_id=str(exec_req.exec_id))
@@ -245,3 +250,13 @@ def test_utils_add_attributes_to_xml(self):
         expected = b"<featureType><name>myname</name><nativeName>myname</nativeName><title>myname</title><srs>EPSG:4326</srs><nativeBoundingBox><minx>-180</minx><maxx>180</maxx><miny>-90</miny><maxy>90</maxy><crs>EPSG:4326</crs></nativeBoundingBox><latLonBoundingBox><minx>-180</minx><maxx>180</maxx><miny>-90</miny><maxy>90</maxy><crs>EPSG:4326</crs></latLonBoundingBox><attributes><attribute><name>field_str</name><binding>java.lang.String</binding><nillable>false</nillable></attribute><attribute><name>field_int</name><binding>java.lang.Integer</binding><nillable>false</nillable></attribute></attributes></featureType>"  # noqa
         actual_xml = add_attributes_to_xml(subset_attributes, base_xml.format(name="myname"))
         self.assertEqual(expected, actual_xml)
+
+    def test_utils_add_attributes_to_xml_supports_generic_geometry(self):
+        """
+        Generic Geometry should be mapped to the GeoServer JTS Geometry binding.
+        """
+        subset_attributes = {"geom": {"type": "Geometry"}}
+        actual_xml = add_attributes_to_xml(subset_attributes, base_xml.format(name="myname"))
+
+        self.assertIn(b"<name>geom</name>", actual_xml)
+        self.assertIn(b"<binding>org.locationtech.jts.geom.Geometry</binding>", actual_xml)

geonode/upload/handlers/empty_dataset/utils.py

@@ -34,6 +34,7 @@
     "Point": "com.vividsolutions.jts.geom.Point",
     "LineString": "com.vividsolutions.jts.geom.LineString",
     "Polygon": "com.vividsolutions.jts.geom.Polygon",
+    "Geometry": "org.locationtech.jts.geom.Geometry",
 }
 RESTRICTION_OPTIONS_TYPE_MAP = {"string": "string", "float": "float", "integer": "int"}
 

geonode/upload/handlers/utils.py

@@ -68,6 +68,7 @@
     "Multi Polygon": "django.contrib.gis.db.models.fields.MultiPolygonField",
     "Multipolygon": "django.contrib.gis.db.models.fields.MultiPolygonField",
     "3D Multi Polygon": "django.contrib.gis.db.models.fields.MultiPolygonField",
+    "Geometry": "django.contrib.gis.db.models.fields.GeometryField",
     "Unknown (any)": "django.contrib.gis.db.models.fields.GeometryField",
 }