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.

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

ORS env and config #31

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ TILESTACHE_CACHE_BUFFER_SIZE=256
TILESTACHE_CACHE_TOKEN=374h5g96831hsgetvmkdel

# Openrouteservice
ORS_API_ENDPOINT = 'https://api.openrouteservice.org/v2'
G3WSUITE_ORS_API_ENDPOINT = 'https://api.openrouteservice.org/v2'
# Optional, can be blank if the key is not required by the endpoint
ORS_API_KEY = '<your API key goes here>'
G3WSUITE_ORS_API_KEY = '<your API key goes here>'
# Max number of ranges (it depends on the server configuration)
ORS_MAX_RANGES = 6
G3WSUITE_ORS_MAX_RANGES = 6
# Max number of locations(it depends on the server configuration)
ORS_MAX_LOCATIONS = 2
G3WSUITE_ORS_MAX_LOCATIONS = 2

# Gunicorn workers (default to 8)
G3WSUITE_GUNICORN_NUM_WORKERS=8
Expand Down
8 changes: 6 additions & 2 deletions config/g3w-suite/settings_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
# List of available ORS profiles
ORS_PROFILES = {
"driving-car": {"name": "Car"},
"driving-hgv": {"name": "Heavy Goods Vehicle"}
"foot-walking": {"name": "Walking"}
}
# Max number of ranges (it depends on the server configuration)
ORS_MAX_RANGES = int(os.getenv('ORS_MAX_RANGES', 6))
Expand Down Expand Up @@ -174,7 +174,11 @@
'openrouteservice': {
'handlers': ['console'],
'level': 'DEBUG',
}
},
'*': {
'handlers': ['console'],
'level': 'DEBUG',
},
}
}

Expand Down
8 changes: 7 additions & 1 deletion docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ services:
- ${WEBGIS_DOCKER_SHARED_VOLUME}/node_modules:/code/node_modules
- ./config/g3w-suite/overrides/templates:/code/templates:ro
- ./config/g3w-suite/settings_docker.py:/code/g3w-admin/base/settings/local_settings.py

networks:
internal:

Expand Down Expand Up @@ -98,6 +97,13 @@ services:
networks:
internal:

redis:
image: redis:latest
expose:
- 6379
networks:
internal:

nginx:
image: nginx:1.19.5
ports:
Expand Down