Merge pull request #261 from fieldsoftheworld/threshold-scaling

Scale confidence values differently (0-100 instead of 0-58)

Author: calebrob6

src/components/GlobalDataPanel.vue

@@ -57,12 +57,12 @@ const handleLocationSelected = (place: PlaceResult) => {
           <v-radio label="2024" :value="2024"></v-radio>
           <v-radio label="2025" :value="2025"></v-radio>
         </v-radio-group>
-        <h3 class="group">Confidence Threshold: {{ (settings.threshold * 100).toFixed(0) }}%</h3>
+        <h3 class="group">Confidence Threshold: {{ settings.threshold }}%</h3>
         <v-slider
           v-model.number="settings.threshold"
           :min="0"
-          :max="1"
-          :step="0.01"
+          :max="100"
+          :step="1"
           color="teal"
           track-color="grey-darken-2"
           thumb-color="teal"

src/components/MapLegend.vue

@@ -45,10 +45,11 @@ const legendThresholdPct = computed(() => {
   const s = legendStops.value
   const threshold = settings.value.threshold
   const n = s.length - 1
+  const labelValues = s.map((stop) => Number(stop.label))
   for (let i = 0; i < n; i++) {
-    if (threshold <= s[i].value) return (i / n) * 100
-    if (threshold <= s[i + 1].value) {
-      const frac = (threshold - s[i].value) / (s[i + 1].value - s[i].value)
+    if (threshold <= labelValues[i]) return (i / n) * 100
+    if (threshold <= labelValues[i + 1]) {
+      const frac = (threshold - labelValues[i]) / (labelValues[i + 1] - labelValues[i])
       return ((i + frac) / n) * 100
     }
   }
@@ -94,7 +95,20 @@ const legendThresholdPct = computed(() => {
       ></div>
     </div>
     <div class="legend-labels">
-      <span v-for="(stop, i) in legendStops" :key="i">{{ stop.label }}</span>
+      <span
+        v-for="(stop, i) in legendStops"
+        :key="i"
+        :style="{
+          left: (i / (legendStops.length - 1)) * 100 + '%',
+          transform:
+            i === 0
+              ? 'none'
+              : i === legendStops.length - 1
+                ? 'translateX(-100%)'
+                : 'translateX(-50%)',
+        }"
+        >{{ stop.label }}</span
+      >
     </div>
   </div>
 </template>
@@ -146,13 +160,17 @@ const legendThresholdPct = computed(() => {
 }
 
 .legend-labels {
-  display: flex;
-  justify-content: space-between;
+  position: relative;
+  height: 1.2em;
   margin-top: 0.2em;
   font-size: 0.7rem;
   opacity: 0.85;
 }
 
+.legend-labels span {
+  position: absolute;
+}
+
 .legend-item {
   display: flex;
   align-items: center;

src/composables/usePermalink.ts

@@ -3,7 +3,7 @@ import type Map from 'ol/Map'
 import useAreaOfInterest from './useAreaOfInterest'
 import useMap from './useMap'
 import useSearch from './useSearch'
-import useSettings from './useSettings'
+import useSettings, { defaultThreshold } from './useSettings'
 import { fromLonLat, toLonLat, transformExtent } from 'ol/proj'
 import { type Extent } from 'ol/extent'
 import { type Coordinate } from 'ol/coordinate'
@@ -58,7 +58,7 @@ export default function usePermalink() {
     zoom: 2,
     center: [0, 0],
     year: 2025,
-    threshold: 0.4,
+    threshold: defaultThreshold,
     fieldBoundariesOpacity: 90,
   }
 
@@ -180,8 +180,10 @@ export default function usePermalink() {
 
           for (const part of keyValueParts) {
             if (part.startsWith('threshold:')) {
-              const val = parseFloat(part.substring(10))
-              if (!isNaN(val)) result.threshold = val
+              const val = parseInt(part.substring(10), 10)
+              if (!isNaN(val)) {
+                result.threshold = val
+              }
             } else if (part.startsWith('year:')) {
               const year = parseInt(part.substring(5), 10)
               if (!isNaN(year)) result.year = year
@@ -286,7 +288,7 @@ export default function usePermalink() {
       }
     } else {
       // Global mode
-      hashParts.push(`threshold:${settings.value.threshold}`)
+      hashParts.push(`threshold:${Math.round(settings.value.threshold)}`)
       if (settings.value.year) {
         hashParts.push(`year:${settings.value.year}`)
       }

src/composables/useSettings.ts

@@ -45,6 +45,8 @@ const availableModes: { id: string; label: string }[] = [
 
 const availableModels = shallowRef<ModelInfo[]>([])
 
+export const defaultThreshold = 70
+
 // Default settings
 const defaultSettings: Settings = {
   autoSceneSelection: true,
@@ -57,7 +59,7 @@ const defaultSettings: Settings = {
   model: '',
   expertMode: false,
   mode: defaultMode,
-  threshold: 0.4,
+  threshold: defaultThreshold,
   fieldBoundariesOpacity: 90,
 }
 
@@ -86,6 +88,9 @@ const loadSettingsFromStorage = (): Settings => {
   const stored = localStorage.getItem('ftw-search-settings')
   if (stored) {
     const parsed = JSON.parse(stored)
+    if (parsed.threshold !== undefined) {
+      parsed.threshold = Math.round(parsed.threshold)
+    }
     return Object.assign(structuredClone(defaultSettings), parsed) as Settings
   }
 

src/layers/Global-Overview-Layers.ts

@@ -6,7 +6,7 @@ import {
   GLOBAL_DATA_MAP_FIELD_START_ZOOM_LEVEL,
   type Settings,
 } from '../composables/useSettings'
-import { areaColorScale, type ColorStop } from './color-scales'
+import { areaColorScale, thresholdToRaw, type ColorStop } from './color-scales'
 
 const ALPHA = 'aa'
 
@@ -24,7 +24,7 @@ const overviewStyle = (settings: Settings) => {
       'case',
       ['<=', ['band', 1], 0],
       '#00000000', // no area data
-      ['<=', ['band', 2], settings.threshold],
+      ['<=', ['band', 2], thresholdToRaw(settings.threshold)],
       '#00000000', // confidence below threshold
       buildAreaInterpolation(areaColorScale), // show area colors
     ],

src/layers/Global-Predictions-Layer.ts

@@ -6,6 +6,7 @@ import {
   get_global_pmtiles_url,
   type Settings,
 } from '../composables/useSettings'
+import { thresholdToRaw } from './color-scales'
 
 export interface GlobalPredictionsController {
   layer: TileLayer<ImageTileSource>
@@ -21,7 +22,7 @@ export function createGlobalPredictionsLayer(settings: Settings): GlobalPredicti
   worker.postMessage({
     action: 'init',
     url: get_global_pmtiles_url(settings.year),
-    threshold: settings.threshold,
+    threshold: thresholdToRaw(settings.threshold),
   })
 
   let revision = 0
@@ -101,7 +102,10 @@ export function createGlobalPredictionsLayer(settings: Settings): GlobalPredicti
   return {
     layer,
     update(newSettings: Settings) {
-      worker.postMessage({ action: 'updateThreshold', threshold: newSettings.threshold })
+      worker.postMessage({
+        action: 'updateThreshold',
+        threshold: thresholdToRaw(newSettings.threshold),
+      })
       revision++
       ;(source as any).setKey(`${GLOBAL_DATA_PMTILES_THRESHOLD_METRIC}-${revision}`)
     },

src/layers/color-scales.ts

@@ -21,12 +21,19 @@ export const areaColorScale: ColorStop[] = [
   { value: 1, color: '#00ff00', label: '100' },
 ]
 
+const CONFIDENCE_MAX = 0.578178 // before scaling, ratio [0-1]
+
+/** Convert a UI percentage threshold (0–100) to the raw internal confidence value. */
+export function thresholdToRaw(pct: number): number {
+  return (pct / 100) * CONFIDENCE_MAX
+}
+
 export const confidenceColorScale: ColorStop[] = [
   { value: 0, color: '#d7191c', label: '0' },
-  { value: 0.4, color: '#fec379', label: '40' },
-  { value: 0.45, color: '#f3fabb', label: '45' },
-  { value: 0.5, color: '#cfecb0', label: '50' },
-  { value: 0.58, color: '#33a02c', label: '58' },
+  { value: thresholdToRaw(70), color: '#fec379', label: '70' },
+  { value: thresholdToRaw(80), color: '#f3fabb', label: '80' },
+  { value: thresholdToRaw(90), color: '#cfecb0', label: '90' },
+  { value: CONFIDENCE_MAX, color: '#33a02c', label: '100' },
 ]
 
 const LUT_SIZE = 256