Merge remote-tracking branch 'origin/development'

Merge dev branch into main

src/backend/app/db/db_models.py

@@ -527,6 +527,7 @@ def tasks_bad(self):
     form_xls = Column(LargeBinary)           # XLSForm file if custom xls is uploaded
     data_extract_type = Column(String)       # Type of data extract (Polygon or Centroid)
     task_split_type = Column(String)         # Type of split (Grid or Feature)
+    hashtags = Column(ARRAY(String))         # Project hashtag
 
 # TODO: Add index on project geometry, tried to add in __table args__
 # Index("idx_geometry", DbProject.geometry, postgresql_using="gist")

src/backend/app/db/postgis_utils.py

@@ -29,13 +29,14 @@ def timestamp():
     return datetime.datetime.utcnow()
 
 
-def geometry_to_geojson(geometry: Geometry, properties: str = {}):
+def geometry_to_geojson(geometry: Geometry, properties: str = {}, id: int = None):
     if geometry:
         shape = to_shape(geometry)
         geojson = {
             "type": "Feature",
             "geometry": mapping(shape),
             "properties": properties,
+            "id": id,
         }
         return Feature(**geojson)