fix(completeness)!: sync source_layer to firebase for completeness project

- rename source_name to source_layer for vector layer

Author: tnagorra

apps/project/tests/query_test.py

@@ -273,7 +273,7 @@ def setUpClass(cls):
                                 "custom": {
                                     "url": "https://custom-osm-data/{x}/{y}/{z}.pbf",
                                     "credits": "custom osm",
-                                    "source_name": "custom-source-name",
+                                    "source_layer": "custom-source-name",
                                     "min_zoom": 0,
                                     "max_zoom": 14,
                                 },

firebase

@@ -146,6 +146,7 @@ def get_project_specifics_for_firebase(self):
                 vector=firebase_models.FbObjVectorTileServerOverlay(
                     tileServer=firebase_models.FbObjVectorTileServer(
                         name=vector_tile_server_name_enum_to_firebase(tsp_overlay.vector.tile_server.name),
+                        sourceLayer=tsp_overlay.vector.tile_server.get_config()["source_layer"],
                         credits=tsp_overlay.vector.tile_server.get_config()["credits"],
                         url=tsp_overlay.vector.tile_server.get_config()["url"],
                         minZoom=tsp_overlay.vector.tile_server.get_config()["min_zoom"],

project_types/tile_map_service/completeness/project.py

@@ -1491,7 +1491,7 @@ input ProjectUpdateInput {
 }
 
 type ProjectVectorTileServerCommonConfig {
-  sourceName: String!
+  sourceLayer: String!
   credits: String!
 }
 
@@ -1513,7 +1513,7 @@ input ProjectVectorTileServerConfigInput {
 
 type ProjectVectorTileServerCustomConfig {
   url: String!
-  sourceName: String!
+  sourceLayer: String!
   credits: String!
   minZoom: Int!
   maxZoom: Int!
@@ -2109,13 +2109,13 @@ type ValidateTutorialTaskPropertyType {
 }
 
 input VectorTileServerCommonConfigInput {
-  sourceName: String!
+  sourceLayer: String!
   credits: String!
 }
 
 input VectorTileServerCustomConfigInput {
   url: String!
-  sourceName: String!
+  sourceLayer: String!
   credits: String!
   minZoom: Int!
   maxZoom: Int!

schema.graphql

@@ -4,19 +4,27 @@
 
 from utils import fields as custom_fields
 
-from .config import VectorConfig, VectorTileServerNameEnum, VectorTileServerNormConfig
+from .config import VectorConfig, VectorTileServerNameEnum
+
+
+class VectorTileServerInstanceConfig(typing.TypedDict):
+    url: str
+    credits: str
+    min_zoom: int
+    max_zoom: int
+    source_layer: str
 
 
 class VectorTileServerCustomConfig(BaseModel):
     url: custom_fields.PydanticVectorTileServerUrl
-    source_name: custom_fields.PydanticLongText
+    source_layer: custom_fields.PydanticLongText
     credits: custom_fields.PydanticLongText
     min_zoom: custom_fields.PydanticZoomLevel
     max_zoom: custom_fields.PydanticZoomLevel
 
 
 class VectorTileServerCommonConfig(BaseModel):
-    source_name: custom_fields.PydanticLongText
+    source_layer: custom_fields.PydanticLongText
     credits: custom_fields.PydanticLongText
 
 
@@ -28,17 +36,47 @@ class VectorTileServerConfig(BaseModel):
     open_free_map: VectorTileServerCommonConfig | None = None
     versatiles: VectorTileServerCommonConfig | None = None
 
-    def get_config(self) -> VectorTileServerNormConfig:
+    def get_config(self) -> VectorTileServerInstanceConfig:
         if self.name == VectorTileServerNameEnum.CUSTOM:
             assert self.custom is not None
             return {
                 "url": self.custom.url,
                 "credits": self.custom.credits,
                 "min_zoom": self.custom.min_zoom,
                 "max_zoom": self.custom.max_zoom,
-                "layers": [self.custom.source_name],
+                "source_layer": self.custom.source_layer,
+            }
+
+        conf = VectorConfig.get_config(self.name)
+
+        if self.name == VectorTileServerNameEnum.OPEN_STREET_MAP:
+            assert self.open_street_map is not None
+            return {
+                "source_layer": self.open_street_map.source_layer,
+                "url": conf["url"],
+                "credits": conf["credits"],
+                "min_zoom": conf["min_zoom"],
+                "max_zoom": conf["max_zoom"],
+            }
+        if self.name == VectorTileServerNameEnum.OPEN_FREE_MAP:
+            assert self.open_free_map is not None
+            return {
+                "source_layer": self.open_free_map.source_layer,
+                "url": conf["url"],
+                "credits": conf["credits"],
+                "min_zoom": conf["min_zoom"],
+                "max_zoom": conf["max_zoom"],
+            }
+        if self.name == VectorTileServerNameEnum.VERSATILES:
+            assert self.versatiles is not None
+            return {
+                "source_layer": self.versatiles.source_layer,
+                "url": conf["url"],
+                "credits": conf["credits"],
+                "min_zoom": conf["min_zoom"],
+                "max_zoom": conf["max_zoom"],
             }
-        return VectorConfig.get_config(self.name)
+        typing.assert_never(self.name)
 
     # FIXME(tnagorra): Do we need this?
     @field_validator("name", mode="before")