Restore type on vector layers.

Author: HaudinFlorence

packages/base/src/formbuilder/creationform.tsx

@@ -186,7 +186,6 @@ export class CreationForm extends React.Component<ICreationFormProps, any> {
           visible: true,
           name: actualName,
         };
-
         this.jGISModel.addLayer(UUID.uuid4(), layerModel);
       }
     });

packages/base/src/tools.ts

@@ -499,6 +499,9 @@ export const loadFile = async (fileInfo: {
   model: IJupyterGISModel;
 }) => {
   const { filepath, type, model } = fileInfo;
+  if (!filepath) {
+    return;
+  }
 
   if (filepath.startsWith('http://') || filepath.startsWith('https://')) {
     switch (type) {

packages/schema/src/schema/project/layers/vectorLayer.json

@@ -2,13 +2,19 @@
   "type": "object",
   "description": "VectorLayer",
   "title": "IVectorLayer",
-  "required": ["source"],
+  "required": ["source", "type"],
   "additionalProperties": false,
   "properties": {
     "source": {
       "type": "string",
       "description": "The id of the source"
     },
+    "type": {
+      "type": "string",
+      "enum": ["points", "polygons", "lines"],
+      "default": "points",
+      "description": "The type of vector layer"
+    },
     "color": {
       "type": "object",
       "description": "The color of the the object"

python/jupytergis_lab/jupytergis_lab/notebook/gis_document.py

@@ -245,6 +245,7 @@ def add_geojson_layer(
         path: str | Path | None = None,
         data: Dict | None = None,
         name: str = "GeoJSON Layer",
+        type: "points" | "polygons" | "lines" = "points",
         opacity: float = 1,
         logical_op: str | None = None,
         feature: str | None = None,
@@ -258,6 +259,7 @@ def add_geojson_layer(
         :param name: The name that will be used for the object in the document.
         :param path: The path to the JSON file or URL to embed into the jGIS file.
         :param data: The raw GeoJSON data to embed into the jGIS file.
+        :param type: The type of the vector layer to create.
         :param opacity: The opacity, between 0 and 1.
         :param color_expr: The style expression used to style the layer, defaults to None
         """
@@ -301,6 +303,7 @@ def add_geojson_layer(
             "visible": True,
             "parameters": {
                 "source": source_id,
+                "type": type,
                 "color": color_expr,
                 "opacity": opacity,
             },

python/jupytergis_qgis/jupytergis_qgis/qgis_loader.py

@@ -783,7 +783,7 @@ def build_uri(parameters: dict[str, str], source_type: str) -> str | None:
         geometry_type = layer.get("parameters", {}).get("type")
         layer_params = layer.get("parameters", {})
 
-        if geometry_type == "circle":
+        if geometry_type == "points":
             symbol = QgsMarkerSymbol()
             color_params = layer_params.get("color", {})
             opacity = layer_params.get("opacity", 1.0)
@@ -811,7 +811,7 @@ def build_uri(parameters: dict[str, str], source_type: str) -> str | None:
                     symbology_state, geometry_type, color_params, symbol
                 )
 
-        elif geometry_type == "line":
+        elif geometry_type == "lines":
             symbol = QgsLineSymbol()
             symbol.setOutputUnit(Qgis.RenderUnit.Pixels)
             color_params = layer_params.get("color", {})
@@ -840,7 +840,7 @@ def build_uri(parameters: dict[str, str], source_type: str) -> str | None:
                     symbology_state, geometry_type, color_params, symbol
                 )
 
-        elif geometry_type == "fill":
+        elif geometry_type == "polygons":
             symbol = QgsFillSymbol()
             symbol.setOutputUnit(Qgis.RenderUnit.Pixels)
             color_params = layer_params.get("color", {})