Tonight

frontend/src/lib/url-state.ts

@@ -8,17 +8,28 @@ import {
 import {
   SCHOOL_FILTER_NAME,
   createSchoolFilterKey,
+  getSchoolBackendFeatureName,
   getSchoolFilterConfig,
   isSchoolFilterName,
   type SchoolDistance,
   type SchoolPhase,
   type SchoolRating,
 } from './school-filter';
+import {
+  SPECIFIC_CRIMES_FILTER_NAME,
+  createSpecificCrimeFilterKey,
+  getSpecificCrimeFeatureName,
+  isSpecificCrimeFeatureName,
+  isSpecificCrimeFilterName,
+} from './crime-filter';
 
 function parseFilters(params: URLSearchParams): FeatureFilters | undefined {
   const filterParams = params.getAll('filter');
   const schoolParams = params.getAll('school');
-  if (filterParams.length === 0 && schoolParams.length === 0) return undefined;
+  const crimeParams = params.getAll('crime');
+  if (filterParams.length === 0 && schoolParams.length === 0 && crimeParams.length === 0) {
+    return undefined;
+  }
 
   const filters: FeatureFilters = {};
   for (const entry of filterParams) {
@@ -60,6 +71,18 @@ function parseFilters(params: URLSearchParams): FeatureFilters | undefined {
     filters[createSchoolFilterKey(phase, rating, distance, index)] = [min, max];
   });
 
+  crimeParams.forEach((entry, index) => {
+    const parts = entry.split(':');
+    if (parts.length < 3) return;
+    const featureName = parts.slice(0, -2).join(':');
+    const min = Number(parts[parts.length - 2]);
+    const max = Number(parts[parts.length - 1]);
+    if (!isSpecificCrimeFeatureName(featureName) || isNaN(min) || isNaN(max)) {
+      return;
+    }
+    filters[createSpecificCrimeFilterKey(featureName, index)] = [min, max];
+  });
+
   return Object.keys(filters).length > 0 ? filters : undefined;
 }
 
@@ -180,6 +203,13 @@ export function stateToParams(
       continue;
     }
 
+    const specificCrimeFeatureName = getSpecificCrimeFeatureName(name);
+    if (specificCrimeFeatureName && isSpecificCrimeFilterName(name)) {
+      const [min, max] = value as [number, number];
+      params.append('crime', `${specificCrimeFeatureName}:${min}:${max}`);
+      continue;
+    }
+
     const meta = features.find((f) => f.name === name);
     if (meta?.type === 'enum') {
       params.append('filter', `${name}:${(value as string[]).join('|')}`);
@@ -225,14 +255,19 @@ export function summarizeParams(queryString: string): string {
 
   const filterParams = params.getAll('filter');
   const schoolParams = params.getAll('school');
-  if (filterParams.length > 0 || schoolParams.length > 0) {
+  const crimeParams = params.getAll('crime');
+  if (filterParams.length > 0 || schoolParams.length > 0 || crimeParams.length > 0) {
     const filterNames = filterParams
       .map((entry) => {
         const colonIdx = entry.indexOf(':');
-        return colonIdx > 0 ? entry.substring(0, colonIdx) : entry;
+        const name = colonIdx > 0 ? entry.substring(0, colonIdx) : entry;
+        return isSpecificCrimeFeatureName(name) ? SPECIFIC_CRIMES_FILTER_NAME : name;
       })
       .filter((n) => n);
     for (let i = 0; i < schoolParams.length; i++) filterNames.push(SCHOOL_FILTER_NAME);
+    for (let i = 0; i < crimeParams.length; i++) {
+      filterNames.push(SPECIFIC_CRIMES_FILTER_NAME);
+    }
     if (filterNames.length > 0) {
       parts.push(
         filterNames.length <= 2