diff --git a/game/server/mapzones/routes.py b/game/server/mapzones/routes.py index af006139..83dc9978 100644 --- a/game/server/mapzones/routes.py +++ b/game/server/mapzones/routes.py @@ -1,5 +1,3 @@ -import logging - from fastapi import APIRouter, Depends, HTTPException, status from game import Game @@ -12,20 +10,6 @@ router: APIRouter = APIRouter(prefix="/map-zones") @router.get("/terrain", operation_id="get_terrain_zones", response_model=MapZonesJs) def get_terrain(game: Game = Depends(GameContext.require)) -> MapZonesJs: - if game.theater.terrain.name == "Falklands": - # The new high fidelity landmap is far too expensive to send to the UI. - # Converting all the points from DCS X/Y to lat/lng and then serializing all - # that data takes minutes and gigabytes (!!) of RAM. - # - # It's not clear how much the rest of Liberation is affected by the landmap - # complexity yet. If the rest of the game is tolerable we will need to start - # baking images of the landmap that can be used as an overlay in the UI rather - # than drawing it from each point. - logging.debug( - "Not sending landmap to the UI for Falklands because it's too slow" - ) - return MapZonesJs.empty() - zones = game.theater.landmap if zones is None: raise HTTPException(status_code=status.HTTP_404_NOT_FOUND) diff --git a/resources/theaters/falklands/landmap.p b/resources/theaters/falklands/landmap.p index bf10cf74..4b669371 100644 Binary files a/resources/theaters/falklands/landmap.p and b/resources/theaters/falklands/landmap.p differ diff --git a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.dbf b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.dbf deleted file mode 100644 index 35925176..00000000 Binary files a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.dbf and /dev/null differ diff --git a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.qix b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.qix deleted file mode 100644 index d4e53b5b..00000000 Binary files a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.qix and /dev/null differ diff --git a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.shp b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.shp deleted file mode 100644 index 43412a9d..00000000 Binary files a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.shp and /dev/null differ diff --git a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.shx b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.shx deleted file mode 100644 index 812dfbf3..00000000 Binary files a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.shx and /dev/null differ diff --git a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.cpg b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.cpg similarity index 100% rename from unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.cpg rename to unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.cpg diff --git a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.dbf b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.dbf new file mode 100644 index 00000000..75eb11ce Binary files /dev/null and b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.dbf differ diff --git a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.prj b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.prj similarity index 100% rename from unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_merged_UTM21S.prj rename to unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.prj diff --git a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.shp b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.shp new file mode 100644 index 00000000..8a2256ef Binary files /dev/null and b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.shp differ diff --git a/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.shx b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.shx new file mode 100644 index 00000000..278f0d40 Binary files /dev/null and b/unshipped_data/arcgis_maps/falklands/exclusion/SouthAtlantic_ExclusionV2_simplified_dissolved_UTM21S.shx differ