jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2160 commits 2 branches 0 tags 27 MiB
Commit graph

2160 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yohan Boniface
7210b1ddb9 Remove useless resolver from nginx config in doc 2023-08-24 17:48:41 +02:00
Yohan Boniface
c4bdb04795 Use X-Accel-Redirect for serving ajax-proxy request 
uMap allows to use remote URL as data sources, but those URLs
are not always CORS open, so this is why there is this "ajax-proxy"
feature, where the URL is passed to the backend.

Additionally, there is a caching feature, which duration is configurable
through frontend settings. Valid values are: disabled, 5 min, 1 hour,
1 day.

Initially, I wanted this to be totally handled by Nginx, but I never
found a wayt to set the proxy_cache_valid value from a query string.

Since then, at least in OSM France servers, the ajax-proxy is still
handled by a Django view, which then opens the remote URL and transfert
the data. This is not optimal. And I suppose this is what is causing
hicups on the OSM France servers lately.

This PR provides a mix option, where python deals with validating the
URL and parsing the TTL parameter, and then it passes the hand to
nginx which will serve the remote content.

So, roughtly:

- the client calls /ajax-proxy/?url=xxx&ttl=300
- python will validate the URL (not internal calls…)
- if UMAP_SENDFILE_HEADER is set, then the python returns an empty
  response with the path /proxy/http://url plus it will set the
  cache ttl through the header X-Accel-Expires
- this /proxy/ location is then handled by nginx
 2023-08-24 13:41:34 +02:00
David Larlet
981f727281
Merge pull request #1278 from umap-project/mkdocs-autolink 
Use magiclink extension for changelog with links
 2023-08-23 11:45:43 -04:00
David Larlet
ccaaa467f1
Use magiclink extension for changelog with links 2023-08-23 09:45:44 -04:00
Yohan Boniface
74cfd18a2f
Merge pull request #1275 from eMerzh/fix_changelog 
fix: correct changelog link
 2023-08-23 08:51:27 +02:00
Brice Maron
cd29486b84 fix: correct changelog link 2023-08-23 08:31:15 +02:00
David Larlet
3b736c2b02
Merge pull request #1274 from umap-project/dependabot/npm_and_yarn/growl-and-mocha--removed 
Bump growl and mocha
 2023-08-22 12:30:38 -04:00
David Larlet
29a96e5fdc
Fix tests with the latest version of mocha 2023-08-22 12:29:13 -04:00
dependabot[bot]
b7b160c808
Bump growl and mocha 
Removes [growl](https://github.com/tj/node-growl). It's no longer used after updating ancestor dependency [mocha](https://github.com/mochajs/mocha). These dependencies need to be updated together.


Removes `growl`

Updates `mocha` from 2.5.3 to 10.2.0
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mochajs/mocha/compare/v2.5.3...v10.2.0)

---
updated-dependencies:
- dependency-name: growl
  dependency-type: indirect
- dependency-name: mocha
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-22 16:20:54 +00:00
Yohan Boniface
798aea100f Bump leaflet.locatecontrol 2023-08-22 18:10:41 +02:00
Yohan Boniface
7f7951ec79 Bump Leaflet.MarkerCluster to 1.5.3 2023-08-22 18:08:37 +02:00
Yohan Boniface
209d7bb843 Bump Leaflet.i18n 2023-08-22 16:37:26 +02:00
David Larlet
4873f94a95
Merge pull request #1273 from umap-project/dependabot/pip/requests-2.31.0 
Bump requests from 2.30.0 to 2.31.0
 2023-08-22 09:51:43 -04:00
dependabot[bot]
4146416580
Bump requests from 2.30.0 to 2.31.0 
Bumps [requests](https://github.com/psf/requests) from 2.30.0 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.30.0...v2.31.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-22 13:48:45 +00:00
Yohan Boniface
e73b269217 changelog 2023-08-22 15:38:20 +02:00
Yohan Boniface
994a73ef2d 1.6.0 2023-08-22 15:33:50 +02:00
Yohan Boniface
debe128bd7 i18n 2023-08-22 15:33:27 +02:00
Yohan Boniface
1f4a906d88
Merge pull request #1272 from umap-project/fix-propagate-show 
Only call propagateShow at init if layer is visible
 2023-08-22 15:25:07 +02:00
Yohan Boniface
1e1d271064 Only call propagateShow at init if layer is visible 
fix #1263

We were calling popagateShow at datalayer init, which then
add a listener to "loaded" event, and then do the propagate.
So when the layer is hidden at load, when dragging it in the
datalayers list, it will be loaded (because we need to save it
with its new position) and it will appears as shown whatever
its real status.
 2023-08-22 10:20:46 +02:00
Yohan Boniface
08f1e3f61b i18n 2023-08-21 17:26:48 +02:00
Yohan Boniface
a997b5454b
Merge pull request #1268 from umap-project/search-bounds 
When map has max bounds, use those bounds for limiting search
 2023-08-21 17:20:30 +02:00
Yohan Boniface
8095c5721d
Merge pull request #1266 from umap-project/zoom-from-to-at-load 
Store DataLayer's settings in DB
 2023-08-21 17:18:48 +02:00
Yohan Boniface
9b3fe26acd
Merge pull request #1269 from umap-project/edit-username 
Very lite "My Profile" page to allow changing username
 2023-08-21 17:18:28 +02:00
Yohan Boniface
085721e3de
Merge pull request #1270 from umap-project/protect-username 
Protect back username field from being modified by social auth login
 2023-08-21 17:18:09 +02:00
Yohan Boniface
90a272aabc
Merge pull request #1271 from umap-project/add-provider 
Allow to add more than one OAuth provider
 2023-08-21 17:17:45 +02:00
Yohan Boniface
a89e6622ed User profile page: only display providers if there are some 
Someone uses uMap with classic auth username/password, and they
don't want those empty HTML elements
 2023-08-21 17:16:34 +02:00
Yohan Boniface
7814702721 Lite styling of user profile form 2023-08-21 17:10:12 +02:00
Yohan Boniface
25b3a66351 Allow to add more than one OAuth provider 2023-08-21 17:08:57 +02:00
Yohan Boniface
15e9cf0b5f Protect back username field from being modified by social auth login 2023-08-21 17:05:01 +02:00
David Larlet
b82fe07781
More explicit link requirement in bug report template 2023-08-21 09:42:15 -04:00
Yohan Boniface
2b471be171 Very lite "My Profile" page to allow changing username 2023-08-21 15:09:30 +02:00
Yohan Boniface
311809520c When map has max bounds, use those bounds for limiting search 
fix #1264
 2023-08-21 10:06:54 +02:00
Yohan Boniface
fb6b0f4d9b Tests: fix CSS selector 2023-08-21 08:27:47 +02:00
Yohan Boniface
9d98541b2c
Merge pull request #1267 from umap-project/minimap-bug 
Fix bug where minimap would not be displayed on load
 2023-08-20 20:55:02 +02:00
Yohan Boniface
9bbc901150 Make sure tilelayers exist before trying to create miniMap 2023-08-20 18:44:25 +02:00
Yohan Boniface
fa090b89df Store DataLayer's settings in DB 
This allows to known the full datalayer behaviour without needing
to load all the data, including the zoom from and to (new settings),
but also the color for example.

This will help also understanding datalayers usage and making
stats.

But no data migration is provided, it's retrocompatible (data
migration in OSM FR servers would be huge, so let's see if it's
really needed).
 2023-08-20 09:48:01 +02:00
Yohan Boniface
95296f31ec
Merge pull request #1261 from umap-project/ajax-proxy-timeout 
Catch timeout error in ajax proxy
 2023-08-20 09:42:47 +02:00
Yohan Boniface
b5d0b50183 Catch timeout error in ajax proxy 2023-08-17 17:43:25 +02:00
Yohan Boniface
bb922d1418 Call DataLayer.show instead of manually adding layer to the map 2023-08-17 08:14:53 +02:00
Yohan Boniface
7452681b31 Rename forgotten DataLayer.openFilter to DataLayer.openFacet 2023-08-17 08:14:22 +02:00
Yohan Boniface
ea21857bd3 1.5.1 2023-08-15 23:09:42 +02:00
Yohan Boniface
d0d1b16413
Merge pull request #1260 from umap-project/visibility-at-create 
Do not try to display share status until map has been saved once
 2023-08-15 23:08:12 +02:00
Yohan Boniface
99c0271285 Update edit header when map has been saved 
We need to update the share status display at first save
 2023-08-15 22:42:58 +02:00
Yohan Boniface
26b3b4b5c7 Do not try to display share status until map is created 2023-08-15 22:36:11 +02:00
Yohan Boniface
b06cfca1f2 Revert "More readable check from DataLayer.showAtZoom" 
This reverts commit c0dd8901e4.
 2023-08-15 22:26:33 +02:00
Yohan Boniface
7078557831 Fix tests: add now mandatory share_statuses in test map 2023-08-15 21:48:54 +02:00
Yohan Boniface
4acb1aa71e changelog 
(Automatically generated by Github)
 2023-08-15 16:53:25 +02:00
Yohan Boniface
88e3da70f5 1.5.0 2023-08-15 16:51:25 +02:00
Yohan Boniface
a50c42dd24 Add make minor command 2023-08-15 16:49:04 +02:00
Yohan Boniface
0e81030481 i18n 2023-08-15 16:47:23 +02:00