Refactor shapeColour calculation to prioritize 'to' value over 'from'…

… value for hierarchical complexity
Seshat-Global-History-Databank · Jan 8, 2025 · f3deccb · f3deccb
1 parent b53baab
commit f3deccb
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/seshat/apps/core/templates/core/world_map.html b/seshat/apps/core/templates/core/world_map.html
@@ -1008,7 +1008,12 @@ <h2>How to use the Seshat World Map</h2>
                         } else if (variable == 'administrative_level') {
                             hierarchicalVariableMaxValue = highestAdministrativeLevel;
                         }
-                        shapeColour = hierarchicalComplexityColour(hierarchicalVariableMaxValue, shape[variable][0]); // TODO: Make this an average
+                        // Calculate the colour based highest of the from and to values
+                        if (shape[variable][1] != 'None' && shape[variable][1] != null) {  // If the to value is not None, use it since it is the highest
+                            shapeColour = hierarchicalComplexityColour(hierarchicalVariableMaxValue, shape[variable][1]);
+                        } else { // If the to value is None, use the from value (even if it is None)
+                            shapeColour = hierarchicalComplexityColour(hierarchicalVariableMaxValue, shape[variable][0]);
+                        }
 
                     } else {  // Absent-present variables
                         shapeWeight = polityBorderWeightSelected;