fly/easy-osm2city
1
0
Fork 0
Code Issues Pull requests Activity

Moved script calls to function

Browse source 
Signed-off-by: merspieler <merspieler@airmail.cc>
This commit is contained in:
merspieler 2019-04-04 06:34:03 +00:00
parent bc10bd35ea
commit 43225744d9
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build
View file

@ -133,7 +133,7 @@ def run_build(west, south, east, north, log_done=False, start_w=None, start_s=No
if build_n > north: if build_n > north:
build_n = north build_n = north
os.system("bash build_tile " + project + " " + man_threads + " -b " + str(build_w) + "_" + str(build_s) + "_" + str(build_e) + "_" + str(build_n)) run_command("bash build_tile " + project + " " + man_threads + " -b " + str(build_w) + "_" + str(build_s) + "_" + str(build_e) + "_" + str(build_n))
if log_done: if log_done:
try: try:
@ -145,6 +145,14 @@ def run_build(west, south, east, north, log_done=False, start_w=None, start_s=No
s += 1 s += 1
w += 1 w += 1
def run_command(command):
exit_code = os.system(command)
if exit_code == 0:
return
elif exit_code == 130:
print("Interrupted by user. Aborting...")
sys.exit(0)
start_time = time.time() start_time = time.time()
try: try:
@ -153,12 +161,12 @@ try:
if bounds == []: if bounds == []:
print("Unable to read project settings") print("Unable to read project settings")
sys.exit(1) sys.exit(1)
os.system("rm -f projects/" + project + "/osm2city-exceptions.log") run_command("rm -f projects/" + project + "/osm2city-exceptions.log")
run_build(bounds[0]["west"], bounds[0]["south"], bounds[0]["east"], bounds[0]["north"], log_done=True) run_build(bounds[0]["west"], bounds[0]["south"], bounds[0]["east"], bounds[0]["north"], log_done=True)
else: else:
if build_fix: if build_fix:
bounds = get_bounds("projects/" + project + "/osm2city-exceptions.log") bounds = get_bounds("projects/" + project + "/osm2city-exceptions.log")
os.system("rm -f projects/" + project + "/osm2city-exceptions.log") run_command("rm -f projects/" + project + "/osm2city-exceptions.log")
if bounds == []: if bounds == []:
print("INFO: Skip fix run: no exceptions found") print("INFO: Skip fix run: no exceptions found")
else: else:
@ -207,4 +215,4 @@ if os.path.isfile("projects/" + project + "/osm2city-exceptions.log"):
print("If you want to rebuild only failed tiles, run with the -f parameter") print("If you want to rebuild only failed tiles, run with the -f parameter")
elif create_zip == True: elif create_zip == True:
print("Creating zip file...") print("Creating zip file...")
os.system("zip -rq projects/" + project + "/" + project + ".zip projects/" + project + "/scenery/") run_command("zip -rq projects/" + project + "/" + project + ".zip projects/" + project + "/scenery/")