almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-30 12:12:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2018 commits 67 branches 145 tags 69 MiB
Commit graph

1432 commits

Author SHA1 Message Date
Yohan Boniface
1ed6a5972d Run prettier 2024-01-02 23:18:24 +01:00
Yohan Boniface
4b0bde5c90 Align copy button to input in share box 
cf #1454
 2024-01-02 22:14:13 +01:00
Yohan Boniface
05401af06b
Merge pull request #1454 from jschleic/download-ui 
Refactor Share & Download UI for better usability
 2024-01-02 21:42:34 +01:00
Yohan Boniface
ced7f3d6ff
Merge pull request #1497 from jschleic/fix-rank-on-reordering 
fix dirty flags when re-ordering layers
 2023-12-31 11:16:06 +01:00
Joachim Schleicher
70e5dbe7dd fix dirty flags when re-ordering layers 
The index of the top layer in the view starts with zero, while the rank of
the layers count backwards. Thus moving the second-last to the last
position should set the dirty flag of rank 0 and 1.
Instead the former implementation set the dirty flag for layers >= 19 in
a list of 20 layers - resulting in the wrong layers saved.

Fixes #375
 2023-12-30 21:39:48 +01:00
Joachim Schleicher
dbf0179297 cleanup sharebox changes 
* "data" moved to helptext
* drop css introduced in previous draft
* prettier.js
 2023-12-29 21:23:03 +01:00
Yohan Boniface
340c492efc 1.12.2 2023-12-29 11:22:23 +01:00
Yohan Boniface
2bb104d29e
Merge pull request #1493 from umap-project/tilelayer-preview-border 
Add a small box-shadow to tilelayer preview
 2023-12-28 20:36:27 +01:00
Yohan Boniface
974536debe
Merge pull request #1492 from umap-project/fix-tms-url-preview 
Fix preview of TMS TileLayer preview
 2023-12-28 20:36:06 +01:00
Yohan Boniface
ab54580820 Fix preview of TMS TileLayer preview 
This is not the ideal fix, instead we'd prefer to use
`TileLayer.getTileUrl`, but this is not possible yet.

cf https://github.com/Leaflet/Leaflet/pull/9201

cf https://lists.openstreetmap.org/pipermail/umap/2023-December/000557.html
 2023-12-28 16:32:57 +01:00
Yohan Boniface
1d85ee5167 Add a small box-shadow to tilelayer preview 
In some situation, the preview is very close to the background, so
it's not visible enough.

fix #1485
 2023-12-28 11:51:04 +01:00
Yohan Boniface
0a099b6ee1 i18n 2023-12-28 11:44:44 +01:00
David Larlet
36f72e3154
Linting templates 2023-12-27 13:50:21 -05:00
David Larlet
c4e55d82cb
Fix imports 2023-12-27 13:43:47 -05:00
David Larlet
7484e52142
Improve maps’ pagination for the dashboard 2023-12-27 13:26:31 -05:00
Yohan Boniface
c3cb813c23
Allow to reopen a dialog in dashboard previews 2023-12-27 11:41:08 -05:00
David Larlet
ded244c9ff
Put CSS and JS blocks to their dedicated places 2023-12-27 11:41:08 -05:00
David Larlet
8d11815625
Move _urls_for_js to utils.py (circular imports) 2023-12-27 11:41:08 -05:00
David Larlet
7ff543e1d5
Create the unique_id in the template (vs. model) 2023-12-27 11:41:08 -05:00
David Larlet
c9b4b96c01
Preview map only on click in user’s dashboard 
Refs #1459
 2023-12-27 11:41:07 -05:00
Yohan Boniface
936bbb9464 Be more explicit on changed fields when updating choropleth form 
The postUpdate method of the Choropleth layer is called after
any form field change, even if this field is not in the dedicated
choropleth helper. So the previous check was too broad, and it
would try to fetch the breaks input value on any form helper, which
would fail if someone change any "non choropleth" property (like
the colour)
 2023-12-27 09:17:29 +01:00
Yohan Boniface
9e346d2d4c search input: add a placeholder to mention typing coordinates 2023-12-26 12:37:17 +01:00
Yohan Boniface
a4dbb69545 Prettier on popup.js 2023-12-26 12:09:27 +01:00
Yohan Boniface
50e8161b89 Rename var in popup.js 2023-12-26 12:08:20 +01:00
Yohan Boniface
fcc07846a4 1.12.1 2023-12-23 09:16:53 +01:00
Yohan Boniface
01d89dbd93 Fix zoomEnd tests 
By moving the tests that delete the datalayer at the end.
 2023-12-23 09:12:34 +01:00
Yohan Boniface
acfcc2e2a6
Merge pull request #1482 from umap-project/greedytemplate-object 
Do not fail on greedyTemplate when description is an object
 2023-12-23 08:41:48 +01:00
Yohan Boniface
b19638bb8d
Merge pull request #1483 from umap-project/escape-drawing 
Better way of handling escape while drawing
 2023-12-23 08:41:33 +01:00
Yohan Boniface
5f8147c274 Remove zoom/moeveend events when deleting datalayer 2023-12-22 18:45:21 +01:00
Yohan Boniface
da2fb856c2 Better way of handling escape while drawing 
With previous fix (in 60c002f94a), the
feature was created even if invalid.

cf #1428
 2023-12-22 13:01:06 +01:00
Yohan Boniface
6890d47b91 Do not fail on greedyTemplate when description is an object 
Quick fix for not failing with an error in case of #1481
 2023-12-22 11:03:38 +01:00
Yohan Boniface
554352e003 Allow to type a latlng in the search box 
fix #1000
cf #1001
 2023-12-21 13:41:19 +01:00
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