Skip to content

V2 - Configurable Removal Time #59

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
BadWolf0081 wants to merge 5 commits into
base: v2
Choose a base branch
from
Open

V2 - Configurable Removal Time #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0aa8651
Adding code to support configurable removal time
BadWolf0081 Jan 12, 2023
05a337d
Update config.ini
BadWolf0081 Jan 13, 2023
b683dfe
fixed config.py for accidental removal of geojson
BadWolf0081 Jan 13, 2023
d9392e8
added fallbacks for newer config items
BadWolf0081 Jan 13, 2023
e181756
corrected default fallback to match # of hours correctly
BadWolf0081 Jan 13, 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
1 change: 1 addition & 0 deletions config_example/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[Config]
language = en/de/fr/es/pl/pt
portal_scraper_interval = 3600
removed_stop_wait = 3600

[Maps]
static_map = True
Expand Down
2 changes: 1 addition & 1 deletion stop_watcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def check_edits(fil, wp, w_type, w_id, w_lat, w_lon, w_name, w_img):
deleted_max_portals = 5
deleted_timespan_portals = ((4*config.scraper_wait) / 60)
deleted_max_stops = 5
deleted_timespan_stops = 300
deleted_timespan_stops = ((4*config.removed_wait) / 60)
if "deleted" in fil:
if "max" in fil["deleted"]:
if "scraper" in fil["deleted"]["max"]:
Expand Down
6 changes: 3 additions & 3 deletions util/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def __init__(self, config_path):

self.language = config_file.get("Config", "language").lower()
self.scraper_wait = config_file.getint("Config", "portal_scraper_interval")

self.removed_wait = config_file.getint("Config", "removed_stop_wait", fallback=18000)

self.use_static_map = config_file.getboolean("Maps", "static_map")
self.static_provider = config_file.get("Maps", "static_map_provider").lower()
Expand All @@ -21,7 +21,7 @@ def __init__(self, config_path):
self.map_url = config_file.get("Maps", "map_url")
self.map_provider = config_file.get("Maps", "frontend").lower()
self.map_name = config_file.get("Maps", "map_name")
self.geojson = config_file.getboolean("Maps", "geojson")
self.geojson = config_file.getboolean("Maps", "geojson", fallback= False)

self.use_geocoding = config_file.getboolean("Maps", "geocoding")
self.geocoding_provider = config_file.get("Maps", "geocoding_provider").lower()
Expand All @@ -40,4 +40,4 @@ def __init__(self, config_path):
self.portal_db_host = config_file.get("DB", "portal_host", fallback=self.db_host)
self.portal_db_port = config_file.getint("DB", "portal_port", fallback=self.db_port)
self.portal_db_user = config_file.get("DB", "portal_user", fallback=self.db_user)
self.portal_db_password = config_file.get("DB", "portal_password", fallback=self.db_password)
self.portal_db_password = config_file.get("DB", "portal_password", fallback=self.db_password)