fix rebase errors

OpenBeta · Dec 1, 2023 · c626c3b · c626c3b
1 parent ed24d4c
commit c626c3b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 7 deletions.
diff --git a/next.config.js b/next.config.js
@@ -6,7 +6,6 @@ module.exports = {
   typescript: {
     ignoreBuildErrors: false
   },
-  // generateEtags: false,
   webpack (config) { // required by @svgr/webpack lib
     const fileLoaderRule = config.module.rules.find((rule) => rule.test?.test?.('.svg'))
 

diff --git a/package.json b/package.json
@@ -17,10 +17,7 @@
     "@lexical/react": "^0.7.5",
     "@math.gl/web-mercator": "3.6.2",
     "@openbeta/sandbag": "^0.0.51",
-<<<<<<< HEAD
-=======
     "@phosphor-icons/react": "^2.0.14",
->>>>>>> cd4aee1f (add climb list)
     "@radix-ui/react-alert-dialog": "^1.0.0",
     "@radix-ui/react-dialog": "^1.0.0",
     "@radix-ui/react-dropdown-menu": "^2.0.1",
@@ -148,4 +145,4 @@
   "engines": {
     "node": "18"
   }
-}
+}
diff --git a/src/js/grades/Grade.ts b/src/js/grades/Grade.ts
@@ -62,9 +62,33 @@ const gradeContextToGradeScales: Partial<Record<GradeContexts, ClimbGradeContext
     mixed: GradeScales.FRENCH,
     aid: GradeScales.AID,
     snow: GradeScales.FRENCH, // is this the same as alpine?
-    ice: GradeScales.FRENCH // is this the same as alpine?
+    ice: GradeScales.WI
+  },
+  [GradeContexts.SA]: {
+    trad: GradeScales.FRENCH,
+    sport: GradeScales.FRENCH,
+    bouldering: GradeScales.FONT,
+    tr: GradeScales.FRENCH,
+    deepwatersolo: GradeScales.FRENCH,
+    alpine: GradeScales.FRENCH,
+    mixed: GradeScales.FRENCH,
+    aid: GradeScales.AID,
+    snow: GradeScales.FRENCH, // SA does not have a whole lot of snow
+    ice: GradeScales.WI
+  },
+  [GradeContexts.UIAA]: {
+    trad: GradeScales.UIAA,
+    sport: GradeScales.UIAA,
+    bouldering: GradeScales.FONT,
+    tr: GradeScales.UIAA,
+    deepwatersolo: GradeScales.FRENCH,
+    alpine: GradeScales.UIAA,
+    mixed: GradeScales.UIAA, // TODO: change to MI scale, once added
+    aid: GradeScales.UIAA,
+    snow: GradeScales.UIAA, // TODO: remove `snow` since it duplicates `ice`
+    ice: GradeScales.WI
   },
-  BR: {
+  [GradeContexts.BRZ]: {
     trad: GradeScales.BRAZILIAN_CRUX,
     sport: GradeScales.BRAZILIAN_CRUX,
     bouldering: GradeScales.VSCALE,
@@ -73,7 +97,11 @@ const gradeContextToGradeScales: Partial<Record<GradeContexts, ClimbGradeContext
     alpine: GradeScales.BRAZILIAN_CRUX,
     mixed: GradeScales.BRAZILIAN_CRUX,
     aid: GradeScales.AID,
+    // definitely no ice in brazil, however once this guy
+    // top roped a fragile frozen waterfall with ice picks
+    // and crampons:
     ice: GradeScales.WI,
+    // whenever it snows in brazil, you see it in the news
     snow: GradeScales.WI
   }
 }