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
Yohan Boniface
26b3b4b5c7
Do not try to display share status until map is created
2023-08-15 22:36:11 +02:00
Yohan Boniface
b06cfca1f2
Revert "More readable check from DataLayer.showAtZoom"
...
This reverts commit c0dd8901e4
.
2023-08-15 22:26:33 +02:00
Yohan Boniface
7078557831
Fix tests: add now mandatory share_statuses in test map
2023-08-15 21:48:54 +02:00
Yohan Boniface
88e3da70f5
1.5.0
2023-08-15 16:51:25 +02:00
Yohan Boniface
0e81030481
i18n
2023-08-15 16:47:23 +02:00
Yohan Boniface
b083bae906
Merge pull request #1238 from umap-project/iframe-popup-large
...
adapt iframe min-width for popup large
2023-08-15 16:39:13 +02:00
Yohan Boniface
5765daa4bf
Merge pull request #1233 from umap-project/edit-header-revamp
...
Edit header revamp
2023-08-15 16:35:57 +02:00
Yohan Boniface
379d75239d
Update umap/static/umap/js/umap.core.js
...
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2023-08-15 16:21:44 +02:00
Yohan Boniface
d2c3b8694b
Allow to control facet labels
2023-08-15 16:21:42 +02:00
Yohan Boniface
b013692527
Make sure filters are called before actually displaying a feature
...
on the map
fix #1005
2023-08-15 16:20:49 +02:00
Yohan Boniface
80e62f3046
Better CSS for facet search
2023-08-15 16:20:49 +02:00
Yohan Boniface
d188525c74
Compute _layers for MarkerCluster, so to easily know if layer has data
2023-08-15 16:20:49 +02:00
Yohan Boniface
81a7bdcd6a
Rename advancedFilters to facet search
2023-08-15 16:20:49 +02:00
Yohan Boniface
9abbfbc01e
Use Leaflet.FormBuilder to build advanced filters form
2023-08-15 16:20:49 +02:00
Yohan Boniface
56cb4b44d0
Factorize about link
2023-08-15 16:20:49 +02:00
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
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