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

1750 commits

Author SHA1 Message Date
Yohan Boniface
48ab865b9a More work on OpenStreetMap popup template 2023-12-20 12:16:35 +01:00
Yohan Boniface
2208a6c67d WIP: OpenStreetMap dedicated popup template 2023-12-20 12:16:35 +01:00
Yohan Boniface
cab87cd59f Deal with data:image in icon image form 2023-12-20 12:16:35 +01:00
Joachim Schleicher
3f6c705d2e re-style download panel 
according to suggestion by @Aurelie-Jallut in
https://github.com/umap-project/umap/pull/1454#issuecomment-1858062371
 2023-12-19 17:27:27 +01:00
Joachim Schleicher
aec4330df6 add download icons 
file icon CC0 from https://www.iconfinder.com/icons/9110902/file_download_icon
arrow down drawn in inkscape
 2023-12-19 16:44:04 +01:00
Yohan Boniface
417f1b9d08 i18n 2023-12-18 23:41:06 +01:00
Joachim Schleicher
d19cc60a7a refactor shareBox into separate class 
download() and format() functions as well as dialog itself and
IFrameExporter helper moved into new file umap.share.js
 2023-12-18 19:26:16 +01:00
Joachim Schleicher
931ac7442d refactor share dialog for better usability 
* ordering is now short URL - download - backup - embed ordered by
  easier use cases for everyone to complex iframe code for web experts
* show available formats as buttons instead of hiding them in a dropdown
* add explaining labels
* change the dark options fieldset to light gray
 2023-12-18 19:25:22 +01:00
Alexis Métaireau
396cbd34b4 build: Update makefile testjs to open the browser 2023-12-18 08:16:17 +00:00
Yohan Boniface
813b283a29
Merge pull request #1476 from umap-project/iconlayers-titles 
Increase iconlayers titles on hover
 2023-12-18 08:44:02 +01:00
Yohan Boniface
12ba5e61f8 Allow to edit pictogram categories from admin list 2023-12-17 12:20:30 +01:00
Yohan Boniface
a3abd5394e Increase iconlayers titles on hover 2023-12-17 10:58:02 +01:00
Yohan Boniface
feb2b06971 1.12.0 2023-12-17 10:03:06 +01:00
Yohan Boniface
3d92a8e845
Merge pull request #1475 from umap-project/iconlayers-polish 
Iconlayers polish
 2023-12-17 09:59:56 +01:00
Yohan Boniface
a0279165ce Add minimal integration tests for tilelayers 2023-12-16 19:26:10 +01:00
Alexis Métaireau
4fbd2fabe5 chore: fix a typo in umap.forms.js 
Renamed `udpatePreview()` to `updatePreview()`
 2023-12-16 18:20:23 +00:00
Yohan Boniface
629a049eba Inform iconLayers when we change current tilelayer 
When an editor change the background layer from our own selector,
we need to inform iconLayers, so it can update its list and order
accordingly
 2023-12-16 18:50:08 +01:00
Yohan Boniface
426297df4f Make sure we do not display twice the same background layer in selector 
At this stage, uMap does not distinguish between a custom background
and the default background, both are saved in map.options.tilelayer.

Given we want a custom background (so not in the list) to appear in
the selector, we need this check to be sure we are not adding again
one layer from the list
 2023-12-16 18:47:14 +01:00
Yohan Boniface
cbb02f9890 Make sure we update the tilelayers switcher when setting a custom one 2023-12-16 09:17:02 +01:00
Yohan Boniface
5d2b968863 chore: prettier 2023-12-16 09:16:13 +01:00
Yohan Boniface
625131f7df i18n 2023-12-16 08:22:16 +01:00
Yohan Boniface
e54e5752ae chore: Remove duplicate key in Map.editable_options 2023-12-15 23:20:35 +01:00
Yohan Boniface
7bcf751d46
Merge pull request #1449 from umap-project/kbd 
Replace "Ctrl" by "Cmd" under macOS and style the "kbd" tag in keyboard shortcuts labels
 2023-12-15 17:48:42 +01:00
Yohan Boniface
97068bdfdf
Merge pull request #1469 from umap-project/iconlayers 
Use Leaflet.IconLayers as tilelayers switcher
 2023-12-15 17:30:11 +01:00
Yohan Boniface
7f5960d1c4 Add parenthesis around keyboard when there is no kbd tag 
This happens in title attributes, for example.
 2023-12-15 17:24:55 +01:00
Yohan Boniface
87132314df
Merge pull request #1446 from umap-project/interactive-layer 
Allow to control the `interactive` option from the layer
 2023-12-15 17:18:57 +01:00
Yohan Boniface
3ffa29802e Use a variable to make explicit max number of shown layers 2023-12-15 17:11:49 +01:00
Yohan Boniface
49c17d6fd1 Simplify eachTilelayer method 
Having a custom layer also in the predefined layers list is a
edge case we can deal with.
 2023-12-15 17:05:00 +01:00
Yohan Boniface
b6b6139c79 Hide overflow from tilelayer title for now 2023-12-15 16:19:31 +01:00
Yohan Boniface
34d3beef25 Make sure custom tilelayer is displayed first, if any 2023-12-15 16:19:15 +01:00
Yohan Boniface
afd57d6806 Control the tilelayer change, instead of letting iconLayers do it 
We want to control min/max zoom and such.
 2023-12-15 16:16:53 +01:00
Yohan Boniface
fe9f4b4a48 WIP: POC of using Leaflet.IconLayers as tilelayers switcher 2023-12-15 11:40:52 +01:00
Yohan Boniface
b9f6645162 Use real tile URL in tests 
It's easier to debug integration tests screenshots (otherwise
background is only grey).
 2023-12-15 09:37:21 +01:00
Yohan Boniface
2f89a76e08 Add minimal CSS for kbd tag 2023-12-15 09:14:20 +01:00
Yohan Boniface
5a6cd9a5b5 Do not display keyboard shortcuts in main help for now 
This main help already display some of them, so let's first
focus on this label refactor, and then do a refactor of that
main help modal.
 2023-12-15 09:14:20 +01:00
Yohan Boniface
d98d5686fb Display Cmd instead of Ctrl for shortcuts on MacOS 2023-12-15 09:14:20 +01:00
Yohan Boniface
9c71d74ec9 WIP 2023-12-15 09:14:20 +01:00
Yohan Boniface
445ce7b6ba
Merge pull request #1468 from umap-project/fix-toolbox-overflow 
Fix toolbox overflow with facets’ search
 2023-12-15 08:26:56 +01:00
Yohan Boniface
a32b680a74
Merge pull request #1465 from umap-project/defaultview-latest-path 
Use bounds instead of center when zooming to Polyline/Polygon
 2023-12-15 08:24:58 +01:00
Yohan Boniface
8568159589
Merge pull request #1466 from umap-project/fix-remove-tilelayer 
Do not call AttributionControl._update for removed tile layer
 2023-12-15 08:24:41 +01:00
David Larlet
45c0805319
Fix toolbox overflow with facets’ search 2023-12-14 17:03:53 -05:00
Yohan Boniface
d1912f57e9 Do not call AttributionControl._update for removed tile layer 2023-12-14 22:55:01 +01:00
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
0852077634 Use bounds instead of center when zooming to Polyline/Polygon 
Here is the initial issue:
- when using defaultView=latest (means latest element of the default layer)
- when map loads, we find the element, call getCenter to center the map on it
- but Polygon/Polyline needs the element to be already on the map to call
  this method (at least because the map CRS is needed)

So while trying to fix that issue, I also found that using a centroid for
a complex geometry was not very friendly: the map zoom on a part of this
geometry, while it seems to be that it's better to have a full view of it.
Now that we highlight the selected element, it's also easier to get which
element is focused when there are a lot close one to the others.
 2023-12-14 15:45:43 +01:00
Yohan Boniface
d93a963e1f Wait for data to be loaded before opening the data browser 
We need the map bounds to compute the isOnScreen check
 2023-12-14 15:20:59 +01: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
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
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
3st3ban3
daeaf093f1 fix: no data in facet filters when set as default panel 2023-12-03 17:45:17 +01:00
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
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
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
c34e39319e Mention more keyboard shortcuts 
cf #1436
 2023-11-27 20:24:50 +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
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
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
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
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
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
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
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
Yohan Boniface
0c99bc45a8 Prevent dragging a datalayer to activate drag on the map 2023-11-23 10:00:02 +01:00
Yohan Boniface
160c4ae420 Do not exclude DEMO and SHOWCASE maps anymore from home 
Those maps can be excluded by setting their share_status=OPEN

cf #1414
 2023-11-21 10:15:31 +01:00
Yohan Boniface
37430ec159 1.11.0 2023-11-20 11:34:14 +01:00
Yohan Boniface
9fca9861dd i18n 2023-11-20 11:30:56 +01:00
Yohan Boniface
ed99a3642f Rename test 2023-11-20 11:27:44 +01:00
Yohan Boniface
9af5375dbf Fix heavy request for getting user maps 
This was creating a huge INNER JOIN, and is replaced
by a UNION

cf https://explain.dalibo.com/plan/91af244fg9d1ec21

Also remove the conditional queryset, as now "my maps"
is serverd by the dashboard page, so we can only serve
public maps on this URL.
 2023-11-18 20:09:19 +01:00
Yohan Boniface
0db7f377c3
Merge pull request #1395 from umap-project/picto-ui 
Refactor icon selector: use tabs, make options more explicit
 2023-11-18 12:13:14 +01:00
Yohan Boniface
c99892b51e Picto field: fix clicking on preview to open the form 2023-11-16 11:46:49 +01:00
Yohan Boniface
cdfcce297d picto field: better handling of default input values 
We don't want to have an URL in the "char" field, and vice versa
 2023-11-16 10:31:40 +01:00
Yohan Boniface
c581172197 Make icons search accent insensitive 2023-11-15 21:06:40 +01:00
David Larlet
13ca7e3e5d
Add tests for favicon-related views 2023-11-15 14:13:33 -05:00
Yohan Boniface
8a2109948f Picto field: add hover and selected style 2023-11-15 18:15:30 +01:00
Yohan Boniface
9d30e150a3
Merge pull request #1409 from umap-project/form-button-css 
More targeted CSS rule for button color
 2023-11-15 18:00:37 +01:00
Yohan Boniface
5aa7ea6a7f More targeted CSS rule for button color 
Otherwise it override forms button (which are in dark mode and thus
need to keep the clear grey color)
 2023-11-15 17:51:35 +01:00
Yohan Boniface
fdbf814fac Fix accordion arrow not displayed on Chromium 2023-11-15 16:54:20 +01:00
Yohan Boniface
91ea6ac318
Merge branch 'master' into highlight-style-for-selected-lines 2023-11-15 16:05:56 +01:00
Yohan Boniface
a850900891
Merge pull request #1407 from jschleic/fix-lineedit-icons 
fix icons
 2023-11-15 15:59:23 +01:00
Yohan Boniface
be0cefd02a
Merge pull request #1396 from umap-project/backup-api 
Full map download endpoint
 2023-11-15 15:39:36 +01:00
David Larlet
0a8848874c
Remove the static webmanifest (dynamic now) 2023-11-14 22:51:34 -05:00
David Larlet
6f73038f92
Redirect favicon.ico and dynamic webmanifest 2023-11-14 22:50:25 -05:00
David Larlet
915d6b6db4
Set a default favicon 2023-11-14 17:32:40 -05:00
Joachim Schleicher
637c982add fix icons 
probably moved accidentally in c8065fb29e
 2023-11-14 21:20:00 +01:00
Joachim Schleicher
34bb2d6eb8 fix null opacity 
partly revert 952385 - since ´null´ is actually used in ternary fields.
Remove null opacity from the testcase. It should be either unset or a
numeric value.
 2023-11-14 20:48:11 +01:00
David Larlet
bf4e481f28
Fix download umap data JS tests 2023-11-14 14:19:54 -05:00
David Larlet
2274243662
Fix integration tests for download view 2023-11-14 14:10:25 -05:00
David Larlet
30e83a143c
Tests download view for permissions 2023-11-14 13:37:02 -05:00
David Larlet
97fa8c2754
Allow the ?download option in URL 2023-11-14 13:26:52 -05:00
Yohan Boniface
4bfc3d6666 Picto field: make sure we open on the right tab 2023-11-14 18:45:40 +01:00
David Larlet
3a0bcd76da
Align link styles to button ones 2023-11-14 12:16:47 -05:00
Yohan Boniface
686ce1fe2d
Merge pull request #1403 from umap-project/fix-1400 
Fix next/previous in popup footer in panel not openning next panel
 2023-11-14 18:15:36 +01:00
David Larlet
207c47d078
Button to download umap backup from backend url 2023-11-14 12:07:17 -05:00
David Larlet
0be42d39cb
Full map download endpoint 2023-11-14 12:07:17 -05:00
David Larlet
bdd7ad17e6
Improve buttons’ contrasts on the homepage #a11y 2023-11-14 11:59:03 -05:00
Yohan Boniface
6602491511
Merge pull request #1405 from umap-project/almet/speedup-tests 
Speedup the tests by using a weaker hash algo.
 2023-11-14 17:51:17 +01:00
Alexis Métaireau
3cc5d3b2af Speedup the tests by using a weaker hash algo. 
On my machine, it reduced the time to run the
test suite from 86s to 53s.

(Most of the remaining time is consumed by the
integration tests spawning chrome in the background)
 2023-11-14 17:45:14 +01:00
Yohan Boniface
9e33144d34 Fix next/previous in popup footer in panel not openning next panel 
fix #1400
cf #1240
 2023-11-13 21:12:53 +01:00
Yohan Boniface
5267d3e9b8 Fix wrong css selector for umap-alert-container elements 
umap-alert is set on the body to show/hide the alert container

fix #1398
 2023-11-13 20:36:48 +01:00
Yohan Boniface
35afd02551 Increase pictogram category title font size 2023-11-13 19:55:37 +01:00
Yohan Boniface
7810cba660 Test: reset MEDIA_ROOT after each test 
We need uploaded pictograms path to be deterministic.
 2023-11-13 19:28:30 +01:00
Yohan Boniface
0562055b65 Picot fied: add test for changing picto from marker itself 2023-11-13 19:28:07 +01:00
Yohan Boniface
eaf6c17db4 Picto field: only add category when at least one picto matches search 2023-11-13 17:11:40 +01:00
Yohan Boniface
2026a2c7e6 picto field: only add close button once 2023-11-13 17:02:35 +01:00
Yohan Boniface
00a13acb83 Add test covering changing picto from the datalayer 2023-11-13 16:58:54 +01:00
Yohan Boniface
d63d81fec3 Refactor icon search 2023-11-09 08:31:24 +01:00
Yohan Boniface
e509687956 Add first test for pictogram selection 2023-11-09 00:02:44 +01:00
Yohan Boniface
1bf1543668 Refactor icon selector: use tabs, make options more explicit 2023-11-08 18:00:12 +01:00
Yohan Boniface
c16a01778b
Merge pull request #1393 from umap-project/fieldset-triangle 
Add triangle icon to form fieldset to make toggle clearer
 2023-11-07 22:39:00 +01:00
Yohan Boniface
09fda11242 Use smaller triangles for fieldsets 2023-11-07 19:24:05 +01:00
Yohan Boniface
41f5a51069 Change background in pictograms list 2023-11-07 19:09:37 +01:00
Yohan Boniface
3034ebc50b
Merge pull request #1388 from umap-project/pictogram-category 
Pictogram category
 2023-11-07 18:01:15 +01:00
Yohan Boniface
03b837ade6 Add triangle icon to form fieldset to make toggle clearer 2023-11-07 17:57:10 +01:00
Joachim Schleicher
952385b1cd default fill-opacity for polygons 
'null' is not a sensible default
 2023-11-01 15:55:06 +01:00
Joachim Schleicher
af969eb5c0 incorporate review feedback for markers 
* drop and div marker increased to 36px size
* adjust drop arrow accordingly
* black box-shadow with increased spread
 2023-11-01 14:32:09 +01:00
Yohan Boniface
407e2dc46a Fix race condition with cluster layer 
This occurs when the cluster layer has a min/maxZoom defined, the
map is loaded inside this zoom range BUT the defaultView=data, and
would immediately change the current zoom to a value outside this range.

In this case, the datalayer is added to the map, then the data is requested,
then the map view is recomputed with the full data bounds.

There may be a better fix on our side, but given there is async in the middle,
it can be time consuming and can add complexity (with more events and listeners)
to properly make it work.
 2023-11-01 10:49:31 +01:00
Yohan Boniface
e9deaab2bc i18n 2023-11-01 08:17:56 +01:00
Yohan Boniface
402455c494 Change edit toolbar secondary button style 2023-10-31 17:57:01 +01:00
Yohan Boniface
5d410c94e3 Update save button style 2023-10-31 17:28:42 +01:00
Yohan Boniface
37094ec6df Update white eye closed 2023-10-31 16:32:54 +01:00
Yohan Boniface
f61f1415ce Update pictograms import script to deal with category and SVG 2023-10-30 21:35:22 +01:00
Yohan Boniface
8c774fb7b3 Add Pictogram.category and list pictos grouped by category 2023-10-30 21:07:55 +01:00
Yohan Boniface
b10838c5ba Automagically change svg icon color according to background color 2023-10-30 18:14:41 +01:00
Yohan Boniface
b6aa201397 Use FileField instead of ImageField for pictogram to allow SVG 2023-10-30 12:45:05 +01:00
Yohan Boniface
e5c616b49c Fix tests 2023-10-27 20:51:50 +02:00
Yohan Boniface
c578decdec 1.10.0 2023-10-27 20:09:42 +02:00
Yohan Boniface
40addf2ce4 i18n 2023-10-27 20:06:37 +02:00
David Larlet
539175f89c
Default message when drawing an existing line/shape 2023-10-27 13:49:26 -04:00
David Larlet
4250712741
More consistent color for close button in alert 2023-10-27 13:40:44 -04:00
David Larlet
bfd4b96807
Better responsive alignment of topbar icons and texts 2023-10-27 13:37:17 -04:00
David Larlet
c25de24009
Fix the bottom padding of help button in topbar 2023-10-27 13:24:12 -04:00
David Larlet
0c4495e356
Fix the z-index of the tooltip above sidepanel 2023-10-27 13:19:47 -04:00
David Larlet
a79e165de1
Fix position of pencil for deactivated layers 2023-10-27 13:18:19 -04:00
Yohan Boniface
8773a63e90
Merge pull request #1386 from umap-project/update-eye-icon 
Update eye icon
 2023-10-27 19:12:33 +02:00
Yohan Boniface
20767f7dc6
Merge pull request #1385 from umap-project/tooltip-mouseout 
Cancel tooltip on mouseout
 2023-10-27 19:12:03 +02:00
Yohan Boniface
d5ab5ac529 Update eye icon 2023-10-27 19:11:07 +02:00
Yohan Boniface
80a88d2c6f Change save button display 2023-10-27 18:58:41 +02:00
Yohan Boniface
9d9b726af5 Cancel tooltip on mouseout 
Prevent a tooltip to be displayed if the user has moved out
the mouse from the anchor.
 2023-10-27 18:45:58 +02:00
David Larlet
dde6254d16
Fix: set step any for float input with decimals 
Useful for latitudes and longitudes.
 2023-10-27 11:56:02 -04:00
David Larlet
67d89874e8
Merge pull request #1290 from umap-project/a11y-from-links-to-buttons 
A11Y: switch from links to buttons when pertinent
 2023-10-27 11:53:23 -04:00
David Larlet
312ebf5a0d
Remove JS inline style made useless 2023-10-27 11:47:33 -04:00
David Larlet
ff9b462531
All left sidebar icons with white background 2023-10-27 11:40:28 -04:00
David Larlet
860e475219
Center the tooltip (arrow) for bottom position 2023-10-27 11:32:03 -04:00
David Larlet
1d65ce6b49
Better labels and icons for edit/preview modes 
Fix #556
 2023-10-27 11:31:34 -04:00
David Larlet
2f424b7539
Flat button for icon shapes direct input 2023-10-27 10:35:26 -04:00
Yohan Boniface
60a0f14439
Merge pull request #1382 from umap-project/fix-global-variable 
Fix variable declared globally by mistake
 2023-10-27 16:12:44 +02:00
Yohan Boniface
41ec18a08d Fix variable declared globally by mistake 
This can have an impact in map listing, because dataToload will
be shared.
 2023-10-27 16:12:12 +02:00
Yohan Boniface
a0da0b31a7
Merge pull request #1383 from umap-project/default-view-datalayer 
Split defaultDatalayer in defaultView/EditDatalayer
 2023-10-27 16:03:14 +02:00
Yohan Boniface
f053e06686 Default view datalayer code refacto 2023-10-27 15:59:37 +02:00
Yohan Boniface
b80d88f7b9
Merge pull request #1384 from umap-project/onload-at-import 
Fix displayOnLoad not honoured at import
 2023-10-27 15:47:35 +02:00
Yohan Boniface
c5a28755a2 Fix JS tests related to a11y a to button change 2023-10-27 12:55:24 +02:00
Yohan Boniface
882cc74bcf Fix displayOnLoad not honoured at import 
fix #1043
 2023-10-27 12:25:40 +02:00
Yohan Boniface
29ab98ede3 Split defaultDatalayer in defaultView/EditDatalayer 
In view mode, we don't want the fallback to create a new datalayer.
 2023-10-27 11:54:35 +02:00
Yohan Boniface
85389699fd
Merge pull request #1379 from umap-project/default-props-no-redraw 
Keep only non graphic props in default properties, to prevent useless redraw
 2023-10-27 09:11:07 +02:00
Yohan Boniface
986e70637a Prevent more useless redraw when editing global settings 2023-10-26 23:07:02 +02:00
Yohan Boniface
9eea9f942d
Merge pull request #1380 from umap-project/range-step-rounding 
Round range step to 1 digit
 2023-10-26 22:56:47 +02:00
Yohan Boniface
ac56194487
Merge pull request #1381 from umap-project/max-zoom-limit-24 
Increase maxZoomLimit to 24
 2023-10-26 22:56:22 +02:00
Yohan Boniface
852857412b Increase maxZoomLimit to 24 
Even if this limit is not a hard limit, just a warning, we now
have been proven some maps using custom backgrounds use zooms
greater than 20.

Eg. this maps which allows zoom until 23:

https://umap.openstreetmap.fr/fr/map/cimetiere-asnieres-la-giraud_716488
 2023-10-26 22:40:54 +02:00
Yohan Boniface
bacf8922c8 Round range step to 1 digit 2023-10-26 22:38:41 +02:00
Yohan Boniface
59e4fb9663
Merge pull request #1376 from umap-project/csv-export 
Add minimal CSV export
 2023-10-26 19:23:34 +02:00
Yohan Boniface
9d5ff35636 Keep only non graphic props in default properties, to prevent useless redraw 2023-10-26 17:21:45 +02:00
Yohan Boniface
9434744219 Fix filter data crashing when data contains non string values 
It may happen when data comes from an import.

fix #1377
 2023-10-26 16:54:43 +02:00
Yohan Boniface
78b6025ef1 Add minimal CSV export 
cf https://forum.openstreetmap.fr/t/export-csv-depuis-une-umap/18290
cf #123
fix #608
 2023-10-26 14:28:18 +02:00
Yohan Boniface
47e5a0676a Fix max not loading when defaultView=latest and datalayer has no data 
When the default datalayer has no data, we need a fallback

fix #1374
 2023-10-24 15:08:42 +02:00
Joachim Schleicher
9b22cb4ab7 prettier.js 
fixup 836c17f
 2023-10-22 20:52:35 +02:00
Joachim Schleicher
86b27ceb0f pin marker: fix ball 'square'ish 2023-10-22 19:49:52 +02:00
Joachim Schleicher
b149a69efd add test case for path higlight 
therefore setting opacity of the example path to 0.6
 2023-10-19 21:31:52 +02:00
Joachim Schleicher
7d6830c7c6 add test case for 88746d5 2023-10-19 21:08:57 +02:00
Joachim Schleicher
88746d593c move higlight() into Marker class 
options.icon pointer is invalid after hide() show() cycle.
 2023-10-19 20:57:40 +02:00
Yohan Boniface
219b3e17dd Fix picto in add datalayer button 2023-10-18 11:52:07 +02:00
Yohan Boniface
d30f35ad78 1.9.3 2023-10-18 09:13:07 +02:00
Yohan Boniface
412a159cc2
Merge pull request #1370 from umap-project/drag-n-drop 
Add experimental drag and drop of file on the map container
 2023-10-18 09:12:10 +02:00
Joachim Schleicher
5778c4ff65 add testcase for marker highlight 2023-10-17 21:45:05 +02:00
Yohan Boniface
c50e21e395 Release scroll wheel zoom on drop 2023-10-17 21:15:47 +02:00
Joachim Schleicher
65ba1cd3ee simply call _redraw to reset style 
thanks for the review to @yohanboniface
 2023-10-17 20:55:37 +02:00
Yohan Boniface
48c86812b6 i18n 2023-10-17 10:35:51 +02:00
David Larlet
1d94ebbaa3
Responsiveness of the header when logged in 2023-10-16 16:28:41 -04:00
David Larlet
85c1af2b50
Use the createLink function when pertinent 2023-10-16 16:19:03 -04:00
David Larlet
8656ca3059
Deal with browsable layers from left sidebar 2023-10-16 15:46:11 -04:00
David Larlet
740ff90262
Keep save button in blue on hover 2023-10-16 15:37:25 -04:00
David Larlet
222af1b528
Header’s styles for logged in user 2023-10-16 15:37:09 -04:00
David Larlet
e87a77cf43
Hide the next icon in buttons’ sprites 2023-10-16 15:18:16 -04:00
David Larlet
9c7269eabc
Better styles for buttons and tooltips 2023-10-16 14:48:20 -04:00
David Larlet
79117f2a66
Better styles for buttons (vs. links) 2023-10-16 10:23:31 -04:00
David Larlet
7695906c38
Better styles for buttons (vs. links) 2023-10-16 10:23:30 -04:00
David Larlet
a28d427ba1
Set a default type="button" for JS buttons 
> The `button` [type] has no default behavior, and does nothing when pressed by default. It can have client-side scripts listen to the element's events, which are triggered when the events occur. — https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button
 2023-10-16 10:22:21 -04:00
David Larlet
688ef19c04
A11Y: switch from links to buttons when pertinent 2023-10-16 10:22:20 -04:00
Yohan Boniface
eda14bd742 Add affordance to drag-n-drop file onto the map 2023-10-13 17:02:08 +02:00
Yohan Boniface
b5bf1396f3 Experimental drag and drop of file on the map container 2023-10-13 12:01:19 +02:00
Yohan Boniface
3c234ead5b Add missing function after cherry-picking 2023-10-13 12:00:59 +02:00
Yohan Boniface
a94cac53ac Move map.importPanel to controls, as other similar functions 2023-10-13 11:58:47 +02:00
Yohan Boniface
d0782b8220 1.9.2 2023-10-12 11:45:41 +02:00
Yohan Boniface
7bdd56ee9e
Merge pull request #1369 from umap-project/heatlayer-map 
Add back HeatLayer._map reference check
 2023-10-12 11:45:05 +02:00
Yohan Boniface
1e8c51b0e5 Add back HeatLayer._map reference check 
In some situation, the property is undefined, given the call is async,
and we can add/remove the layer during the async stack
 2023-10-12 11:06:14 +02:00
Yohan Boniface
1f61378aac Fix map reference in DataLayersControl 
This would create an error when DataLayersControl is not added to
the map, but the mouseenter/leave event would still be active through
the datalayers list
 2023-10-12 10:57:05 +02:00
Yohan Boniface
23404e9870 1.9.1 2023-10-12 10:12:49 +02:00
Yohan Boniface
8fdddddc9e Prevent computing choropleth breaks for each feature when importing 
When importing a choropleth layer, the layer does not have a umap_id,
thus "hasDataLoaded" is immediately true, instead of being true when
all the "known" data is imported.

At this point, I can't find a good reason to keep the check on umap_id,
so let's remove and move forward.
 2023-10-12 10:07:51 +02:00
Yohan Boniface
7318ebd2f9 choropleth: be more defensive when consuming breaks 2023-10-12 10:06:19 +02:00
Yohan Boniface
e751cd0fc4 1.9.0 2023-10-12 09:21:22 +02:00
Yohan Boniface
3119c75fb2 i18n 2023-10-12 09:19:37 +02:00
Yohan Boniface
6aa6eb4c11
Merge pull request #1136 from umap-project/choropleth 
Add experimental choropleth datalayer type
 2023-10-12 08:47:30 +02:00
Yohan Boniface
02342c487a Choropleth: allow to control breakpoints manually 2023-10-12 08:39:47 +02:00
Yohan Boniface
dac1f16bc6
Merge pull request #1358 from umap-project/heat-improvements 
Heatmap improvements
 2023-10-11 22:50:30 +02:00
Yohan Boniface
c2feba1df0
Merge pull request #1349 from umap-project/toggle-attribution 
Hide attribution on small screen and add a small ? to display it
 2023-10-11 22:49:44 +02:00
Yohan Boniface
739626351c Choropleth: replace chromajs by colorbrewer + simple-statistics 
simple-statistics has a few advantages:
- faster
- more accurate kmeans algo
- Jenks-Fisher algo

Also, I suspect will use it again for next step, which is Bubble
mode layer.
 2023-10-11 19:36:12 +02:00
Yohan Boniface
e97e566c42 Use non full white as left color for default choropleth color scale 2023-10-10 21:58:38 +02:00
Yohan Boniface
3d2ad3c1c6
Update umap/static/umap/map.css 
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
 2023-10-10 21:40:34 +02:00
Yohan Boniface
bcd9b1ac04 Fix getOption not considering null values 2023-10-10 21:22:19 +02:00
Yohan Boniface
84a5b3c6f5 Fix Choropleth JS tests 2023-10-10 21:22:19 +02:00
Yohan Boniface
7be238a4ab Add minimal Choropleth integration test 2023-10-10 21:22:17 +02:00
Yohan Boniface
3b304e5249 Tests: populate settings from _umap_options when data is passed 2023-10-10 21:19:20 +02:00
Yohan Boniface
35758a1e13 Choropleth: do not add layer before knowing the whole dataset 
And only compute limits once.
 2023-10-10 21:16:01 +02:00
Yohan Boniface
d9522d9c1f Add default value to choropleth mode MultiChoice 2023-10-10 21:16:01 +02:00
Yohan Boniface
ce39afc64a Allow to override MultiChoice default value 2023-10-10 21:16:01 +02:00
Yohan Boniface
7fd905741a Use MultiChoice input for "choropleth mode" 2023-10-10 21:16:01 +02:00
Yohan Boniface
3334db3fa2 Use Range input for choropleth steps, and limit to 9 
This limit comes from ColorBrower sequential color sets, which
we use.
 2023-10-10 21:16:01 +02:00
Yohan Boniface
82bb017b23 Basic Choropleth tests 2023-10-10 21:16:01 +02:00
Yohan Boniface
125aa72785 Make choropleth mode work with lines 2023-10-10 21:16:01 +02:00
Yohan Boniface
7b68c52a15 Allow to select choropleth property from a list instead of gessing it 2023-10-10 21:16:01 +02:00
Yohan Boniface
6c502c54b4 Better defaults for choropleth layer 2023-10-10 21:16:01 +02:00
Yohan Boniface
451eb8c0bf Naive Choropleth legend, WIP 2023-10-10 21:16:01 +02:00
Yohan Boniface
7a0dbd014a There is one more limit than the number of steps 
Limits are steps boundaries, and first limit is always the lower value,
and latest limit always the bigger.
 2023-10-10 21:16:01 +02:00
Yohan Boniface
bf116e8d93 Use brewer palettes for choropleth colors 
cf https://gka.github.io/chroma.js/#chroma-brewer
 2023-10-10 21:16:01 +02:00
Yohan Boniface
5d350a7cc9 Control property used in choropleth 2023-10-10 21:16:01 +02:00
Yohan Boniface
8e12e6cf24 POC of a choropleth layer 2023-10-10 21:16:01 +02:00
Yohan Boniface
31ea8d1a83
Merge pull request #1362 from umap-project/hide-datalayer-in-caption 
Allow to hide a datalayer from the caption list
 2023-10-10 21:06:09 +02:00
Joachim Schleicher
9ef09512db highlight: increase fillOpacity for polygons 
sqrt gives larger increase for low opacities like 0.2
while preserving some (tiny) shine-through for large values like 0.8
and is limited to the desired range of (0,1]
 2023-10-10 10:47:36 +02:00
Joachim Schleicher
836c17f2e8 fire events from Popup Panel 
to also highlight path and markers when using the side panel.
Therefore we duplicate the event code from the base class.
 2023-10-10 10:29:20 +02:00
Joachim Schleicher
3594bc2605 highlight markers 
add .umap-icon-active class for currently selected marker icon.
CSS styles override the marker styles to display
* in the foreground
* with full opacity
* with larger sizes where possible (ball and circle)
 2023-10-10 10:29:20 +02:00
Yohan Boniface
da01977414 Fix permissions tests 2023-10-09 18:30:44 +02:00
Yohan Boniface
547485e50f Allow to hide a datalayer from the caption list 2023-10-06 22:26:31 +02:00
Yohan Boniface
de6c9f3b84 Make sure we don't use DataLayer.settings by reference 2023-10-06 22:25:56 +02:00
Joachim Schleicher
7696203159 highlight selected path 
when opening a popup increase opacity and weight.
In maps with multiple lines one can see much easier, where the line
starts and ends.
 2023-10-05 21:18:05 +02:00
Yohan Boniface
5bfa2fce38 Patch HeatLayer for better rendering 
Patch comes from https://github.com/Leaflet/Leaflet.heat/pull/78

We'll remove it when this PR get merged and released.
 2023-10-05 18:15:59 +02:00
Yohan Boniface
ca7257658c Make that Range inherit from FloatInput 
Otherwise we store a string
 2023-10-05 18:15:21 +02:00
Yohan Boniface
3e54310c8d Add Range input for heatmap radius 2023-10-05 17:36:07 +02:00
Yohan Boniface
a5c7214533 Add back helpText on Range input 2023-10-05 17:32:27 +02:00
Yohan Boniface
20cdc837af Use toFixed instead of toPrecision in Range input 
toPrecision returns an exponential notation for example for:
 const x = 100
 x.toPrecision(2)
 2023-10-05 15:14:28 +02:00
Yohan Boniface
34122b1549
Remove unused CSS class .third 
Co-authored-by: Joachim Schleicher <joachimsl@gmx.de>
 2023-10-04 09:36:55 +02:00
Joachim Schleicher
79a1ea232a switch to grid layout for multiple choice buttons 
to allow multi-line texts in translations
 2023-10-04 09:19:09 +02:00
Yohan Boniface
495dd6444f Finally add Map.create_at field 
This field should have been added at the beginning, but this is
like planting trees, isn't it ?
 2023-09-27 11:01:50 +02:00
Yohan Boniface
ff27cdd04a Hide attribution on small screen and add a small ? to display it 
fix #844
 2023-09-27 10:30:57 +02:00
Yohan Boniface
f73308e99d 1.8.2 2023-09-27 07:21:06 +02:00
Yohan Boniface
677fd3d982
Merge pull request #1336 from umap-project/shared-edit-url 
Redirect to canonical when URL contains the ?edit parameter
 2023-09-27 07:17:29 +02:00
Yohan Boniface
013d2fd5ee Always remove ?edit from URL, so users do not share it by mistake 2023-09-27 07:13:30 +02:00
Yohan Boniface
50591e1ac5 i18n 2023-09-27 06:48:00 +02:00
Joachim Schleicher
ccda9aca3f Fix #1308 
The star indicating a dirty map uses more than 5px (depending on font-size).
So the additional star switched from showing the map name to
ellipses-overflow in px-implementation.
1ch is the with of the digit '0'.
 2023-09-26 20:57:58 +02:00
Yohan Boniface
cae52c905a
Merge pull request #1346 from umap-project/short-url-none 
Make sure SHORT_SITE_URL is defined to expose Map.short_url
 2023-09-26 15:52:51 +02:00
David Larlet
af3518ad08
Apply Black to settings files 2023-09-26 09:40:41 -04:00
Yohan Boniface
44910f5410 Do no try to fit data bounds if bounds are not valid 
This may happen if:
- the map as some layers containing data, but set as not browsable
- any other layer is empty
 2023-09-26 10:49:01 +02:00
Yohan Boniface
c1698545bd Make sure SHORT_SITE_URL is defined to expose Map.short_url 2023-09-26 10:34:50 +02:00
Yohan Boniface
649f21a0d5
Merge pull request #1339 from umap-project/browse-in-bbox 
Allow to restrict data browser items to current map view
 2023-09-26 08:16:22 +02:00
Yohan Boniface
af78d1e348
Merge pull request #1343 from umap-project/popup-large-width 
Set an explicit width to popup large container
 2023-09-25 22:00:15 +02:00
Yohan Boniface
a37c6005ce Set an explicit width to popup large container 
Until now, the width was computed on the fly by Leaflet, based
on the popup content, but this leads to a bunch of issue on
image/iframe width.

cf https://forum.openstreetmap.fr/t/bugs-divers-relevees-sur-une-umap-absent-sur-une-autre/17254/8
 2023-09-25 18:30:58 +02:00
David Larlet
27e8fd0cac
Merge pull request #1324 from openbrian/add-username-to-features 
Add username to features
 2023-09-25 11:08:32 -04:00
Yohan Boniface
1597cd731e Data browser: add back placeholder 2023-09-25 14:35:27 +02:00
Yohan Boniface
0ad6e425b5 Refactor data browser 
- move a dedicated class (function was becoming big)
- user FormBuilder instead of custom form elements
 2023-09-25 13:42:14 +02:00
Yohan Boniface
e0e7fc5844 Better way to set DataLayer.geojson content during tests 2023-09-25 13:40:01 +02:00
Yohan Boniface
9cf2bf1578 Allow to restrict browser items to current map view 2023-09-25 13:33:58 +02:00
Yohan Boniface
ff89125c80 Redirect to canonical URL when people share the ?edit link 2023-09-23 20:48:45 +02:00
David Larlet
98e57c150c
1.8.1 2023-09-22 14:55:46 -04:00
Yohan Boniface
dcbec3534c Fix datalayer's data duplicated at first save 2023-09-22 20:48:08 +02:00
Yohan Boniface
17104bfcbd Consume editMode from query string the proper way 2023-09-22 20:21:49 +02:00
David Larlet
18b43458e0
Merge pull request #1332 from umap-project/editmode-for-old-maps 
Do not try to set editMode on _umap_options for old maps
 2023-09-22 13:50:27 -04:00
Yohan Boniface
d67a17eca3 Do not try to set editMode on _umap_options for old maps 2023-09-22 19:03:01 +02:00
Yohan Boniface
27f3e08bc1 Fix anonymous maps displayed by mistake in user dashboard 2023-09-22 19:00:42 +02:00
David Larlet
500577a201
1.8.0 2023-09-22 12:29:58 -04:00
Yohan Boniface
76debf318b i18n 2023-09-22 18:28:41 +02:00
Yohan Boniface
2c7b6153b4 i18n 2023-09-22 18:27:41 +02:00
David Larlet
2563357c02
Merge pull request #1321 from umap-project/1318-restrict-zoom-options 
Restrict possible min/max zoom values
 2023-09-22 12:12:56 -04:00
David Larlet
f6dbb7d45b
Correct url type for background url templates 2023-09-22 12:10:53 -04:00
David Larlet
aed9e898e9
Restrict possible min/max zoom values 
Fix #1318
 2023-09-22 12:00:15 -04:00
Yohan Boniface
c36ea1e4b8 Fix error when trying to change map owner 
This bug has been introduced with this change:

8b4842ff21

That was not the correct fix, and this one should be the proper one.

We don't want to edit the permissions reference until we do save, otherwise user
cannot save as it is already no more the owner.

So:
- change permissions.options
- save
- commit those changes to map.options.permissions
- use only those values to check for isOwner and isAnonymousMap
 2023-09-22 17:34:44 +02:00
Yohan Boniface
157146dc04 Do not make map name and share status label clickable unless user can edit 2023-09-22 17:32:19 +02:00
Yohan Boniface
a04acb828d Update Map.can_edit docstring 2023-09-22 17:32:19 +02:00
Yohan Boniface
f05bdb2ac3 Use datalayer.isDataReadOnly in feature.isReadOnly 2023-09-22 17:32:19 +02:00
Yohan Boniface
a9b9a7e955 Tests: reuse name var 2023-09-22 17:32:19 +02:00
Yohan Boniface
dfd04c33b0 Fix typo in tests 2023-09-22 17:32:19 +02:00
Yohan Boniface
e13f3ac235 Add DataLayer.isDataReadonly 
In some places we need to know if a given datalayer can accept new
features, or not, whether because being readonly or being remote
 2023-09-22 17:32:19 +02:00
Yohan Boniface
5ffd1a1b10 Expose DataLayer.edit_status separately to the front 
They now differ from the Map.edit_status ones
 2023-09-22 17:32:19 +02:00
Yohan Boniface
6ba8166f86 Reset DataLayer.edit_status migration 2023-09-22 17:32:19 +02:00
Yohan Boniface
4e54a93ee0 Add DataLayer.INHERIT edit status option 2023-09-22 17:32:19 +02:00
Yohan Boniface
3cbd6cca40 Add back Map.edit_status 
Revert "Fix existing permissions related tests"

This reverts commit 36d7d87301c54a1a40bc6bbc164120768b258fae.

WIP
 2023-09-22 17:32:19 +02:00
Yohan Boniface
3dc4efe7b1 Remove data migration for edit_status 2023-09-22 17:32:19 +02:00
Yohan Boniface
360b6415cb Make OWNER mode the default edit_status for anonymous owned maps 2023-09-22 17:32:19 +02:00
Yohan Boniface
5f5196a52d Make sure to select only editable layers for attachin to features 2023-09-22 17:32:19 +02:00
Yohan Boniface
0afb0bff82 Include layer name in translation 2023-09-22 17:32:19 +02:00
Yohan Boniface
36befefbc6 Fix permissions related frontend tests 2023-09-22 17:32:19 +02:00
Yohan Boniface
84e3aa7121 Add default value for DataLayer.options.editMode 2023-09-22 17:32:19 +02:00
Yohan Boniface
6b269125d4 Make sure only owner see the delete map button 2023-09-22 17:32:19 +02:00
David Larlet
ddada8fb2b Remove the hasDirty concept 
And only save the map in case of an `advanced` `editMode`.
 2023-09-22 17:32:19 +02:00
Yohan Boniface
24e4aed8d3 Rename allowEdit in editMode 2023-09-22 17:32:17 +02:00
Yohan Boniface
de7c693c7b Remove console.log 2023-09-22 17:30:08 +02:00
Yohan Boniface
2d1d9281d9 Add SQL migration to populate DataLayer.edit_status from Map.edit_status 2023-09-22 17:30:08 +02:00
Yohan Boniface
af44b3a0a6 Add playwright test for editor's permissions form 2023-09-22 17:30:07 +02:00
Yohan Boniface
a15aa3566a Add playwright tests for anonymous map 2023-09-22 17:30:07 +02:00
Yohan Boniface
d902546da4 Add map update playwright tests 2023-09-22 17:30:07 +02:00
Yohan Boniface
168cc01c2e Do not try to access self.object in MapCreate 2023-09-22 17:30:07 +02:00
Yohan Boniface
42eb0e6ded Add more tests for datalayer permissions 2023-09-22 17:30:06 +02:00
Yohan Boniface
d6d55e619a Fix existing permissions related tests 2023-09-22 17:26:57 +02:00
Yohan Boniface
e52b40807a Expose correct edit statuses in anonymous mode 2023-09-22 17:26:57 +02:00
Yohan Boniface
e06da18f1e Fix helptext not displayed in anonymous permissions panel 2023-09-22 17:26:57 +02:00
Yohan Boniface
1cefd4e851 Hide create/delete datalayers button + map settings to users without rights 2023-09-22 17:26:57 +02:00
Yohan Boniface
35d7a5c550 Remove unused icon in 16.svg 2023-09-22 17:26:57 +02:00
Yohan Boniface
9189262855 Do not try to save map itself unless it has been modified 2023-09-22 17:26:57 +02:00
Yohan Boniface
ee9acf3427 Fix map check in DataLayerUpdate view 2023-09-22 17:26:57 +02:00
Yohan Boniface
70a1a1d584 Move copyToClipboard to L.Util 2023-09-22 17:26:57 +02:00
Yohan Boniface
76239ef55c Make DataLayer.isReadOnly explicit and true by default 2023-09-22 17:26:56 +02:00
Yohan Boniface
3d2e62c858 Do not use Map.edit_status anymore 
But keep it for now, for data migration, and just in case
 2023-09-22 17:26:55 +02:00
Yohan Boniface
de907dcb50 Do not expose readonly datalayers for features 2023-09-22 17:25:55 +02:00
Yohan Boniface
89ab029cab WIP: move edit_status from Map to DataLayer 2023-09-22 17:25:55 +02:00
Yohan Boniface
73d19e849f Refactor share_status check in datalayers views 2023-09-22 17:24:01 +02:00
Yohan Boniface
9bcc18b790
Merge pull request #1329 from umap-project/prune-gz 
Prune old .gz when saving a datalayer
 2023-09-22 17:14:31 +02:00
Yohan Boniface
b6b9943264 Prune old .gz when saving a datalayer 
We'll not consume them.

fix #1317
 2023-09-21 19:12:07 +02:00
Yohan Boniface
5b7fec5f9b
Merge pull request #1314 from openbrian/docker-compose-app-depends-on-db 
Replace wait_for_database with depends_on and healthcheck.
 2023-09-21 10:11:56 +02:00
Brian DeRocher
6720f76d85 Set the map option. No need for setting boolean from query string. 
Only add the owner property if the feature flag (map.options.featuresHaveOwner) is enabled.

Default to features do NOT have owners.
 2023-09-20 13:16:52 -04:00
Brian DeRocher
77b56623ed Remove field from map settings form. 2023-09-20 13:07:12 -04:00
Brian DeRocher
6c58bf367d Use camelcase and fix typo. 2023-09-20 13:03:36 -04:00
Brian DeRocher
e25fb5d04f Add FeaturesHaveOwners map option. 
WIP
 2023-09-20 12:48:32 -04:00
Brian DeRocher
e76c147b65 owner is no longer a form field. 2023-09-20 10:53:27 -04:00
Brian DeRocher
35e37c2d4b Add translation for "owner". 2023-09-20 10:52:13 -04:00
Brian DeRocher
e2b789e575 Do not use the form for the owner property. 
Only add the owner property to defaultProperties, if there is a user.  In other words the user can use the map without logging in.
 2023-09-20 10:51:01 -04:00
Brian DeRocher
204db34282 Replace bash based waiting with python based django-probes. 2023-09-20 09:45:26 -04:00
Yohan Boniface
f6730a9829
Update umap/views.py 
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
 2023-09-20 15:17:29 +02:00
Yohan Boniface
43e5391c49 Fix map displayed more than once in user dashboard when multiple editors 
fix #1325
 2023-09-20 11:30:05 +02:00
Brian DeRocher
9c89c50560 Set a default property for features that the owner is the current user. 
https://github.com/umap-project/umap/issues/430
 2023-09-19 19:13:14 -04:00
Yohan Boniface
038a1a3c4d
Merge pull request #1315 from umap-project/dot-in-property 
Remove dot in property name
 2023-09-19 07:35:10 +02:00
Yohan Boniface
9120d54be7 Fix table editor not closing anymore from fullwidth 
(From f3b5c82767)
 2023-09-18 13:02:19 +02:00
Yohan Boniface
647d8910c0 Remove dot in property name 
Otherwise it will break when trying to access it in FormBuilder
 2023-09-18 12:21:06 +02:00
Yohan Boniface
417dde04b0 1.7.3 2023-09-18 11:19:59 +02:00
Yohan Boniface
9f47b0fc55 i18n 2023-09-18 11:19:40 +02:00
Yohan Boniface
0a83c42724
Merge pull request #1313 from jschleic/feature-1312 
Add outlinkTarget to default interactionProperties
 2023-09-15 12:15:47 +02:00
Yohan Boniface
13d398318d Tests: fix toggle edit panel check 
We do not remove the panel content anymore
 2023-09-15 12:11:13 +02:00
Joachim Schleicher
db31aa119e Add outlinkTarget to default interactionProperties 
Fix #1312
 2023-09-14 10:36:23 +02:00
David Larlet
f535993201
Add a powered by uMap footer 
Fix #1304
 2023-09-08 17:17:11 -04:00
David Larlet
2152ca3d1a
Merge pull request #1069 from umap-project/playwright-integration-tests 
Setup to create integration tests with Playwright
 2023-09-08 11:24:35 -04:00
Yohan Boniface
aa1b04b3ad
Merge pull request #1298 from umap-project/fix-remotelayer-with-zoom-onload 
Try to fix remote datalayer not sending dataloaded
 2023-09-08 16:02:37 +02:00
Yohan Boniface
aca473692a
Merge pull request #1303 from umap-project/icons-quick-changes 
Enhance icon selector form
 2023-09-08 16:01:25 +02:00
Yohan Boniface
4857d7c29c Use css width for img custom width 
The width attribute is the intrinsic width of the image, and thus
it will not overwrite the default CSS

cf https://forum.openstreetmap.fr/t/bugs-divers-relevees-sur-une-umap-absent-sur-une-autre/17254/5
 2023-09-07 07:16:55 +02:00
Yohan Boniface
4009e759dc Prevent HTML blinking when loading icons list 2023-09-05 11:21:17 +02:00
Yohan Boniface
d72ae3fc34 Very minimal search input for icons list 
fix #1302
 2023-09-05 10:55:35 +02:00
Yohan Boniface
ce7575c5eb But back icon preview 2023-09-05 10:29:44 +02:00
Yohan Boniface
c5084c4332 Add toggle link to show/hide iconUrl raw input 2023-09-05 10:14:24 +02:00
Yohan Boniface
91e71eccda Change button look in icon form 2023-09-05 09:41:09 +02:00
Yohan Boniface
bfd36bc0e1 Do not reset icon list on icon choice 
cf #1302
 2023-09-05 09:38:07 +02:00
Yohan Boniface
c08e7c5527 Remove duplicate help text in icon advanced free field 2023-09-05 09:36:30 +02:00
Yohan Boniface
09d0891318 Change link color in dark mode 2023-09-05 09:36:05 +02:00
Yohan Boniface
3a5174c003 Fix tests with playwright 
Basically:
- when using playwright, we use live_server
- live_server make django-pytest switch in "transactional db" mode
- when in this mode, it will reset all data of all tables in db
- we relied on data created during the migrations, so only available
  for first test run
 2023-09-04 15:04:00 +02:00
Yohan Boniface
c35c6ee78c test: allow to run playwright tests directly with py.test cli 2023-09-04 15:00:51 +02:00
David Larlet
29547d0bd6 Add a test to verify marker creation at position 2023-09-04 11:03:31 +02:00
David Larlet
95bf685159 Setup to create integration tests with Playwright 2023-09-04 11:03:28 +02:00
Yohan Boniface
648fe65f14 WIP: try to fix remote datalayer not sending dataloaded 
This occurs when the remote datalayer has a min or maxZoom defined,
and the map is loaded outside those zooms. In this case, when
calling fetchRemoteData, the fetch was never done, nor the final
call to fromGeoJSON, which would have sent the dataloaded event.
 2023-09-01 20:31:34 +02:00
Yohan Boniface
dcb884f0d7 1.7.2 2023-09-01 17:35:24 +02:00
Yohan Boniface
33e1bb87ca i18n 2023-09-01 17:35:05 +02:00
Yohan Boniface
d4c0bc0854
Merge pull request #1292 from umap-project/panel-portrait 
Better distinguish panel behaviour in portrait vs landscape modes
 2023-09-01 17:28:58 +02:00
Yohan Boniface
1cd1094398
Merge pull request #1293 from umap-project/feature-name-focus 
Put focus on name when opening feature edit panel
 2023-09-01 17:26:10 +02:00
Yohan Boniface
078bff3f2b
Merge pull request #1294 from umap-project/help-button-icon 
Restore help button icon
 2023-09-01 17:24:42 +02:00
Yohan Boniface
6ce541e899
Merge pull request #1291 from umap-project/guess-mime-type-return 
Avoid using a tuple as a content type when guessed
 2023-09-01 17:24:03 +02:00
Yohan Boniface
cb13b4e04d
Merge pull request #1297 from umap-project/popup-large-img-min-width 
Add back min-width for img in popup-large
 2023-09-01 17:23:01 +02:00
Yohan Boniface
87f6b98a99 Add back min-width for img in popup-large 2023-09-01 17:21:43 +02:00
Yohan Boniface
d89d2287b9 Fix datalayers with min/maxZoom never sending dataloaded event 2023-09-01 17:02:23 +02:00
Yohan Boniface
1b60b46a3f Delete old options after consuming them 2023-09-01 17:00:51 +02:00
Yohan Boniface
562f516272 Minimap exports tests 2023-08-31 17:48:59 +02:00
Yohan Boniface
bf66036b7b Make sure we load all data before downloading it 
fix #980
 2023-08-31 16:36:34 +02:00
Yohan Boniface
d78f2e087e Restore help button icon 
While changing the edit header help link, I've changed all help
buttons, which was not intended.
 2023-08-31 15:24:21 +02:00
Yohan Boniface
3d32bf206b i18n 2023-08-31 12:07:33 +02:00
Yohan Boniface
96d6b45734 Put focus on name when opening feature edit panel 
cf #243
 2023-08-30 13:26:16 +02:00
Yohan Boniface
f3b5c82767 Better distinguish panel behaviour in portrait vs landscape modes 
fix #870
 2023-08-30 12:36:40 +02:00
Yohan Boniface
7ed6cfb2a4 Better position for disable icon 2023-08-30 11:35:52 +02:00
David Larlet
6cacc7122b
Avoid using a tuple as a content type when guessed 
Only use the content type with mimetypes.guess_type
 2023-08-29 15:24:58 -04:00
David Larlet
c122ecf5e4
Merge pull request #1287 from umap-project/edit-header-polish 
Edit header polish: move "My Dashboard" and "Help" to the right, display asterisk in dirty mode
 2023-08-29 13:14:30 -04:00
Yohan Boniface
4c8b4c66d0 Add border around minor button in edit toolbar 2023-08-29 18:14:36 +02:00
Yohan Boniface
2986e8cec9
Merge pull request #1288 from umap-project/clean-onbeforeunload 
Remove custom message from onbeforeunload event
 2023-08-29 17:52:11 +02:00
Yohan Boniface
51c1990681 Explicitly set DataLayer._dataloaded status, instead of guessing it 
fix #438
 2023-08-29 17:49:19 +02:00
Yohan Boniface
02eb69a280 Add a button to load remote data from configuration form 
cf #438
 2023-08-29 16:56:04 +02:00
Yohan Boniface
ed7181ba24 Remove custom message from onbeforeunload event 
It's not supported anymore by browsers.
 2023-08-29 16:36:04 +02:00
Yohan Boniface
38bed0a6cf Move "My Dashboard" and "Help" to the right of the edit toolbar 2023-08-29 13:57:00 +02:00
Yohan Boniface
fc42eb2573 Add a small asterisk near map title when it's dirty 2023-08-29 11:22:23 +02:00
Yohan Boniface
949f245c00 1.7.1 2023-08-28 18:00:58 +02:00
Yohan Boniface
bcdac413be ajax proxy: quote URL before passing it to Nginx 2023-08-28 18:00:40 +02:00
Yohan Boniface
8c9ee91b42 Add test for ajax-proxy internal redirect 2023-08-28 16:49:32 +02:00
Yohan Boniface
a4b0961163 1.7.0 2023-08-28 16:42:24 +02:00
Yohan Boniface
dbba8d2744
Merge pull request #1280 from umap-project/ajax-proxy-redirect 
Use X-Accel-Redirect for serving ajax-proxy request
 2023-08-28 16:37:19 +02:00
Yohan Boniface
6f3803cce3 1.6.1 2023-08-25 10:19:45 +02:00
Yohan Boniface
174e6ddc6b i18n 2023-08-25 10:18:22 +02:00
Yohan Boniface
1b769bf07c Change "My Maps" to "My Dashboard" in navigation 2023-08-25 10:11:04 +02:00
Yohan Boniface
77a13eb0f0
Merge pull request #1284 from umap-project/fix-minimap-changing-center-3 
Remove default center to prevent multiple map initialisations
 2023-08-25 10:07:23 +02:00
Yohan Boniface
bdbde7cfd2 Ensure default view when map as no data at load 2023-08-25 09:59:02 +02:00
Yohan Boniface
e636ced4c6 Set default center in case of location error at load 2023-08-24 21:24:02 +02:00
Yohan Boniface
9c16bbfe51 Remove default center to prevent multiple map initialisations 
We want to init the map view once, in our initCenter method,
so we remove any center from the option, to prevent Leaflet
to init the map on this centers

fix #1277
 2023-08-24 20:48:24 +02:00
Yohan Boniface
f12e87e727 Fix datalayers being shown on zoom even if displayOnLoad is false 
fix #1276
 2023-08-24 19:57:47 +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
Brice Maron
cd29486b84 fix: correct changelog link 2023-08-23 08:31:15 +02:00
David Larlet
29a96e5fdc
Fix tests with the latest version of mocha 2023-08-22 12:29:13 -04: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
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
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
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
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
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
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