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

2087 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yohan Boniface
c334f7554e feat: add experimental "map preview" 
This is the same as "map new", but it is not in edit mode. This
allow to click on the elements and see the popups instead of editing
it when using a `dataUrl` query string.
This way of using uMap is not documented, but it's used by some
partners (Deveco recently, data.gouv.fr historicaly).

In the same time, this PR adds two things:
- possibility to pass data direclty in querystring (instead of an URL):
  in the case of Deveco, they have pages where only point is shown (for
  each company)
- possibility to pass style options directly from query string: may
  allow for example to control the `popupTemplate`, eg. to use a table
  one that will display all properties of the clicked feature

Note: dataUrl and such also works in normal "map new" view. There are
two use cases around those parameters, from external sites:
- see this data on uMap (should point on map preview)
- create a map with those data (should point on map new)
 2024-02-07 13:57:20 +01:00
Yohan Boniface
2b08d499ac
Merge pull request #1579 from umap-project/dependabot/pip/hatch-1.9.3 
chore: bump hatch from 1.9.1 to 1.9.3
 2024-02-05 20:54:46 +01:00
dependabot[bot]
40b3c6439e
chore: bump hatch from 1.9.1 to 1.9.3 
Bumps [hatch](https://github.com/pypa/hatch) from 1.9.1 to 1.9.3.
- [Release notes](https://github.com/pypa/hatch/releases)
- [Commits](https://github.com/pypa/hatch/compare/hatch-v1.9.1...hatch-v1.9.3)

---
updated-dependencies:
- dependency-name: hatch
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-05 19:49:09 +00:00
Yohan Boniface
3ba417ed02
Merge pull request #1578 from umap-project/dependabot/pip/ruff-0.2.0 
chore: bump ruff from 0.1.6 to 0.2.0
 2024-02-05 20:48:21 +01:00
Yohan Boniface
cd887732ab
Merge pull request #1580 from umap-project/dependabot/pip/mkdocs-material-9.5.7 
chore: bump mkdocs-material from 9.4.14 to 9.5.7
 2024-02-05 20:47:57 +01:00
dependabot[bot]
9352271232
chore: bump mkdocs-material from 9.4.14 to 9.5.7 
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.4.14 to 9.5.7.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.4.14...9.5.7)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-05 17:52:13 +00:00
dependabot[bot]
7ebf05d1b9
chore: bump ruff from 0.1.6 to 0.2.0 
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.1.6 to 0.2.0.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/v0.1.6...v0.2.0)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-05 17:51:52 +00:00
Yohan Boniface
6fb7b02b40
Merge pull request #1555 from umap-project/request-module 
chore: move xhr management to a module and refactor
 2024-02-05 17:59:48 +01:00
Yohan Boniface
0ebb7615aa chore: make Request and ServerRequest pure JS class 
And use UI for dealing with dataloading/dataload events (used
for progress bar).
 2024-02-05 07:23:16 +01:00
Yohan Boniface
4a99f357f2 chore: lint 2024-02-05 07:23:16 +01:00
Yohan Boniface
325880f86f chore: make all request errors inherit the same parent class 2024-02-05 07:23:16 +01:00
Yohan Boniface
6b5ecac9c6 chore: move Map.Init.js test to playwright suite 2024-02-05 07:23:16 +01:00
Yohan Boniface
0b65d0dd9d chore: move iframe options test to playwright 2024-02-05 07:23:16 +01:00
Yohan Boniface
2271669e80 chore: move browser tests to playwright 2024-02-05 07:23:16 +01:00
Yohan Boniface
e44e0df69a tests: fix 90% of the javascript tests 2024-02-05 07:23:15 +01:00
Yohan Boniface
d1df70b0f4 fix: proper way to deal with 412 2024-02-05 07:22:53 +01:00
Yohan Boniface
d07d9f61d2 chore: refactore datalayers loading 2024-02-05 07:22:53 +01:00
Yohan Boniface
3f1070c90d chore: rename NokError and fix init param 2024-02-05 07:22:53 +01:00
Yohan Boniface
da7d09527b chore: catch error when using Request, and make remote URL working again 
I decided to remove the check `is_ajax` from `validate_url` to simplify
and edge case, and because I think it was more or less useless.
Basically, when getting remote data, we have two cases:
- direct call to the remote URL
- proxy through our `ajax_proxy` system (to work around CORS limitations)

In the first case, we cannot set the `X-Requested-With` header, otherwise
preflight step will fail, and in the second case, until now, we needed
to set this header for this `is_ajax` check to pass. So keeping this check
would mean adapting the behaviour of the Request/ServerRequest class in
a non elegant way. So let's make it simple…
 2024-02-05 07:22:53 +01:00
Yohan Boniface
5926eb53ba chore: catch error in getMore 2024-02-05 07:22:53 +01:00
Yohan Boniface
16265b566e chore: remove xhr module, now replaced by request.js 2024-02-05 07:22:53 +01:00
Yohan Boniface
ab966722f9 wip: rework request error flow 2024-02-05 07:22:53 +01:00
Yohan Boniface
b947134fa2 chore: ServerRequest returns an explicit error if any 2024-02-05 07:22:53 +01:00
Yohan Boniface
c50be398ab wip: use new request for fetching remote data 2024-02-05 07:22:53 +01:00
Yohan Boniface
8b2778116d wip: make the getMore button work again with new Request 2024-02-05 07:22:53 +01:00
Yohan Boniface
49f600adfa wip: refactor login flow 
Instead of dealing with in JavaScript, let's do a more classic
HTTP flow.

The main flows work, but there is still at least one to deal with:
when editing a map without being logged in, the server may ask for
login, and in this case we should login THEN reissue the request,
so we need to interrupt the first request in some way,
otherwise the server will still answer with a 403, which is what
happens after this commit.
 2024-02-05 07:22:53 +01:00
Yohan Boniface
084bc3d518 wip: move xhr management to a module and refactor 
It sort of work for common cases, but edge cases needs work,
specifically the login flow.
 2024-02-05 07:22:53 +01:00
Yohan Boniface
1d80645eda
Merge pull request #1576 from umap-project/fix-redraw-zoomend 
fix: do not try to reset tooltip of feature not on map
 2024-02-05 07:13:51 +01:00
Yohan Boniface
84bff2e416 fix: do not try to reset tooltip of feature not on map 
This can happen in a situation where:
- a layer as zoom limits
- we click on a feature, which opens a popup
- then zoom over the layer's limit (with
  scroll or keyboard, not keyboard, in order to not close the popup)
- then click in anywhere in the map, which will close the popup

Since the highlight of features on click (cf #1359), we redraw them
on popupclose, which explains the bug described above.

fix #1575
 2024-02-04 19:33:01 +01:00
Yohan Boniface
79bac2c353
Merge pull request #1572 from umap-project/real-counters 
feat: adapt browser counter to the currently displayed features
 2024-02-01 08:52:54 +01:00
Yohan Boniface
60832797d0 feat: adapt browser counter to the currently displayed features 2024-01-31 08:06:21 +01:00
Yohan Boniface
1c88f7f88c
Merge pull request #1571 from umap-project/intercept-options-geojson 
fix: make sure we do not add geojson in options
 2024-01-31 06:57:00 +01:00
David Larlet
8336dd2b78
Merge pull request #1534 from umap-project/dependabot/pip/django-5.0.1 
chore: bump django from 4.2 to 5.0.1
 2024-01-30 14:05:09 -05:00
David Larlet
5da9b67b2a
Merge branch 'master' into dependabot/pip/django-5.0.1 2024-01-30 14:01:55 -05:00
David Larlet
c3a849258d
Merge pull request #1568 from umap-project/eslint 
lint: use eslint with a browserslist configuration
 2024-01-30 13:58:59 -05:00
Yohan Boniface
9cb6ed6400 fix: make sure we do not add geojson in options 
This change is already in production, but has not been commited yet…
 2024-01-30 19:04:59 +01:00
David Larlet
7fc19b1038
Merge pull request #1567 from umap-project/explicit-release-strategy 
docs: define an explicit release stragegy
 2024-01-29 17:52:06 -05:00
David Larlet
65f1cdd6b4
lint: use eslint with a browserslist configuration 2024-01-29 16:44:04 -05:00
David Larlet
a159914c53
deps: adaptations for Django 5.x 2024-01-29 14:29:24 -05:00
David Larlet
c3691b235e
docs: define an explicit release stragegy 2024-01-29 13:30:13 -05:00
Yohan Boniface
20998f05be
Merge pull request #1565 from umap-project/playwright-wait-for-ajax 
tests: fix test_collaborative_editing_draw_markers
 2024-01-29 18:26:51 +01:00
Yohan Boniface
074fc1bc18
Merge pull request #1552 from umap-project/preconnect-tilelayer 
feat: set preconnect link for tilelayer
 2024-01-29 18:26:24 +01:00
Yohan Boniface
dd57794ca6
Merge pull request #1562 from umap-project/svg-default-icon 
feat: use svg for default icon (circle)
 2024-01-29 18:05:45 +01:00
Yohan Boniface
902240fe34 tests: fix test_collaborative_editing_draw_markers 
We needed to:
- make playwright to wait for ajax requests
- add a sleep to prevent saving two datalayer's version in the same
  second
 2024-01-29 17:36:43 +01:00
Yohan Boniface
5d6bf0a3a6
Merge pull request #1505 from umap-project/dependabot/pip/vermin-1.6.0 
chore: bump vermin from 1.5.2 to 1.6.0
 2024-01-29 12:50:21 +01:00
Yohan Boniface
caeb9d5b44
Merge pull request #1531 from umap-project/home-highlighted 
Introduce UMAP_HOME_FEED to control which maps are shown on the home page
 2024-01-29 12:48:24 +01:00
Yohan Boniface
ab73fde85e
Merge pull request #1542 from umap-project/unsupport-leaflet-storage-settings 
chore: remove support for settings starting with LEAFLET_STORAGE_
 2024-01-29 12:47:39 +01:00
Yohan Boniface
dee5af33a5
Merge pull request #1535 from umap-project/empty-fileinput 
fix: empty file input when closing the importer panel
 2024-01-29 12:47:15 +01:00
Yohan Boniface
c5270fb165
Merge pull request #1538 from umap-project/test-querystring 
fix: honour datalayersControl=expanded in querystring
 2024-01-29 12:46:55 +01:00
Yohan Boniface
1fdd5bbb78
Merge pull request #1541 from umap-project/site-link 
chore: use https://umap-project.org link in map footer
 2024-01-29 12:46:27 +01:00