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

2521 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yohan Boniface
d928028a97 Allow to control the interactive flag from the layer 
This flag deactivate all interactions for a path. It can be useful
when some polygon is used to delimitate an area on the map, but
when we don't want this area to be clickable.

I've a case where I've many of those polygons in a given map, and
they are imported, so I don't want to go one by one to deactivate it.
 2023-12-02 10:13:35 +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
Yohan Boniface
c36696cc31 i18n 2023-11-27 09:34:17 +01:00
Yohan Boniface
ab2bb6bb5c
Merge pull request #1419 from umap-project/stop-drag 
Prevent dragging a datalayer to activate drag on the map
 2023-11-26 21:59:16 +01:00
Yohan Boniface
3d7f87354b
Merge pull request #1420 from umap-project/restore-button 
Restore style of "restore version button"
 2023-11-26 21:58:58 +01:00
Yohan Boniface
84d7c8771e
Merge pull request #1432 from umap-project/locate-easing 
Set map default center even if waiting for user location
 2023-11-26 21:58:36 +01:00
Yohan Boniface
1be6b1d758
Merge pull request #1434 from umap-project/icon-text-size 
Reset increasing icon text size
 2023-11-26 21:58:17 +01:00
Yohan Boniface
25a61f1808 Reset increasing icon text size 
There are some usage with 5 chars that do not fit anymore.
Let's reset for now and maybe introduce later a way for the user
to configure the size
 2023-11-26 17:17:19 +01:00
Yohan Boniface
4347d40e64 Set map default center even if waiting for user location 
There is an edge case when using "locate" a default view AND
activating easing for transitions: in this case, Leaflet.locate needs
a  "starting view" to compute the easing to the new position (the
user location).

I could have only set the default_view when easing is on, but I
thought it was simpler to just set it anyway…
 2023-11-26 11:13:56 +01:00
Alexis Métaireau
34ee8e81de
Merge pull request #1413 from umap-project/almet/ci 2023-11-24 22:36:36 +00:00
Alexis Métaireau
aff0181636 [style] Format the code 2023-11-24 23:31:18 +01:00
Alexis Métaireau
72b0bc44ad [chore] remove python2 imports 2023-11-24 23:31:18 +01:00
Alexis Métaireau
35dc1acb07 [fix] Use timezone aware datetimes 2023-11-24 23:31:18 +01:00
Alexis Métaireau
1e9406c54f [fix] Update Django requirements to >=4.2 2023-11-24 23:31:18 +01:00
Alexis Métaireau
51c3ee3ce4 [ci] Add support for Github Actions 
This runs the tests for different python versions,
with different working sets, and also run
a linter.
 2023-11-24 23:31:18 +01:00
David Larlet
bef217bd3c
Merge pull request #1429 from umap-project/download-from-dashboard 
Reuse the map_download view/url for the dashboard
 2023-11-24 17:03:21 -05:00
David Larlet
56bb414113
Provide space/separators between Dashboard actions 2023-11-24 15:32:44 -05:00
David Larlet
b4464a7ca2
Reuse the map_download view/url for the dashboard 
Refs #1396
 2023-11-24 15:28:58 -05:00
Yohan Boniface
1b87df7a7f
Merge pull request #1422 from umap-project/slideshow-buttons 
Restore missing buttons in caption bar
 2023-11-23 21:22:09 +01:00
Yohan Boniface
19c7a273d5
Merge pull request #1423 from umap-project/doc-proxy-header 
Add in documentation example of filtering headers in ajax proxy conf
 2023-11-23 21:21:49 +01:00
Yohan Boniface
09903a8808
Merge pull request #1425 from umap-project/blue-links 
But back blue links in popup and small credit
 2023-11-23 17:37:45 +01:00
Yohan Boniface
e891ed61dd But back blue links in popup and small credit 
fix #1418
 2023-11-23 17:19:31 +01:00
Yohan Boniface
10fa1fd029
Merge pull request #1421 from umap-project/float-step-any 
Use step=any by default for FloatInput
 2023-11-23 17:13:55 +01:00
Yohan Boniface
fc64551c82 Add in documentation example of filtering headers in ajax proxy conf 2023-11-23 17:03:16 +01:00
Yohan Boniface
42ebe43698 Add minimal playwright test case for slideshow 2023-11-23 14:53:52 +01:00
Yohan Boniface
9781f6eb9c Restore missing buttons in caption bar 
Those button, being width: 100% and display: block were not displayed
AND were pushing out also the slideshow buttons.
 2023-11-23 13:07:18 +01:00
Yohan Boniface
4936a97218 Use step=any by default for FloatInput 
This is fixed in Leaflet.FormBuilder itself
 2023-11-23 12:29:52 +01:00
Yohan Boniface
fd2fb2a405 Restore style of "restore version button" 2023-11-23 11:00:35 +01:00