use TileServer class for project creation

Author: Hagellach37

mapswipe_workers/mapswipe_workers/project_types/base/project.py

@@ -558,51 +558,6 @@ def calc_required_results(self):
                 self.requiredResults + group.requiredCount * group.numberOfTasks
             )
 
-    def get_tile_server(self, tile_server):
-        """
-        Creates a dictonary with informations of the tile server
-        with project draft values or default values.
-        """
-
-        name = tile_server.get("name", "bing")
-
-        url = tile_server.get(
-            "url", auth.get_tileserver_url(tile_server.get("name", "bing"))
-        )
-        if url == "":
-            url = auth.get_tileserver_url(tile_server.get("name", "bing"))
-
-        apiKeyRequired = tile_server.get("apiKeyRequired")
-
-        apiKey = tile_server.get(
-            "apiKey", auth.get_api_key(tile_server.get("name", "bing"))
-        )
-        if apiKey == "":
-            apiKey = auth.get_api_key(tile_server.get("name", "bing"))
-
-        wmtsLayerName = tile_server.get("wmtsLayerName", None)
-        if wmtsLayerName == "":
-            wmtsLayerName = None
-
-        captions = tile_server.get("caption", None)
-
-        date = tile_server.get("date", None)
-
-        credits = tile_server.get("credits", "")
-
-        tile_server_dict = {
-            "name": name,
-            "url": url,
-            "apiKeyRequired": apiKeyRequired,
-            "apiKey": apiKey,
-            "wmtsLayerName": wmtsLayerName,
-            "captions": captions,
-            "date": date,
-            "credits": credits,
-        }
-
-        return tile_server_dict
-
     @abstractmethod
     def validate_geometries():
         pass

mapswipe_workers/mapswipe_workers/project_types/tile_map_service_grid/project.py

@@ -5,6 +5,7 @@
 from mapswipe_workers.definitions import DATA_PATH, CustomError, logger
 from mapswipe_workers.project_types.tile_map_service_grid.group import Group
 from mapswipe_workers.utils import tile_grouping_functions as grouping_functions
+from mapswipe_workers.project_types.base.tile_server import BaseTileServer
 from osgeo import ogr, osr
 
 
@@ -15,11 +16,11 @@ def __init__(self, project_draft: dict):
         self.groupSize = project_draft["groupSize"]
         self.geometry = project_draft["geometry"]
         self.zoomLevel = int(project_draft.get("zoomLevel", 18))
-        self.tileServer = self.get_tile_server(project_draft["tileServer"])
+        self.tileServer = vars(BaseTileServer(project_draft["tileServer"]))
 
         # get TileServerB for change detection and completeness type
         if self.project_type in [3, 4]:
-            self.tileServerB = self.get_tile_server(project_draft["tileServerB"])
+            self.tileServer = vars(BaseTileServer(project_draft["tileServerB"]))
 
     def validate_geometries(self):
         raw_input_file = (