SkiRunDifficulty.colormap convention support

Author: dhimmel

openskistats/models.py

@@ -3,6 +3,7 @@
 https://github.com/russellporter/openskidata-format
 """
 
+from dataclasses import dataclass
 from enum import StrEnum
 from typing import Annotated, Literal
 
@@ -36,6 +37,36 @@ class SkiRunConvention(StrEnum):
     japan = "japan"
 
 
+@dataclass
+class _SkiRunColors:
+    green: str
+    blue: str
+    red: str
+    black: str
+    orange: str
+    gray: str
+
+
+# from https://github.com/russellporter/openskidata-format/blob/e421ef0a0814437c362611e07cb43c32bac4172c/src/Run.ts#L87-L92
+ski_run_colors_bright = _SkiRunColors(
+    green="#00a80e",
+    blue="#005aa8",
+    red="#f8161a",
+    black="#000000",
+    orange="#ff9100",
+    gray="#595959",
+)
+
+ski_run_colors_subtle = _SkiRunColors(
+    green="#badbb8",
+    blue="#a1a1d8",
+    red="#ff8c8e",
+    black="#828282",
+    orange="#e5c47e",
+    gray="#d9d9d9",
+)
+
+
 class SkiRunDifficulty(StrEnum):
     """
     https://wiki.openstreetmap.org/wiki/Key:piste:difficulty
@@ -76,35 +107,53 @@ def condensed_values(cls) -> "list[SkiRunDifficulty]":
 
     @classmethod
     def colormap(
-        cls, condense: bool = False, subtle: bool = True
+        cls,
+        condense: bool = False,
+        subtle: bool = True,
+        convention: SkiRunConvention = SkiRunConvention.north_america,
     ) -> "dict[SkiRunDifficulty, str]":
         """
-        Difficulty to color mapping based on North American conventions.
-        https://www.nsaa.org/NSAA/Safety/Trail_Signage/NSAA/Safety/Trail_Signage.aspx
+        Difficulty to color mapping according to the local convention.
+        See:
+        <https://github.com/russellporter/openskidata-format/blob/e421ef0a0814437c362611e07cb43c32bac4172c/src/Run.ts#L113-L166>
+        <https://www.nsaa.org/NSAA/Safety/Trail_Signage/NSAA/Safety/Trail_Signage.aspx>
         """
-        colormap = (
-            {
-                cls.novice: "#badbb8",
-                cls.easy: "#badbb8",
-                cls.intermediate: "#a1a1d8",
-                cls.advanced: "#828282",
-                cls.expert: "#828282",
-                cls.extreme: "#828282",
-                cls.freeride: "#828282",  # considered "#e5c47e"
-                cls.other: "#d9d9d9",
+        colors = ski_run_colors_subtle if subtle else ski_run_colors_bright
+        if convention == SkiRunConvention.north_america:
+            colormap = {
+                cls.novice: colors.green,
+                cls.easy: colors.green,
+                cls.intermediate: colors.blue,
+                cls.advanced: colors.black,
+                cls.expert: colors.black,
+                cls.extreme: colors.orange,
+                cls.freeride: colors.orange,
+                cls.other: colors.gray,
+            }
+        elif convention == SkiRunConvention.europe:
+            colormap = {
+                cls.novice: colors.green,
+                cls.easy: colors.blue,
+                cls.intermediate: colors.red,
+                cls.advanced: colors.black,
+                cls.expert: colors.black,
+                cls.extreme: colors.orange,
+                cls.freeride: colors.orange,
+                cls.other: colors.gray,
             }
-            if subtle
-            else {
-                cls.novice: "#60A45C",
-                cls.easy: "#60A45C",
-                cls.intermediate: "#3E7DBF",
-                cls.advanced: "#000000",
-                cls.expert: "#000000",
-                cls.extreme: "#000000",
-                cls.freeride: "#000000",  # considered "#DEB251"
-                cls.other: "#bfbfbf",
+        elif convention == SkiRunConvention.japan:
+            colormap = {
+                cls.novice: colors.green,
+                cls.easy: colors.green,
+                cls.intermediate: colors.red,
+                cls.advanced: colors.black,
+                cls.expert: colors.black,
+                cls.extreme: colors.orange,
+                cls.freeride: colors.orange,
+                cls.other: colors.gray,
             }
-        )
+        else:
+            raise ValueError(f"Unsupported run coloring convention: {convention}")
         if condense:
             colormap = {
                 key: value
@@ -113,9 +162,13 @@ def colormap(
             }
         return colormap
 
-    def color(self, subtle: bool = False) -> str:
+    def color(
+        self,
+        subtle: bool = True,
+        convention: SkiRunConvention = SkiRunConvention.north_america,
+    ) -> str:
         """Get the color for the difficulty level."""
-        return self.colormap(subtle=subtle)[self]
+        return self.colormap(subtle=subtle, convention=convention)[self]
 
     @classmethod
     def markdown_description(cls, mode: Literal["phrase", "list"] = "phrase") -> str:

openskistats/plot_runs.py

@@ -12,7 +12,7 @@
     cut_bearings_pl,
     get_cut_bearing_bins_df,
 )
-from openskistats.models import SkiRunDifficulty
+from openskistats.models import SkiRunConvention, SkiRunDifficulty
 from openskistats.plot import NARROW_SPACE, _add_polar_y_ticks
 from openskistats.utils import (
     pl_condense_run_difficulty,
@@ -315,6 +315,7 @@ def plot_bearing_by_latitude_bin() -> plt.Figure:
 
 def plot_run_difficulty_histograms_by_slope(
     condense_difficulty: bool = False,
+    convention: SkiRunConvention = SkiRunConvention.north_america,
 ) -> pn.ggplot:
     difficulty_col = (
         "run_difficulty_condensed" if condense_difficulty else "run_difficulty"
@@ -364,7 +365,9 @@ def plot_run_difficulty_histograms_by_slope(
             )
         )
     )
-    colormap = SkiRunDifficulty.colormap(condense=condense_difficulty, subtle=True)
+    colormap = SkiRunDifficulty.colormap(
+        condense=condense_difficulty, subtle=True, convention=convention
+    )
     return (
         pn.ggplot(
             data=run_stats,