Fix dependencies issues shapely/MVT and free localost from osmose.openstreetmap.fr #540
Conversation
…m osmose.openstreetmap.fr
| @@ -10,7 +10,7 @@ module.exports = (env, argv) => { | |||
| }, | |||
| plugins: [ | |||
| new SpritezeroWebpackPlugin({ | |||
| source: '../web_api/static/images/**/*.svg', | |||
| source: 'images/**/*.svg', | |||
There was a problem hiding this comment.
May you need this, because you de not run it from the right path ?
There was a problem hiding this comment.
I run this from the docker-compose, in the osmose-frontend/docker directory
docker-compose -f docker-compose.yml -f docker-compose-test.yml up
And it didn't work unless I make the path relative to the config file (which is already in web_api/static)
osmose.py
Outdated
| @app.get("/assets/marker-gl-sprite.json") | ||
| def sprite_png(): | ||
| return Response(open("web_api/public/assets/marker-gl-sprite.json", "rb").read()) | ||
|
|
||
|
|
||
| @app.get("/assets/marker-gl-sprite.png") | ||
| def sprite_png(): | ||
| return Response(open("web_api/public/assets/marker-gl-sprite.png", "rb").read()) | ||
|
|
||
|
|
There was a problem hiding this comment.
May just implement it in a generic way in the catch_all ?
There was a problem hiding this comment.
The catch_all is rooted in web/public and assets are in web_api.
Routing appropriate resources between web/public and web_api in catch_all is equivalent to define dedicated routes
I wondered how these resources are served today and didn't found out
osmose.py
Outdated
| @@ -11,6 +12,23 @@ | |||
|
|
|||
| app = FastAPI() | |||
|
|
|||
| origins = [ | |||
There was a problem hiding this comment.
CORS on non public API are on purpose.
I'm OK for CORS as middleware, but only for API. Host can be *.
There was a problem hiding this comment.
We may find more appropriate strategy for origins (I choose the default one).
But I was unable to get https://osmose.openstreetmap.fr/assets/marker-gl-sprite.png from localhost:8080 when opening the map in my browser.
localhost should rely on localhost resources only and we may adjust appropriate origins depending on env prod/dev
There was a problem hiding this comment.
Indeed @frodrigo, I didn't understand properly the nesting with FastAPI.
I've specified more appropriate CORS for web assets only, and preserving the existing CORS for everything else.
Fix two issues preventing local map to run when testing or dev:
I recommend to give it a try on public infrastructure. I didn't know how marker-gl-sprite is exposed today as there is no mention in uvicorn app nor in apache-site files.
This PR intends to establish a common way to serve those files both in dev and in prod.