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.

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

Add Hierarchical complexity vars to world map #216

Merged
merged 30 commits into from
Jan 9, 2025

Conversation

edwardchalstrey1
Copy link

@edwardchalstrey1 edwardchalstrey1 commented Jan 7, 2025

This PR:

  • Adds the Hierarchical Complexity variables to the world map with a color range from blue to red
  • Reorders the variable lists by alphabetical order
Details:
  • Refactor such that settlement_hierarchy_from and settlement_hierarchy_to are instead a list called settlement_hierarchy and the same for the other vars
  • Make sure this line is modified to account for a list:
    • shape.settlement_hierarchy_from = JSON.parse(shape.settlement_hierarchy.replace(/'/g, '"'));
  • Get the max values of the hierarchical complexity vars from python
  • Update the hierarchicalComplexityColourMapping so it's a continuous scale of the appropriate range (figure out what this is)
  • Calculate the shapeColour for Hierarchical complexity variables using the average of the from and to
  • Account for polities where the variable is not set with the uncoded colour
  • Ensure the legend reflects the colours
  • Make sure the hierarchical variables are named properly in the variables list
  • Refactor highest values to use a dict
  • Make the legend always remain when settings open except for globe view

Settlement hierarchy: 0-8
Religious level: 0-10
admin: 0-20
military: 0-24

@edwardchalstrey1 edwardchalstrey1 self-assigned this Jan 7, 2025
@edwardchalstrey1 edwardchalstrey1 marked this pull request as ready for review January 9, 2025 13:49
…inistrative levels in world_map.html to handle 'None' and null values
…inistrative levels in world_map.html to handle 'None' and null values
@edwardchalstrey1 edwardchalstrey1 merged commit 029d5aa into dev Jan 9, 2025
1 check passed
@edwardchalstrey1 edwardchalstrey1 deleted the hierarchical-complexity branch January 9, 2025 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant