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
David Larlet
da1e25be2a
Remove the limit of visible maps in user’s view
...
It should not have any performance issue given that we paginate over the list anyway.
Fix #1025
2023-05-12 13:51:39 -04:00
Yohan Boniface
7dda4a6da0
Merge pull request #1082 from umap-project/mutable-search
...
Allow to create search index without changing unaccent mutability
2023-05-12 16:42:14 +02:00
Yohan Boniface
2bcac67dec
Use flyTo option in locate if map settings aks for it
2023-05-11 12:34:39 +02:00
Yohan Boniface
e3d5bd794f
black is a colour
2023-05-11 11:33:30 +02:00
Yohan Boniface
1038836a72
Use Django full text instead of custom SQL
2023-05-11 11:33:08 +02:00
Yohan Boniface
005a759b81
Update umap/views.py
...
Co-authored-by: Adrien nayrat <adrien.nayrat@gmail.com>
2023-05-10 19:24:33 +02:00
Yohan Boniface
7384fda61a
Allow to create search index without changing unaccent mutability
...
cf #519
2023-05-10 11:47:29 +02:00
Yohan Boniface
1fce475e41
i18n
2023-05-10 10:25:14 +02:00
David Larlet
aa68e096d0
Typo: missing h
in character’s string
...
Thanks @andrew-black512
Fixes #1009
2023-05-05 14:46:23 -04:00
Yohan Boniface
f732db9fa3
Delete _storage_options when save a feature
...
fix #1076
2023-05-05 18:40:04 +02:00
Yohan Boniface
25ab9f943c
Refactor bringToCenter, flyTo and zoomTo in only one function
...
In the same move:
- Map.options.easing is now false by default
- if zoomTo options is set, it should be honoured each time we
use the zoomTo function
fix #679 #179
2023-05-05 18:39:51 +02:00
Yohan Boniface
207b5e7792
i18n
2023-05-03 11:25:33 +02:00
Yohan Boniface
4251a65816
i18n
2023-05-02 18:56:17 +02:00
Yohan Boniface
515aee9324
Enhance measure messages
2023-05-02 17:52:25 +02:00
Yohan Boniface
d87770cf9a
Merge pull request #1068 from knowname/dev
...
Show distance when drawing Polylines.
2023-05-02 17:45:49 +02:00
Yohan Boniface
c03efec562
i18n
2023-05-02 17:09:37 +02:00
Philip Beelmann
9d79f2ba83
remove translation template (will be done by transifex)
2023-05-02 10:34:14 +00:00
Philip Beelmann
be806435f9
use "line length", remove translations (will be done by transifex)
2023-05-02 10:29:55 +00:00
Philip Beelmann
f737d81b40
refactor
2023-05-02 10:07:53 +00:00
Philip Beelmann
afbe7c90d8
dont show popup "click to add a marker" when moving marker
2023-05-02 08:00:46 +00:00
Philip Beelmann
d1ffd76d47
cleanup
2023-04-28 12:55:01 +00:00
Philip Beelmann
ca40e762c1
Remove "({distance})" from locale "Click last point to finish shape"
2023-04-27 12:14:04 +00:00
Philip Beelmann
3d5da276d5
refactor: translation variables
2023-04-27 10:27:53 +00:00
Philip Beelmann
62c7a5f689
refactor: No need to translate ({distance})
2023-04-27 10:20:43 +00:00
Philip Beelmann
077688fc16
Revert "add distance to "continue drawing message""
...
This reverts commit 839ffd89bb
.
2023-04-27 10:18:59 +00:00
Philip Beelmann
eb1cfdbab0
bugfixes: copy/paste + renaming
2023-04-27 10:12:20 +00:00
Philip Beelmann
5d2a4cab5f
fix syntax
2023-04-27 09:39:15 +00:00
Philip Beelmann
c916a67ae0
bugfix
2023-04-27 09:27:57 +00:00
Philip Beelmann
693b32c0ee
refactor getMeasure function
2023-04-27 09:13:13 +00:00
Philip Beelmann
3f12b69c25
extend getMeasure by argument extraPoint
2023-04-25 11:11:00 +00:00
Philip Beelmann
ee6724cddb
show line and polygon measurements while drawing / editing
2023-04-25 10:58:47 +00:00
Philip Beelmann
60fb67516d
add line distance and polygon area messages
2023-04-25 10:58:46 +00:00
Philip Beelmann
839ffd89bb
add distance to "continue drawing message"
2023-04-25 10:57:58 +00:00
Yohan Boniface
fec581548e
i18n
2023-04-25 10:57:56 +00:00
knowname
0ea3678c78
Merge branch 'master' into dev
2023-04-24 12:15:23 +02:00
David Larlet
9e688f4d24
Optimize SVG icons sizes
...
Using Jake Archibald’s tool: https://jakearchibald.github.io/svgomg/ with default settings except keeping width/height attributes because some old browsers require default sizes for rendering (it also avoid huge/100% icons in case the CSS is not applied for whatever reason).
2023-04-22 19:05:05 -04:00
Yohan Boniface
50fffd0417
i18n
2023-04-21 23:19:18 +02:00
Philip Beelmann
ec6239a837
append distance as variable to all translations
2023-04-21 14:55:20 +00:00
Philip Beelmann
aeb48a40ee
show line length while drawing line
2023-04-21 14:49:03 +00:00
Yohan Boniface
edc97f4cc7
Initialize STATICFILES_DIRS
...
fix #1060
2023-04-04 09:11:12 +02:00
Luc Didry
123af0a7c9
🐛 — Allow to use SHA1-signed anonymous edit URL
...
The default django.core.signing Signer uses SHA256 algorithm since Django 3.
Umap used Django 2 in the paste, so people had SHA1 signed anonymous edit URLs,
which became unusable when umap switch to Django 3.
This commit makes them usable again (the new SHA256-signed anonymous edit URLs
still works, obviously).
2023-03-29 12:49:32 +02:00
Yohan Boniface
3f155101af
black on decorators.py
2023-03-01 19:14:59 +01:00
Yohan Boniface
83ca957263
Remove unused code
2023-03-01 19:13:45 +01:00
Yohan Boniface
b493334803
Exclude remoteLayer from import targets
...
Those layers cannot contain data, as they use an URL to fetch it.
2023-03-01 18:27:20 +01:00
Yohan Boniface
ae6f9fda57
Fix restauring full umap with remoteData
...
The check about umap_id was before isLoaded and hasDataLoaded split,
so I guess (hope) it's useless here.
A bit of history:
217f2fcb15
2ea27c87f6
2023-03-01 18:21:24 +01:00
Yohan Boniface
58cee72915
CSS: move alert above panel
2023-03-01 18:19:58 +01:00
Yohan Boniface
f6f765e52f
Catch empty attribution in overlay
2023-03-01 17:35:07 +01:00
Yohan Boniface
d2161a3d09
black on utils.py
...
o
2023-02-28 17:29:11 +01:00
Yohan Boniface
90607c7581
Black on test_datalayer_views
2023-02-28 17:14:57 +01:00
Yohan Boniface
169f7e954c
Allow to add an overlay tilelayer
...
cf #71 #976
2023-02-28 14:08:34 +01:00
Yohan Boniface
1c3fe61aa4
Split L.Map.edit function
2023-02-28 11:02:07 +01:00
Yohan Boniface
0cb72fb5f6
i18n
2023-02-27 18:54:51 +01:00
Yohan Boniface
238401f983
i18n
2023-02-27 14:39:59 +01:00
Yohan Boniface
41e40a1ea8
i18n
2023-02-27 13:52:05 +01:00
Yohan Boniface
9fad415c9f
Add missing migration
2023-02-27 13:51:33 +01:00
Yohan Boniface
1c39245af8
iwyu
2023-02-27 13:50:37 +01:00
Yohan Boniface
e343ddb636
Do not deal with gzip while serving without x-accel-redirect
...
Let's keep this path simple, as it should not be used in normal
production context.
2023-02-27 13:49:21 +01:00
Yohan Boniface
6694306660
Use If-Unmodified-Since istead of If-Match
...
If-Match relies on ETag, which depends on the Content-Encoding,
which is more fragile given we updated the etag on save, while normal
files are served by nginx. So this may occurs false mismatch.
2023-02-27 13:45:15 +01:00
Yohan Boniface
5b7f08ed08
Refactor gzip creation
2023-02-27 12:04:09 +01:00
Yohan Boniface
abc1f119d5
black on views.py
2023-02-27 11:38:59 +01:00
Yohan Boniface
3aa34d124e
black on views.py
2023-02-27 11:00:33 +01:00
Yohan Boniface
97e2df0a8d
Prevent caching datalayer's data for owners/editors
...
cf #1038
2023-02-25 22:17:10 +01:00
Yohan Boniface
2bd4008f97
Use Nginx ETag algo
...
There is a situation where the ETag can be generated by Nginx,
but then used by Django: when the user starts editing a layer,
the js client will send the ETag received from Nginx to uMap
as value to check is there is an editing conflict.
2023-02-25 21:50:39 +01:00
Yohan Boniface
a8dee3fa07
Add Vary: Accept-Encoding header
2023-02-23 11:17:19 +01:00
Yohan Boniface
0300a5f962
ETag must be between double quotes per spec
2023-02-23 11:10:44 +01:00
Yohan Boniface
cfcb83dbfb
black on urls.py
2023-02-23 11:10:24 +01:00
Yohan Boniface
e60227f7da
Merge pull request #1041 from k-3st3ban/master
...
New asked features: checkbox filters, permanent credits, and caption menus options
2023-02-23 10:28:53 +01:00
3st3ban3
eed12fdf87
Update wording to avoid confusion for data checkboxes
2023-02-22 17:36:22 +01:00
Yohan Boniface
2fc30b117b
Prepare for Django 4.x
2023-02-22 15:19:38 +01:00
Yohan Boniface
96a194e1f4
i18n
2023-02-22 15:18:56 +01:00
Yohan Boniface
bd1dd4e233
i18n
2023-02-22 10:23:03 +01:00
3st3ban3
6d900ac79f
Show filters menu only if filter keys are defined
2023-02-18 10:13:12 +01:00
3st3ban3
ce17f8dfe0
Fix undefined error without refreshing page after creating advanced filters
2023-02-15 18:46:20 +01:00
3st3ban3
2221806b7e
Update permanent credits alignement and shape
2023-02-13 17:33:50 +01:00
3st3ban3
ced62d8eed
Fix controls errors with permanent credits
2023-01-22 00:28:56 +01:00
3st3ban3
423084e9ea
Interface option to hide caption menus
2023-01-14 23:15:27 +01:00
3st3ban3
57ba42061c
Permanent credits feature in the bottom left corner
2023-01-14 22:48:16 +01:00
3st3ban3
d69f965f79
Filters checkboxes using features' properties
2023-01-14 22:31:39 +01:00
Duvel
af8fc0ad54
Merge branch 'umap-project:master' into master
2022-11-27 15:25:00 +01:00
Aleksejs Popovs
4155dd27d0
Switch to an actually unused class name
2022-11-24 15:38:23 -05:00
Aleksejs Popovs
7f4f5b460a
Delete custom locate control
2022-11-24 14:27:41 -05:00
Aleksejs Popovs
864abf9f46
Replace custom locate control with Leaflet.Locate
2022-11-24 14:26:49 -05:00
Aleksejs Popovs
c4415e1e99
Vendor leaflet.locatecontrol
2022-11-24 13:55:09 -05:00
Duvel
27d47a8e56
Merge branch 'umap-project:master' into master
2022-10-15 15:09:48 +02:00
Yohan Boniface
7dc608a242
fix: fix version import from context processors
2021-12-30 12:06:41 +01:00
Yohan Boniface
cc14796c6c
chore: use setup.cfg
2021-12-30 11:16:00 +01:00
Yohan Boniface
b7009e3ed0
Init empty permissions
...
Fix bug where we coud not edit permissions of a new saved map unless
reloading the page.
2021-12-29 17:35:15 +01:00
Tobias
00890aabde
CSS: Fix cut of text in iframes of popup content
...
The overflow hidden removed in 72f8fd971d
did cut of iframes and their content. However, it did introduce a scrollbar when the iframe is too big. Which is fixed here by adding a max-width of 100%.
There was a max-width but one with fixed pixel values before, which was removed in 345283782c (diff-5470058378896897263b7a99e4226772660e09d5e9e51b530fffc6075b8e07bfL1299)
.
The stylesheet-style's max-width will overwrite any width-specification given via the width-attribute on the iframe as well as width-conditions set as inline-styles. However, adding a inline max-width-style will overwrite the css-file specification due to higher css specificity.
2021-12-29 14:17:22 +01:00
Tobias
b3ad642a06
CSS: Fix cut of text popup content
...
The overflow that was removed in 72f8fd971d
did cut off long URLs and such which where now visible overflowing the popup content. However, we do want the visible but using `break-word`.
2021-12-28 21:29:31 +01:00
Tobias
72f8fd971d
CSS: Fix cut of text in table of popup content
...
Whenever the key or value is too long, the table was pushed being wider than the given container. And the overflow rules cut off the content of the table.
Fixes
- Remove overflow rules (reset to defaults, which is `auto`), which makes a scroll bar show up if content is too wide
- Let long text break in lines instead of pushing the table (which in turn prevents the scroll bar from showing up)
2021-12-22 14:47:22 +01:00
Yohan Boniface
4a3d4ae7a7
Use correct JSONField
2021-09-16 12:17:08 +02:00
Yohan Boniface
91cfc39cb6
Make Django with DEFAULT_AUTO_FIELD setting
2021-09-16 12:15:18 +02:00
Yohan Boniface
e0bcd07d4b
chore: i18n
2021-09-16 11:54:03 +02:00
Ansgar Hegerfeld
d080c118b6
Fix German typo
2021-09-15 21:43:07 +02:00
Yohan Boniface
e6b02724eb
Merge branch 'dj3'
2021-08-06 11:12:12 +02:00
Yohan Boniface
ec11d675e9
i18n
2021-07-11 12:29:18 +02:00
Donal Hunt
8f1de412b8
redirect users back to TLD version of umap after 3rd party auth.
...
setting "SOCIAL_AUTH_REDIRECT_IS_HTTPS = True" per https://python-social-auth.readthedocs.io/en/latest/configuration/settings.html#processing-redirects-and-urlopen
2021-05-31 15:33:13 +01:00
Yohan Boniface
ebf0dee216
Travis stuff
2021-05-30 22:53:16 +02:00
Yohan Boniface
1200b82838
First attempt to upgrade to Django 3.X
...
Bloqued by https://github.com/peopledoc/django-agnocomplete/issues/119
2021-05-17 10:51:24 +02:00
Manfred Stock
c7b78567c7
Extend regex to support original example from issue #820 and more
...
The original example from issue #820 was using a dash ('-') as fallback,
however, the regular expression did not accept those. It also didn't
support white space (and many other characters) in the fallback, which
are also supported now, so one can even put e.g. links including label
in the fallback.
2020-12-13 17:12:17 +01:00
Manfred Stock
77d9e1f4e2
Return first defined property instead of last property
...
The changes done in b29adaa5
and ec275d64
introduced a property
fallback, however, this always returned the property/string in the
rightmost position, ignoring any of the previous values, even if
they were defined.
2020-12-12 18:31:02 +01:00
Yohan Boniface
7893ff1c7d
fix english typo
2020-11-09 09:54:16 +01:00
Yohan Boniface
953e8eea52
1.2.3
2020-11-09 09:18:44 +01:00
Yohan Boniface
1c4531f70a
Update map extent on first save if it still default one
...
cf #841
2020-11-09 08:09:05 +01:00
Yohan Boniface
fe7a7f5434
Fix English typo setted => set
2020-11-09 07:30:02 +01:00
Yohan Boniface
1770c31de5
i18n
2020-11-08 17:57:37 +01:00
Yohan Boniface
1afc366e11
Do not change zoom when locating user
...
cf #763
2020-11-08 17:52:45 +01:00
Yohan Boniface
eeb58a8c21
Display an error message when latlng is invalid
2020-11-08 17:43:57 +01:00
Yohan Boniface
70eec17555
fix changing map ownership broken
...
cf #780
2020-11-08 17:39:01 +01:00
Yohan Boniface
3089b71705
Prevent to redraw a marker when setting invalid latlng from edit form
...
cf #799
2020-11-08 16:49:23 +01:00
Yohan Boniface
3927a845a4
Control search API URL from uMap config
...
cf #842
2020-11-08 15:10:13 +01:00
Yohan Boniface
ec275d64fe
Deal with property fallback in templating
...
eg. {prop1|prop2|"default"}
cf #820
2020-11-08 14:38:09 +01:00
Yohan Boniface
b29adaa53f
Minimal fallback handling in templating
...
eg. {var|defaultvalue}
cf #820
2020-11-08 14:38:09 +01:00
Remco Schoen
c0e91578b1
Added docker support
2020-05-15 17:59:08 +00:00
Binnette
729049aa04
Responsive images
2020-04-09 10:28:47 +02:00
Binnette
8b28536bbb
Improve popup and panel layout
2020-04-09 00:08:30 +02:00
Binnette
e2ca1ecd63
Normalize keyboard shortcuts in translation
2020-03-29 20:17:00 +02:00
Binnette
c0b7d13cfb
Normalize keyboard shortcuts
2020-03-28 23:59:23 +01:00
Yohan Boniface
82bffa43ff
1.2.2
2020-03-28 11:20:39 +01:00
Binnette
170fffbe5f
fix bad line break
2020-03-28 11:15:31 +01:00
Yohan Boniface
3fa3473908
1.2.1
2020-03-25 15:14:19 +01:00
Yohan Boniface
2ba7a057f3
Be more liberal about username regex in URL
...
fix #774
2020-03-25 15:11:11 +01:00
Yohan Boniface
4358a35a5d
Set dir=rtl when appropriate
...
cf #752
2020-03-23 11:30:45 +01:00
Yohan Boniface
ebc3b90d40
1.2.0
2020-03-23 08:39:21 +01:00
Yohan Boniface
7f0454fce0
Use new settings of social-auth
...
cf #754
2020-03-22 18:00:47 +01:00
Yohan Boniface
f7972b47a4
TableEditor: prevent adding properties with "."
...
fix #426
2020-03-22 15:57:05 +01:00
Yohan Boniface
24baed0c1a
Prevent old style slideshow to be actived on load
...
We used to only consider the delay to define if the slideshow was
active or not.
2020-03-22 15:40:52 +01:00