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

Fix disputed boundary map styling #1564

Merged
merged 4 commits into from
Dec 26, 2024
Merged

Fix disputed boundary map styling #1564

merged 4 commits into from
Dec 26, 2024

Conversation

frozenhelium
Copy link
Member

@frozenhelium frozenhelium commented Nov 28, 2024 •
edited by tnagorra
Loading

Changes

This PR address the styling issues and inconsistent behavior of the overlapping boundaries.

The side-effect of this changes in BaseMap is that translation of labels has been removed from the admin layers.

At the moment, changes are only applied to the Active Operation Map visible in the home page.

  • src/components/domain/ActiveOperationMap
  • src/components/domain/BaseMapPointInput
  • src/components/domain/RiskImminentEventMap
  • src/components/domain/RiskSeasonalMap
  • src/views/CountryNsOverviewActivities/Map
  • src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsMap
  • src/views/CountryOngoingActivitiesEmergencies
  • src/views/CountryOngoingActivitiesThreeWActivities/ResponseActivitiesMap
  • src/views/CountryOngoingActivitiesThreeWProjects/Map
  • src/views/CountryProfileOverview/PopulationMap
  • src/views/Emergencies/Map
  • src/views/EmergencyActivities/ActivitesMap
  • src/views/EmergencyDetails/EmergencyMap
  • src/views/GlobalThreeW/Map
  • src/views/RegionThreeW/MovementActivitiesMap
  • src/views/SurgeOverview/SurgeMap
  • src/views/ThreeWProjectForm/DistrictMap/DistrictMapModal

Address

Depends on

There are no dependencies on the backend or the mapbox styles.

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Nov 28, 2024 •
edited
Loading

⚠️ No Changeset found

Latest commit: 3a3fb4a

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@frozenhelium frozenhelium force-pushed the fix/disputed-boundary-map-styling branch 2 times, most recently from 1e23bec to 48b279b Compare November 28, 2024 13:14
@frozenhelium frozenhelium force-pushed the fix/disputed-boundary-map-styling branch from 48b279b to 7ad89f4 Compare November 28, 2024 13:18
@frozenhelium frozenhelium force-pushed the fix/disputed-boundary-map-styling branch from 7ad89f4 to c218385 Compare November 28, 2024 13:22
@frozenhelium frozenhelium marked this pull request as ready for review December 20, 2024 02:39
@frozenhelium frozenhelium force-pushed the fix/disputed-boundary-map-styling branch from c218385 to a574633 Compare December 20, 2024 02:39
@samshara samshara requested a review from tnagorra December 20, 2024 09:25
@shreeyash07
Copy link
Collaborator

Please add description and issue links.

shreeyash07
shreeyash07 previously requested changes Dec 23, 2024
View reviewed changes
app/src/components/domain/ActiveOperationMap/index.tsx Outdated Show resolved Hide resolved
app/src/components/domain/GlobalMap/index.tsx Outdated Show resolved Hide resolved
@frozenhelium frozenhelium force-pushed the fix/disputed-boundary-map-styling branch from a574633 to 6892ba8 Compare December 23, 2024 09:38
@frozenhelium frozenhelium force-pushed the fix/disputed-boundary-map-styling branch from 6892ba8 to 3c4c340 Compare December 23, 2024 11:28
@tnagorra tnagorra force-pushed the fix/disputed-boundary-map-styling branch from 22f6f9b to 8bde1d6 Compare December 24, 2024 06:31
@tnagorra tnagorra force-pushed the fix/disputed-boundary-map-styling branch from 99703aa to 8810ce2 Compare December 24, 2024 10:28
frozenhelium and others added 4 commits December 24, 2024 16:17
@frozenhelium @tnagorra
Create a GlobalMap component
87e75a6 
- Use GlobalMap in the ActiveOperationMap
@tnagorra
Fix lint issues regarding type import
2bd4414
@tnagorra
Add comments on why z-index was changed
bcbd660 
- Revert back usage of GlobalMap on RiskImminentEventMap
@tnagorra
Remove setting layout for boundary-mask layout
3a3fb4a 
- We should not override layout for admin-0-boundary
@tnagorra tnagorra force-pushed the fix/disputed-boundary-map-styling branch from 8810ce2 to 3a3fb4a Compare December 24, 2024 10:32
@samshara samshara mentioned this pull request Dec 26, 2024
Open
17 tasks
@samshara samshara dismissed shreeyash07’s stale review December 26, 2024 05:52

The requested changes we added.

@samshara samshara assigned samshara and unassigned tnagorra Dec 26, 2024
@samshara samshara merged commit 9f63f03 into develop Dec 26, 2024
10 checks passed
@samshara samshara deleted the fix/disputed-boundary-map-styling branch December 26, 2024 05:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@barshathakuri barshathakuri barshathakuri left review comments

@tnagorra tnagorra tnagorra approved these changes

@samshara samshara samshara approved these changes

@shreeyash07 shreeyash07 shreeyash07 left review comments

Assignees

@samshara samshara

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@frozenhelium @shreeyash07 @tnagorra @samshara @barshathakuri