Commit graph

1959 commits

Author SHA1 Message Date
Yohan Boniface
cac3c63ac0
Merge pull request #1835 from umap-project/classif-to-toggle
chore: replace DomUtil.classIf by classList.toggle
2024-05-17 17:02:35 +02:00
Yohan Boniface
6327c988ab fix: do not close blindly editPanel when deleting a layer
fix #498
fix #1831
2024-05-17 17:01:47 +02:00
Yohan Boniface
26d4b439cd chore: replace DomUtil.classIf by classList.toggle
cf #1342
2024-05-17 16:51:25 +02:00
Yohan Boniface
630de6d749 fix: do not consider shortcuts if shift is also pressed
fix #1452
2024-05-17 16:08:40 +02:00
Yohan Boniface
26c9f913e3 fix: do not autoclose panel blindly after map save
fix #1139
cf #1831
2024-05-17 15:19:10 +02:00
Yohan Boniface
c860866fe9 feat: add defaultPanelMode setting
cf https://forum.openstreetmap.fr/t/umap-2-3-changement-de-gestion-des-pop-up/23680/3

Trying to make this panel expanded/condenses thing simpler and more intuitive.

It's mode can be set:
- by explicitely setting defaultPanelMode = xxx
- or, if defaultPanelMode is undefined, with sensible default when there is
  an onLoadPanel defined, and to respect previous uMap behaviour
- or, if defaultPanelMode is unset, and some feature opens in the panel, it
  will be set to expanded (here again to respect previous behaviour
- then, when user change it manually (by clicking on the toggle button), then
  we should never change it automatically, and respect the previous mode when
  reopening the panel

(We are only talking about the left panel, here.)
2024-05-16 19:48:19 +02:00
Yohan Boniface
3a19b921a7 chore: prettier 2024-05-16 12:18:07 +02:00
Yohan Boniface
571154e4f3 fix: error when clicking on the geolocate button
fix #1812
2024-05-15 15:17:50 +02:00
Yohan Boniface
00ad05bb82 feat: use accent color for switch and multichoices on dark background 2024-05-14 18:59:05 +02:00
Yohan Boniface
9e2a29002a Apply suggestions from code review
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2024-05-14 17:35:33 +02:00
Yohan Boniface
e6b4a54499 fix: show non visible layers in caption
fix #1820
2024-05-14 16:26:00 +02:00
Yohan Boniface
c58196b285 chore: move caption to its own module 2024-05-14 16:00:26 +02:00
Yohan Boniface
71a8aafeba 2.3.0 2024-05-09 18:08:08 +02:00
Yohan Boniface
6b3da97d73 i18n 2024-05-09 18:07:13 +02:00
Yohan Boniface
0ce1971b4e
Merge pull request #1794 from umap-project/integrate-facets
feat: integrate facets into browser filters
2024-05-09 17:57:15 +02:00
Yohan Boniface
eb1a0bae25
Merge pull request #1808 from umap-project/panel-height-with-footer-bar
fix: adapt panel expanded height when map has a caption bar
2024-05-09 17:56:39 +02:00
Yohan Boniface
5b4bf9d416
Merge pull request #1804 from umap-project/edit-layer-on-esc
fix: open edit panel when pressing ESC while drawing, if valid
2024-05-09 17:45:25 +02:00
Yohan Boniface
b5da347a67 fix: adapt panel expanded height when map has a caption bar
cf #1788
2024-05-09 17:07:33 +02:00
Yohan Boniface
58588761d5 fix: open edit panel when pressing ESC while drawing, if valid 2024-05-09 16:43:01 +02:00
Yohan Boniface
84b904c71d fix: really focus on search input after showing the panel
fix #1806
2024-05-09 16:36:05 +02:00
Yohan Boniface
4ebbf8ed11
Merge pull request #1805 from umap-project/fix-continue-line
fix: do not try to render drawinTooltip on drawing start
2024-05-09 16:01:57 +02:00
Yohan Boniface
6c5bdf8670 wip: add integration test to make sure filters are kept when closing panel 2024-05-09 15:57:14 +02:00
Yohan Boniface
f06461967a fix: do not try to render drawinTooltip on drawing start
The event does not contain latlng, so we cannot compute the
line length yet.
2024-05-09 13:32:39 +02:00
Yohan Boniface
b0b740f9b5 wip: fix CSS selector to determine if browser is open or not 2024-05-08 19:37:28 +02:00
Yohan Boniface
86ae6bb816 wip: better way of computing isMin/MaxModified in facets fields 2024-05-08 19:27:23 +02:00
Yohan Boniface
53458053a7 wip: properly deal with old onLoadPanel 'facet' value
We need to replace it, so the new value is saved and used
elsewhere (eg. in the "UI options" form)
2024-05-08 19:07:13 +02:00
Yohan Boniface
369f798839
Merge pull request #1790 from umap-project/panel-expanded-mobile
fix: allow panel expanded mode in mobile
2024-05-08 18:56:41 +02:00
Yohan Boniface
99effc880b wip: rename facet by filters in user facing labels 2024-05-08 18:46:47 +02:00
Yohan Boniface
0741d2a943 wip: add min/max attributes to minmax filters inputs 2024-05-08 18:40:40 +02:00
Yohan Boniface
76c719f3b1 wip: add a reset button to filters form in browser 2024-05-08 18:40:00 +02:00
Yohan Boniface
46088f3213 wip: highlight modified inputs instead of fieldset in filters 2024-05-07 20:32:40 +02:00
Yohan Boniface
63d936a069 wip: review form style with Aurelie 2024-05-07 20:26:13 +02:00
Yohan Boniface
fa1752c992 fix: keep current selected date/number value when reopening browser 2024-05-07 16:39:28 +02:00
Yohan Boniface
8ef8ad538e wip: one const per line 2024-05-07 15:43:27 +02:00
David Larlet
dcad0e1bb2
Merge pull request #1801 from umap-project/1796-add-purify-attributes
fix: allow `dir` and `title` attributes
2024-05-07 09:40:27 -04:00
Yohan Boniface
2f3e7d03ab chore: fix tests after fieldset refactor 2024-05-07 13:29:03 +02:00
Yohan Boniface
b450acf81d chore: prettier 2024-05-07 12:31:28 +02:00
Yohan Boniface
cd48267cf2 wip: remove unused code 2024-05-07 12:29:48 +02:00
Yohan Boniface
ba0ba1a85d wip: add a badge on filters title and datalayers icon when active 2024-05-07 12:28:13 +02:00
Yohan Boniface
43755c81fa fix: only set date/number facets selected if values have changed
For displaying the badge, we need to know when custom values have
been set. Also, this prevent useless facet checks when user has
changed one value then changed it back to default.
2024-05-07 12:23:17 +02:00
Yohan Boniface
701b00f4f7 wip: do not override selected values when recomputing facets 2024-05-07 12:21:31 +02:00
Yohan Boniface
d805653e3c wip: make explicit in browser.build that we set mode only if defined 2024-05-07 12:20:40 +02:00
David Larlet
5b9746066c
fix: allow dir and title attributes
Fix #1796
2024-05-06 18:26:05 -04:00
Yohan Boniface
0b98ef2f9d wip: replace fake fieldset by proper details/summary tags 2024-05-03 18:53:05 +02:00
Yohan Boniface
406198882a wip: add filter icon for filters button 2024-05-03 18:48:26 +02:00
Yohan Boniface
f78e95b088 wip: remove tabs from browser 2024-05-03 16:06:51 +02:00
Yohan Boniface
aa78b13f8e feat: integrate facets into browser filters 2024-05-03 12:53:06 +02:00
David Larlet
8679c0ded8
Merge pull request #1792 from umap-project/fix-title-html
fix: do not add title to button if content is a DOM node
2024-05-02 11:34:46 -04:00
Yohan Boniface
916da8be94 fix: do not add title to button if content is a DOM node 2024-05-02 17:14:48 +02:00
Yohan Boniface
f1a8180a29
Merge pull request #1789 from umap-project/panel-responsive
Add max-width to panel in landscape mode
2024-05-02 16:41:23 +02:00
Yohan Boniface
e688ce8f57 chore: try to change Playwright expect timeout
Some tests randomly fail in the CI because of timeout a bit short.
2024-05-02 14:30:54 +02:00
Yohan Boniface
c40b01fc48 fix: add max-width to panel in landscape mode
In some situation in mobile (eg. when the keyboard is used), the
screen is still considered as landscape, but it is very small, so
make sure the panel does not overflow on the right.

cf #1788
2024-05-02 12:26:36 +02:00
Yohan Boniface
51d5095d2c fix: allow panel expanded mode in mobile 2024-05-02 12:24:36 +02:00
David Larlet
49b240a3db
2.2.2 2024-05-01 14:08:56 -04:00
David Larlet
c05282f19c
2.2.1 2024-05-01 13:36:00 -04:00
David Larlet
2c1cd46167
fix: no .mjs extension for JS modules
It requires a special nginx configuration that we want to avoid for all instances deployments:

```
include mime.types;
types {
  application/javascript mjs;
}
```
2024-05-01 13:27:45 -04:00
Yohan Boniface
dc69ec55c8 2.2.0 2024-05-01 18:05:44 +02:00
Yohan Boniface
55dc083866 i18n 2024-05-01 18:04:01 +02:00
Yohan Boniface
0f798d4cc6
Merge pull request #1774 from umap-project/browser-tabs
feat: add browser tabs submenu
2024-05-01 17:54:22 +02:00
Yohan Boniface
85e2a8ef5b
Merge pull request #1785 from umap-project/fix-modifier-macos
fix: deal with the modifier key under macOS
2024-05-01 17:51:58 +02:00
Yohan Boniface
5bfc65167a wip: refactor credits css in caption 2024-05-01 17:48:35 +02:00
Yohan Boniface
6cc34d1f97 wip: change flat tags colors (in browser/caption/iconUrl field) 2024-05-01 17:43:20 +02:00
Yohan Boniface
4e7f1e43c0 wip: make owner closer to title in caption box 2024-05-01 17:43:20 +02:00
Yohan Boniface
00a3c2fe34 wip: change tabs rendering in browser and iconUrl form field 2024-05-01 17:43:20 +02:00
Yohan Boniface
b550c93b87 wip: move owner link above tabs in caption 2024-05-01 17:43:20 +02:00
Yohan Boniface
d013d6b0e3 wip: add browser tabs submenu 2024-05-01 17:43:20 +02:00
David Larlet
d00c394a99
fix: deal with the modifier key under macOS 2024-05-01 11:40:37 -04:00
Yohan Boniface
cd10a6259f
Merge pull request #1784 from umap-project/fix-alert-anonymous
fix: make sure to display anonymous edit link even if email is not configured
2024-05-01 17:07:57 +02:00
Yohan Boniface
713214e258
Merge pull request #1782 from umap-project/fix-caption
fix: ensure tilelayer attribution with smart text is displayed as HMTL
2024-05-01 17:05:24 +02:00
Yohan Boniface
0002b22f5c chore: skip failing test for now
This test was relying on changing DEFAULT_FROM_EMAIL in the test,
but given this setting is used at load from urls.py, it has no
effect.
2024-05-01 16:57:46 +02:00
Yohan Boniface
596004c8c0
Merge pull request #1783 from umap-project/fix-name-click
fix: open caption form when clicking on map name, not advanced props
2024-05-01 16:28:40 +02:00
Yohan Boniface
fedb083612 chore: be more explicit on what HTML we allow when escaping 2024-05-01 16:26:38 +02:00
Yohan Boniface
200ee6ea10 chore: fix formatting 2024-05-01 16:26:38 +02:00
Yohan Boniface
c3516516cd chore: change DomUtil.element signature 2024-05-01 16:26:37 +02:00
Yohan Boniface
8c20397209 fix: make sure to display anonymous edit link even if email is not configured 2024-05-01 15:43:10 +02:00
Yohan Boniface
757cc1ee6c fix: open caption form when clicking on map name, not advanced props 2024-05-01 15:31:32 +02:00
Yohan Boniface
dccb93c8a8 fix: make sure we escape all innerHTML calls 2024-04-30 23:19:19 +02:00
Yohan Boniface
cdb46752a9 fix: ensure tilelayer attribution with smart text is displayed as HMTL 2024-04-30 20:02:13 +02:00
Yohan Boniface
acb5a68755 fix: fix back button in the layer edit form 2024-04-25 10:56:51 +02:00
Yohan Boniface
6a48d641c9 2.2.0b0 2024-04-24 21:29:21 +02:00
Yohan Boniface
453056cb15 feat: remove Map.description
The field was not populated since years, and we already have the
info inside the JSONB `settings`.
2024-04-24 16:39:59 +02:00
Yohan Boniface
52ab531362
Merge pull request #1751 from umap-project/browse-data-expanded
make that "browse data" opens the browser in expanded mode
2024-04-19 17:39:26 +02:00
David Larlet
dc40addef4
Merge pull request #1766 from umap-project/redraw-popup-on-marker-change
fix: redraw popup on marker’s modifications
2024-04-19 11:34:04 -04:00
David Larlet
dd69efb45b
chore: set default navigation timeout for CI 2024-04-19 11:33:38 -04:00
David Larlet
788c638f3d
fix: redraw popup on marker’s modifications 2024-04-19 11:24:06 -04:00
David Larlet
d8c2e14b42
Merge pull request #1763 from umap-project/flammermann-facet-date
Date and number support for facets
2024-04-19 10:58:02 -04:00
David Larlet
c5507fbafe
fix: tests with iso dates and explicit days 2024-04-19 10:27:32 -04:00
Yohan Boniface
65e226ff1c
Merge pull request #1753 from umap-project/msg-no-csv-header
feat: display a message when importer cannot find lat/lng columns
2024-04-19 16:05:04 +02:00
David Larlet
5232d77382
Merge pull request #1765 from umap-project/ci-mock-osm-tiles
Mock OSM tiles requests in Playwright for speed
2024-04-19 09:54:39 -04:00
Yohan Boniface
a1d78437d5 chore: use translate instead of L._ in facets module 2024-04-19 13:19:20 +02:00
Yohan Boniface
37e0582b30 chore: try to parse naive dates as UTC 2024-04-19 13:15:53 +02:00
Yohan Boniface
eb0d17154c chore: add facets.getParser method 2024-04-19 13:15:53 +02:00
Yohan Boniface
b0c6b42c17 chore: fix typo in css 2024-04-19 13:15:53 +02:00
Yohan Boniface
ab85e945be chore: remove unwanted span in translated string 2024-04-19 13:15:53 +02:00
Yohan Boniface
68a22a9177 chore: redraw facets panel if open when changing facetKey 2024-04-19 13:15:53 +02:00
Yohan Boniface
0b1693a1a2 chore: add some tests for facet search 2024-04-19 13:15:53 +02:00
Yohan Boniface
91f0f29d5e chore: refactor FeatureMixin.matchFacets 2024-04-19 13:15:53 +02:00
Yohan Boniface
9c326d09e1 chore: remove the need for makeDirty in U.FormBuilder 2024-04-19 13:15:53 +02:00
Yohan Boniface
53f93ee97e chore: move facets to a dedicated module 2024-04-19 13:15:52 +02:00
Yohan Boniface
47c6473285 chore: refactor facet date and number HTML widgets 2024-04-19 13:11:45 +02:00
flammermann
39857decda resolve merge conflict 2024-04-19 13:11:45 +02:00
flammermann
f4413a8a74 translation capability and small cleanups 2024-04-19 13:11:44 +02:00
flammermann
10b1bc6265 Support date and number properties in facet search - mini fix in placeholder 2024-04-19 13:10:27 +02:00
flammermann
b0c9edba7f Support date and number properties in facet search - refactoring 2024-04-19 13:10:27 +02:00
flammermann
839bb4c5d8 Support date properties in facet search - split type into dataType and inputType 2024-04-19 13:10:27 +02:00
flammermann
2c48b97b4b Support date properties in facet search - enhance UI 2024-04-19 13:10:27 +02:00
flammermann
4042b86746 Support date properties in facet search - state allowed data types 2024-04-19 13:10:27 +02:00
flammermann
ce485f88f9 Support date properties in facet search - remove comments parseDateField 2024-04-19 13:10:27 +02:00
flammermann
763341eacf Support date properties in facet search - move parseDateField 2024-04-19 13:10:27 +02:00
flammermann
ba88dfafcd Support date properties in facet search - change default type 2024-04-19 13:10:27 +02:00
flammermann
4de6bc6c91 Support date properties in facet search - fix indents 2024-04-19 13:10:27 +02:00
flammermann
a2e3d6f327 Support date properties in facet search 2024-04-19 13:10:27 +02:00
David Larlet
836c3361d7
ci: mock OSM tiles requests in Playwright for speed
Also, cast the PLAYWRIGHT_TIMEOUT parameter.
2024-04-18 14:08:57 -04:00
Yohan Boniface
4ded52e3fc chore: change Panel.open signature 2024-04-18 17:46:56 +02:00
Yohan Boniface
9a46901795
Merge pull request #1750 from umap-project/latest-open-popup
feat: open popup when default view is set to latest
2024-04-17 19:30:10 +02:00
Yohan Boniface
62e7e3c01a
Merge pull request #1755 from umap-project/browser-no-control
fix: make sure we do not render browser in map fragment
2024-04-17 18:33:54 +02:00
Yohan Boniface
1bd1511d6d
Merge pull request #1757 from umap-project/fix-browser-on-save
fix: prevent rebuilding the browser at each save
2024-04-17 18:33:19 +02:00
Yohan Boniface
ba72f59624
Merge pull request #1760 from umap-project/fix-esc-fragment
fix: do not try to close editPanel if not set
2024-04-17 15:10:12 +02:00
Yohan Boniface
67bc181098
Merge pull request #1756 from umap-project/edit-in-osm-in-contextmenu
feat: add link in contextmenu to edit map in OSM
2024-04-17 15:04:09 +02:00
Yohan Boniface
1bf2642090
Merge pull request #1762 from umap-project/pw-timeout
chore: allow to set playwright timeout from env var
2024-04-17 15:03:46 +02:00
Yohan Boniface
0c1c5f117d fix: do not try to close editPanel if not set
When in the user dashboard and opening a map preview, when we
press escape it will try to close non existing panels (they are
not instantiated given there is not edit mode there)
2024-04-17 15:03:25 +02:00
Yohan Boniface
d985a6585e chore: formatting 2024-04-17 14:58:04 +02:00
Yohan Boniface
89c92471bd
Merge pull request #1761 from umap-project/increase-url-template
fix: increase TileLayer.url_template size
2024-04-17 14:57:30 +02:00
Yohan Boniface
c79660c354 chore: allow to set playwright timeout from env var
so we can increase it in the CI
2024-04-17 14:57:02 +02:00
Yohan Boniface
0acf5f2f2f chore: change zoomTo signature to make it more explicit 2024-04-17 14:55:20 +02:00
Yohan Boniface
d743ffeea0 fix: increase TileLayer.url_template size
fix #255
2024-04-17 11:19:31 +02:00
Yohan Boniface
17e96e6c63 feat: add minimal OpenGraph links
cf #1591
2024-04-17 10:55:07 +02:00
Yohan Boniface
c4b8e24dab fix: prevent rebuilding the browser at each save
Otherwise we lose the browser current context (some layer may
be opened, or user may have scrolled down)
2024-04-17 10:03:30 +02:00
Yohan Boniface
d0cc1cdd3d i18n 2024-04-17 09:45:13 +02:00
Yohan Boniface
87e2467a4c feat: add link in contextmenu to edit map in OSM
fix #1651
2024-04-17 09:34:39 +02:00
Yohan Boniface
99d5165fcf fix: make sure we do not render browser in map fragment
There was an edge case when map has "dataLayersControl=expanded":
we only overrided "onLoadPanel", so dataLayersControl was still
considerer. Let's have a more generic stop.
2024-04-17 08:27:58 +02:00
Yohan Boniface
a6ed20b120 wip: make that "browse data" opens the browser in expanded mode
And also add a "See layer" action in the context menu.

I'm not totally sure it's the way to go, but it's closer to the
current behaviour, and as a user a way missing a way to go straight
to the extanded browser version.
2024-04-16 18:07:21 +02:00
Yohan Boniface
8c418287e4 feat: display a message when importer cannot find lat/lng columns
fix #1699
2024-04-16 17:39:15 +02:00
Yohan Boniface
e2413d1b83
Merge pull request #1749 from umap-project/layers-list-import-panel
fix: update layers list in import panel
2024-04-16 16:36:12 +02:00
Yohan Boniface
4b05a62b8b feat: open popup when default view is set to latest
fix #1726
2024-04-16 14:52:52 +02:00
Yohan Boniface
4f58b64ce5 fix: update layers list in import panel
fix #1729
2024-04-16 13:49:03 +02:00
Yohan Boniface
d3bf9fcdf0 fix: hide delete button for editors in dashboard
fix #1739
2024-04-16 11:32:00 +02:00
Yohan Boniface
2602b27f34 chore: fix tests after rebase 2024-04-16 10:30:05 +02:00
Yohan Boniface
65bad68efe wip: change icon for panel expanded/condensed 2024-04-16 09:09:59 +02:00
Yohan Boniface
9ee672f1e7 wip: fix border for dark panel 2024-04-16 09:09:59 +02:00
Yohan Boniface
4cfe319a91 fix: remove white border from black edit buttons 2024-04-16 09:09:59 +02:00
Yohan Boniface
b933c4badd wip: align panel bottom above scale control 2024-04-16 09:09:59 +02:00
Yohan Boniface
e615e0926a chore: fix tests 2024-04-16 09:09:59 +02:00
Yohan Boniface
573a33df5a chore: use CSS vars for panel 2024-04-16 09:09:59 +02:00
Yohan Boniface
211a86f27c chore: lint 2024-04-16 09:09:59 +02:00
Yohan Boniface
2f1a85144e chore: make panel toolbox sticky instead of fixed
No need to deal with width, that way.
2024-04-16 09:09:59 +02:00
Yohan Boniface
cd01e4085f chore: better align icon and title in panels 2024-04-16 09:09:59 +02:00
Yohan Boniface
8279ae8a62 chore: put back order of edit buttons
We'll certainly change them later, but for now let's create
useless noise for users
2024-04-16 09:09:59 +02:00
Yohan Boniface
2f3d579079 chore: make captionControl nullable in schema.js
So it can be configured to appears in the "More" button
2024-04-16 09:09:59 +02:00
Yohan Boniface
c9acb22d64 chore: remove calls to L. from browser.js 2024-04-16 09:09:59 +02:00