fix style

opengisch · Jan 15, 2025 · d60e6ef · d60e6ef
1 parent 1706890
commit d60e6ef
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/src/qgis_server_light/exporter/extract.py b/src/qgis_server_light/exporter/extract.py
@@ -82,10 +82,13 @@ def extract_save_layer(
             decoded[key] = str(decoded[key])
         if key == "path":
             decoded[key] = decoded[key].replace(f'{project.readPath("./")}/', "")
-    if unify_layer_names_by_group:
-        short_name = create_unified_short_name(child.shortName(), path)
+    if child.shortName() == "":
+        # if layer has no short name we fallback to the qgis_layer_id
+        short_name = child.id()
     else:
         short_name = child.shortName()
+    if unify_layer_names_by_group:
+        short_name = create_unified_short_name(short_name, path)
     crs = Crs(
         postgis_srid=child.dataProvider().crs().postgisSrid(),
         auth_id=child.dataProvider().crs().authid(),
@@ -161,7 +164,7 @@ def extract_save_layer(
             Vector(
                 path=source_path.replace(f'{project.readPath("./")}/', ""),
                 name=short_name,
-                title=child.title(),
+                title=child.title() or child.name(),
                 style=urlsafe_b64encode(style_doc.toByteArray()).decode(),
                 driver=child.providerType(),
                 bbox_wgs84=bbox_wgs84,
@@ -183,16 +186,16 @@ def extract_save_layer(
             if "tileMatrixSet" in decoded:
                 source = DataSource(
                     wmts=WmtsSource(
-                        contextual_wms_legend=decoded["contextualWMSLegend"],
+                        contextual_wms_legend=decoded.get("contextualWMSLegend"),
                         crs=decoded["crs"],
                         dpi_mode=decoded["dpiMode"],
-                        feature_count=decoded["featureCount"],
+                        feature_count=decoded.get("featureCount"),
                         format=decoded["format"],
                         layers=decoded["layers"],
                         styles=decoded["styles"],
-                        tile_dimensions=decoded["tileDimensions"],
+                        tile_dimensions=decoded.get("tileDimensions"),
                         tile_matrix_set=decoded["tileMatrixSet"],
-                        tile_pixel_ratio=decoded["tilePixelRatio"],
+                        tile_pixel_ratio=decoded.get("tilePixelRatio"),
                         url=decoded["url"],
                     )
                 )
@@ -279,12 +282,16 @@ def extract_group(
         else:
             if unify_layer_names_by_group:
                 children.append(
-                    create_unified_short_name(child.layer().shortName(), path)
+                    create_unified_short_name(
+                        child.layer().shortName() or child.layer().id(), path
+                    )
                 )
             else:
-                children.append(child.layer().shortName())
+                children.append(child.layer().shortName() or child.layer().id())
     tree.members.append(
-        TreeGroup(name=group.customProperty("wmsShortName"), children=children)
+        TreeGroup(
+            name=group.customProperty("wmsShortName") or group.name(), children=children
+        )
     )
     datasets.group.append(
         Group(

diff --git a/src/qgis_server_light/interface/job.py b/src/qgis_server_light/interface/job.py
@@ -127,7 +127,6 @@ class QslGetMapJob(QslAbstractJob):
     )
 
     def get_layer_by_name(self, name: str) -> Raster | Vector | Custom:
-        name = name.lower()
         for layer in self.raster_layers + self.vector_layers + self.custom_layers:
             if layer.name == name:
                 return layer

diff --git a/src/qgis_server_light/interface/qgis.py b/src/qgis_server_light/interface/qgis.py
@@ -121,38 +121,42 @@ class WfsSource:
 
 @dataclass
 class WmsSource(Source):
-    contextual_wms_legend: str = field(
-        metadata={"name": "ContextualWMSLegend", "type": "Element", "required": True}
-    )
     crs: str = field(metadata={"name": "Crs", "type": "Element", "required": True})
     dpi_mode: str = field(
         metadata={"name": "DpiMode", "type": "Element", "required": True}
     )
-    feature_count: int = field(
-        metadata={"name": "FeatureCount", "type": "Element", "required": True}
-    )
     format: str = field(
         metadata={"name": "Format", "type": "Element", "required": True}
     )
     layers: str = field(
         metadata={"name": "Layers", "type": "Element", "required": True}
     )
     url: str = field(metadata={"name": "Url", "type": "Element", "required": True})
+    feature_count: int = field(
+        default=None,
+        metadata={"name": "FeatureCount", "type": "Element", "required": True},
+    )
+    contextual_wms_legend: str = field(
+        default=None,
+        metadata={"name": "ContextualWMSLegend", "type": "Element", "required": True},
+    )
 
 
-@dataclass
+@dataclass(kw_only=True)
 class WmtsSource(WmsSource):
     styles: str = field(
         metadata={"name": "Styles", "type": "Element", "required": True}
     )
     tile_dimensions: str = field(
-        metadata={"name": "TileDimensions", "type": "Element", "required": True}
+        default=None,
+        metadata={"name": "TileDimensions", "type": "Element", "required": True},
     )
     tile_matrix_set: str = field(
         metadata={"name": "TileMatrixSet", "type": "Element", "required": True}
     )
     tile_pixel_ratio: str = field(
-        metadata={"name": "TilePixelRatio", "type": "Element", "required": True}
+        default=None,
+        metadata={"name": "TilePixelRatio", "type": "Element", "required": True},
     )