WAITP-1222: Marker layer #4686

tcaiger · 2023-06-28T05:13:52Z

Issue #: WAITP-1222: Marker layer

Changes:

Restructure the map controls to stop interferring with the map
Fix the useOnChangeMapOverlay util
Add MarkerLayer

Screenshots:

packages/tupaia-web/src/api/queries/index.ts

packages/tupaia-web/src/features/Map/Map.tsx

tcaiger · 2023-07-07T02:01:13Z

packages/tupaia-web/src/features/Map/MarkerLayer/MarkerLayer.tsx

+
+export const MarkerLayer = () => {
+  // set the map default overlay if there isn't one selected
+  useDefaultMapOverlay();


This effect could go anywhere and I'm not really sure where it should go. I put it here so that it's close to where the report data is used.

I agree it could go anywhere. I almost feel like it should be built into the links, but then it's possible a link could be navigated to in some way without a default overlay code being in it (e.g directly entering the url). Is useDefaultMapOverlay used anywhere else? Could it possibly be contained in the map component?

packages/ui-map-components/src/components/Markers/MeasureMarker.tsx

alexd-bes

This is a massive amount of effort, nice work! I have a few questions but in general it's looking good, and awesome to be hitting this point in the project!

packages/tupaia-web/src/api/queries/useEntities.ts

alexd-bes · 2023-07-07T02:32:42Z

packages/tupaia-web/src/api/queries/useMapOverlayReport.ts

+    measureData: measureDataResponse,
+  };
+};
+


I don't see anything wrong with this, but I guess it opens up the question, should we be doing this on the frontend, or should the endpoint be returning data the correct way? Or is this because dashboard reports and map overlay reports are both using the report endpoint?

Yes good question. I just had a chat to Ethan about this and he said that this could be done on the backend but it would be messy because we use the report route is used fro both the map overlays and the dashboard items.

packages/tupaia-web/src/features/Map/MapOverlaySelector/DesktopMapOverlaySelector.tsx

alexd-bes · 2023-07-07T02:37:36Z

packages/tupaia-web/src/features/Map/MapOverlaySelector/DesktopMapOverlaySelector.tsx

@@ -49,6 +49,7 @@ const Heading = styled(Typography).attrs({

 const Container = styled(MaxHeightContainer)`
  border-radius: 0 0 5px 5px;


I wonder if we should save this border radius value somewhere (just the 5px) since it gets used a lot. I know not strictly part of this PR, but just something I thought of

hmmm we could do but I wonder if it would actually be helpful. I don't think that is something that would change in a theme for example.

alexd-bes · 2023-07-07T02:43:59Z

packages/tupaia-web/src/features/Map/MarkerLayer/MarkerLayer.tsx

+
+export const MarkerLayer = () => {
+  // set the map default overlay if there isn't one selected
+  useDefaultMapOverlay();


I agree it could go anywhere. I almost feel like it should be built into the links, but then it's possible a link could be navigated to in some way without a default overlay code being in it (e.g directly entering the url). Is useDefaultMapOverlay used anywhere else? Could it possibly be contained in the map component?

packages/tupaia-web/src/features/Map/MarkerLayer/MarkerLayer.tsx

packages/tupaia-web/src/features/Map/MarkerLayer/processMeasureData.ts

packages/tupaia-web/src/features/Map/MarkerLayer/useDefaultMapOverlay.ts

tcaiger · 2023-07-10T22:49:19Z

packages/tupaia-web/src/features/Map/useDefaultMapOverlay.ts

+import { MapOverlayGroup, ProjectCode, EntityCode } from '../../types';
+
+// When the map overlay groups change, update the default map overlay
+export const useDefaultMapOverlay = (


I ended up refactoring this a little to try and make it clearer and moved it to the map component so it's easier to find.

alexd-bes · 2023-07-10T22:50:40Z

packages/tupaia-web/src/features/Map/MarkerLayer/processMeasureData.ts

-  entitiesData: any;
-  serieses: any;
-  hiddenValues: any;
+interface processMeasureDataProps {


/

Suggested change

interface processMeasureDataProps {

interface ProcessMeasureDataProps {

alexd-bes · 2023-07-10T22:50:49Z

packages/tupaia-web/src/features/Map/MarkerLayer/processMeasureData.ts

 }
 export const processMeasureData = ({
  measureData,
  entitiesData,
  serieses,
  hiddenValues,
-}: processMeasureData) => {
+}: processMeasureDataProps) => {


Suggested change

}: processMeasureDataProps) => {

}: ProcessMeasureDataProps) => {

alexd-bes · 2023-07-10T22:51:46Z

Nice work, thanks for doing all the types in this too!

* Working legend, grouped columns * Apply location values * Tidy up * Styled column groups * Tiy up files * Add in hidden column titles * Update hidden column title and config types * Generate types * Move the buttons * WAITP-1222: Marker layer (#4686) * setup map entites * wip * wip * re organise project view * mobile search layout * polygon layer * map animation * fix mini map * Update Dashboard.tsx * merging * map overlay data * add Map overlays feature folder * useEntitiesWithLocation * typescript * remove test code * Update InteractivePolygon.tsx * set up * fix api * marker layer * Update types.d.ts * update map layout * wip map overlays * revert map control layout * Update useEntities.ts * copy lesmis * wip * Update MapOverlayList.tsx * default map overlay * radius overlays * navigate to dashboard * fix scroll * measure level * refactor marker layer * refactor useDefaultMapOverlay * types * useEntitiesByMeasureLevel * Update MapOverlaysRoute.ts * fix active entity * Update MarkerLayer.tsx * add comments * Update processMeasureData.ts * refactor useDefaultMapOverlay * Fix merge conflicts * Fix conflict errors --------- Co-authored-by: Tom Caiger <caigertom@gmail.com>

* WAITP-1231 Working table * WIP * Update Matrix.tsx * Fix linting errors * convert to use context * Update hooks * Fix issues * Reorganise files * reorganise context * Working table * Remove enlarged cell modal file * Working modal * Tidy up * Update MatrixCell.tsx * Tidy up hover * Add cell handling for markdown * fix types * WAITP-1231 fixes * Delete types.d.ts * Update index.ts * Fix type error * Waitp 1231 base matrix part 2 (#4714) * Working legend, grouped columns * Apply location values * Tidy up * Styled column groups * Tiy up files * Add in hidden column titles * Update hidden column title and config types * Generate types * Move the buttons * WAITP-1222: Marker layer (#4686) * setup map entites * wip * wip * re organise project view * mobile search layout * polygon layer * map animation * fix mini map * Update Dashboard.tsx * merging * map overlay data * add Map overlays feature folder * useEntitiesWithLocation * typescript * remove test code * Update InteractivePolygon.tsx * set up * fix api * marker layer * Update types.d.ts * update map layout * wip map overlays * revert map control layout * Update useEntities.ts * copy lesmis * wip * Update MapOverlayList.tsx * default map overlay * radius overlays * navigate to dashboard * fix scroll * measure level * refactor marker layer * refactor useDefaultMapOverlay * types * useEntitiesByMeasureLevel * Update MapOverlaysRoute.ts * fix active entity * Update MarkerLayer.tsx * add comments * Update processMeasureData.ts * refactor useDefaultMapOverlay * Fix merge conflicts * Fix conflict errors --------- Co-authored-by: Tom Caiger <caigertom@gmail.com> --------- Co-authored-by: Tom Caiger <caigertom@gmail.com>

* setup map entites * wip * wip * re organise project view * mobile search layout * polygon layer * map animation * fix mini map * Update Dashboard.tsx * merging * map overlay data * add Map overlays feature folder * useEntitiesWithLocation * typescript * remove test code * Update InteractivePolygon.tsx * set up * fix api * marker layer * Update types.d.ts * update map layout * wip map overlays * revert map control layout * Update useEntities.ts * copy lesmis * wip * Update MapOverlayList.tsx * default map overlay * radius overlays * navigate to dashboard * fix scroll * measure level * refactor marker layer * refactor useDefaultMapOverlay * types * useEntitiesByMeasureLevel * Update MapOverlaysRoute.ts * fix active entity * Update MarkerLayer.tsx * add comments * Update processMeasureData.ts * refactor useDefaultMapOverlay

* WAITP-1231 Working table * WIP * Update Matrix.tsx * Fix linting errors * convert to use context * Update hooks * Fix issues * Reorganise files * reorganise context * Working table * Remove enlarged cell modal file * Working modal * Tidy up * Update MatrixCell.tsx * Tidy up hover * Add cell handling for markdown * fix types * WAITP-1231 fixes * Delete types.d.ts * Update index.ts * Fix type error * Waitp 1231 base matrix part 2 (#4714) * Working legend, grouped columns * Apply location values * Tidy up * Styled column groups * Tiy up files * Add in hidden column titles * Update hidden column title and config types * Generate types * Move the buttons * WAITP-1222: Marker layer (#4686) * setup map entites * wip * wip * re organise project view * mobile search layout * polygon layer * map animation * fix mini map * Update Dashboard.tsx * merging * map overlay data * add Map overlays feature folder * useEntitiesWithLocation * typescript * remove test code * Update InteractivePolygon.tsx * set up * fix api * marker layer * Update types.d.ts * update map layout * wip map overlays * revert map control layout * Update useEntities.ts * copy lesmis * wip * Update MapOverlayList.tsx * default map overlay * radius overlays * navigate to dashboard * fix scroll * measure level * refactor marker layer * refactor useDefaultMapOverlay * types * useEntitiesByMeasureLevel * Update MapOverlaysRoute.ts * fix active entity * Update MarkerLayer.tsx * add comments * Update processMeasureData.ts * refactor useDefaultMapOverlay * Fix merge conflicts * Fix conflict errors --------- Co-authored-by: Tom Caiger <caigertom@gmail.com> --------- Co-authored-by: Tom Caiger <caigertom@gmail.com>

* setup map entites * wip * wip * re organise project view * mobile search layout * polygon layer * map animation * fix mini map * Update Dashboard.tsx * merging * map overlay data * add Map overlays feature folder * useEntitiesWithLocation * typescript * remove test code * Update InteractivePolygon.tsx * set up * fix api * marker layer * Update types.d.ts * update map layout * wip map overlays * revert map control layout * Update useEntities.ts * copy lesmis * wip * Update MapOverlayList.tsx * default map overlay * radius overlays * navigate to dashboard * fix scroll * measure level * refactor marker layer * refactor useDefaultMapOverlay * types * useEntitiesByMeasureLevel * Update MapOverlaysRoute.ts * fix active entity * Update MarkerLayer.tsx * add comments * Update processMeasureData.ts * refactor useDefaultMapOverlay

* WAITP-1231 Working table * WIP * Update Matrix.tsx * Fix linting errors * convert to use context * Update hooks * Fix issues * Reorganise files * reorganise context * Working table * Remove enlarged cell modal file * Working modal * Tidy up * Update MatrixCell.tsx * Tidy up hover * Add cell handling for markdown * fix types * WAITP-1231 fixes * Delete types.d.ts * Update index.ts * Fix type error * Waitp 1231 base matrix part 2 (#4714) * Working legend, grouped columns * Apply location values * Tidy up * Styled column groups * Tiy up files * Add in hidden column titles * Update hidden column title and config types * Generate types * Move the buttons * WAITP-1222: Marker layer (#4686) * setup map entites * wip * wip * re organise project view * mobile search layout * polygon layer * map animation * fix mini map * Update Dashboard.tsx * merging * map overlay data * add Map overlays feature folder * useEntitiesWithLocation * typescript * remove test code * Update InteractivePolygon.tsx * set up * fix api * marker layer * Update types.d.ts * update map layout * wip map overlays * revert map control layout * Update useEntities.ts * copy lesmis * wip * Update MapOverlayList.tsx * default map overlay * radius overlays * navigate to dashboard * fix scroll * measure level * refactor marker layer * refactor useDefaultMapOverlay * types * useEntitiesByMeasureLevel * Update MapOverlaysRoute.ts * fix active entity * Update MarkerLayer.tsx * add comments * Update processMeasureData.ts * refactor useDefaultMapOverlay * Fix merge conflicts * Fix conflict errors --------- Co-authored-by: Tom Caiger <caigertom@gmail.com> --------- Co-authored-by: Tom Caiger <caigertom@gmail.com>

tcaiger added 30 commits June 26, 2023 11:56

setup map entites

7c58a4d

Merge branch 'epic-frontend-rewrite' into waitp-1209-map-entities

be3949d

wip

bb1c054

wip

8d27d3d

re organise project view

2133941

mobile search layout

aa418f0

polygon layer

e2ef8f2

map animation

906051a

fix mini map

abf1fb9

Merge branch 'epic-frontend-rewrite' into waitp-1209-map-entities

adcbdae

Update Dashboard.tsx

a8370ef

Merge branch 'epic-frontend-rewrite' into waitp-1209-map-entities

96157e9

merging

6737171

map overlay data

09c98b4

add Map overlays feature folder

8e2c656

useEntitiesWithLocation

f4ae823

typescript

090f49d

remove test code

527ee50

Update InteractivePolygon.tsx

5289eba

set up

89a863e

Merge branch 'epic-frontend-rewrite' into waitp-1222-marker-layer

d1b3970

fix api

2518d9a

marker layer

8f6259f

Merge branch 'epic-frontend-rewrite' into waitp-1222-marker-layer

d770b06

Update types.d.ts

7849107

update map layout

dd4ba7a

wip map overlays

130565d

revert map control layout

4752824

Merge branch 'epic-frontend-rewrite' into waitp-1222-marker-layer

227d319

Update useEntities.ts

c824e5d

tcaiger added 8 commits July 5, 2023 11:42

refactor marker layer

f320565

refactor useDefaultMapOverlay

3aa714c

types

019908b

useEntitiesByMeasureLevel

7aa823c

Merge branch 'epic-frontend-rewrite' into waitp-1222-marker-layer

a8e0203

Update MapOverlaysRoute.ts

da15bc3

Merge branch 'epic-frontend-rewrite' into waitp-1222-marker-layer

e5fb9a0

fix active entity

056a378

tcaiger commented Jul 7, 2023

View reviewed changes

packages/tupaia-web/src/api/queries/index.ts Show resolved Hide resolved

tcaiger commented Jul 7, 2023

View reviewed changes

packages/tupaia-web/src/features/Map/Map.tsx Show resolved Hide resolved

tcaiger commented Jul 7, 2023

View reviewed changes

packages/ui-map-components/src/components/Markers/MeasureMarker.tsx Show resolved Hide resolved

Update MarkerLayer.tsx

3beee32

alexd-bes requested changes Jul 7, 2023

View reviewed changes

tcaiger added 4 commits July 7, 2023 17:10

add comments

065e582

Merge branch 'epic-frontend-rewrite' into waitp-1222-marker-layer

db8b094

Update processMeasureData.ts

bbb2bd8

refactor useDefaultMapOverlay

590443f

tcaiger requested a review from alexd-bes July 10, 2023 22:44

tcaiger commented Jul 10, 2023

View reviewed changes

alexd-bes approved these changes Jul 10, 2023

View reviewed changes

tcaiger merged commit da68bb5 into epic-frontend-rewrite Jul 10, 2023

tcaiger deleted the waitp-1222-marker-layer branch July 10, 2023 23:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WAITP-1222: Marker layer #4686

WAITP-1222: Marker layer #4686

tcaiger commented Jun 28, 2023 •

edited

Loading

tcaiger Jul 7, 2023

alexd-bes Jul 7, 2023

alexd-bes left a comment

alexd-bes Jul 7, 2023

tcaiger Jul 7, 2023

alexd-bes Jul 7, 2023

tcaiger Jul 7, 2023

alexd-bes Jul 7, 2023

tcaiger Jul 10, 2023

alexd-bes Jul 10, 2023

alexd-bes Jul 10, 2023

alexd-bes commented Jul 10, 2023

		@@ -49,6 +49,7 @@ const Heading = styled(Typography).attrs({

		const Container = styled(MaxHeightContainer)`
		border-radius: 0 0 5px 5px;

	interface processMeasureDataProps {
	interface ProcessMeasureDataProps {

	}: processMeasureDataProps) => {
	}: ProcessMeasureDataProps) => {

WAITP-1222: Marker layer #4686

WAITP-1222: Marker layer #4686

Conversation

tcaiger commented Jun 28, 2023 • edited Loading

Issue #: WAITP-1222: Marker layer

Changes:

Screenshots:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexd-bes left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexd-bes commented Jul 10, 2023

tcaiger commented Jun 28, 2023 •

edited

Loading