Adds Marianas Islands support (#1406)

* Implements #1399

* Reverting accidental change in generate_landmap.py

* Changelog update

* Import beacon data for Marianas.

Co-authored-by: Dan Albert <dan@gingerhq.net>
This commit is contained in:
bgreman
2021-07-03 14:51:26 -04:00
committed by GitHub
parent 727facfb90
commit aa328d3ef7
15 changed files with 229 additions and 5 deletions

View File

@@ -39,6 +39,7 @@ from dcs.terrain.persiangulf import PersianGulf
from dcs.terrain.syria import Syria
from dcs.terrain.terrain import Terrain
from dcs.terrain.thechannel import TheChannel
from dcs.terrain.marianaislands import MarianaIslands
from dcs.triggers import TriggerStart
from pyproj import CRS, Transformer
@@ -59,6 +60,7 @@ ARG_TO_TERRAIN_MAP = {
"persiangulf": PersianGulf(),
"thechannel": TheChannel(),
"syria": Syria(),
"marianaislands": MarianaIslands(),
}
# https://gisgeography.com/central-meridian/
@@ -71,6 +73,7 @@ CENTRAL_MERIDIANS = {
"persiangulf": 57,
"thechannel": 3,
"syria": 39,
"marianaislands": 147,
}

View File

@@ -5,10 +5,20 @@ import argparse
from pathlib import Path
from typing import List, Tuple, Union, Dict
from dcs.terrain import Caucasus, PersianGulf, Syria, Nevada, Normandy, TheChannel
from dcs.terrain import (
Caucasus,
PersianGulf,
Syria,
Nevada,
Normandy,
TheChannel,
MarianaIslands,
)
from dcs import Mission
Terrain = Union[Caucasus, PersianGulf, Syria, Nevada, Normandy, TheChannel]
Terrain = Union[
Caucasus, PersianGulf, Syria, Nevada, Normandy, TheChannel, MarianaIslands
]
SAVE_PATH = Path("resources/frontlines")

View File

@@ -32,7 +32,7 @@ def _geometry_collection_to_multipoly(obj: GeometryCollection) -> MultiPolygon:
raise RuntimeError(f"Not sure how to convert collection to multipoly: {obj.wkt}")
for terrain in ["cau", "nev", "syria", "channel", "normandy", "gulf"]:
for terrain in ["cau", "nev", "syria", "channel", "normandy", "gulf", "marianaislands"]:
print("Terrain " + terrain)
m = Mission()
m.load_file("./{}_terrain.miz".format(terrain))

Binary file not shown.