Skip to content

Commit 5406c34

Browse files
committed
terrain features
1 parent b72b770 commit 5406c34

File tree

7 files changed

+3643
-9
lines changed

7 files changed

+3643
-9
lines changed

.gitignore

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@
1313

1414
elevation_data/
1515

16-
wfire/pkg/
16+
pkg/
1717

18-
wfire/pkg/sumdb/
18+
bin/
1919

20-
wfire/src/bin/
2120

22-
wfire/src/cmd/run.exe
23-
24-
wfire/bin/

src/simulation/terrain/HGT_parser.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import gzip
44
import argparse
55
import csv
6-
# import numpy as np
6+
77
from tqdm import tqdm
88
from gmalthgtparser import HgtParser
99

1010
try:
1111
parser = argparse.ArgumentParser()
12-
parser.add_argument('-wdir', type=str, default=r'/home/miguel/Documents/projects', help="working dir")
12+
parser.add_argument('-wdir', type=str, default=r'/home/miguel/Documents/projects/Wildfire', help="working dir")
1313
parser.add_argument('lat1', type=float, help="latitude1 for HGT file")
1414
parser.add_argument('lon1', type=float, help="longitude1 for HGT file")
1515
parser.add_argument('lat2', type=float, help="latitude2 for HGT file")
@@ -32,6 +32,7 @@
3232
def linspace(lower, upper, num):
3333
return [lower + x*(upper-lower)/num for x in range(num)]
3434

35+
3536
def filename_gen(lat, lon):
3637
''' receives coordinates used to select hgt file'''
3738
if lat >= 0:
@@ -101,6 +102,6 @@ def generate_topology(p1, p2, n_points=100):
101102

102103
terrain = generate_topology(p1, p2, n_points=80)
103104

104-
with open(r'C:\Users\Miguel\Documents\repos\wfire\wfire\src\simulation\terrain\temp\coords.csv', "w", newline="") as f:
105+
with open(r'/home/miguel/Documents/projects/Wildfire/wfire/src/simulation/terrain/temp/coords.csv', "w", newline="") as f:
105106
writer = csv.writer(f)
106107
writer.writerows(terrain)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/home/miguel/Documents/projects/Wildfire/bin/python3.8 src/simulation/terrain/generate_objects.py 38.798802 -9.332599 38.799060 -9.350210
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
import os
2+
import argparse
3+
import csv
4+
5+
import overpy
6+
7+
8+
try:
9+
parser = argparse.ArgumentParser()
10+
parser.add_argument('-wdir', type=str, default=r'/home/miguel/Documents/projects/Wildfire', help="working dir")
11+
parser.add_argument('lat1', type=float, help="latitude1")
12+
parser.add_argument('lon1', type=float, help="longitude1")
13+
parser.add_argument('lat2', type=float, help="latitude2")
14+
parser.add_argument('lon2', type=float, help="longitude2")
15+
16+
args, unknown = parser.parse_known_args()
17+
18+
os.chdir(args.wdir)
19+
except Exception as e:
20+
print(e)
21+
lat1 = args.lat1
22+
lon1 = args.lon1
23+
lat2 = args.lat2
24+
lon2 = args.lon2
25+
# print(lat1,lat2, lon1, lon2)
26+
27+
api = overpy.Overpass()
28+
29+
q = f"""
30+
way({lat1}, {lon1}, {lat2}, {lon2}) ["highway"];
31+
(._;>;);
32+
out body;
33+
"""
34+
result = api.query(q)
35+
36+
street_lst = list()
37+
for way in result.ways:
38+
for node in way.nodes:
39+
street_lst.append((float(node.lat), float(node.lon)))
40+
41+
with open(r'/home/miguel/Documents/projects/Wildfire/wfire/src/simulation/terrain/temp/street_coordinates.csv', "w", newline="") as f:
42+
writer = csv.writer(f)
43+
writer.writerows(street_lst)
44+
45+
46+
api = overpy.Overpass()
47+
q = f"""
48+
way({lat1}, {lon1}, {lat2}, {lon2}) ["landuse"];
49+
(._;>;);
50+
out body;
51+
"""
52+
result = api.query(q)
53+
54+
natural_lst = list()
55+
for way in result.ways:
56+
for node in way.nodes:
57+
natural_lst.append((float(node.lat), float(node.lon)))
58+
59+
with open(r'/home/miguel/Documents/projects/Wildfire/wfire/src/simulation/terrain/temp/landuse_coordinates.csv', "w", newline="") as f:
60+
writer = csv.writer(f)
61+
writer.writerows(natural_lst)
62+
63+
64+
api = overpy.Overpass()
65+
q = f"""
66+
way({lat1}, {lon1}, {lat2}, {lon2}) ["natural"];
67+
(._;>;);
68+
out body;
69+
"""
70+
result = api.query(q)
71+
72+
natural_lst = list()
73+
for way in result.ways:
74+
for node in way.nodes:
75+
natural_lst.append((float(node.lat), float(node.lon)))
76+
77+
with open(r'/home/miguel/Documents/projects/Wildfire/wfire/src/simulation/terrain/temp/natural_coordinates.csv', "w", newline="") as f:
78+
writer = csv.writer(f)
79+
writer.writerows(natural_lst)
80+

0 commit comments

Comments
 (0)