Merge pull request #42 from spatial-data-lab/main

Merge changes from main to release branch for first release candidate

Author: koettert

knime_extension/icons/icon/Visulization/SpatiaHeatmap.png renamed to knime_extension/icons/icon/Visulization/SpatialHeatmap.png

@@ -15,12 +15,13 @@
 # The different node files
 import nodes.calculation
 import nodes.conversion
+import nodes.io
+import nodes.locationanalysis
 import nodes.opendata
+import nodes.spatialmodels
 import nodes.spatialstatistics
 import nodes.spatialtool
 import nodes.transform
 import nodes.visualize
-import nodes.geolab
-import nodes.spatialmodels
-import nodes.io
-import nodes.locationanalysis
+
+# import nodes.geolab

knime_extension/src/geospatial_ext.py

@@ -327,18 +327,18 @@ def execute(self, exec_context: knext.ExecutionContext, input_1):
     name="Transformed geo table",
     description="Transformed Geo input table",
 )
+@knut.geo_node_description(
+    short_description="This node generate rectangles representing the envelope of each geometry.",
+    description="""This node generate rectangles representing the envelope of each geometry. 
+    That is, the point or smallest rectangular polygon (with sides parallel to the coordinate axes) 
+    that contains each of the geometries.""",
+    references={
+        "Envelop": "https://geopandas.org/en/stable/docs/reference/api/geopandas.GeoSeries.envelope.html",
+    },
+)
 class BoundingBoxNode:
-    """
-    This node generate rectangles representing the envelope of each geometry.
-    """
-
-    geo_col = knext.ColumnParameter(
-        "Geometry column",
-        "Select the geometry column to transform.",
-        # Allow only GeoValue compatible columns
-        column_filter=knut.is_geo,
-        include_row_key=False,
-        include_none_column=False,
+    geo_col = knut.geo_col_parameter(
+        description="Select the geometry column to compute the bounding box."
     )
 
     def configure(self, configure_context, input_schema_1):
@@ -373,21 +373,22 @@ def execute(self, exec_context: knext.ExecutionContext, input_1):
     description="Table with geometry column to transform",
 )
 @knext.output_table(
-    name="Transformed geo table",
+    name="Transformed Geo table",
     description="Transformed Geo input table",
 )
+@knut.geo_node_description(
+    short_description="This node generate the smallest convex Polygon containing all the points in each geometry.",
+    description="""This node generate the smallest convex Polygon containing all the points in each geometry.
+    The convex hull of a geometry is the smallest convex Polygon containing all the points in each geometry, 
+    unless the number of points in the geometric object is less than three. For two points, the convex hull 
+    collapses to a LineString; for 1, a Point.""",
+    references={
+        "Convex hull": "https://geopandas.org/en/stable/docs/reference/api/geopandas.GeoSeries.convex_hull.html",
+    },
+)
 class ConvexHullNode:
-    """
-    This node generate the smallest convex Polygon containing all the points in each geometry.
-    """
-
-    geo_col = knext.ColumnParameter(
-        "Geometry column",
-        "Select the geometry column to transform.",
-        # Allow only GeoValue compatible columns
-        column_filter=knut.is_geo,
-        include_row_key=False,
-        include_none_column=False,
+    geo_col = knut.geo_col_parameter(
+        description="Select the geometry column to compute the convex hull."
     )
 
     def configure(self, configure_context, input_schema_1):
@@ -425,25 +426,23 @@ def execute(self, exec_context: knext.ExecutionContext, input_1):
     name="Transformed geo table",
     description="Transformed Geo input table",
 )
+@knut.geo_node_description(
+    short_description="This node returns a geometry containing the union of all geometries in the input column.",
+    description="This node returns a geometry containing the union of all geometries in the input column.",
+    references={
+        "Unary union": "https://geopandas.org/en/stable/docs/reference/api/geopandas.GeoSeries.unary_union.html",
+    },
+)
 class UnaryUnionNode:
-    """
-    This node generate the smallest convex Polygon containing all the points in each geometry.
-    """
-
-    geo_col = knext.ColumnParameter(
-        "Geometry column",
-        "Select the geometry column to transform.",
-        # Allow only GeoValue compatible columns
-        column_filter=knut.is_geo,
-        include_row_key=False,
-        include_none_column=False,
+    geo_col = knut.geo_col_parameter(
+        description="Select the geometry column to compute the unary union."
     )
 
     def configure(self, configure_context, input_schema_1):
         self.geo_col = knut.column_exists_or_preset(
             configure_context, self.geo_col, input_schema_1, knut.is_geo
         )
-        return input_schema_1
+        return None
 
     def execute(self, exec_context: knext.ExecutionContext, input_1):
         gdf = gp.GeoDataFrame(input_1.to_pandas(), geometry=self.geo_col)

knime_extension/src/nodes/calculation.py

@@ -25,30 +25,16 @@
 # Conversion helper methods
 ########################################################################################
 
-DEFAULT_CRS = "epsg:4326"
-"""Default coordinate reference system."""
-
-__DEF_CRS_DESCRIPTION = """[Coordinate reference system (CRS)](https://en.wikipedia.org/wiki/Spatial_reference_system) column
-        Supports the following input types:
-        
-        - PROJ string
-        - JSON string with PROJ parameters
-        - CRS WKT string
-        - An authority string [i.e. 'epsg:4326']
-        - An EPSG integer code [i.e. 4326]
-        - A tuple of ('auth_name': 'auth_code') [i.e ('epsg', '4326')]
-        """
-
 
 def crs_input_parameter(
     label: str = "CRS",
-    description: str = __DEF_CRS_DESCRIPTION,
+    description: str = knut.DEF_CRS_DESCRIPTION,
 ) -> knext.StringParameter:
     """Returns a CRS (coordinate reference system) string input parameter."""
     return knext.StringParameter(
         label=label,
         description=description,
-        default_value=DEFAULT_CRS,
+        default_value=knut.DEFAULT_CRS,
     )
 
 
@@ -153,7 +139,7 @@ def execute(self, exec_context, input_table):
 class WKTtoGeoNode(_ToGeoConverter):
 
     input_column = knext.ColumnParameter(
-        label="WKT Column",
+        label="WKT column",
         description="[Well-known-text (WKT)](https://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry) column to convert",
         column_filter=knut.is_string,
         include_row_key=False,
@@ -192,7 +178,7 @@ def __init__(self):
 # class WKBtoGeoNode(_ToGeoConverter):
 
 #     input_column = knext.ColumnParameter(
-#         label="WKB Column",
+#         label="WKB column",
 #         description="[Well-known-binary (WKB)](https://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry) column to convert",
 #         column_filter=knut.is_binary,
 #         include_row_key=False,
@@ -227,7 +213,7 @@ def __init__(self):
 class GeoJSONtoGeoNode(_ToGeoConverter):
 
     input_column = knext.ColumnParameter(
-        label="GeoJSON Column",
+        label="GeoJSON column",
         description="[GeoJSON](https://en.wikipedia.org/wiki/GeoJSON) column to convert",
         column_filter=knut.is_string,
         include_row_key=False,
@@ -308,6 +294,13 @@ def configure(self, configure_context, input_schema_1):
             f"Output column '{_ToGeoConverter.DEF_GEO_COL_NAME}'  exists in input table",
         )
         validate_crs(self.crs)
+        from shapely.geometry import Point
+
+        return input_schema_1.append(
+            knext.Column(
+                ktype=knext.logical(Point), name=_ToGeoConverter.DEF_GEO_COL_NAME
+            )
+        )
 
     def execute(self, exec_context: knext.ExecutionContext, input_table):
         # https://geopandas.org/en/stable/docs/user_guide/projections.html#the-axis-order-of-a-crs
@@ -564,6 +557,8 @@ def execute(self, exec_context: knext.ExecutionContext, input_1):
         gs = gdf.loc[:, self.geo_col]
         # https://geopandas.org/en/stable/docs/user_guide/projections.html#the-axis-order-of-a-crs
         # In GeoPandas the coordinates are always stored as (x, y), and thus as (lon, lat) order, regardless of the CRS
-        gdf[self.col_lon] = gs.x
+        # However the standard order for EPSG:4326 is latitude, longitude which is why we use this order in the output
+        # Also the ISO 6709 standard (https://en.wikipedia.org/wiki/ISO_6709) uses this order
         gdf[self.col_lat] = gs.y
+        gdf[self.col_lon] = gs.x
         return knut.to_table(gdf, exec_context)