Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed rendering layers Bubbles + Points #2612

Open
wants to merge 8 commits into
base: next
Choose a base branch
from
+84 −3
Open

fixed rendering layers Bubbles + Points #2612

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1b11c97
fixed rendering layers Bubbles + Points
kwongz Oct 4, 2024
4f1b2d5
Merge branch 'next' into fix/2560-map-markers-rendering
kwongz Oct 4, 2024
c44853b
chore: changeset
kwongz Oct 4, 2024
5d33fad
Merge branch 'fix/2560-map-markers-rendering' of https://github.com/e…
kwongz Oct 4, 2024
6ad2ce7
fixing conflict
kwongz Oct 4, 2024
8b9486f
fixing layering
kwongz Oct 4, 2024
76dda50
Fixes layering issue and allows for layering control of bubbles and p…
kwongz Oct 15, 2024
16d7c79
handle non number z values, cleaned up code
kwongz Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/rare-singers-tease.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@evidence-dev/core-components': patch
---

fixed bubbles + points layering issue
11 changes: 10 additions & 1 deletion packages/ui/core-components/src/lib/unsorted/viz/map/EvidenceMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,16 @@ export class EvidenceMap {
link
) {
if (!Leaflet) throw new Error('Leaflet is not yet available');
const marker = Leaflet.circleMarker(coords, circleOptions).addTo(this.#map);
const pointsLayer = Leaflet.layerGroup().addTo(this.#map);
const bubblesLayer = Leaflet.layerGroup().addTo(this.#map);
const marker = Leaflet.circleMarker(coords, circleOptions);
// handle layering
if (circleOptions.markerType === 'points') {
marker.addTo(pointsLayer);
} else if (circleOptions.markerType === 'bubbles') {
marker.addTo(bubblesLayer);
marker.bringToBack();
}
this.updateMarkerStyle(marker, circleOptions); // Initial style setting and storage

marker.on('click', () => {
Expand Down
4 changes: 3 additions & 1 deletion packages/ui/core-components/src/lib/unsorted/viz/map/components/Bubbles.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
export let size = undefined; // column containing size data
/** @type {number} */
export let opacity = 0.8;
/** @type {'bubble' | 'points' }*/
export let pointStyle = 'bubbles';
/** @type {'categorical' | 'scalar' | undefined} */
export let legendType = undefined;
</script>

<Points sizeCol={size} {opacity} {legendType} {...$$restProps} />
<Points sizeCol={size} {opacity} {pointStyle} {legendType} {...$$restProps} />
6 changes: 5 additions & 1 deletion packages/ui/core-components/src/lib/unsorted/viz/map/components/Points.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@

let values, colorScale, sizeExtents, maxData, maxSizeSq;

/** @type {'bubble' | 'points' }*/
export let pointStyle = 'points';

/**
* Initialize the component.
* @returns {Promise<void>}
Expand Down Expand Up @@ -300,7 +303,8 @@
opacity: opacity,
weight: borderWidth,
color: borderColor,
className: `outline-none ${pointClass}`
className: `outline-none ${pointClass}`,
markerType: pointStyle
}}
selectedOptions={{
fillColor: selectedColor,
Expand Down