Commit graph

1768 commits

Author SHA1 Message Date
Yohan Boniface
3c234ead5b Add missing function after cherry-picking 2023-10-13 12:00:59 +02:00
Yohan Boniface
a94cac53ac Move map.importPanel to controls, as other similar functions 2023-10-13 11:58:47 +02:00
Yohan Boniface
ddbcdbcde7 changelog 2023-10-12 11:47:04 +02:00
Yohan Boniface
d0782b8220 1.9.2 2023-10-12 11:45:41 +02:00
Yohan Boniface
7bdd56ee9e
Merge pull request #1369 from umap-project/heatlayer-map
Add back HeatLayer._map reference check
2023-10-12 11:45:05 +02:00
Yohan Boniface
b0d135a759
Merge pull request #1368 from umap-project/datalyerscontrol-map
Fix map reference in DataLayersControl
2023-10-12 11:44:49 +02:00
Yohan Boniface
1e8c51b0e5 Add back HeatLayer._map reference check
In some situation, the property is undefined, given the call is async,
and we can add/remove the layer during the async stack
2023-10-12 11:06:14 +02:00
Yohan Boniface
1f61378aac Fix map reference in DataLayersControl
This would create an error when DataLayersControl is not added to
the map, but the mouseenter/leave event would still be active through
the datalayers list
2023-10-12 10:57:05 +02:00
Yohan Boniface
5f9d7d3ec3 changelog 2023-10-12 10:14:57 +02:00
Yohan Boniface
23404e9870 1.9.1 2023-10-12 10:12:49 +02:00
Yohan Boniface
a77668a03c
Merge pull request #1367 from umap-project/choropleth-import
Fix import of .umap file containing a choropleth layer
2023-10-12 10:12:10 +02:00
Yohan Boniface
8fdddddc9e Prevent computing choropleth breaks for each feature when importing
When importing a choropleth layer, the layer does not have a umap_id,
thus "hasDataLoaded" is immediately true, instead of being true when
all the "known" data is imported.

At this point, I can't find a good reason to keep the check on umap_id,
so let's remove and move forward.
2023-10-12 10:07:51 +02:00
Yohan Boniface
7318ebd2f9 choropleth: be more defensive when consuming breaks 2023-10-12 10:06:19 +02:00
Yohan Boniface
07031595e7 changelog 2023-10-12 09:23:45 +02:00
Yohan Boniface
e751cd0fc4 1.9.0 2023-10-12 09:21:22 +02:00
Yohan Boniface
3119c75fb2 i18n 2023-10-12 09:19:37 +02:00
Yohan Boniface
6aa6eb4c11
Merge pull request #1136 from umap-project/choropleth
Add experimental choropleth datalayer type
2023-10-12 08:47:30 +02:00
Yohan Boniface
aa6a488ef1 Remove ChromaJS dependency from package.json 2023-10-12 08:41:07 +02:00
Yohan Boniface
02342c487a Choropleth: allow to control breakpoints manually 2023-10-12 08:39:47 +02:00
Yohan Boniface
dac1f16bc6
Merge pull request #1358 from umap-project/heat-improvements
Heatmap improvements
2023-10-11 22:50:30 +02:00
Yohan Boniface
c2feba1df0
Merge pull request #1349 from umap-project/toggle-attribution
Hide attribution on small screen and add a small ? to display it
2023-10-11 22:49:44 +02:00
Yohan Boniface
739626351c Choropleth: replace chromajs by colorbrewer + simple-statistics
simple-statistics has a few advantages:
- faster
- more accurate kmeans algo
- Jenks-Fisher algo

Also, I suspect will use it again for next step, which is Bubble
mode layer.
2023-10-11 19:36:12 +02:00
Yohan Boniface
e97e566c42 Use non full white as left color for default choropleth color scale 2023-10-10 21:58:38 +02:00
Yohan Boniface
3d2ad3c1c6
Update umap/static/umap/map.css
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2023-10-10 21:40:34 +02:00
Yohan Boniface
bcd9b1ac04 Fix getOption not considering null values 2023-10-10 21:22:19 +02:00
Yohan Boniface
84a5b3c6f5 Fix Choropleth JS tests 2023-10-10 21:22:19 +02:00
Yohan Boniface
7be238a4ab Add minimal Choropleth integration test 2023-10-10 21:22:17 +02:00
Yohan Boniface
3b304e5249 Tests: populate settings from _umap_options when data is passed 2023-10-10 21:19:20 +02:00
Yohan Boniface
35758a1e13 Choropleth: do not add layer before knowing the whole dataset
And only compute limits once.
2023-10-10 21:16:01 +02:00
Yohan Boniface
d9522d9c1f Add default value to choropleth mode MultiChoice 2023-10-10 21:16:01 +02:00
Yohan Boniface
ce39afc64a Allow to override MultiChoice default value 2023-10-10 21:16:01 +02:00
Yohan Boniface
7fd905741a Use MultiChoice input for "choropleth mode" 2023-10-10 21:16:01 +02:00
Yohan Boniface
3334db3fa2 Use Range input for choropleth steps, and limit to 9
This limit comes from ColorBrower sequential color sets, which
we use.
2023-10-10 21:16:01 +02:00
Yohan Boniface
82bb017b23 Basic Choropleth tests 2023-10-10 21:16:01 +02:00
Yohan Boniface
125aa72785 Make choropleth mode work with lines 2023-10-10 21:16:01 +02:00
Yohan Boniface
7b68c52a15 Allow to select choropleth property from a list instead of gessing it 2023-10-10 21:16:01 +02:00
Yohan Boniface
6c502c54b4 Better defaults for choropleth layer 2023-10-10 21:16:01 +02:00
Yohan Boniface
451eb8c0bf Naive Choropleth legend, WIP 2023-10-10 21:16:01 +02:00
Yohan Boniface
7a0dbd014a There is one more limit than the number of steps
Limits are steps boundaries, and first limit is always the lower value,
and latest limit always the bigger.
2023-10-10 21:16:01 +02:00
Yohan Boniface
bf116e8d93 Use brewer palettes for choropleth colors
cf https://gka.github.io/chroma.js/#chroma-brewer
2023-10-10 21:16:01 +02:00
Yohan Boniface
5d350a7cc9 Control property used in choropleth 2023-10-10 21:16:01 +02:00
Yohan Boniface
8e12e6cf24 POC of a choropleth layer 2023-10-10 21:16:01 +02:00
Yohan Boniface
31ea8d1a83
Merge pull request #1362 from umap-project/hide-datalayer-in-caption
Allow to hide a datalayer from the caption list
2023-10-10 21:06:09 +02:00
Joachim Schleicher
9ef09512db highlight: increase fillOpacity for polygons
sqrt gives larger increase for low opacities like 0.2
while preserving some (tiny) shine-through for large values like 0.8
and is limited to the desired range of (0,1]
2023-10-10 10:47:36 +02:00
Joachim Schleicher
836c17f2e8 fire events from Popup Panel
to also highlight path and markers when using the side panel.
Therefore we duplicate the event code from the base class.
2023-10-10 10:29:20 +02:00
Joachim Schleicher
3594bc2605 highlight markers
add .umap-icon-active class for currently selected marker icon.
CSS styles override the marker styles to display
* in the foreground
* with full opacity
* with larger sizes where possible (ball and circle)
2023-10-10 10:29:20 +02:00
Yohan Boniface
da01977414 Fix permissions tests 2023-10-09 18:30:44 +02:00
Yohan Boniface
547485e50f Allow to hide a datalayer from the caption list 2023-10-06 22:26:31 +02:00
Yohan Boniface
de6c9f3b84 Make sure we don't use DataLayer.settings by reference 2023-10-06 22:25:56 +02:00
Joachim Schleicher
7696203159 highlight selected path
when opening a popup increase opacity and weight.
In maps with multiple lines one can see much easier, where the line
starts and ends.
2023-10-05 21:18:05 +02:00