Skip to content

Fix OSM-related crashes #302

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

Open
mrkajetanp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix OSM-related crashes #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d26a242
osm: Add extra overpass servers, increase tentatives, max tentative time
mrkajetanp Mar 21, 2026
bce27f3
vector_utils: Use list comprehension when passing lines to MultiLineS…
mrkajetanp Mar 21, 2026
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
14 changes: 8 additions & 6 deletions src/O4_OSM_Utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@

overpass_servers = {
"DE": "http://overpass-api.de/api/interpreter",
"PC": "https://overpass.private.coffee/api/interpreter",
"VK": "https://maps.mail.ru/osm/tools/overpass/api/interpreter",
"FR": "http://api.openstreetmap.fr/oapi/interpreter",
"KU": "https://overpass.kumi.systems/api/interpreter",
"RU": "http://overpass.osm.rambler.ru/cgi/interpreter",
}
overpass_server_choice = "DE"
max_osm_tentatives = 8
max_osm_tentatives = 80

################################################################################
class OSM_layer:
Expand Down Expand Up @@ -542,7 +544,7 @@ def get_overpass_data(query, bbox, server_code=None):
true_server_code,
"sent a corrupted answer (no closing </osm> tag in ",
"answer), new tentative in",
2 ** tentative,
min(2 ** tentative, 120),
"sec...",
)
elif len(r.content) <= 1000 and b"error" in r.content:
Expand All @@ -552,7 +554,7 @@ def get_overpass_data(query, bbox, server_code=None):
true_server_code,
"sent us an error code for the data (data too big ?), ",
"new tentative in",
2 ** tentative,
min(2 ** tentative, 120),
"sec...",
)
else:
Expand All @@ -563,7 +565,7 @@ def get_overpass_data(query, bbox, server_code=None):
" OSM server",
true_server_code,
"rejected our query, new tentative in",
2 ** tentative,
min(2 ** tentative, 120),
"sec...",
)
except:
Expand All @@ -572,14 +574,14 @@ def get_overpass_data(query, bbox, server_code=None):
" OSM server",
true_server_code,
"was too busy, new tentative in",
2 ** tentative,
min(2 ** tentative, 120),
"sec...",
)
if tentative >= max_osm_tentatives:
return 0
if UI.red_flag:
return 0
time.sleep(2 ** tentative)
time.sleep(min(2 ** tentative, 120))
tentative += 1
return r.content

Expand Down
5 changes: 2 additions & 3 deletions src/O4_Vector_Utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,9 +802,8 @@ def ensure_MultiLineString(input_geometry):
elif "Collection" in input_geometry.geom_type:
return geometry.MultiLineString(
(
line
for line in input_geometry.geoms
if line.geom_type in ["LineString", "LinearRing"]
[line for line in input_geometry.geoms
if line.geom_type in ["LineString", "LinearRing"]]
)
)
else:
Expand Down