District numbers and outlines #210

nofurtherinformation · 2024-11-21T16:27:51Z

Adds zone numbers to map. Hacky approach, but mostly works

Description

If selected, this option grabs the rendered map features, dissolves the geometries based on the zone assignment, and adds labels to the map with the zone numbers

Reviewers

Primary: @raphaellaude
Secondary: @mariogiampieri

nofurtherinformation · 2024-11-21T18:43:59Z

app/src/app/constants/layers.ts

+        lineWidth * 0.35,
+        14,
+        lineWidth,
+      ],


This was just code styling

nofurtherinformation · 2024-12-12T22:38:33Z

I've taken another pass to optimize and clean up the way this works a bit. Previously, this functionality added a bunch of map.queryRenderedFeatures calls, which are generally not very good.

Now, whenever a tile loads in, the event listener (map.on("data")) caches the IDs for painting by county and sends the geometry to the geometry worker (WebWorker, off-main-thread) and that caches the geometries if not already present. We keep track of the x-y-z index of the tile, so there isn't a ton of work duplicated. The only additional work here is some stringification for data sent from the main thread to the worker, but it is relatively minimal.

Whenever the assignments updates, the results get sent to the worker which mutates its copy of the data with the updated zones. When zone districts are toggled on or the viewport changes, the worker uses bboxClip followed by dissolve(by="zone") to get zone geometries and center of mass. The center of mass is checked to make sure its actually in the geometry, and if not a random point in the geometry is chosen.

I think there are some additional use cases that will be good to have this amount of geometric data available on the client, and having it on a separate thread means that UX performance impact is minimal. I'm fairly convinced this is a reasonable direction, especially in the interest of keeping the backend lightweight -- eager to hear feedback from you all @raphaellaude @mariogiampieri !

mariogiampieri

This is super slick- it makes a lot of sense to create that separate thread and the user experience was great in my testing. I agree there could be other use cases for a separate worker like- nice work!

Having the dissolved zone areas is nice- I could see a world where we want to outline the zones.

Only minor issue is removing the unused imports but otherwise g2g!

mariogiampieri · 2024-12-14T16:40:02Z

app/src/app/constants/layers.ts

@@ -10,6 +10,10 @@ import {getBlocksSource} from './sources';
 import {DocumentObject} from '../utils/api/apiHandlers';
 import {MapStore, useMapStore} from '../store/mapStore';
 import {colorScheme} from './colors';
+import {map, throttle} from 'lodash';
+import {wrap} from 'comlink';


pp: it appears wrap and map from lodash are no longer used here, should be removed

Good catch, thank you!

mariogiampieri · 2024-12-14T17:02:19Z

app/src/app/utils/GeometryWorker/geometryWorker.ts

+      const zone = feature.properties?.zone;
+      if (!zone) return;
+      const featureArea = area(feature);
+      if (!largestDissolvedFeatures[zone] || featureArea > largestDissolvedFeatures[zone].area) {


O: this makes sense for now given that we are not enforcing contiguity on zones, but could likely be refactored later when that rule is enforced

Agreed! I added this note in a TODO along with a couple other future directions we could add

nofurtherinformation · 2024-12-16T22:55:49Z

Thank you @mariogiampieri! I just updated the unused imports and added a couple notes to our future selves.

mariogiampieri

lgtm, nice work!

mariogiampieri

lgtm! great work

raphaellaude

lgtm!

raphaellaude · 2024-12-23T05:35:54Z

PS This closes a few issues:

nofurtherinformation added 5 commits November 21, 2024 10:22

add option to map options

941e4db

calculate dissolved areas and add layer helpers

047dc2f

add o ption to sidebar

8d73ebf

add to events and render subs

7f8ad48

Update Layers.tsx

a4c0dc0

nofurtherinformation temporarily deployed to pr-210 November 21, 2024 16:27 — with GitHub Actions Inactive

Filter by area

e632dca

nofurtherinformation temporarily deployed to pr-210 November 21, 2024 18:02 — with GitHub Actions Inactive

Log timing

14c18dd

nofurtherinformation temporarily deployed to pr-210 November 21, 2024 18:03 — with GitHub Actions Inactive

Move geometry operations to worker

a27fe34

nofurtherinformation temporarily deployed to pr-210 November 21, 2024 18:21 — with GitHub Actions Inactive

Merge branch 'main' into district-numbers-and-outlines

f802a34

nofurtherinformation temporarily deployed to pr-210 November 21, 2024 18:22 — with GitHub Actions Inactive

don't always remove layers

c8dd710

nofurtherinformation temporarily deployed to pr-210 November 21, 2024 18:42 — with GitHub Actions Inactive

nofurtherinformation commented Nov 21, 2024

View reviewed changes

app/src/app/constants/layers.ts

lineWidth * 0.35,

14,

lineWidth,

],

Copy link

Collaborator Author

nofurtherinformation Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was just code styling

Remove commented code and clean up

416d092

nofurtherinformation temporarily deployed to pr-210 November 21, 2024 18:45 — with GitHub Actions Inactive

nofurtherinformation self-assigned this Nov 21, 2024

Merge branch 'main' into district-numbers-and-outlines

4393462

nofurtherinformation temporarily deployed to pr-210 November 21, 2024 18:52 — with GitHub Actions Inactive

throttle instead of debounce

f9056f4

nofurtherinformation temporarily deployed to pr-210 November 21, 2024 19:44 — with GitHub Actions Inactive

nofurtherinformation marked this pull request as ready for review November 22, 2024 13:59

nofurtherinformation requested review from raphaellaude and mariogiampieri and removed request for raphaellaude November 22, 2024 13:59

Optimize geometry worker

5ca6853

nofurtherinformation temporarily deployed to pr-210 December 12, 2024 20:38 — with GitHub Actions Inactive

Add all features, dissolve only polygons

2daf3f3

nofurtherinformation temporarily deployed to pr-210 December 13, 2024 19:58 — with GitHub Actions Inactive

Better comments, naming

dc17d92

nofurtherinformation temporarily deployed to pr-210 December 13, 2024 20:06 — with GitHub Actions Inactive

cleanup, naming, docs, prettier

14c7d7e

nofurtherinformation temporarily deployed to pr-210 December 13, 2024 20:14 — with GitHub Actions Inactive

mariogiampieri requested changes Dec 14, 2024

View reviewed changes

nofurtherinformation added 2 commits December 16, 2024 16:47

remove unused deps

29a774e

add todos

110bdb3

nofurtherinformation temporarily deployed to pr-210 December 16, 2024 22:52 — with GitHub Actions Inactive

Merge branch 'main' into district-numbers-and-outlines

1b03a09

nofurtherinformation temporarily deployed to pr-210 December 16, 2024 22:53 — with GitHub Actions Inactive

nofurtherinformation requested a review from mariogiampieri December 16, 2024 22:53

nofurtherinformation requested a review from mapmeld December 17, 2024 20:50

mariogiampieri previously approved these changes Dec 19, 2024

View reviewed changes

nofurtherinformation added 2 commits December 19, 2024 09:17

Merge branch 'main' into district-numbers-and-outlines

ae4a08f

Package lock update

de3962c

nofurtherinformation dismissed mariogiampieri’s stale review via de3962c December 19, 2024 15:19

nofurtherinformation temporarily deployed to pr-210 December 19, 2024 15:19 — with GitHub Actions Inactive

mariogiampieri approved these changes Dec 23, 2024

View reviewed changes

raphaellaude approved these changes Dec 23, 2024

View reviewed changes

nofurtherinformation merged commit a260a8b into main Dec 23, 2024
1 check passed

nofurtherinformation deleted the district-numbers-and-outlines branch December 23, 2024 16:14

nofurtherinformation deployed to pr-210 December 23, 2024 16:14 — with GitHub Actions Active

nofurtherinformation mentioned this pull request Jan 7, 2025

District numbers appear on map #96

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

District numbers and outlines #210

District numbers and outlines #210

nofurtherinformation commented Nov 21, 2024

nofurtherinformation Nov 21, 2024

nofurtherinformation commented Dec 12, 2024

mariogiampieri left a comment

mariogiampieri Dec 14, 2024

nofurtherinformation Dec 16, 2024

mariogiampieri Dec 14, 2024

nofurtherinformation Dec 16, 2024

nofurtherinformation commented Dec 16, 2024

mariogiampieri left a comment

mariogiampieri left a comment

raphaellaude left a comment

raphaellaude commented Dec 23, 2024

District numbers and outlines #210

District numbers and outlines #210

Conversation

nofurtherinformation commented Nov 21, 2024

Description

Reviewers

nofurtherinformation Nov 21, 2024

Choose a reason for hiding this comment

nofurtherinformation commented Dec 12, 2024

mariogiampieri left a comment

Choose a reason for hiding this comment

mariogiampieri Dec 14, 2024

Choose a reason for hiding this comment

nofurtherinformation Dec 16, 2024

Choose a reason for hiding this comment

mariogiampieri Dec 14, 2024

Choose a reason for hiding this comment

nofurtherinformation Dec 16, 2024

Choose a reason for hiding this comment

nofurtherinformation commented Dec 16, 2024

mariogiampieri left a comment

Choose a reason for hiding this comment

mariogiampieri left a comment

Choose a reason for hiding this comment

raphaellaude left a comment

Choose a reason for hiding this comment

raphaellaude commented Dec 23, 2024