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

1135 commits

Author SHA1 Message Date
Yohan Boniface
3d45242684 Remove use of getMap on the map itself 2023-08-15 16:20:48 +02:00
Yohan Boniface
ac30e71e74 Do not let advancedFilters control add/remove features from map 
This should be done by the datalayer itself, which is now the case.
 2023-08-15 16:20:48 +02:00
Yohan Boniface
d8a1592fcf Smaller iframe min-width for screen < 480px 2023-08-15 08:31:14 +02:00
Yohan Boniface
5058e27496
Merge pull request #1253 from umap-project/from-to-zoom 
Make fromZoom and toZoom options available for all layers
 2023-08-15 07:58:33 +02:00
Yohan Boniface
c0dd8901e4 More readable check from DataLayer.showAtZoom 2023-08-15 07:57:38 +02:00
Yohan Boniface
b70e20cc89
Merge pull request #1251 from umap-project/explicit-default 
Explicitely use map default when dynamic var is unset
 2023-08-15 07:50:42 +02:00
Yohan Boniface
dfe4db1f0d Add and use L.Util.hasVar 2023-08-15 07:48:59 +02:00
Yohan Boniface
ebeeee072f
Merge pull request #1255 from umap-project/default-view 
Better control of default view
 2023-08-15 07:32:07 +02:00
Yohan Boniface
92fbc0a81c
Merge pull request #1252 from umap-project/tilelayer-panel 
Do not close panel when switching tilelayer
 2023-08-15 07:28:55 +02:00
Yohan Boniface
567a3fb308
Merge pull request #1250 from umap-project/has-geom 
Do not try to compute geom based property before we have a geom
 2023-08-15 07:28:02 +02:00
Yohan Boniface
48750b3fde
Merge pull request #1245 from umap-project/dynamic-default-status 
Allow to configure default share and edit status
 2023-08-15 07:26:29 +02:00
Yohan Boniface
fefa6954eb
Merge pull request #1241 from umap-project/misplaced-icons 
Fix misplaced icons
 2023-08-15 07:25:57 +02:00
Yohan Boniface
5b867bacfa
Merge pull request #1240 from umap-project/fix-panel-popup 
Fix popup panel not opening from the data browser
 2023-08-15 07:25:30 +02:00
Yohan Boniface
f94a513c4a
Merge pull request #1235 from umap-project/logout-redirect 
Adapt logout behaviour in ajax/not ajax modes
 2023-08-15 07:24:55 +02:00
Yohan Boniface
d008bc7539 Better control of default view 
fix #40

Let the user choose the map behaviour to define default view:

- saved center and zoom: current behaviour, and default
- bounds: will compute the view to fit all the map data, useful for
  having the same view in different sized devices (mobile…)
- latest feature: useful in some situation, where the map tracks some
  progress (travel…), this will certainly needs a bit more iterations,
  mainly to have an explicit default datalayer
- user location: this option used to exist but was then removed, I
  can remember when and why

Note: when there is a URL hash, the hash will be used
 2023-08-12 07:39:13 +02:00
Yohan Boniface
322c9fe042 Make fromZoom and toZoom options available for all layers 
fix #473
 2023-08-10 09:46:17 +02:00
Yohan Boniface
e8f9ed5a9d Do not close panel when switching tilelayer 
fix #190
 2023-08-10 07:10:27 +02:00
Yohan Boniface
1d0c7008fa Explicitely use map default when dynamic var is unset 2023-08-09 09:06:26 +02:00
Yohan Boniface
38c29b9cc1 Do not try to compute geom based property before we have a geom 
fix #1177
 2023-08-09 08:09:26 +02:00
Yohan Boniface
8758c0dc65 i18n 2023-08-07 08:17:39 +02:00
Yohan Boniface
0c3dc02fc1 Allow to configure default share and edit status 
fix #1244
 2023-08-07 08:16:49 +02:00
Yohan Boniface
88209158cc Fix test failing due to attribute order 
Let's fix by hand for this time and see if happen again…
 2023-08-02 16:29:45 +02:00
Yohan Boniface
8491276e04 Fix misplaced icons 2023-08-01 10:37:25 +02:00
Yohan Boniface
3115038ba6 Fix popup panel not opening from the data browser 
The issue was:
- clicking on feature in the data browser replaces the panel content
- then the clicked link (the feature name or the little glass icon) is removed
- thus it is detached from the DOM
- and specially from its parent on which disableClickPropagation was called
- so Leaflet fails to prevent click propagation
- so the map received the click, and thus it call the onRemove method on
  the panel, as expected (clicking on the map always close the current
  open popup, if any)

This could be removed when this is released:

https://github.com/Leaflet/Leaflet/pull/9052
 2023-07-31 20:59:09 +02:00
Yohan Boniface
50b8b66261 Simplify Panel popup inheritance 
Panel is not a real popup, so the less we inherit the better
 2023-07-31 20:58:25 +02:00
Yohan Boniface
d0ce5f68cd adapt iframe min-width for popup large 
fix #1236
 2023-07-31 11:34:25 +02:00
Yohan Boniface
fc37ad7c17 Adapt logout behaviour in ajax/not ajax modes 2023-07-27 15:02:51 +02:00
Yohan Boniface
d449564250 Move Map.renderEditToolbar to controls, for consistency 2023-07-25 17:50:28 +02:00
Yohan Boniface
bd48bfc617 Align edit toolbar icon with vertical icons 2023-07-25 11:47:30 +02:00
Yohan Boniface
701f2704f6 Pool man responsive edit toolbar 2023-07-25 11:43:59 +02:00
Yohan Boniface
ccac42d25a Full text edit button 2023-07-25 11:19:00 +02:00
Yohan Boniface
10b1e0bb0a Add icons to cancel and save buttons 2023-07-25 10:43:35 +02:00
Yohan Boniface
7287d4a528 Change "my maps" link label in edit toolbar 2023-07-25 10:18:30 +02:00
Yohan Boniface
b48b4ce2d3 Add underline on hover on edit toolbar links 2023-07-25 10:18:30 +02:00
Yohan Boniface
4e606d81bc Add share_status in edit toolbar 2023-07-25 10:18:30 +02:00
Yohan Boniface
a74439ac47 Remove click-to-edit 2023-07-25 10:18:30 +02:00
Yohan Boniface
202c73c35a Add logo in edit header 
cf #609
 2023-07-25 10:18:30 +02:00
Yohan Boniface
d56162390d
Merge pull request #1232 from umap-project/edit-panel-icon 
Add icons to better distinguish edit panels
 2023-07-25 10:18:11 +02:00
Yohan Boniface
5825b54d9e
Merge pull request #1229 from umap-project/gpx-mimetype 
Use proper GPX mimetype
 2023-07-25 10:16:58 +02:00
Yohan Boniface
2821cfba86
Merge pull request #1228 from umap-project/url-in-cors-message 
Add target URL in CORS error message
 2023-07-25 10:15:49 +02:00
Yohan Boniface
831d09c6e1 Make URL available for translators in CORS message 2023-07-25 10:14:57 +02:00
Yohan Boniface
3b1b877f64 i18n 2023-07-24 16:44:07 +02:00
Yohan Boniface
7a5a8794fd Add icons to better distinguish edit panels 
cf #1156
 2023-07-24 16:40:08 +02:00
Yohan Boniface
429e5d0b93 Use proper GPX mimetype 
fix #1225
 2023-07-24 09:33:20 +02:00
Yohan Boniface
cd49d11e5e Add target URL in CORS error message 
fix #1226
 2023-07-24 08:51:55 +02:00
Yohan Boniface
a9d612bf6c 1.4.4 2023-07-22 09:15:21 +02:00
Yohan Boniface
bd339db397
Merge pull request #1224 from umap-project/fix-tooltip-position 
Do not modify tooltipAnchor inplace, as it's shared by all markers
 2023-07-22 09:11:53 +02:00
Yohan Boniface
0531ca4700
Merge pull request #1222 from umap-project/proxy-timeout 
Add a timeout in proxy
 2023-07-22 09:10:36 +02:00
Yohan Boniface
5261daf6ec
Merge pull request #1221 from umap-project/non-ascii-variables 
Be more liberal in what chars a variable can contain
 2023-07-22 09:10:12 +02:00
Yohan Boniface
fc7d693984 i18n 2023-07-22 09:07:56 +02:00
Yohan Boniface
2b1b80ae23 Do not modify tooltipAnchor inplace, as it's shared by all markers 
fix #1223
 2023-07-22 09:04:29 +02:00
Yohan Boniface
2f89e99cb8 Add a timeout in proxy 
This view should not be used in production, but it is sometimes, so
just in case…
 2023-07-21 12:51:31 +02:00
Yohan Boniface
299e9e0821 Fix two JS tests broken since 8b4842ff21 2023-07-20 14:19:50 +02:00
Yohan Boniface
95e1745e6f Be more liberal in what chars a variable can contain 
May break some undocumented cases…

cf #139 #676
 2023-07-20 14:14:56 +02:00
Yohan Boniface
a0654776f6 Add migrations for models label changes 2023-07-20 11:54:45 +02:00
Yohan Boniface
0ec481ed07 1.4.3 2023-07-20 11:49:31 +02:00
Yohan Boniface
05bbe625bd
Merge pull request #1220 from umap-project/last-modified-no-gzip 
gzip file may not be yet created when computing the Last-Modified
 2023-07-20 09:22:35 +02:00
Yohan Boniface
0d4d4cd147 i18n 2023-07-20 09:08:51 +02:00
Yohan Boniface
d91184a021 gzip file may not be yet created when computing the Last-Modified 2023-07-20 09:02:40 +02:00
Yohan Boniface
145d5c6c7d i18n 2023-07-19 21:53:18 +02:00
Yohan Boniface
48b8ec4ed6 i18n 2023-07-19 15:49:20 +02:00
Yohan Boniface
34175b89a8 1.4.2 2023-07-19 15:47:25 +02:00
Yohan Boniface
261a7547a6 i18n 2023-07-19 15:47:13 +02:00
Yohan Boniface
04a36556bd
Merge pull request #1217 from umap-project/arobase-in-variable 
Allow to use arobase in variables
 2023-07-19 15:42:22 +02:00
Yohan Boniface
6a7eefe460
Merge pull request #1214 from umap-project/labelkey-help 
Update labelKey help text
 2023-07-19 15:22:36 +02:00
Yohan Boniface
b0566410c5
Merge pull request #1216 from umap-project/fix-if-unmodified-pre-1.3.0 
Fix if unmodified pre 1.3.0
 2023-07-19 15:22:11 +02:00
Yohan Boniface
13a1c3bd5c Use gzip mtime for Last-Modified comparison when in gzip mode 
Prior to 1.3.0, uMap was not setting the gzip mtime, so it was
whatever the time it get requested at first.
Since 1.3.0:
- when creating the geojson.gzip, we also force its mtime to be
  the geojson one
- we replaced If-Match by If-Unmodified, which relies on Last-Modified

When uMap is served by a proxy like Nginx (and X-Accel-Redirect),
and if user accepts gzip, then the Last-Modified would be the gzip
one, not the flat geojson one.

So when comparing that value in a subsequent update, we need to
compare with the correct value.

fix #1212
 2023-07-19 14:21:00 +02:00
Yohan Boniface
f69c959f2a Use ns time for geojson and gzipped geojson mtime 2023-07-19 14:16:57 +02:00
Richlv
d921d3d6dd
typo fixes 2023-07-19 13:45:13 +03:00
Yohan Boniface
56586125a4 Allow to use arobase in variables 
fix #1028
 2023-07-19 08:25:31 +02:00
Yohan Boniface
54e5064d70 Update labelKey help text 
fix #1022
 2023-07-19 08:16:14 +02:00
Yohan Boniface
1be7950237 i18n 2023-07-18 12:21:16 +02:00
Yohan Boniface
5be060d937 i18n 2023-07-17 20:21:05 +02:00
Yohan Boniface
6f667f2749 1.4.1 2023-07-17 16:22:28 +02:00
Yohan Boniface
6abc088121 i18n 2023-07-17 16:16:08 +02:00
Yohan Boniface
c1f8684a29 Replace si_LK by si 2023-07-17 16:00:55 +02:00
Yohan Boniface
2f00ddb8c5 Fix test 2023-07-17 15:55:37 +02:00
Yohan Boniface
6021191522 i18n 2023-07-17 15:16:45 +02:00
Yohan Boniface
e7212e8dff
Merge pull request #1208 from umap-project/dashboard-popup-end 
Fallback user to dashboard after OAuth process
 2023-07-17 15:07:26 +02:00
Yohan Boniface
4a06046079
Merge pull request #1209 from umap-project/share-status-in-dashboard 
Display share status in dashboard
 2023-07-17 15:06:50 +02:00
Yohan Boniface
d26db7f0bc
Merge pull request #1211 from umap-project/mousewheel-to-wheel 
Switch from mousewheel to wheel, as Leaflet did
 2023-07-17 15:06:18 +02:00
Yohan Boniface
bbcf9d8b96 Switch from mousewheel to wheel, as Leaflet did 
Otherwise, wheel will zoom the map even when sent on a panel or
control.
 2023-07-17 12:33:35 +02:00
Yohan Boniface
77cedd3288 Display share status in dashboard 2023-07-17 09:08:59 +02:00
Yohan Boniface
a2da1d64f7 Fallback user to dashboard after OAuth process 
Now that we have a dashboard page, this makes more sense than the
"public profile" page.
 2023-07-16 12:04:51 +02:00
Yohan Boniface
37732b8f16 Fix tooltip anchor not updated anymore according to the direction 
This is a change in Leaflet 1.7.0

cf https://github.com/Leaflet/Leaflet/issues/7302
 2023-07-16 11:35:33 +02:00
Yohan Boniface
891c23747f 1.4.0 2023-07-15 11:36:42 +02:00
Yohan Boniface
d4aa1c6311 i18n 2023-07-15 09:41:19 +02:00
Yohan Boniface
25d2d5adf5
Merge pull request #1203 from umap-project/iframe-popup 
Better fit iframe in popup
 2023-07-15 09:37:16 +02:00
Yohan Boniface
301f123371
Merge pull request #1205 from umap-project/fix-line-icons 
Fix line edit icons
 2023-07-15 09:36:56 +02:00
Yohan Boniface
617d6ba9ef Fix last maps returned when search was empty 2023-07-15 09:31:55 +02:00
Yohan Boniface
6b539b9d40 Add pagination to map table in user dashboard 2023-07-15 09:31:55 +02:00
Yohan Boniface
7adc409cdb Add html title to dashboard page 2023-07-15 09:31:55 +02:00
Yohan Boniface
7fb776c2a4 add thead and tbody in maps table 2023-07-15 09:31:54 +02:00
Yohan Boniface
bb4c027ec7 Allow to use http://umap.fr/map/xxxx?share to open shareBox on load 
That way is more consistent with ?download and ?edit
 2023-07-15 09:31:37 +02:00
Yohan Boniface
4c879ca991 Fix drag-hangle icon missing since svg switch 2023-07-13 19:38:13 +02:00
Yohan Boniface
c8065fb29e Fix line edit icons 
fix #1204
 2023-07-13 19:38:11 +02:00
Yohan Boniface
8f76252b3a Apply suggestions from code review 
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
 2023-07-12 09:09:01 +02:00
Yohan Boniface
d2cc6e101d Minimal user_dashboard tests 2023-07-12 09:09:01 +02:00
Yohan Boniface
4d0ced9a98 Add very basic user dashboard 2023-07-12 09:09:01 +02:00
Yohan Boniface
3592307b4e Allow to download the full map data at load 2023-07-12 09:09:01 +02:00
Yohan Boniface
3786a767f2 Allow to open the map in edit mode 2023-07-12 09:09:01 +02:00
Yohan Boniface
63a7ef00ea Allow to open the share form on map load 2023-07-12 09:09:01 +02:00
Yohan Boniface
e1f34e20ff Fix typo in dataloading event names 2023-07-12 09:09:01 +02:00
Yohan Boniface
5088d97ca0 Better fit iframe in popup 2023-07-12 08:45:47 +02:00
Yohan Boniface
c2d8e93e8e i18n 2023-07-12 07:37:52 +02:00
Yohan Boniface
adb325bb79
Merge pull request #1201 from umap-project/bump-leaflet 
Bump Leaflet to 1.9.4
 2023-07-11 22:45:23 +02:00
Yohan Boniface
67e7ec7424
Merge pull request #1199 from umap-project/popup-overflow-x 
We do not want horizontal overflow/scroll bar in popups
 2023-07-11 22:43:05 +02:00
Yohan Boniface
08fed332cb Bump Leaflet to 1.9.4 
Changelog:

https://github.com/Leaflet/Leaflet/blob/main/CHANGELOG.md

Sounds safe for us. Tested localy. Tests pass. Inch Allah.
 2023-07-11 16:01:39 +02:00
Yohan Boniface
8b4842ff21 Fix permissions panel empty at first save 
cf https://forum.openstreetmap.fr/t/apres-enregistrement-dune-carte-les-permissions-ne-sont-pas-presentes/15995
 2023-07-11 08:33:32 +02:00
Yohan Boniface
3978e46356 We do not want horizontal overflow/scroll bar in popups 
fix #1198
 2023-07-10 07:04:51 +02:00
Yohan Boniface
31bf449e73 Display time in datalayer versions list 
fix #852
 2023-07-04 10:19:05 +02:00
Yohan Boniface
6429e10110 1.3.7 2023-07-03 22:08:06 +02:00
Yohan Boniface
cf397956f9 i18n 2023-07-03 22:07:21 +02:00
Yohan Boniface
4b5234389e
Merge pull request #1188 from umap-project/layers-icons 
Layers icons
 2023-07-03 20:54:14 +02:00
Yohan Boniface
d05cd1ecff Adjust multiline icon so it does not show up on datalayer icon box 2023-07-03 20:52:33 +02:00
Yohan Boniface
f9e4f13e86 Fix datalayers icon position 
Otherwise we see the top border of the icon below…
 2023-07-03 20:47:25 +02:00
Yohan Boniface
133a74b1f9
Merge pull request #1190 from umap-project/locale-vs-lang 
Use LANGUAGE_CODE instead of locale name for browser APIs
 2023-07-03 20:41:30 +02:00
Yohan Boniface
3ebc83c133 Do not ignore punctuation when sorting features 
fix #1189
 2023-07-03 20:19:39 +02:00
Yohan Boniface
339ef3555f Use LANGUAGE_CODE instead of locale name for browser APIs 
fix #1187
 2023-07-03 19:44:49 +02:00
Yohan Boniface
4153580a6a Invert datalayers and tilelayers icons in main toolbar 2023-07-03 19:07:30 +02:00
Yohan Boniface
1a5276d649 Invert tilelayers and datalayers icons on edit toolbar 2023-07-03 19:04:36 +02:00
Yohan Boniface
a2f98f989c change tilelayers icon 2023-07-03 19:02:07 +02:00
David Larlet
e03bbeadfc
1.3.6 2023-07-01 11:44:24 -04:00
David Larlet
51978f9f2a
Display latest created maps on empty search 2023-06-30 21:40:35 -04:00
Yohan Boniface
30bbffff61 change datalayer icon 2023-06-30 18:33:56 +02:00
Yohan Boniface
9000e7c2f4
Merge pull request #1174 from umap-project/svg-icons 
Svg icons
 2023-06-30 16:26:32 +02:00
Yohan Boniface
78d0f13f97 Change arrow box border 2023-06-29 22:41:29 +02:00
Yohan Boniface
a27db07879 Use correct arrow more/less 2023-06-29 22:36:13 +02:00
Yohan Boniface
fa742a329f Move border of arrow more/less box to div to better align with other icons 2023-06-29 22:30:57 +02:00
Yohan Boniface
86bff268ba Move arrow icon to 24px 
So we have more space around, otherwise there 1px of the narrow
icons appear.
 2023-06-29 22:23:23 +02:00
Yohan Boniface
146e58a5bc Update icons from base.css too 
A bunch of those are unused:

- i.info was used in helpTooltip, but it's not anymore
- umap-delete, umap-to-polyline and such was used in contextmenu,
  but are not anymore
 2023-06-29 07:46:26 +02:00
Yohan Boniface
ad5057c5b8 Fix click-to-edit icon position 2023-06-28 22:12:39 +02:00
Yohan Boniface
9056b8603f Use svg for 16 px icons too 
Those icons would need more love to better factorize the way
they are used:
- the size of the HTML element including the icon is not consistent
- some icons are on the default file but could be in the white one

To be done in a later step
 2023-06-28 21:39:43 +02:00
Yohan Boniface
2e6272f8e2 Remove unused icon 2023-06-28 07:36:08 +02:00
Yohan Boniface
4a43c653f1 Switch 24-white.png to 24-white.svg 2023-06-28 07:34:07 +02:00
David Larlet
a87309cee6
Add a setting for the number of maps per search 
Useful for https://github.com/umap-project/umap-dsfr
 2023-06-27 18:41:00 -04:00
David Larlet
a96a1fa527
Reduce a bit the line-height for +/- zoom buttons 2023-06-27 16:03:04 -04:00
David Larlet
a62d88140e
Merge pull request #1175 from umap-project/1026-cors-error 
Handle CORS errors with an explicit message
 2023-06-27 15:51:36 -04:00
Yohan Boniface
509ff4efed
Merge pull request #1173 from umap-project/reverse-sort 
Allow to sort reverse
 2023-06-27 21:51:30 +02:00
Yohan Boniface
549f077f7b Update ru from transifex 2023-06-27 21:24:29 +02:00
Yohan Boniface
2149fd35a3 Better help message for sortKey 2023-06-27 18:39:06 +02:00
David Larlet
14830b867b
Handle CORS errors with an explicit message 
Fix #1026
 2023-06-27 11:59:38 -04:00
Yohan Boniface
df90340937 Switch 24.png to 24.svg 2023-06-27 14:04:02 +02:00
Yohan Boniface
1a8c6c846b Allow to sort reverse 
cf #698
 2023-06-26 09:44:21 +02:00
Yohan Boniface
5b151296e2 Move browser tests to Controls.js with others 2023-06-26 09:40:11 +02:00
Yohan Boniface
4c5fb43720
Merge pull request #1171 from umap-project/fullscreen-link-querystring 
Fullscreen link should reflect the user choices
 2023-06-26 08:10:07 +02:00
Yohan Boniface
d8dc71affc Declare directly fullUrl as a const 2023-06-26 08:09:19 +02:00
Yohan Boniface
75326aa6ee Prevent from using an id when restoring a umap backup 
cf #1042
 2023-06-26 08:02:15 +02:00
Yohan Boniface
10af29d01c WIP 2023-06-26 07:25:40 +02:00
Yohan Boniface
05a029f261 Fullscreen link should reflect the user choices 
But the scollWheelZoom that is forced to true.

fix #390
 2023-06-24 11:23:38 +02:00
Yohan Boniface
001b79795a
Merge pull request #1168 from umap-project/invalid-latlng 
Be more strict when coordinates are set manually
 2023-06-23 21:03:55 +02:00
Yohan Boniface
c8f853cbaf prettier js 2023-06-23 21:02:54 +02:00
Yohan Boniface
fe80358fd5
Merge pull request #1170 from umap-project/natural-sort 
More natural sort of features
 2023-06-23 18:12:12 +02:00
Yohan Boniface
ec021c7d02 Move Map.renderShareBox to controls, for consistency 2023-06-23 18:09:35 +02:00
Yohan Boniface
21b6c2f034 More natural sort of features 
fix #353

+ a bit of prettier noise, sorry
 2023-06-23 18:03:03 +02:00
David Larlet
06cdb55a6c
Merge pull request #1164 from framasoft/fix-custom-templates-settings 
🐛 — Fix UMAP_CUSTOM_TEMPLATES setting
 2023-06-23 10:16:53 -04:00
Yohan Boniface
cf0c07b1b2
Merge pull request #1169 from umap-project/quick-delete 
Add "delete" link in data browser
 2023-06-23 15:29:09 +02:00
Yohan Boniface
bea0f441c3
Merge pull request #1160 from umap-project/smart-color 
Allow to use properties as color value
 2023-06-23 15:26:50 +02:00
Yohan Boniface
31f158abe1
Update umap/static/umap/js/umap.features.js 
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
 2023-06-23 15:26:00 +02:00
Yohan Boniface
c3aa2aeb30
Merge pull request #1162 from umap-project/link-target 
Control links target
 2023-06-23 15:25:34 +02:00
Yohan Boniface
b267615062 Remove unused vars 2023-06-23 15:24:50 +02:00
Yohan Boniface
1e96515669 Add "delete" link in data browser 
fix #692
 2023-06-23 14:53:07 +02:00
Yohan Boniface
98f4e69abb getSmartOption => getDynamicOption 2023-06-23 08:15:39 +02:00
Yohan Boniface
41f0c03af1
Merge pull request #1161 from umap-project/i18n-anonymous-url 
Allow to set the lang while generating an anonymous_edit_url
 2023-06-23 08:13:45 +02:00
Yohan Boniface
d16feca225
Merge pull request #1163 from umap-project/fix-1042 
Pass options at datalayer creation when importing from umap file
 2023-06-23 08:12:21 +02:00
Yohan Boniface
666fed3d9c Be more strict when coordinates are set manually 
cf https://forum.openstreetmap.fr/t/impossible-de-charger-la-carte-carte-acteurs-naturels-batiment/15607/7
 2023-06-23 08:07:49 +02:00
Yohan Boniface
da1c0addbc Expose 'locale' parameter in templates 
fix #183
 2023-06-22 07:06:44 +02:00
Luc Didry
1adbadbd57
🐛 — Fix UMAP_CUSTOM_TEMPLATES setting 2023-06-21 13:55:41 +02:00
Yohan Boniface
e7d47b4ce5 Pass options at datalayer creation when importing from umap file 
fix #1042

Until now, we create an empty datalayer (which has some defaults),
then we overwrite the options while calling fromGeoJSON method
 2023-06-21 13:47:12 +02:00
Yohan Boniface
a1ec50ed8c Allow to define outlinkTarget at layer level 2023-06-21 12:24:29 +02:00
Yohan Boniface
3f8db1191f Allow to control popup links target 2023-06-21 12:19:01 +02:00
Yohan Boniface
2a04af162a Make outlink and outlinkTarget available for each feature 
It was only for polygon until then.

cf #323
 2023-06-21 12:00:34 +02:00
Yohan Boniface
48c27d56e4 Allow to set the lang while generating an anonymous_edit_url 
fix #993
 2023-06-21 10:48:29 +02:00
Yohan Boniface
d54d3aa514 Allow to use properties as color value 
cf #858
 2023-06-21 09:59:37 +02:00
Yohan Boniface
0aec986c10 Advanced filter should not affect non browsable layers 2023-06-20 21:57:35 +02:00
Yohan Boniface
1620c0567b Create DataLayer.renderLegend 2023-06-20 20:35:17 +02:00
Yohan Boniface
615498d3bf
Merge pull request #1151 from umap-project/ctrl-shift-click 
Document Shift-Click and add Ctrl-Shift-click to edit datalayer
 2023-06-20 20:24:50 +02:00
Yohan Boniface
2f4fe8a011 Uppercase "Click" 2023-06-20 20:22:17 +02:00
Yohan Boniface
12df0f757e Move L.U.Map.displayCaption to umap.controls.js 
Let's be consistent, all other control like actions are there.
 2023-06-20 20:21:00 +02:00
Yohan Boniface
3b466c2d19 Use + between keys in help texts 2023-06-20 20:12:38 +02:00
Yohan Boniface
97fe3d7d20 Do not force scroll on popup content 
fix #1152
 2023-06-20 20:08:29 +02:00
Yohan Boniface
6642d4a4f4 Use ⇧ instead of Shift in help messages 2023-06-20 19:50:11 +02:00
Yohan Boniface
58cf784b7e Make ctrl-shift-click work on MacOS too 2023-06-20 19:15:57 +02:00
David Larlet
5ec7b3e49a
Merge pull request #1154 from umap-project/djlint 
Linting and prettifying templates with djLint for consistency
 2023-06-20 11:31:44 -04:00
David Larlet
5d38e02f52
Merge pull request #1155 from umap-project/font-display-swap 
Set `font-display: swap;` for fonts definition
 2023-06-20 11:23:37 -04:00
David Larlet
4e8ebfa722
Set font-display: swap; for fonts definition 
> Gives the font face an extremely small block period and an infinite swap period. — https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display#values
 2023-06-20 10:20:21 -04:00
David Larlet
7ccb804231
Manual JS conversion in content template 2023-06-20 10:10:40 -04:00
David Larlet
de37721c40
Manually reformat JS parts for djLint 2023-06-20 10:05:28 -04:00
David Larlet
be5d27d292
Lint template files with djLint 2023-06-20 10:00:02 -04:00
David Larlet
70e3852c0c
Prettify template files with djlint 2023-06-20 09:40:32 -04:00
Yohan Boniface
1d5c1a067a Expose version in /stats/ endpoint 2023-06-20 15:14:28 +02:00
Yohan Boniface
3cee4fda01 Document Shift-Click and add Ctrl-Shift-click to edit datalayer 2023-06-19 10:45:18 +02:00
Yohan Boniface
247efc5345 1.3.5 2023-06-17 16:00:57 +02:00
Yohan Boniface
b324e59cd4 Fix stars link in header 2023-06-17 15:59:16 +02:00
David Larlet
020f805fbe
🚀 1.3.4 2023-06-17 09:46:04 -04:00
David Larlet
e23f1dd3c2
From to setup.cfg+setuptools to pyproject.toml+hatch 2023-06-17 09:09:36 -04:00
David Larlet
ac8f343d67
Back to max-height only for datalayers 
Refs https://github.com/umap-project/umap/pull/1149
Refs https://github.com/umap-project/umap/pull/1143

There are still issues with resize+(max-)height combination, to be addressed in a future release.
 2023-06-17 09:06:36 -04:00
pfbreton-perso
5dd0c2394a
browse datalayers overflow fix 
In my previous improvement where I suggested to set the height of datalayers to the size of the content and add a resize handle i neglected the case where a very long list of layers could make the control unusable by overflowing the available screen space.

I suggest to reintroduce a maximum height so that we have a good compromize between resizing the datalayer list and the maximum possible size.
 2023-06-17 09:06:36 -04:00
Yohan Boniface
608c54d4bf
Merge pull request #1145 from umap-project/custom-username 
Allow to customize user display name and URL slug
 2023-06-17 06:39:55 +02:00
Yohan Boniface
02a14a32f4 add tests for user display and slug customization 2023-06-17 06:35:21 +02:00
Yohan Boniface
7320e6f9fd
Merge pull request #1148 from umap-project/overflow-popup 
Overflow popup
 2023-06-16 19:34:46 +02:00
Yohan Boniface
b04016d305 Remove unused CSS class 2023-06-16 19:32:01 +02:00
Yohan Boniface
4ee33c0434 Move overflow-y directive to umap-popup-content 
fix #1146
 2023-06-16 19:06:53 +02:00
Yohan Boniface
8701358b2b Remove DOM unused element from popup 2023-06-16 19:06:31 +02:00
Yohan Boniface
81fcc080d9 Allow to customize user display name and URL slug 2023-06-16 14:59:59 +02:00
Yohan Boniface
453a7b5616 Remove unused settings from social auth 
I cannot find any reference of those settings while looking
at social-core code.
 2023-06-16 14:52:12 +02:00
Yohan Boniface
8b4ffba859 Show messages also in the content part 
Messages are already shown in the map, if any.
 2023-06-16 14:45:43 +02:00
pfbreton-perso
d53bbf84f2
Ability to resize the list of layers displayed on the map 
This is a proposed change to resize the list of layers to fit the content of the list by default and give the ability to resize the window.

I felt that I was constrained by the fixed size that wasn't displaying enough layers to be comfortable to use.
 2023-06-15 11:52:10 -04:00
David Larlet
bb8d233411
Remove DIRS from settings.TEMPLATES 
It’s more convenient to let the sub-themes declare their own templates (especially with `'APP_DIRS': True`).
 2023-06-14 21:15:37 -04:00
remco
411b3245c3 Fix #406 for easy installing on ubuntu 2023-06-14 21:47:37 +02:00
David Larlet
8400d9f03a
Even better with a test 
Refs 4fca2cccca
 2023-06-14 12:59:44 -04:00
David Larlet
4fca2cccca
Allow geo: scheme in (description) links 
Fix #1140
 2023-06-14 12:56:32 -04:00
David Larlet
3edad3976d
Display the number of maps on search results page 2023-06-14 09:58:48 -04:00
Yohan Boniface
65628fe202 make lebab :p 2023-06-08 14:46:50 +02:00
Yohan Boniface
6efa674884 Allow to control icon opacity 
fix #236
 2023-06-08 10:09:31 +02:00
Yohan Boniface
5870d55fff Remove L.U.Icon._setColor 
Let's use setIconStyles from Leaflet instead
 2023-06-08 09:53:18 +02:00
Yohan Boniface
74844f53a3 i18n 2023-06-07 09:12:33 +02:00
Yohan Boniface
1eec9011ff i18n 2023-06-07 09:11:45 +02:00
Yohan Boniface
bf4ef5aeca i18n 2023-06-06 23:16:28 +02:00
David Larlet
fad196bff7
Display the current version + link to changelog 2023-06-06 14:05:35 -04:00
David Larlet
b1179a7443
Avoid popup content to extend beyond the space allowed 
Fix #1126
 2023-06-06 09:10:51 -04:00
Yohan Boniface
4b502e9857 Merge branch 'docker' 2023-06-05 17:00:46 +02:00
Yohan Boniface
faebeebbdf INTERNAL_IPS should default to a list 2023-06-05 15:08:19 +02:00
Yohan Boniface
00f34c45ba Handle OpenStreetMap OAuth by default 2023-06-05 14:48:55 +02:00
Yohan Boniface
5e201b44fb Use django-environ to make part of the settings available throught env vars 2023-06-05 11:48:21 +02:00
Yohan Boniface
9fc1c3f336 i18n 2023-06-05 09:22:31 +02:00
Yohan Boniface
06c156ffcf i18n 2023-06-04 08:52:03 +02:00
Yohan Boniface
863c2e18d2 Display username in edit-toolbar when logged in 2023-06-04 08:45:10 +02:00
Yohan Boniface
51a904dc07 Only return anonymous_url in anonymous context 
Otherwise the frontend will treat map as anonymous even with
and owner and display a wrong message creation.

Also, this edit URL does not make sense (and will not work)
when there is an owner.
 2023-06-04 08:05:48 +02:00
Yohan Boniface
6e0c4723a4
Merge pull request #1102 from umap-project/mail-link 
Add a button to send edit link by email in anonymous mode
 2023-06-02 23:32:34 +02:00
Yohan Boniface
1b791347d8 Also catch InvalidURL in ajax-proxy 
fix #1119
 2023-06-02 22:45:13 +02:00
Yohan Boniface
39a887a6f6 Also catch URLError in ajax-proxy 
fix #1118
 2023-06-02 22:36:02 +02:00
David Larlet
8b1b36f740
Fix width of columns in popups and tables 
See https://umap.openstreetmap.fr/en/map/example01_923828#5/53.606/9.009 for example
 2023-06-02 14:24:28 -04:00
David Larlet
4ba1946868
Fix test about subject 
Introduced in 5460876ff4
 2023-06-02 11:54:44 -04:00
David Larlet
bf4a84de99
Apply black on test map views file 2023-06-02 11:54:09 -04:00
David Larlet
725feb8d01
Fallback to copy to clipboard without HTTPS 2023-06-02 11:50:03 -04:00
David Larlet
ca97a4d745
Bump constrasts on buttons 2023-06-02 11:41:40 -04:00
Yohan Boniface
309db975af
Merge branch 'master' into master 2023-06-02 17:34:49 +02:00
Yohan Boniface
5460876ff4
Update umap/views.py 
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
 2023-06-02 17:33:09 +02:00
Yohan Boniface
d180caa0d5 Fix closing alert on callback 2023-06-01 09:32:44 +02:00
Yohan Boniface
cfe6bdf2a8 Fix closing the alert when clicking on an action button 2023-05-31 18:40:52 +02:00
Yohan Boniface
5d6afdfb1b Add a "Copy link" button near to the anonymous edit link 2023-05-31 18:32:51 +02:00
Yohan Boniface
8f77b63b08 Changed working of edit link alert + added a carriage return 2023-05-31 17:33:05 +02:00
Yohan Boniface
e0760ca403 Only ask to send edit link if email has been set up 2023-05-31 17:20:22 +02:00
Yohan Boniface
8f52d34bb2 WIP: final bit to make sending edit link working 2023-05-31 17:05:57 +02:00
Yohan Boniface
eb32dcc9b6 Make that Map.get_anonymous_edit_url returns full URL 2023-05-31 16:30:07 +02:00
Yohan Boniface
7f2545f09b Allow to use Infinity for an alert duration 2023-05-31 16:16:31 +02:00
Yohan Boniface
69bf6593ac (WIP) Add a button to send edit link by email in anonymous mode 2023-05-31 14:50:43 +02:00
Yohan Boniface
b61b5a48a3 Fix wrong assignement to const 2023-05-31 10:22:37 +02:00
Yohan Boniface
2c451a2941 i18n 2023-05-31 09:57:02 +02:00
Yohan Boniface
945042a65f i18n 2023-05-31 09:14:32 +02:00
Yohan Boniface
1cd75c5ccb
Merge pull request #1113 from umap-project/420-zoom-set 
Better zoom set/modified wording
 2023-05-31 09:09:38 +02:00
David Larlet
0b76ebb259
Apply black to models.py 2023-05-30 20:41:32 -04:00
David Larlet
2c2bd10e27
Better zoom set/modified wording 
Fix #420, hopefully the fuzzy translations will be updated!
 2023-05-30 18:29:57 -04:00
David Larlet
b6628a3015
Merge pull request #1112 from umap-project/1095-read-only-banner 
Banner + no create buttons when in read only mode
 2023-05-30 18:25:33 -04:00
David Larlet
3f28c04241
Banner + no create buttons when in read only mode 
Fix #1095
 2023-05-30 16:17:12 -04:00
David Larlet
0cd1cf4ffc
Merge pull request #1094 from umap-project/use-dompurify 
Use DOMPurify to escape malicious input from user
 2023-05-30 15:49:29 -04:00
David Larlet
0a75998f11
Apply Lebab for template conversions 2023-05-30 14:53:53 -04:00
David Larlet
4a3c845eca
Handle iframes and target attribute with dompurify 2023-05-30 14:23:06 -04:00
David Larlet
fa3d653944
Update the test template to add the purify depency 2023-05-30 14:23:05 -04:00
David Larlet
3122286c8e
Use DOMPurify in escapeHTML() for a global impact 2023-05-30 14:22:04 -04:00
David Larlet
fd3f854a9c
Use DOMPurify to escape malicious input from user 2023-05-30 14:22:04 -04:00
David Larlet
8d6185c476
Manual review of Lebab for let/const conversions 2023-05-30 14:16:10 -04:00
David Larlet
56ce9ae22c
Apply Lebab for let/const conversions 
As far as I understand, it default to `let` in these cases because the tool cannot figure out if a `const` is possible. It has to be checked manually:

```
./node_modules/lebab/bin/index.js --replace "umap/static/umap/js/*.js" --transform let
umap/static/umap/js/umap.xhr.js:
228:  warning  Unable to transform var  (let)
umap/static/umap/js/umap.ui.js:
83:  warning  Unable to transform var  (let)
umap/static/umap/js/umap.slideshow.js:
15:  warning  Unable to transform var  (let)
83:  warning  Unable to transform var  (let)
umap/static/umap/js/umap.popup.js:
100:  warning  Unable to transform var  (let)
umap/static/umap/js/umap.permissions.js:
14:  warning  Unable to transform var  (let)
umap/static/umap/js/umap.layer.js:
195:  warning  Unable to transform var  (let)
436:  warning  Unable to transform var  (let)
568:  warning  Unable to transform var  (let)
584:  warning  Unable to transform var  (let)
989:  warning  Unable to transform var  (let)
1088:  warning  Unable to transform var  (let)
1098:  warning  Unable to transform var  (let)
umap/static/umap/js/umap.js:
124:  warning  Unable to transform var  (let)
223:  warning  Unable to transform var  (let)
343:  warning  Unable to transform var  (let)
376:  warning  Unable to transform var  (let)
406:  warning  Unable to transform var  (let)
849:  warning  Unable to transform var  (let)
732:  warning  Unable to transform var  (let)
948:  warning  Unable to transform var  (let)
959:  warning  Unable to transform var  (let)
878:  warning  Unable to transform var  (let)
1085:  warning  Unable to transform var  (let)
umap/static/umap/js/umap.icon.js:
145:  warning  Unable to transform var  (let)
184:  warning  Unable to transform var  (let)
umap/static/umap/js/umap.forms.js:
453:  warning  Unable to transform var  (let)
umap/static/umap/js/umap.features.js:
15:  warning  Unable to transform var  (let)
101:  warning  Unable to transform var  (let)
143:  warning  Unable to transform var  (let)
373:  warning  Unable to transform var  (let)
429:  warning  Unable to transform var  (let)
890:  warning  Unable to transform var  (let)
949:  warning  Unable to transform var  (let)
umap/static/umap/js/umap.core.js:
149:  warning  Unable to transform var  (let)
175:  warning  Unable to transform var  (let)
umap/static/umap/js/umap.controls.js:
665:  warning  Unable to transform var  (let)
876:  warning  Unable to transform var  (let)
1249:  warning  Unable to transform var  (let)
```
 2023-05-30 14:16:09 -04:00
Yohan Boniface
99b2bfb811 i18n 2023-05-30 17:52:33 +02:00
Yohan Boniface
bd769091a7
Merge pull request #1109 from umap-project/direct-link 
Also expose direct map URL in the export panel
 2023-05-30 14:50:45 +02:00
Yohan Boniface
c52e093db8 Also expose direct map URL in the export panel 
cf #699
 2023-05-30 11:04:10 +02:00
Yohan Boniface
2f79078141
Merge pull request #1108 from umap-project/fix-js-tests 
Fix JS tests
 2023-05-30 08:46:38 +02:00
Yohan Boniface
50091ec0fa Redirect to "user_maps" at login end when window.opener is not accessibile 
This is the case for Twitter.
We'll try to refactor the process later, but let's make it "acceptable"
for now.

cf #1097
 2023-05-30 08:42:23 +02:00
Yohan Boniface
18232bcad0 Rename class to match switching to Twitter OAuth V2 2023-05-30 08:42:23 +02:00
Yohan Boniface
7b65820b73 HOT fix: add message in login_popup_end.html to work around Twitter issues 
In case of logging through Twitter, we don't have access to
window.opener, so we cannot close the window and tell uMap to
finish the login process.
 2023-05-30 08:42:23 +02:00
Yohan Boniface
a462a58ae0 Remove SOCIAL_AUTH_PIPELINE from settings/base.py 
We are using the default, so not need to define them on our
side.
 2023-05-30 08:42:23 +02:00
Yohan Boniface
9ca5ba974b Auth: mark id as protected, otherwise social-core try to create 
new account at each login:

```
  File "/srv/umap/venv/lib/python3.10/site-packages/social_core/backends/base.py", line 83, in pipeline
    out = self.run_pipeline(pipeline, pipeline_index, *args, **kwargs)
  File "/srv/umap/venv/lib/python3.10/site-packages/social_core/backends/base.py", line 113, in run_pipeline
    result = func(*args, **out) or {}
  File "/srv/umap/venv/lib/python3.10/site-packages/social_core/pipeline/user.py", line 122, in user_details
    strategy.storage.user.changed(user)
  File "/srv/umap/venv/lib/python3.10/site-packages/social_django/storage.py", line 16, in changed
    user.save()
django.db.utils.IntegrityError: duplicate key value violates unique constraint "auth_user_username_key"
DETAIL:  Key (username)=(xxxxx) already exists.
```
 2023-05-30 08:42:23 +02:00
David Larlet
23053a26fc Correct tests fixtures for options permissions 2023-05-26 14:12:08 -04:00
David Larlet
c5b19728f0 Fix sinon’s fakeServer’s URLs with /?date param 
Since this commit 97e2df0a8d tests were broken because the URL has an extra date parameter to update the cache for datalayers. With the new regexp, we match these new URLs with the fakeServer from sinon.

Also update sinon to v15.
 2023-05-26 13:39:58 -04:00
David Larlet
06a354730b Apply PrettierJS to tests files 
Command: `make pretty filepath="umap/static/umap/test/*"`
 2023-05-26 13:25:21 -04:00
David Larlet
7f85684d52
Merge pull request #1100 from umap-project/stats-view 
Add a very basic `/stats/` JSON view
 2023-05-23 13:05:11 -04:00
David Larlet
6f72df82b7 Improve stats view testing with another user 2023-05-23 12:09:10 -04:00
David Larlet
deb0ab09d3 Add one hour cache to the stats view 2023-05-23 11:51:54 -04:00
David Larlet
9d752ea306 Add a very basic /stats/ JSON view 
Will be useful to feed munin for instance.
 2023-05-22 17:47:04 -04:00
David Larlet
b4b5497b09 Follow up on #1090 for overlay’s opacity 
I missed that one and I fixed a bug in the meantime setting a correct label (vs. invisible placeholder for an input of type range).

I set a fallback on the datalist id in case no label is specified (which is probably not a good idea).
 2023-05-22 14:41:45 -04:00
Yohan Boniface
32873b7fe3
Merge pull request #1092 from umap-project/713-better-anonymous-editing 
Do not display an alert if the map is not created
 2023-05-20 08:56:52 +02:00
David Larlet
f83a666aa1 Do not display an alert if the map is not created 
Refs #713, otherwise that first message is displayed and then override by the map creation one.
 2023-05-19 11:32:40 -04:00
David Larlet
f604c12be3 Max width for the help box (on small screens) 
Fix #887 as suggested by @esteban-em
 2023-05-19 10:21:34 -04:00
Yohan Boniface
cd32b0eb3e
Merge pull request #1090 from umap-project/877-sliders-thickness 
Display the steps for inputs of type range
 2023-05-19 12:09:06 +02:00
David Larlet
6156993536 Display the steps for inputs of type range 
Fix #877
 2023-05-18 14:20:46 -04:00
David Larlet
18cb5ba7c6 Lazy load tile layers thumbnails 
The list can be pretty big (like on OSMfr).
 2023-05-18 12:54:36 -04:00
David Larlet
d0f89c3be2
Merge pull request #1086 from umap-project/lebab-arrow 
Install and apply Lebab for JS arrows’ conversions
 2023-05-17 10:59:19 -04:00
David Larlet
d88eee9ca4 Manual lebab conversions 2023-05-16 16:19:14 -04:00
Yohan Boniface
a2b1b7bc88 Refactor UserMaps and UserStars views 2023-05-15 14:50:18 +02:00
Yohan Boniface
40f40038f8 Fix url order for retrieving user stars 
Since that initial PR, the username regex has been more gready.
 2023-05-15 12:22:28 +02:00
Yohan Boniface
30f9612a12 Adapt star icon bg position after rebase 2023-05-15 12:22:28 +02:00
Yohan Boniface
8c113d9a19 Rename MapStar view in ToggleMapStarStatus 2023-05-15 12:22:28 +02:00
Yohan Boniface
1c5ffd8136 Update umap/views.py 
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
 2023-05-15 12:22:28 +02:00
Yohan Boniface
37b4d05da5 (WIP) Allow to star map and retrieve starred maps 2023-05-15 12:22:26 +02:00
David Larlet
70c74455b0
Merge pull request #1087 from umap-project/898-iframe-geolocation 
Allow geolocation from iframe embeds, fix #898
 2023-05-12 14:55:04 -04:00
David Larlet
ffeabb7d49
Merge pull request #1084 from umap-project/1025-no-limits 
Remove the limit of visible maps in user’s view
 2023-05-12 14:54:07 -04:00
David Larlet
d859b3f153 Allow geolocation from iframe embeds, fix #898 2023-05-12 14:12:56 -04:00
David Larlet
838bd73458 Install and apply Lebab for JS arrows’ conversions 2023-05-12 14:04:59 -04:00
David Larlet
f43742212b Apply PrettierJS to the whole codebase 2023-05-12 13:57:03 -04:00