Commit graph

999 commits

Author SHA1 Message Date
Yohan Boniface
a8e37500dd fix: reset table editor properties after creating a new one 2024-02-15 11:50:44 +01:00
Yohan Boniface
2dd7266d21 feat: show recent picto in a separate tab 2024-02-15 10:56:07 +01:00
Yohan Boniface
126e47eef9 feat: show last used pictograms in list
This feature was planned in the initial rework of the pictogram
form UI, but not yet done. Some recent discussion in the OSM French
forum reactivated the need for it.

cf https://forum.openstreetmap.fr/t/marker-and-marker-colors/21051
2024-02-15 10:54:59 +01:00
Yohan Boniface
9e805ea8da fix: make default picto always white for now
fix #1594
2024-02-14 18:41:07 +01:00
Yohan Boniface
34608f55c1
Merge pull request #1592 from umap-project/zoomto-from-qs
feat: allow to set zoomTo from query string
2024-02-14 18:34:04 +01:00
Yohan Boniface
709674b7d9
Merge pull request #1607 from umap-project/osm-oauth2
chore: migrate to OAuth 2 for OpenStreetMap backend
2024-02-14 18:31:57 +01:00
Yohan Boniface
0dc49d2de3 fix: do not try to animate the panel
The panel inherits from the classic Popup, but given it's fixed on
the UI, it does not make sense to try to move it, and it some
situation there is a race condition that make Leaflet try to animate
but this fails
2024-02-14 17:54:48 +01:00
Yohan Boniface
a99ee90e15 chore: migrate to OAuth 2 for OpenStreetMap backend
fix #1279
2024-02-14 11:30:16 +01:00
Yohan Boniface
c378d5dc60 feat: allow to set zoomTo from query string
When using data/dataUrl querystring, uMap will import data at load,
and will set view using this data bounds. In some situation (Deveco),
the user wants to control the max zoom of the final view.

Also add labelKey and showLabel to be parsed from query string, still
for Deveco needs.
2024-02-13 18:00:23 +01:00
Yohan Boniface
e1e255f709
Merge pull request #1593 from umap-project/icon-img-breakpoint
feat: change breakpoint to switch black SVG img to white
2024-02-13 14:16:25 +01:00
David Larlet
44a254725f
Merge pull request #1604 from umap-project/fix-dashboard-style
fix: improve dashboard styles
2024-02-13 07:52:10 -05:00
Yohan Boniface
59cb10342b chore: prettier 2024-02-13 12:10:47 +01:00
Yohan Boniface
6c38a063fd i18n 2024-02-13 11:57:09 +01:00
Yohan Boniface
9ba8adbd85 feat: use a WCAG algo to define contrast colour
I've decided for a basic home made util, because:
- I'm not sure color is still maintained
- colorjs.io sounds very cool and maintained, but is 105k
- there is no custom bundle yet
- it uses proper modules, but for just the contrast util we need
  to pull all the class logic, and it's a lot
2024-02-13 11:29:56 +01:00
David Larlet
4f469ced47
fix: improve dashboard styles 2024-02-12 20:59:35 -05:00
Yohan Boniface
a239633fae feat: change threshold to switch black SVG img to white 2024-02-12 17:54:53 +01:00
David Larlet
22412ffe13
chore: Use CSS variables 2024-02-09 22:22:21 -05:00
Yohan Boniface
f3d1a3995c fix: add pointer cursor to buttons in dashboard 2024-02-09 19:08:43 +01:00
Yohan Boniface
06d5af2a84 i18n 2024-02-09 18:19:20 +01:00
Yohan Boniface
a0634e5f55
Merge pull request #1587 from umap-project/use-global-l
chore: do not introduce a new global, use L and L.U already there
2024-02-09 18:04:48 +01:00
Yohan Boniface
074bf675c4 chore: replace window.L.U by window.U 2024-02-09 18:01:05 +01:00
David Larlet
285b9337ad
fix: consistency in logos colors and links 2024-02-09 11:54:37 -05:00
Yohan Boniface
68f2de7f44 chore: do not introduce a new global, use L and L.U already there 2024-02-09 17:10:19 +01:00
Yohan Boniface
1f5bfcb567
Merge pull request #1586 from umap-project/fix-browser-inbbox
fix: browser inBbox setting not persistent and features click not opening popup
2024-02-09 17:09:11 +01:00
David Larlet
81a1367696
fix: color consistency between buttons and icons 2024-02-09 10:47:04 -05:00
Yohan Boniface
e8a9c68dde fix: fix dashboard buttons height and alignment in Firefox Linux 2024-02-09 16:35:20 +01:00
David Larlet
96acd710dc
fix: improve responsiveness of dashboard header 2024-02-09 10:30:48 -05:00
David Larlet
63a213a95f
fix: dashboard title alignments and links 2024-02-09 10:15:14 -05:00
David Larlet
5827a4cab0
fix: make dashboard table scrollable 2024-02-09 10:14:44 -05:00
Yohan Boniface
275c012e4e i18n 2024-02-09 11:58:44 +01:00
David Larlet
afdc732204
Merge pull request #1430 from umap-project/download-all-from-dashboard
Ability to clone, delete and download all maps from user’s dashboard
2024-02-08 09:51:01 -05:00
Yohan Boniface
4cec24797e chore: move Browser to a module 2024-02-08 13:09:18 +01:00
Yohan Boniface
355cdd9f07 fix: browser inBbox setting not persistent and features click not opening popup
Refactor the way it updates itself in the process.
2024-02-08 12:57:08 +01:00
David Larlet
1acadc746a
fix: use the regular delete view instead of ajax 2024-02-07 17:38:39 -05:00
Yohan Boniface
009f2c916f fix: use variable for color in browser if any 2024-02-07 19:38:46 +01:00
Yohan Boniface
10efc5d103
Merge pull request #1573 from umap-project/map-preview
feat: add experimental "map preview" in /map/ endpoint
2024-02-07 19:14:37 +01:00
Yohan Boniface
7943c61b3e chore: do not consume style query string now that we handle keys separatly 2024-02-07 18:47:00 +01:00
David Larlet
d4b380aa5f
feat: add icons to the dashboard actions 2024-02-07 12:32:00 -05:00
David Larlet
8a6e992b9c
Ability to clone a map and overall UI improvements 2024-02-07 12:32:00 -05:00
David Larlet
46cf432eb4
Paginate user’s maps combined downloads 2024-02-07 12:32:00 -05:00
Yohan Boniface
f09e399b3c chore: refactor setting Map options from querystring 2024-02-07 17:53:45 +01:00
Yohan Boniface
bd626690ef fix: non loaded layers should still be visible in legend and data browser
Also rework the browsable/browse methods to try to make them more
understandable…

fix #1554
2024-02-07 16:32:51 +01:00
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
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
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
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
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
65f1cdd6b4
lint: use eslint with a browserslist configuration 2024-01-29 16:44:04 -05: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
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
Yohan Boniface
e69b5a7af0
Merge pull request #1547 from umap-project/1545-fix-icons
fix(1545): fix icons for mailto and tel
2024-01-29 12:46:03 +01:00
Yohan Boniface
cfe3bad5a4
Merge pull request #1550 from umap-project/choropleth-min-classes
fix: do not ask more classes than available values in choropleth mode
2024-01-29 12:45:40 +01:00
Yohan Boniface
95b457b38c
Merge pull request #1551 from umap-project/fix-browser-with-variable
fix: build browser once features are on the map, not before
2024-01-29 12:45:16 +01:00
Yohan Boniface
256d6c631c feat: use svg for default icon (circle)
fix #1560
2024-01-29 12:24:16 +01:00
Yohan Boniface
53ad987aea fix: prevent datalayer to resetting to an old version on save
This happens in collaborative mode only.

cf #1536
cf #1537

cf https://forum.openstreetmap.fr/t/probleme-de-sauvegarde-des-cartes/20596
cf https://forum.openstreetmap.fr/t/umap-soucis-de-debutants/20538
cf https://forum.openstreetmap.fr/t/probleme-de-maj-des-icones/20565
2024-01-25 15:42:00 +01:00
Yohan Boniface
7ae742ca70 chore: add grey background to body on map page to prevent blinking
Otherwise the DOM loads and create a white script before the JS is
parsed and ready to display the map. This is due to using modules
and scripts in defer mode.
2024-01-22 14:41:21 +01:00
Yohan Boniface
ae4c1a9454 fix: build browser once features are on the map, not before
Features title may contain variables, which include geographical
ones (center, lat, lon…), and in this case the feature must be
on the map to be able to compute them (eg. the polygon center).

fix #1519
2024-01-22 12:49:33 +01:00
Yohan Boniface
d696fe885f fix: do not ask more classes than available values in choropleth
It actually does not make sense, and it's a sanity check: some
computation algorithms fail in this situation.
2024-01-22 11:12:14 +01:00
David Larlet
7c4009965a
Use minified versions + sourcemaps of vendor statics 2024-01-21 14:02:16 -05:00
David Larlet
7e5c15b5b0
fix(1545): fix icons for mailto and tel
Fix #1545
2024-01-19 11:48:23 -05:00
Yohan Boniface
11045345fc i18n 2024-01-17 18:50:24 +01:00
Yohan Boniface
fb63588ac5 chore: use https://umap-project.org link in map footer 2024-01-17 11:25:47 +01:00
Yohan Boniface
cf13d15753 fix: honour datalayersControl=expanded in querystring
fix #1525
2024-01-16 19:58:10 +01:00
Yohan Boniface
4227e171f3 fix: empty file input when closing the importer panel
Otherwise, we cannot import anything else than a file, even when
closing and reopening the panel. User needs to refresh the page.
2024-01-16 12:28:59 +01:00
Yohan Boniface
8026c16926 i18n 2024-01-15 18:32:51 +01:00
David Larlet
5d758ebc0d
Create a dedicated js/components folder 2024-01-10 14:31:54 -05:00
David Larlet
7b5b5b1b22
Set a umap-fragment web component for lists 2024-01-09 14:49:14 -05:00
4b34a7d300 merge index.js with global.js 2024-01-08 19:29:43 +01:00
7c697f7529 Merge @ybon changes 2024-01-08 18:49:03 +01:00
Yohan Boniface
ce22a2ee74 Only load Leaflet once, as module 2024-01-08 18:43:54 +01:00
95212dbdf5 [refactor] Use JS modules for client URL routing
Also expose some vendorized libs as modules in `modules/vendors.js`
2024-01-08 18:43:54 +01:00
Yohan Boniface
067d74de9f fix: icon element is undefined when clustered 2024-01-08 16:35:41 +01:00
Yohan Boniface
d0c560e29a i18n 2024-01-08 13:43:48 +01:00
Yohan Boniface
0f1e13b994 chore: fix failing JS test 2024-01-08 13:31:02 +01:00
Yohan Boniface
2812431722 feat(browser): add counter in datalayer headline 2024-01-08 12:46:06 +01:00
Yohan Boniface
cea5e30582
Merge pull request #1499 from umap-project/dedicated-layer-settings
Move layer specific settings to a dedicated fieldset
2024-01-08 12:30:41 +01:00
Yohan Boniface
75ff147371 Move layer specific settings to a dedicated fieldset
cf #1490
2024-01-08 12:25:40 +01:00
Yohan Boniface
fe61acd6c1
Merge pull request #1479 from umap-project/osm-template
Add a popup template to showcase OpenStreetMap data
2024-01-08 12:10:48 +01:00
Yohan Boniface
ba6371381a Better margin around popup title icon 2024-01-08 12:00:19 +01:00