Commit graph

1847 commits

Author SHA1 Message Date
David Larlet
b25bb16858
Merge pull request #1455 from jschleic/tooltip-and-headline
Unify tooltip and headline and add the corresponding icon
2023-12-14 14:26:06 -05:00
Yohan Boniface
8ce09b039f
Merge pull request #1458 from umap-project/fix-datachanged
Make sure DataLayer._dataloaded is set only once all data is imported
2023-12-12 10:20:54 +01:00
Joachim Schleicher
e020a3656c finetune
* left align share icon
* add light tilelayer icon in "view" mode
2023-12-11 11:39:54 +01:00
Yohan Boniface
f54992c0e5 Make sure DataLayer._dataloaded is set only once all data is imported
When DataLayer._dataloaded is set, DataLayer.addLayer will send 'datachanged'
event (for once for each feature). When the data browser panel is open, the
browser is listening to 'datachanged' to rebuild itself.

Not sure this is the real final fix, but that may need more refactoring, so
I think this approach is already a better situation than the current.

fix #1457
2023-12-11 10:36:39 +01:00
Joachim Schleicher
259a002705 fix picto tests 2023-12-09 20:32:07 +01:00
Joachim Schleicher
20bbbbad0c fixup tests 2023-12-08 21:47:11 +01:00
Joachim Schleicher
69939ec2a3 add title and heading to layer and tilelayer 2023-12-08 21:11:19 +01:00
Joachim Schleicher
3b89c22c23 add title and icon to buttons
* search and share icons on the left get an `title` attribute
* all panels start with an `h3` headline including the corresponding icon
* thus add smaller versions of the 24px-icons to 16.svg or 16-white.svg
* unify strings for button and headline to match
2023-12-08 21:11:19 +01:00
David Larlet
e84f5b19ca
Merge pull request #1453 from umap-project/better-changelog-rendering
Better changelog rendering
2023-12-08 09:00:08 -05:00
Yohan Boniface
7ef3fb2caa
Merge pull request #1445 from umap-project/importer-class
Make it easier to open file dialog
2023-12-08 06:48:38 +01:00
David Larlet
1fccbb7d59
Better changelog rendering 2023-12-06 12:46:32 -05:00
Alexis Métaireau
38ec262f16 [ci] Add a separate target for docs 2023-12-06 11:33:34 +00:00
Alexis Métaireau
d15c436d42 [chore] fix docs requirements 2023-12-06 11:04:15 +00:00
Alexis Métaireau
e4ad904536
Merge pull request #1440 from umap-project/almet/rework-docs 2023-12-06 10:40:24 +00:00
Alexis Métaireau
ce4b411cec
Update docs/contributing.md
Co-authored-by: Yohan Boniface <yb@enix.org>
2023-12-05 23:13:27 +01:00
Alexis Métaireau
b04ad69276
Update docs/config/settings.md
Co-authored-by: Yohan Boniface <yb@enix.org>
2023-12-05 23:12:40 +01:00
Alexis Métaireau
18afcad918
Update docs/config/customize.md
Co-authored-by: Yohan Boniface <yb@enix.org>
2023-12-05 23:12:28 +01:00
Alexis Métaireau
4676fd09e6
Update docs/architecture/overview.md
Co-authored-by: Yohan Boniface <yb@enix.org>
2023-12-05 23:12:09 +01:00
Alexis Métaireau
c058db8ae2 [docs] Rework the documentation 2023-12-05 16:18:10 +01:00
Yohan Boniface
50da2c0e1c Add integration test for textarea import 2023-12-05 14:28:11 +01:00
Yohan Boniface
c62c327878 Importer: call showPicker only on openFiles, not at each open
This allows to open the files dialog with Ctrl+O
2023-12-05 12:59:49 +01:00
David Larlet
1bfbde320c Add working showPicker to open files dialog 2023-12-05 12:59:49 +01:00
Yohan Boniface
67f6fa7587 Add non working ways to focus the importer file input 2023-12-05 12:59:49 +01:00
Yohan Boniface
42906ea8b4 Add non working way to open files dialog 2023-12-05 12:59:49 +01:00
Yohan Boniface
84b5e2188a Move importer panel to a separate class 2023-12-05 12:59:43 +01:00
Yohan Boniface
43a0480a3c
Merge pull request #1447 from k-3st3ban/fix-no-facet-with-remote-data
fix: no data in facet filters when set as default panel
2023-12-03 18:59:58 +01:00
3st3ban3
daeaf093f1 fix: no data in facet filters when set as default panel 2023-12-03 17:45:17 +01:00
Yohan Boniface
e251c84298
Merge pull request #1442 from umap-project/log-tilelayer-error
Log error when loading tilelayer
2023-11-29 18:10:01 +01:00
Yohan Boniface
9b28a48c9b
Merge pull request #772 from umap-project/optimistic-merge
Optimistic conflicts resolution mecanism
2023-11-29 17:56:17 +01:00
Yohan Boniface
312863b2d4
Merge pull request #1443 from umap-project/minimap-style
Use map style options to style minimap bbox rectangle
2023-11-29 17:51:40 +01:00
Yohan Boniface
ea8de2a4b9
Merge pull request #1444 from umap-project/commit-on-esc
Finish drawing line/polygon instead of cancelling when pressing Escape
2023-11-29 17:51:21 +01:00
Yohan Boniface
7591031e63 Add integration tests covering basic polygon drawing 2023-11-29 17:34:12 +01:00
Yohan Boniface
64e90bb4c1 Add integrations tests covering basic line creation 2023-11-29 17:26:01 +01:00
Yohan Boniface
60c002f94a Call commitDrawing instead of stopDrawing on ESC
fix #1428
2023-11-29 16:32:22 +01:00
Yohan Boniface
f8d2ecdd32 Use map style options to style minimap bbox rectangle
Ref:

https://forum.openstreetmap.fr/t/option-dexport-mini-carte/19223/6
2023-11-29 16:15:33 +01:00
Yohan Boniface
7a78645055 Log error when loading tilelayer
I see this message from time to time, but I've no details so I
cannot investigate easily. Let's log the error to help.
2023-11-29 15:49:17 +01:00
Alexis Métaireau
f37ed700f6 [feat] add a simple conflict resolution mecanism.
The server tries to merge conflicting saves of
the same layer.

What it does:

- use the `If-Unmodified-Since` header to check
  if changes happened to the stored data ;
- Compare the incoming version with its reference version
  to get a diff.
- Reapply the diff on top of the latest version.
- If the merge is not possible, return a
  "422 Conflict" HTTP response.
- If the merge worked, return the merged document,
  to be updated by the client.
2023-11-29 13:04:24 +01:00
David Larlet
8804a953ee
[docs] Adapt primary color to match uMap one 2023-11-28 21:40:09 -05:00
David Larlet
8e94c9e470
[docs] Bump mkdocs to 1.5.3
This way mkdocs-material is happy:

> mkdocs-material 9.4.14 depends on mkdocs>=1.5.3 and ~=1.5
2023-11-28 21:39:24 -05:00
Alexis Métaireau
b3d6d6da08 [docs] Update the documentation 2023-11-28 15:54:11 +01:00
Yohan Boniface
34e0461ca8 Run prettier on umap.layer.js 2023-11-28 15:28:57 +01:00
Yohan Boniface
fc2b7e5d4b
Merge pull request #1438 from umap-project/table-fullwidth
Always use fullwidth table editor
2023-11-28 08:47:06 +01:00
Yohan Boniface
b716530f99 Remove '|' from label, now added in CSS
(Since #1422)
2023-11-27 22:44:35 +01:00
Yohan Boniface
d47c6f3214 Always use fullwidth table editor
Adding a property when table is not in fullwidth is buguish, so
let's make it simple.

In the future, we'd replace this table editor with a dedicated lib.

cf #1363
2023-11-27 22:43:14 +01:00
Yohan Boniface
1e419fc692
Merge pull request #1437 from umap-project/kbd
Mention more keyboard shortcuts
2023-11-27 21:44:57 +01:00
Yohan Boniface
c34e39319e Mention more keyboard shortcuts
cf #1436
2023-11-27 20:24:50 +01:00
Yohan Boniface
8903b88765
Merge pull request #1435 from umap-project/fix-slideshow-buttons
Fix slideshow buttons not show when facets are active
2023-11-27 17:29:08 +01:00
Yohan Boniface
f274b39fc9 Fix slideshow buttons not show when facets are active
cf #1422
2023-11-27 16:39:42 +01:00
Yohan Boniface
3c3a99ba6e changelog 2023-11-27 10:24:00 +01:00
Yohan Boniface
35ff0dd7ce 1.11.1 2023-11-27 09:50:41 +01:00