almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-05-01 20:42:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
3648 commits 67 branches 145 tags 69 MiB
Commit graph

2514 commits

Author SHA1 Message Date
fim100
ca86721b89 revert MarkerCluster.Default.css 2024-08-28 22:39:48 +02:00
fim100
431cd91d4c revert leaflet.css 2024-08-28 22:39:48 +02:00
fim100
f9ba7f3c50 Update map.css 2024-08-28 22:39:48 +02:00
fim100
e74ca192d6 fix placement of navigation links in dashboard 
My Map and My Profile
 2024-08-28 22:39:48 +02:00
fim100
80a842bd32 fix icon position in dashboard 2024-08-28 22:39:48 +02:00
fim100
c52207ee0f make map.css rtl-friendly 2024-08-28 22:39:48 +02:00
fim100
c554427fa8 make alert.css rtl-friendly 2024-08-28 22:39:48 +02:00
fim100
ed2a91330f make nav.css rtl-friendly 2024-08-28 22:39:48 +02:00
fim100
3d7ca9c6f9 make importers.css rtl-friendly 2024-08-28 22:39:48 +02:00
fim100
b886dbac3c make content.css rtl-friendly 2024-08-28 22:39:48 +02:00
fim100
26b1369a3c make base.css rtl-friendly 2024-08-28 22:39:48 +02:00
fim100
a39d89295c making slideshow.css rtl-friendly 2024-08-28 22:39:48 +02:00
fim100
1671a0bef1 making Update icon.css rtl-friendly 2024-08-28 22:39:48 +02:00
fim100
d65c48a88a making Update leaflet.css rtl-friendly 2024-08-28 22:39:48 +02:00
fim100
ec790ad296 making MarkerCluster.Default.css rtl-friendly 2024-08-28 22:39:48 +02:00
Yohan Boniface
ca4df94e7f fix: correctly add drawn latlng when continuing line backward 
Otherwise the measure if wrong.

fix #2069
 2024-08-28 15:01:43 +02:00
Dimitar
f4c3a10251
Also update regex 2024-08-19 12:20:58 +03:00
Dimitar
92e3de87db
Use preferred tile.openstreetmap.org URL 
For reference: https://github.com/openstreetmap/operations/issues/737
 2024-08-15 19:58:15 +03:00
Yohan Boniface
ab8bce985e
Merge pull request #2053 from umap-project/bubble-layer 
Add "Proportional Circles" layer type
 2024-08-15 11:04:47 +02:00
Yohan Boniface
f05590e605
Merge pull request #2025 from umap-project/login-from-map 
fix: catch login_required from map page and add a way to login
 2024-08-15 10:57:10 +02:00
Yohan Boniface
e42ed4373f wip: do not fail when setting "Circles" layer with non markers data 2024-08-15 10:36:54 +02:00
Yohan Boniface
b0c37671a8
Merge pull request #2060 from umap-project/georss-link-title 
fix: do not append HTML element as title in GeoRSSLink popup
 2024-08-15 10:25:21 +02:00
Yohan Boniface
bc34851def fix: do not append HTML element as title in GeoRSSLink popup 2024-08-15 10:17:43 +02:00
Yohan Boniface
0847dc1ba6 fix: import GPX desc as description 2024-08-14 11:01:31 +02:00
Yohan Boniface
930463032b wip: add minimal legend for circles layer 2024-08-13 12:30:39 +02:00
Yohan Boniface
cbb022f804 wip: use sqrt for computing circles radius to smooth the sizes 
The theory is that the circles surface should be proportional, not
the radius.
 2024-08-13 11:11:24 +02:00
Yohan Boniface
6b60b0de64 wip: add "Proportional Circles" layer 2024-08-13 11:11:24 +02:00
Yohan Boniface
5a33709cc9
Merge pull request #2057 from umap-project/icon-to-modules 
chore: move icon.js to modules
 2024-08-13 11:10:32 +02:00
Yohan Boniface
a04accf16c
Merge pull request #1994 from umap-project/more-tilelayers-button 
feat: add a "+" button in the tilelayer switcher
 2024-08-13 11:05:02 +02:00
Yohan Boniface
f9484c3336 chore: move icon.js to modules 2024-08-13 11:00:17 +02:00
Yohan Boniface
f08e9cadb5
Merge pull request #2041 from umap-project/mask-polygon 
feat: allow to display a polygon "negative"
 2024-08-13 10:57:37 +02:00
Yohan Boniface
327c1603f5 Revert "chore: switch to an UI class getter" 
This reverts commit 6b793758c5d7d85a2120a5376134f485ea0807bc.
 2024-08-13 10:20:46 +02:00
David Larlet
7863cebc32 chore: switch to an UI class getter 2024-08-13 10:20:46 +02:00
Yohan Boniface
00c384bf25 feat: allow to display a polygon "negative" 
fix #1125
 2024-08-13 10:20:44 +02:00
Yohan Boniface
a0ec0de6f7 feat: align celllayer and cellayerplus border 2024-08-07 09:12:46 +02:00
Yohan Boniface
facccc1c70 feat: add a "+" button in the tilelayer switcher 2024-08-06 13:38:39 +02:00
Yohan Boniface
91c9088082 i18n 2024-08-03 07:37:20 +02:00
David Larlet
29c07755b5
fix: reposition convert to polyline icon 2024-08-02 15:03:40 -04:00
Yohan Boniface
d574abfc36 chore: remove umap.popup.js from js.html 
The file has been deleted.
 2024-08-02 17:39:45 +02:00
David Larlet
a73134cdb0
Merge pull request #2042 from umap-project/vendors-included 
chore: include vendorized static dependencies
 2024-08-02 11:19:35 -04:00
Yohan Boniface
5d0abe7dc1
Merge pull request #2033 from umap-project/nocontrol-no-loading 
fix: deactivate loader on map fragments
 2024-08-02 17:18:02 +02:00
Yohan Boniface
9f5361f2c0
Merge pull request #2034 from umap-project/popup-to-modules 
chore: move popups to modules
 2024-08-02 17:15:26 +02:00
David Larlet
ff8903e751
fix: remove Ctrl from tests for cross OS compatibility 2024-08-02 11:04:24 -04:00
David Larlet
c6b2dbd04c
fix: avoid vendorizing lealfet useless files 2024-08-02 10:13:55 -04:00
David Larlet
5c7624a08e
fix: avoid vendorizing markercluster sources 2024-08-02 10:06:27 -04:00
David Larlet
cf00069017
fix: avoid vendorizing leaflet.toolbar sources 2024-08-02 10:01:57 -04:00
David Larlet
4125bd1be0
chore: include vendorized static dependencies 2024-08-02 09:54:54 -04:00
Yohan Boniface
5a0b75fd33
Merge pull request #2027 from umap-project/tableditor-direct-import 
chore: import TableEditor directly from layer
 2024-07-31 22:53:19 +02:00
Yohan Boniface
144c757e0f chore: remove old TableEditor.js tests file 2024-07-31 22:42:23 +02:00
Yohan Boniface
222e69fbf4 chore: import TableEditor directly from layer 2024-07-31 22:42:22 +02:00
Yohan Boniface
6de5dabcc6 fix: fix georss import 2024-07-31 22:31:43 +02:00
Yohan Boniface
5145404dc4 fix: show delete button for owner and anonymous owner 2024-07-31 22:29:29 +02:00
Yohan Boniface
a2ca3a1436 chore: move popups to modules 2024-07-30 16:59:44 +02:00
Yohan Boniface
3bdd5bedf1 fix: catch login_required from map page and add a way to login 2024-07-30 14:41:10 +02:00
Yohan Boniface
084c674847 fix: deactivate loader on map fragments 
Since 8ddc570e23 we lost the link
request <=> map, so the "dataloading" and "dataload" events are
global to the DOM, so when loading a list of maps, all instances
react to all dataloading events, which makes the list a mess.

I'd prefer to keep this loading indicator per map, but it's much
easier to just hide it, so let's go that way.
 2024-07-30 14:28:41 +02:00
David Larlet
c240357922
fix: do not rely on the hasChildNodes() method 
Introduced in 5ba1c28408

TIL: `hasChildNodes()` is sensitive to white spaces.
 2024-07-29 21:15:24 -04:00
David Larlet
5ba1c28408
chore: reformat templates with djlint 2024-07-29 10:53:34 -04:00
Yohan Boniface
671d88296f wip: remove print 2024-07-29 16:24:59 +02:00
Yohan Boniface
cd439bb7d0 wip: remove umap.features.js 2024-07-29 16:24:59 +02:00
Yohan Boniface
65c5cb5ab5 wip: refactor isolateShape 2024-07-29 16:24:59 +02:00
Yohan Boniface
cd30f49773 wip: move back click handler to Leaflet Marker/Path 
We tried to have only one listened at map level, but we get into
troubles with bindTooltip({permanent: false} and MarkerClusterGroup
stoping the event to each the map.

Let's go back to previous behaviour, and try later to clean this
event management.
 2024-07-29 16:24:59 +02:00
Yohan Boniface
1bbdaa4c90 wip: do not try to redraw cluserized marker 2024-07-29 16:24:59 +02:00
Yohan Boniface
565f6d87b6 wip: fix editing Point coordinates by hand 
For now we edit ui._latlng, but in an ideal world, we should edit
Point coordinates and then sync to the ui Marker.
 2024-07-29 16:24:59 +02:00
Yohan Boniface
25d12420b2 wip: fix popup position for markers 
Not sure what changed during the refactor, but now all popups
where opening at click position (plus the popupAnchor for markers).
 2024-07-29 16:24:59 +02:00
Yohan Boniface
f80d471203 wip: do not sync twice on commit 2024-07-29 16:24:59 +02:00
Yohan Boniface
a022619625 wip: refactor DataLayer.geojsonToFeatures and fix sync tests 2024-07-29 16:24:59 +02:00
Yohan Boniface
081323dc8a wip: (almost) fix tests 2024-07-29 16:24:59 +02:00
Yohan Boniface
7aa07709b3 wip: first step in moving features to modules (work in progress) 2024-07-29 16:24:56 +02:00
Yohan Boniface
e2d8201321 chore: move permissions to modules 2024-07-29 15:18:25 +02:00
Yohan Boniface
aae75d86e9
Merge pull request #2008 from umap-project/layer-var-in-popup 
feat: add {layer} as popup variable (aka extended properties)
 2024-07-23 21:49:04 +02:00
Yohan Boniface
ab34765c30
Merge pull request #1989 from umap-project/layer-to-modules 
chore: move layers to modules/
 2024-07-23 21:42:22 +02:00
Yohan Boniface
6b67ce26a1 feat: expose marker altitude in variables (as "alt") 2024-07-23 21:33:55 +02:00
Yohan Boniface
ef4e33a6ec
Merge pull request #2010 from umap-project/var-null 
Fix variable pointing to null value displayed instead of the fallback
 2024-07-22 17:58:15 +02:00
David Larlet
a8468cb4fa
chore: modern JS 2024-07-22 09:58:17 -04:00
Yohan Boniface
6b4b6ce53b fix: do not consider null as value in greedyTemplate 
cf #820#issuecomment-2227821746
 2024-07-22 11:56:10 +02:00
Yohan Boniface
da8e206cd0 chore: pass biome on utils unittests 2024-07-22 11:55:35 +02:00
Yohan Boniface
67ec77fd8a fix: broken sortKey help 
And move properties to shema.js. Given those keys does not have
a "guessable" handler, let's have a "customHandlers" prop to deal
with those (instead of keeping them outside of the schema…)

fix #2006
 2024-07-22 11:09:25 +02:00
Yohan Boniface
d54843bbe2 feat: add {layer} as popup variable (aka extended properties) 
fix #2007
 2024-07-22 10:41:46 +02:00
David Larlet
9609fafe93
fix: handle the 'auto' value special case for z-index 
Fix #1997
 2024-07-15 13:33:07 -04:00
Yohan Boniface
abbd0e4803 chore: move layers to modules/ 
This is a small step in the direction of spliting the data part
and the rendering part.

Basically in modules/data relies the data part, and in modules/rendering
the rendering part, which at some point in the history should be
the only place where we use and inherit from Leaflet, including utils
and such.
 2024-07-12 23:21:41 +02:00
David Larlet
f5fd0eb6e9
fix: remove padding from table editor inputs 
Also, decrease line-height of header cells
 2024-07-12 14:23:54 -04:00
Yohan Boniface
764fbb4247 2.5.1 2024-07-12 19:01:42 +02:00
Yohan Boniface
163d24c7d0 fix: correct way to replace imports in collecstatic 2024-07-12 19:00:59 +02:00
Yohan Boniface
3226be1bdb 2.5.0 2024-07-12 18:46:45 +02:00
Yohan Boniface
8c58b06ce4 i18n 2024-07-12 18:34:03 +02:00
David Larlet
f40387d5fc
Merge pull request #1968 from umap-project/filter-layer-3 
Refactor the table editor including mass actions and filters
 2024-07-12 12:18:47 -04:00
David Larlet
75e4679cc9
chore: fix tests 2024-07-12 12:12:29 -04:00
David Larlet
f8cb195336
chore: back to this.properties for TableEditor 2024-07-12 12:02:28 -04:00
David Larlet
b63a0f7f2d
chore: better errors on name validation 2024-07-12 11:53:12 -04:00
David Larlet
85a4fda0ed
chore: use datalayer._propertiesIndex directly 2024-07-12 11:51:04 -04:00
David Larlet
238798acc3
chore: clean table editor CSS 2024-07-12 11:41:14 -04:00
David Larlet
7ce5646c54
chore: move computePosition to Positioned base class 2024-07-12 11:37:03 -04:00
Yohan Boniface
b4d13304f0 fix: add back slideshow.setOptions method, called from U.Map 2024-07-12 15:18:52 +02:00
Yohan Boniface
a51cc8102f fix: fix race condition when slideshow is in autostart mode 
Given `setViewFromQueryString` is now async, the slideshow may start
before it is run and thus it has called `initCaptionBar`, so let's
call it directly (and it's not linked to query string, so…)
 2024-07-12 15:16:42 +02:00
Yohan Boniface
a101309e03 wip: use Input not BlurInput in tableeditor 
BlurInput adds a "check" button we don't want here.
 2024-07-12 12:31:50 +02:00
Yohan Boniface
96c9bf9413 wip: set contextmenu x/y according to position in window 2024-07-12 12:21:30 +02:00
Yohan Boniface
4a6b271bbe wip: deal with escape in tableeditor input/textarea 2024-07-11 20:39:05 +02:00
Yohan Boniface
9f04f56c7c wip: use position: fixed for input/textarea in tableeditor 
so it does not increase the cell width and does not change all
the table size.
Actually, there is still a small size change as we remove the cell
content before adding the input/textarea, but more subtle than before
 2024-07-11 20:39:05 +02:00
Yohan Boniface
3fb7be28ec wip: remove old tableeditor class 2024-07-11 20:39:05 +02:00
Yohan Boniface
2f8cda83b6 wip: do not try to read map.fullPanel blindly 
It is only defined when user has write permissions.
 2024-07-11 20:39:05 +02:00
Yohan Boniface
f1c34f9d27 wip: minimal keyboard navigation in table editor 2024-07-11 20:39:05 +02:00
Yohan Boniface
f62f3b4ab9 wip: make outline appears on click on table editor 2024-07-11 20:39:05 +02:00
Yohan Boniface
1ef416a622 wip: allow to open table "editor" (readonly) for remote data layers 2024-07-11 20:39:05 +02:00
Yohan Boniface
5909630e0e wip: fix bugs and add tests for table editor 2024-07-11 20:39:05 +02:00
Yohan Boniface
9ac3de2b33 wip: (huge) table editor refactor 2024-07-11 20:39:05 +02:00
Yohan Boniface
ae9659620a wip: another attemp to massiverly delete features from a condition 2024-07-11 20:39:05 +02:00
Yohan Boniface
ec7b546bf5 chore: try to fix toZoom and fromZoom randomly failing tests 2024-07-11 16:07:27 +02:00
Yohan Boniface
a035b6cb38 chore: use our own page fixture so to print console messages 2024-07-11 10:53:33 +02:00
Yohan Boniface
3fa478abac
Merge pull request #1981 from umap-project/autocomplete-datalist 
feat: add AutocompleteDatalist and use it for conditional rules
 2024-07-10 11:36:59 +02:00
Yohan Boniface
75e36f1c54
Merge pull request #1980 from umap-project/osm-relation-tags 
fix: import unified relations from OSM data (use latest osmtogeojson)
 2024-07-10 10:34:03 +02:00
Yohan Boniface
7baa70d1b6 feat: add AutocompleteDatalist and use it for conditional rules 2024-07-10 10:10:53 +02:00
Yohan Boniface
d830978f6f fix: import unified relations and tags from OSM data (use latest osmtogeojson) 
fix #1011
 2024-07-10 09:23:52 +02:00
Yohan Boniface
76fbb306fc
Merge pull request #1982 from umap-project/categorized-color 
fix: use correct color for categorized/choropleth layers in browser
 2024-07-09 15:16:19 +02:00
Yohan Boniface
ed6f0fcdf1
Merge pull request #1979 from umap-project/fix-blurinput 
fix: BlurInput was not updating the object in some situations
 2024-07-09 15:15:26 +02:00
Yohan Boniface
e3f59850a7 fix: fix preview color for polygons 
Use usually set the `color` property, but we want to use the
fillColor if it sets.
 2024-07-09 12:47:10 +02:00
Yohan Boniface
00483882a1 fix: use correct color for categorized/choropleth layers in browser 2024-07-09 11:58:29 +02:00
Yohan Boniface
dd9c3ba194 chore: biome 2024-07-09 11:47:34 +02:00
Yohan Boniface
3be274929a fix: BlurInput was not updating the object in some situations 
Steps to reproduce:
- click in any BlurInput
- change to any value
- click outside the input => the value will be set to the object
- click again in the input
- change value to the initial
- click outside => the value will not be set

This is because the BlurInput in sync on blur, and it was comparing
the current field value with an "initial" one, only set at build.
This check is made because we don't want to trigger an edit when a
user click in a blurinput and click outside without changing the value.
 2024-07-09 10:46:22 +02:00
Yohan Boniface
36b4510e46 fix: make sure panels are above controls 
fix #1954
 2024-07-05 18:59:13 +02:00
Yohan Boniface
4ae47de8a9
Merge pull request #1958 from umap-project/broken-help 
fix: main help button from edit toolbar was broken
 2024-07-05 18:51:14 +02:00
Yohan Boniface
207860ecf5 chore: refactor help.button arguments 2024-07-05 18:27:53 +02:00
Yohan Boniface
ec5f8d7b3c
Update umap/static/umap/js/modules/help.js 
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
 2024-07-05 18:19:00 +02:00
Yohan Boniface
257d205690
Merge pull request #1953 from umap-project/categorized-layer 
feat: add new type of layer Categorized
 2024-07-05 18:18:36 +02:00
Yohan Boniface
1b8b130805 wip: no need for await here 2024-07-05 17:52:35 +02:00
Yohan Boniface
cc6ae95371 wip: make Map.initialize async 
We want to be able to await function there.

Specifically, we want to await the data creation when it comes from
the `data` url param, so when we also consume the `feature` url param,
that feature is already on the map so we can open it
 2024-07-05 17:52:35 +02:00
Yohan Boniface
49db1f9aaa chore: move share to modules 2024-07-05 17:52:33 +02:00
Yohan Boniface
741fc70a17 wip: simpler syntax for dynamic import in formatters 2024-07-05 17:51:53 +02:00
Yohan Boniface
891f04656f wip: make collectstatic happy with import() in comments 
Also add missing .map files.

Maybe a proper solution would be to commit the vendors/ and
remove manually the comments.
 2024-07-05 17:51:53 +02:00
Yohan Boniface
ca0f771947 wip: move formatters to a module 
This mainly allows to dynamically load the third party libraries.

In the same process, those libs have changed:

- tokml => switch to placemarkio fork, more up to date and available
  as ESM
- togpx => switch to geojson-to-gpx, more up to date and available as
  ESM (note: this lib does not export polygons, because they do not
  make sense in GPX world, while the previous was converting them as
  lines before)
 2024-07-05 17:51:53 +02:00
Yohan Boniface
f293f9c929 chore: move slideshow to a module 2024-07-05 17:35:08 +02:00
Yohan Boniface
6aa74060ad chore: make explicit that the "show get started dialog" is a special case 2024-07-05 09:52:39 +02:00
David Larlet
8b62aecd31
chore: create a WithTemplate base class 
Allows to load a string/template and bind all `data-ref` references to `this.elements`.
 2024-07-04 20:11:38 -04:00
Yohan Boniface
6976fd1f63
Merge pull request #1963 from umap-project/overpass-departement 
fix: allow to search a French departement in Overpass importer
 2024-07-02 22:51:40 +02:00
Yohan Boniface
6cbda1f373
Merge pull request #1964 from umap-project/throttle-search 
fix: add throttle in autocomplete
 2024-07-02 22:51:09 +02:00
Yohan Boniface
1839c48234
Merge pull request #1956 from umap-project/custom-prompt 
chore: add custom prompt
 2024-07-02 22:49:05 +02:00
Yohan Boniface
6872a584be wip: fix tests 2024-07-02 21:09:23 +02:00
Yohan Boniface
4c1ea8b97f wip: make sure dialog polyfill works 2024-07-02 20:49:14 +02:00
Yohan Boniface
f8577c3639 chore: always use real tiles in playwright when in debug mode 2024-07-02 19:11:39 +02:00
Yohan Boniface
abbd0eef62 fix: add throttle in autocomplete 2024-07-02 19:06:11 +02:00
Yohan Boniface
91badcdb5e wip: rework dialog class 2024-07-02 18:11:22 +02:00
Yohan Boniface
23396ad4df fix: allow to search a French departement in Overpass importer 
And make it configurable in the same time.
 2024-07-02 10:45:05 +02:00
Yohan Boniface
759dd34ef3 fix: main help button from edit toolbar was broken 2024-07-01 18:58:01 +02:00
Yohan Boniface
186025e0f0 chore: add custom prompt 2024-07-01 18:54:06 +02:00
Yohan Boniface
ce3439f6b5 feat: add new type of layer Categorized 
This is like Choropleth, but with categories instead of graduated.

fix #1433
 2024-07-01 12:48:46 +02:00
Yohan Boniface
796037cd74 2.4.2 2024-06-26 23:19:28 +02:00
Yohan Boniface
3a10b0c4e0 i18n 2024-06-26 23:18:30 +02:00
Yohan Boniface
3db414cb97 fix tests broken in c09adffb64 2024-06-26 23:16:02 +02:00
Yohan Boniface
c09adffb64 fix: make sure to quote spaces in URL when using proxy 
space is a control character, and thus is forbidden in an URL, and
we do have spaces in overpass URL (containing raw queries).
 2024-06-26 22:57:25 +02:00
David Larlet
3805d7f308
fix: better line-height for importers’ names 2024-06-26 15:43:46 -04:00
David Larlet
b01a194469
Merge pull request #1943 from umap-project/multiple-dataurl-onload 
feat: handle multiple dataUrl parameters on map load
 2024-06-26 14:22:11 -04:00
David Larlet
84e7f7a0a8
Merge pull request #1944 from umap-project/apply-biome-unsafe-2 
chore: apply Biome unsafe changes
 2024-06-26 13:21:56 -04:00
David Larlet
31d1c36a48
chore: explicit comment for global isNaN usage 2024-06-26 13:05:24 -04:00
Alexis Métaireau
7a7977c5cd fix(sync): do not send messages when loading data from the server 
This introduces a `sync=true/false` parameter that can be passed along
when loading data from our own server, in which case we don't want to
send "operation" messages.
 2024-06-26 18:59:20 +02:00
Alexis Métaireau
0dcedeb525 fix(sync): sync feature layer changes 
This commits adds a way to differenciate "end of edit" events that are
triggered rightfully and the one which are triggered during the deletion
of a feature.

Also, directly call the `sync.upsert()` method after the move happened.
 2024-06-26 18:59:20 +02:00
Alexis Métaireau
4f19824805 fix(sync): pass the correct datalayer uuid 2024-06-26 18:59:20 +02:00
David Larlet
b5cb092cd4
chore: from switch with unique case to if/else 2024-06-26 11:29:20 -04:00
David Larlet
04c50c4453
chore: deal with missing label for url_template 2024-06-26 10:35:46 -04:00
David Larlet
7c2b5839a9
Merge pull request #1942 from umap-project/rational-zindexes 
chore: rationalize z-indexes in CSS
 2024-06-26 10:10:47 -04:00
David Larlet
d1ded301a5
chore: do not use Number.isNaN in special cases 2024-06-25 21:41:29 -04:00
David Larlet
c61ca9c506
chore: remove the noDelete rule completely 2024-06-25 21:31:37 -04:00
David Larlet
b819c554ee
chore: there is a difference between unset and delete 2024-06-25 20:53:02 -04:00
David Larlet
7a82b6547e
chore: do not use Number.isNaN in special cases 2024-06-25 18:14:34 -04:00
David Larlet
5c88502a2e
chore: set a sync default value on createDataLayer 
Rel: https://biomejs.dev/linter/rules/use-default-parameter-last/
 2024-06-25 17:23:52 -04:00
David Larlet
445a793c3e
chore: apply Biome unsafe changes 
Without `useBlockStatements`
 2024-06-25 17:11:17 -04:00
David Larlet
b426d212f0
feat: handle multiple dataUrl parameters on map load 2024-06-25 16:41:39 -04:00
David Larlet
735c9dc6d8
chore: rationalize z-indexes in CSS 
Positive side-effect: alerts are now above importers panel.
 2024-06-25 14:56:25 -04:00
David Larlet
ef33a26f11
chore: apply Biome safe changes 2024-06-25 10:00:57 -04:00
David Larlet
e32deedcc8
chore: setup Biome to replace Prettier 
If you are using SublimeText: https://packagecontrol.io/packages/LSP-biome
 2024-06-25 09:59:40 -04:00
Alexis Métaireau
adc1cf460f Use css variables 
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
 2024-06-25 14:15:23 +02:00
Alexis Métaireau
c3a412059a fix: better spacing for the alert box, when activated 2024-06-25 14:15:23 +02:00
David Larlet
0b031dc7cc
fix: Distinction between clearing data vs. layers 
Fix #1934
 2024-06-24 17:04:33 -04:00
Yohan Boniface
5a5bada7b8 2.4.1 2024-06-24 08:33:23 +02:00
Yohan Boniface
e4af031ca1
Merge pull request #1933 from umap-project/fix-change-datalayer 
fix: fix path disappearing when changing its datalayer
 2024-06-24 08:32:32 +02:00
Yohan Boniface
d1fd842c1a i18n 2024-06-24 08:16:41 +02:00
Yohan Boniface
8d9bd4aec1 fix: fix path disappearing when changing its datalayer 
fix #1931
 2024-06-24 08:08:23 +02:00
Yohan Boniface
2123f7d1e6 2.4.0 2024-06-21 22:09:51 +02:00
Yohan Boniface
37c5601609
Merge pull request #1930 from umap-project/feature-panel-querystring 
feat: give precedence to feature in query string over onLoadPanel
 2024-06-21 22:04:05 +02:00
Yohan Boniface
a8daca425c i18n 2024-06-21 21:59:43 +02:00
Yohan Boniface
82c9ec7d39 feat: give precedence to feature in query string over onLoadPanel 
cf #1893
 2024-06-21 21:57:34 +02:00
Yohan Boniface
c2fc9ffb57 chore: use button element for "back to browser" action 
As we did for other actions in c0ecc39439
 2024-06-21 21:53:22 +02:00
Yohan Boniface
2b2a63fe29 chore: fix failing test 2024-06-21 18:29:40 +02:00
Yohan Boniface
02dd29a55f chore: add margin left to radio buttons 2024-06-21 18:03:02 +02:00
Yohan Boniface
e5259b3ffe
Merge pull request #1929 from umap-project/heading-css-size 
chore: change heading CSS size
 2024-06-21 17:46:44 +02:00
Yohan Boniface
9fabfe08cd
Merge pull request #1922 from umap-project/smaller-headings 
chore: smaller headings in descriptions
 2024-06-21 16:39:44 +02:00
Yohan Boniface
2b8326bd61
Merge pull request #1928 from umap-project/fix-slideshow-buttons 
fix: fix slideshow toolbar position and size
 2024-06-21 16:38:28 +02:00
Yohan Boniface
cd69e5fbb0
Merge pull request #1924 from umap-project/popup-min-width 
fix: increase popup min-width
 2024-06-21 16:38:06 +02:00
Yohan Boniface
5e480627cc
Merge pull request #1923 from umap-project/white-space-description 
fix: also use white-space: pre-line on map description
 2024-06-21 16:37:43 +02:00
Yohan Boniface
25cd19049e
Merge pull request #1921 from umap-project/fix-layer-labelkey 
fix: use layer labelKey if any when filtering features
 2024-06-21 16:37:14 +02:00
Yohan Boniface
73493258f1
Merge pull request #1920 from umap-project/fix-overlay-null 
chore: do not set overlay=null as default
 2024-06-21 16:36:57 +02:00
Yohan Boniface
ebafb6d40a chore: change heading CSS size 2024-06-21 16:35:07 +02:00
Yohan Boniface
7be62f3dab fix: fix slideshow toolbar position and size 
broken by c0ecc39439
 2024-06-21 16:33:37 +02:00
Yohan Boniface
3037128540 fix: add icon to "edit map details" panel title 2024-06-21 15:14:27 +02:00
Yohan Boniface
36db88f5a6 fix: increase popup min-width 
Since fa2bef85d3 popup are smaller,
let's try to have them as before.
 2024-06-21 14:55:42 +02:00
Yohan Boniface
25f338f51d fix: also use white-space: pre-line on map description 
We removed line breaks management on the JS side so to manage it
in CSS, but this CSS was only active on popup/panels for features.
Let's have a class for this, and add it to the map description to
(about panel).
 2024-06-21 14:39:12 +02:00
Yohan Boniface
6f38dcf4d7 fix: this css var has been renamed elsewhere 2024-06-21 14:07:48 +02:00
Yohan Boniface
3ed548b097 chore: smaller headings in descriptions 
We already have a h3 as title, both in the popup or in the panel
 2024-06-21 14:05:47 +02:00
Yohan Boniface
4fc66da80c fix: use layer labelKey if any when filtering features 
fix #1908
 2024-06-21 13:35:06 +02:00
Yohan Boniface
5609092cc0 chore: do not set overlay=null as default 
FormBuilder will break when reimporting an exported map with this
default value (at the casting to object was only made on the init,
so reimporting will override this to null again).
 2024-06-21 11:39:39 +02:00
David Larlet
ed2386eaae
2.4.0b2 2024-06-20 10:56:26 -04:00
David Larlet
0edf7cc5d9
i18n 2024-06-20 10:56:04 -04:00
David Larlet
8b2610947a
Merge pull request #1917 from umap-project/1911-better-importers-styles 
fix: CSS adjustments for importers
 2024-06-20 09:59:40 -04:00
David Larlet
f78320d153
Merge pull request #1916 from umap-project/1913-alert-on-import 
fix: display an alert if the import is successful
 2024-06-20 09:59:26 -04:00
David Larlet
41abbc90d0
Merge pull request #1914 from umap-project/1912-native-radio-inputs 
fix: remove custom styles for radio inputs
 2024-06-20 09:59:00 -04:00
David Larlet
0a9f57d2d8
fix: CSS adjustments for importers 
Fix #1911
 2024-06-18 15:11:58 -04:00
David Larlet
7e6d264796
fix: display an alert if the import is successful 
Fix #1913
 2024-06-18 14:53:27 -04:00
David Larlet
f1b1abb38f
Merge pull request #1903 from umap-project/set-layername-from-dataset 
feat: set layer name when importing from dataset
 2024-06-18 14:41:02 -04:00
David Larlet
08f5debd62
fix: remove custom styles for radio inputs 
Fix #1912
 2024-06-18 14:38:00 -04:00
Yohan Boniface
b977d26eae feat: set layer name when importing from dataset 2024-06-17 11:54:06 +02:00
Yohan Boniface
afcaf2a07a fix: correct way to open files dialgo with ctrl+O 2024-06-17 10:46:46 +02:00
David Larlet
1a3377723b
2.4.0b1 2024-06-14 21:44:44 -04:00
David Larlet
411452ac70
fix: allow first radio input click when second selected 2024-06-14 17:43:00 -04:00
David Larlet
a3afadb677
fix: hide importers section if none is defined 2024-06-14 17:21:09 -04:00
David Larlet
ceab5090a7
fix: explicit import paths for collectstatic hashes 2024-06-14 17:20:16 -04:00
David Larlet
6de3e1f881
2.4.0b0 2024-06-14 16:42:13 -04:00
Yohan Boniface
c144c9d958 fix: django cannot run collectstatic with circular imports in modules 
alert.js was importing request.js which then imports alert.js

In the process, we moved the post to send the email out of the
alert.js file, and thus tried another pattern to communicate data
between an alert and its caller.
 2024-06-14 22:05:56 +02:00
Yohan Boniface
99595e3e2f chore: fix translated test 2024-06-14 20:51:29 +02:00
Yohan Boniface
b747b347f4 fix: dialog class should have "window" class to get propert buttons 2024-06-14 20:45:39 +02:00
Yohan Boniface
74e0b43311 fix: correct syntax for translating string when sending emails 2024-06-14 20:41:53 +02:00
Yohan Boniface
ca18c5b7df chore: move alert.html inside templates and update translations 
When alert.html was in static, Django was creating a new translation
file, while we want it to just add those strings in the backend
po file.
 2024-06-14 20:41:53 +02:00
Yohan Boniface
34f00dfec1 tests: try to fix randomly failing test test_should_honour_fromZoom 2024-06-14 18:51:58 +02:00
Yohan Boniface
710b0cf1d9
Merge pull request #1857 from umap-project/geodatamine-plugin 
Importers for custom external sources
 2024-06-14 18:47:45 +02:00
Yohan Boniface
88b7e401c0
Merge pull request #1776 from umap-project/conditional-rules 
feat: very minimal experimental conditional style rules
 2024-06-14 18:40:37 +02:00
Yohan Boniface
e16d3a629c wip: fix tests 2024-06-14 18:40:05 +02:00
Yohan Boniface
ca16e5b2c9 wip: use new alert API after rebase 2024-06-14 18:40:05 +02:00
Yohan Boniface
e9f9c30639 wip: shorter labels in importer panel 2024-06-14 18:40:05 +02:00
Yohan Boniface
6f0d42d817 wip: re-center radio and checkbox inputs 2024-06-14 18:40:05 +02:00
Yohan Boniface
4ed7c45086 wip: use same label in buttons and title for "Import data" 
The control says "Import data", let's keep this for now.
 2024-06-14 18:40:05 +02:00
Yohan Boniface
e90ad4b9cd wip: sort themes in GeoDataMine importer 2024-06-14 18:40:05 +02:00
Yohan Boniface
d928195a5b wip: rename and document UMAP_IMPORTERS 2024-06-14 18:40:05 +02:00
Yohan Boniface
4127ffb891 wip: simplify a bit input CSS height 2024-06-14 18:40:05 +02:00
Yohan Boniface
4f1eb20be9 wip: move importers css to a dedicated file and refactor 2024-06-14 18:40:05 +02:00
Yohan Boniface
017e407758 wip: refactor margin bottom management in caption title 2024-06-14 18:40:05 +02:00
Yohan Boniface
3f6940cd5b wip: make sure importers are always in the same order 
Given they are loaded from an import() call, the order they are
added in IMPORTERS in asynchronous, so we cannot rely on this order
 2024-06-14 18:40:05 +02:00
Yohan Boniface
c51f8ae5ce wip: close importer dialog on escape in any 2024-06-14 18:40:05 +02:00
Yohan Boniface
460843b900 wip: add icons for importers 2024-06-14 18:40:05 +02:00
Yohan Boniface
115130083d wip: make sure we do not add an invalid overpass URL 2024-06-14 18:40:05 +02:00
Yohan Boniface
a70307ea29 wip: rename presets to datasets 2024-06-14 18:40:05 +02:00
Yohan Boniface
2c9623aff6 wip: refine geodatamine importer 2024-06-14 18:40:05 +02:00
Yohan Boniface
f1901ea84c wip: add margin-bottom on select element 2024-06-14 18:40:04 +02:00
Yohan Boniface
c1ab57d952 wip: add quick help for overpass importer expressions syntax 2024-06-14 18:38:44 +02:00
Yohan Boniface
c599082eca wip: deal with multiple dialog z-index 2024-06-14 18:38:44 +02:00
Yohan Boniface
b7dd771a7f wip: prettier 2024-06-14 18:38:44 +02:00
Yohan Boniface
c3ae3b5770 wip: minimal overpass importer 
cf #112
 2024-06-14 18:38:44 +02:00
Yohan Boniface
43f7e6a467 feat: allow to set the new layer name at import 2024-06-14 18:38:44 +02:00
Yohan Boniface
3998a88d43 wip: use dt/dd for import formats help box 2024-06-14 18:38:43 +02:00
Yohan Boniface
b0e9bbd86c wip: smaller dialog width 2024-06-14 18:38:30 +02:00
Yohan Boniface
35189cc9fb wip(importer): use only one submit button and be smarter to guess action 2024-06-14 18:38:30 +02:00
Yohan Boniface
8dd1c4bc7f wip: remove AutoComplete.URL (can't set class properties yet) 2024-06-14 18:38:30 +02:00
Yohan Boniface
1cefd4c9a7 wip: allow to control geodatamine baseUrl from settings 2024-06-14 18:38:30 +02:00
Yohan Boniface
d35e72dab9 wip: add aspoint attribute to geodatamine URL 2024-06-14 18:38:30 +02:00
Yohan Boniface
4e3228d114 feat: allow to create remote data layer from import panel 
And make the form conditional.
 2024-06-14 18:38:30 +02:00
Yohan Boniface
dbafe19b7f chore: declare ttl property in schema 2024-06-14 18:38:30 +02:00
Yohan Boniface
16fd5d8ca3 wip: typo 2024-06-14 18:38:30 +02:00
Yohan Boniface
342dcbabbe wip: no need for AVAILABLE_IMPORTERS 2024-06-14 18:38:30 +02:00
Yohan Boniface
f5eea1fe3f wip(naming): replace "plugin" by "importer" 
We are not ready yet to talk about plugins
 2024-06-14 18:38:30 +02:00
Yohan Boniface
93a189497b wip: control plugins from settings 2024-06-14 18:38:29 +02:00
Yohan Boniface
a7a214d7fe wip: deal with boundary types in geodatamine importer 2024-06-14 18:38:29 +02:00
Yohan Boniface
03ce8e90d6 wip: refactor importer 2024-06-14 18:38:29 +02:00
Yohan Boniface
c7cd87ec8a wip: move presets to importer plugins 2024-06-14 18:38:29 +02:00
Yohan Boniface
b657a5e9b3 wip: simpler importer API 2024-06-14 18:38:29 +02:00
Yohan Boniface
1e4de02694 wip: add a basic importer for commune shapes 
Mainly wanted to have two improters to play with, in order to
better understand the common part, and thus the API we may define
between them and the importer panel.
 2024-06-14 18:38:29 +02:00
Yohan Boniface
5b914c1bd2 wip: make it simpler to create an autocomplete class 2024-06-14 18:38:29 +02:00
Yohan Boniface
e51347e239 wip: very naive geodatamine and communes importers 2024-06-14 18:38:29 +02:00
Yohan Boniface
22ccd61d87 chore: remove empty help entry inclusion 2024-06-14 18:30:32 +02:00
Yohan Boniface
191fb6d853 chore: reviewing labels with Aurélie 2024-06-14 18:24:56 +02:00
Yohan Boniface
59dbde4f32 chore: make browser labels consistent 2024-06-14 18:24:54 +02:00
Yohan Boniface
d407949138 chore: be more explicit on browser modes 2024-06-14 18:24:10 +02:00
Yohan Boniface
e023321ee5
Merge pull request #1895 from umap-project/request-error-alert 
fix: display an alert on any request error
 2024-06-14 18:22:54 +02:00
Yohan Boniface
713be1538c chore: change alert CSS sizing 2024-06-14 18:21:44 +02:00
David Larlet
eda3823b3a
Merge pull request #1896 from umap-project/better-alerts 
chore: overall alerts improvements
 2024-06-14 11:51:46 -04:00
Yohan Boniface
7e86bc6db8 wip: do not display alerts from the maps in a content list page 2024-06-14 17:51:42 +02:00
Yohan Boniface
a2ba35cb93
Merge pull request #1894 from umap-project/fix-feature-edit-icon 
fix: use correct icon class in edit feature panel
 2024-06-14 17:31:42 +02:00
David Larlet
fb1407cdbf
chore: overall alerts improvements 2024-06-14 11:08:59 -04:00
Yohan Boniface
9dc11ec9f9 wip: fix tests after rebase on master 2024-06-14 16:55:36 +02:00
Yohan Boniface
6bdba1d0ed wip: do not use public class fields yet 
Browser support is not enough.
 2024-06-14 16:55:36 +02:00
Yohan Boniface
f10d345113 wip: use this.rules.getOption directly 2024-06-14 16:55:36 +02:00
Yohan Boniface
907ba09c45 wip: do not use private property yet 
Support is not ready for us.
 2024-06-14 16:55:36 +02:00
Yohan Boniface
05ea45acd2 wip: use getter/setter for Rule dynamic properties 2024-06-14 16:55:36 +02:00
Yohan Boniface
7367de5545 wip: deal with boolean values in conditional rules 2024-06-14 16:55:36 +02:00
Yohan Boniface
5ec944fce0 wip: deal with gt/lt and numbers in conditional rules 2024-06-14 16:55:36 +02:00
Yohan Boniface
129f46dd6d wip: add minimal tests for conditional rules 2024-06-14 16:55:36 +02:00
Yohan Boniface
d6ae4744a6 wip: make sure we update rule when condition is changed 
And make sure we redraw data on map
 2024-06-14 16:55:36 +02:00
Yohan Boniface
805c09e34e wip: allow to deactivate a conditional rule from list 2024-06-14 16:55:36 +02:00
Yohan Boniface
a2d04b9ad4 wip: use direct imports instead of L. global 2024-06-14 16:55:36 +02:00
Yohan Boniface
4f8e453012 wip: allow to reorder rules 2024-06-14 16:55:36 +02:00
Yohan Boniface
05eab25da4 feat: very minimal experimental conditional style rules 2024-06-14 16:55:33 +02:00
Yohan Boniface
15de486425 fix: use correct icon class in edit feature panel 2024-06-14 15:31:16 +02:00
Yohan Boniface
d221a98e78 fix: display an alert on any request error 
This used to be the case, but was changed by mistake in the
request refactor (swicht from xhr)
 2024-06-14 15:24:01 +02:00
Alexis Métaireau
b94995120a refactoring(sync): Simplify the design of the sync engine. 
Removes the concept of message dispatcher and message sender, all of
it can be done by the syncengine class, making it easier to grasp.
 2024-06-14 00:20:59 +02:00
Yohan Boniface
e968261dff wip: fix more tests 2024-06-13 20:53:07 +02:00
Yohan Boniface
897d4f22f4 chore(tests): make sure we send a valid geojson when data is empty 2024-06-13 20:52:28 +02:00
David Larlet
b863beaec9
chore: fix tests 2024-06-13 14:13:42 -04:00
David Larlet
802d5d9d6c
chore: set default language for tests as en-GB 2024-06-13 13:41:00 -04:00
David Larlet
b197e067e8
fix: listen to the correct event for conflicts 2024-06-12 19:06:28 -04:00
David Larlet
8400b55b9d
chore: direct import of the Alert class in modules 2024-06-12 18:30:40 -04:00
David Larlet
cea2aee88f
chore: rename alert choice to conflict + CSS vars 2024-06-12 18:15:28 -04:00
David Larlet
10e398d222
chore: better alerts CSS 2024-06-12 18:03:05 -04:00
David Larlet
6cb1be1fd4
chore: use direct import for ServerRequest in alerts 2024-06-12 18:03:05 -04:00
David Larlet
ddaafa8cda
chore: scroll when the help box is too big 2024-06-12 18:03:05 -04:00
David Larlet
c0ecc39439
chore: uniformize buttons across panels and alerts 2024-06-12 18:03:05 -04:00