Issue #62: add cache path option.

This commit is contained in:
Sergey Vartanov 2021-07-08 01:52:24 +03:00
parent 376087949a
commit e18419cc3a
4 changed files with 19 additions and 8 deletions

View file

@ -41,17 +41,19 @@ def main(argv) -> None:
if not options:
sys.exit(1)
input_file_names: List[Path]
cache_path: Path = Path(options.cache)
cache_path.mkdir(parents=True, exist_ok=True)
os.makedirs("map", exist_ok=True)
input_file_names: List[Path]
if options.input_file_name:
input_file_names = list(map(Path, options.input_file_name))
else:
content = get_osm(options.boundary_box)
content = get_osm(options.boundary_box, cache_path)
if not content:
error("cannot download OSM data")
input_file_names = ["map" / Path(options.boundary_box + ".osm")]
sys.exit(1)
input_file_names = [cache_path / f"{options.boundary_box}.osm"]
scheme: Scheme = Scheme(Path(TAGS_FILE_NAME))
min_: np.array

View file

@ -15,14 +15,17 @@ __author__ = "Sergey Vartanov"
__email__ = "me@enzet.ru"
def get_osm(boundary_box: str, to_update: bool = False) -> Optional[str]:
def get_osm(
boundary_box: str, cache_path: Path, to_update: bool = False
) -> Optional[str]:
"""
Download OSM data from the web or get if from the cache.
:param boundary_box: borders of the map part to download
:param cache_path: cache directory to store downloaded OSM files
:param to_update: update cache files
"""
result_file_name: Path = "map" / Path(boundary_box + ".osm")
result_file_name: Path = cache_path / f"{boundary_box}.osm"
if not to_update and result_file_name.is_file():
return result_file_name.open().read()
@ -30,7 +33,8 @@ def get_osm(boundary_box: str, to_update: bool = False) -> Optional[str]:
matcher = re.match(
"(?P<left>[0-9.-]*),(?P<bottom>[0-9.-]*)," +
"(?P<right>[0-9.-]*),(?P<top>[0-9.-]*)",
boundary_box)
boundary_box
)
if not matcher:
error("invalid boundary box")

View file

@ -98,7 +98,7 @@ class Tile:
f"{min(lon1, lon2):.3f},{min(lat1, lat2):.3f},"
f"{max(lon1, lon2):.3f},{max(lat1, lat2):.3f}"
)
content = get_osm(boundary_box)
content = get_osm(boundary_box, Path("cache"))
if not content:
error("cannot download OSM data")
return None

View file

@ -47,6 +47,11 @@ def parse_options(args) -> argparse.Namespace:
default=18,
dest="scale",
type=float)
parser.add_argument(
"--cache",
help="path for temporary OSM files",
default="cache"
)
parser.add_argument(
"--labels",
help="label drawing mode: `no`, `main`, or `all`",