Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RFC, Use asyncio for external programs, just prototype for now #235

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

RFC, Use asyncio for external programs, just prototype for now #235

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aeb7938
Split invoking of extract into separate method
alfh Nov 19, 2023
e357761
Prototype of using async for running external programs, just for tag …
alfh Nov 19, 2023
6b8dbdd
further hacking with asyncio, it is now working with semaphore
alfh Nov 26, 2023
f0213c0
Use asyncio to merge tile files
alfh Dec 3, 2023
4b87d15
Use asyncio for sorting tile files, but still unsure if we really nee…
alfh Dec 3, 2023
42248da
Use asyncio for creating map files and compressing them
alfh Dec 3, 2023
ea921e9
Some minor cleanup of asyncio, and tuning of semaphores
alfh Dec 3, 2023
a95b96e
The create map file step is quite memory consuming, tune down semaphores
alfh Dec 3, 2023
5adb156
Add missing setting of tile filename
alfh Dec 3, 2023
8e23657
Use asyncio also for invoking contour generation, use pyhgtmap for el…
alfh Dec 9, 2023
d205e40
Fix building command arguments for compressing
alfh Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions wahoomc/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#!/usr/bin/python

# import official python packages
import asyncio
import logging

# import custom python packages
Expand Down Expand Up @@ -75,10 +76,12 @@ def run(run_level):
o_osm_maps = OsmMaps(o_osm_data)

# Filter tags from country osm.pbf files'
o_osm_maps.filter_tags_from_country_osm_pbf_files()
asyncio.run(o_osm_maps.filter_tags_from_country_osm_pbf_files())


# Generate land
o_osm_maps.generate_land()
asyncio.run(o_osm_maps.generate_land())


# Generate sea
o_osm_maps.generate_sea()
Expand All @@ -88,15 +91,13 @@ def run(run_level):
o_osm_maps.generate_elevation(o_input_data.use_srtm1)

# Split filtered country files to tiles
o_osm_maps.split_filtered_country_files_to_tiles()
asyncio.run(o_osm_maps.split_filtered_country_files_to_tiles())

# Merge splitted tiles with land and sea
o_osm_maps.merge_splitted_tiles_with_land_and_sea(
o_input_data.process_border_countries, o_input_data.contour)
asyncio.run(o_osm_maps.merge_splitted_tiles_with_land_and_sea(o_input_data.process_border_countries, o_input_data.contour))

# Creating .map files
o_osm_maps.create_map_files(o_input_data.save_cruiser,
o_input_data.tag_wahoo_xml)
asyncio.run(o_osm_maps.create_map_files(o_input_data.save_cruiser, o_input_data.tag_wahoo_xml))

# Zip .map.lzma files
o_osm_maps.make_and_zip_files('.map.lzma', o_input_data.zip_folder)
Expand Down
Loading
Loading