Constituency Map - Competitiveness #6

vaeyias · 2024-04-17T02:37:32Z

Main Changes:

Backend:
- India Constituency Geojson
- load in Lok Sahba data for margin percentage/winners
- added two files (competitivenessColor.json containing the colors corresponding to each map entry and competitivenessData.json containing data from the dataset) that contain data for the competitiveness map (to reduce loading time)
new page for the competitiveness map
Changes to the Example leaflet map:
- currently, CompetitivenessMap.js loads in the geojson and fetches the competitiveness data from two files in the backend. Then, it fetches new data everytime the election year changes
- removed previous Legend showing that allows you to select which layers to display from MapBase.js
- added a gradient legend
- added a legend displaying information about a constituency on hover
- added a timeline slider to change election year
- adjustments to center and boundaries
Other changes
- new dependency: MUI for the discrete timeline slider

To-Dos

add functions to generate initial colors data to backend
nav bar button leading to the page (I believe another group is working on this)
move Example.scss code to a diff file (I couldn't find where the Example.scss file was being imported so I couldn't change the file name)
stylistic improvements to map/information displayed
- the information being displayed at the side of the map
- potentially add labels directly on constituencies
- remove background map
style the "loading..." text that appears before the map appears
make new components, such as DiscreteSlider and GradientLegend more reusable with props
minor organizational changes to files/code, like moving the new json files out of the geojson folder

TO DO: fix null error

also fixed a typo

displays more info when user clicks on a constituency

add data files (colors and constituencyData) to backend to reduce map loading time.

JusticeV452

Thanks for getting this in quickly, and nice job reducing the map's load time! Also, thanks for making the changes and TODOs clear in the PR, including an image, and ensuring all the checks passed. I made a few comments regarding the comment blocks intended for future use and renaming a function, but overall, everything looks great.

frontend/components/CompetitivenessMap.js

frontend/scss/example.scss

frontend/scss/mapLegends.scss

backend/app/api_views.py

backend/app/management/commands/load_loksabha.py

backend/config/urls.py

.vscode/settings.json

changed get_competiveness_colors to get_competitiveness_data

-edited comments from pylint:disable=R0801 to pylint:disable=duplicate-code -used parenthesis instead of \ to break lines in code

- removed large comment blocks - removed some comments in scss files - used white and black instead of the variable $color-white and $color-black

vaeyias added 27 commits March 12, 2024 13:37

add model for LS elections

cd3391d

TO DO: fix null error

add vote shares to model

0fe851c

Merge branch 'main' into constituency-map

a6c683f

Add 2019 constituency map

4aa9acd

also fixed a typo

change ls-elections url name

74af1f1

add get request to get specific election year

00bf3d5

update map to only fetch once

5faa992

update map to fetch data from db

324f7c7

add map colors and display data on hover

8cefe3e

add more election data to display

37938b6

add onclick template for map

2fca924

update map to filter by pc number

9afe963

add discrete slider

e2345af

add gradient legend

e0d3136

add default color for undefined constituencies

56cbb68

add previewData legend on map

3ef440f

add onClick feature on map

7dea52c

displays more info when user clicks on a constituency

reduce map laoding time

d18b5d5

add data files (colors and constituencyData) to backend to reduce map loading time.

fix ESlint warnings

a523f7b

clean up comments

f06d2a7

set map boundaries and center map title

aa885d5

style slider

4690204

adjust map bounds

81b8f99

merge main into map branch

89c7c91

Merge branch 'main' into constituency-map

eb94aca

remove duplicate functions

1882888

remove unused geojson

123d97b

vaeyias requested a review from JusticeV452 April 17, 2024 02:37

vaeyias added 2 commits April 16, 2024 22:46

fix backend pylint errors 1

bf3e98d

merge migrations

ce7298f

fix backend pylint errors 2

cd126ea

vaeyias self-assigned this Apr 17, 2024

disable pylint similar lines warning in load_loksabha and load_seatshare

2a028a5

JusticeV452 assigned eleanorxyli and fleuriie Apr 18, 2024

JusticeV452 requested changes Apr 18, 2024

View reviewed changes

vaeyias added 5 commits April 17, 2024 22:46

fix function name

39cfd06

changed get_competiveness_colors to get_competitiveness_data

edit pylint warning comments and improve code style

d82245e

-edited comments from pylint:disable=R0801 to pylint:disable=duplicate-code -used parenthesis instead of \ to break lines in code

remove unnecessary comments

99e3899

- removed large comment blocks - removed some comments in scss files - used white and black instead of the variable $color-white and $color-black

remove changes from .vscode\settings.json

ee5db47

add .vscode directory to .gitignore

a395a15

vaeyias requested a review from JusticeV452 April 18, 2024 03:24

JusticeV452 approved these changes Apr 18, 2024

View reviewed changes

JusticeV452 merged commit c96927a into main Apr 18, 2024
4 checks passed

JusticeV452 deleted the constituency-map branch April 18, 2024 03:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Constituency Map - Competitiveness #6

Constituency Map - Competitiveness #6

vaeyias commented Apr 17, 2024 •

edited

Loading

JusticeV452 left a comment •

edited

Loading

Constituency Map - Competitiveness #6

Constituency Map - Competitiveness #6

Conversation

vaeyias commented Apr 17, 2024 • edited Loading

JusticeV452 left a comment • edited Loading

Choose a reason for hiding this comment

vaeyias commented Apr 17, 2024 •

edited

Loading

JusticeV452 left a comment •

edited

Loading