Merge remote-tracking branch 'origin/main' into add-env-var-1990

Author: melissaluc

.example.env

@@ -2,8 +2,7 @@ HUGGINGFACE_LOGIN_TOKEN=REDACTED
 MAPBOX_SATELLITE_URL=https://api.mapbox.com/styles/v1/mapbox/satellite-streets-v11/tiles/{z}/{x}/{y}
 MAPBOX_STREETS_URL=https://api.mapbox.com/styles/v1/mapbox/streets-v11/tiles/{z}/{x}/{y}
 VITE_ENV=DEV
-VITE_CONTACT_FORM_DEV=https://docs.google.com/forms/d/e/1FAIpQLScrhJY9ezqlKcpYermIImgGKYZ4bP2k1BRAOpuEay-tVXfvdQ/viewform?embedded=true
-VITE_CONTACT_FORM_PROD=REDACTED
+VITE_CONTACT_FORM=REDACTED
 VITE_CONTENTFUL_SPACE=REDACTED
 VITE_CONTENTFUL_TOKEN=REDACTED
 VITE_MAPBOX_TOKEN=REDACTED

components/Map/Map.jsx

@@ -552,7 +552,9 @@ class Map extends React.Component {
     const features = this.getAllFeaturesAtPoint(e.point);
 
     if (!features.length) {
-      this.reset()
+      if(this.hasDistrictSelected()) {
+        this.reset()
+      }
     } else {
       for (let i = 0; i < features.length; i += 1) {
         const feature = features[i];

components/contact/ContactForm.jsx

@@ -24,10 +24,7 @@ function ContactForm() {
     <div className={classes.formContainer}>
       {/* Embed the Google Form */}
       <iframe
-        src={import.meta.env.MODE === 'development'
-          ? import.meta.env.VITE_CONTACT_FORM_DEV
-          : import.meta.env.VITE_CONTACT_FORM_PROD
-        }
+        src={import.meta.env.VITE_CONTACT_FORM}
         className={classes.iframe}
         title="Contact Form"
       >

components/db/DbProvider.jsx

@@ -10,48 +10,26 @@ import Worker from 'web-worker';
 import DbContext from '@db/DbContext';
 import moment from 'moment';
 
-// List of remote dataset locations used by db.registerFileURL
-const prod_datasets = {
-  parquet: {
-    // huggingface
-    //* Quick fix - update url when 2025 data available
-    hfYtd2025:
-      'https://huggingface.co/datasets/311-data/2024/resolve/main/2024.parquet', // 2025 year-to-date
-    hfYtd2024:
-      'https://huggingface.co/datasets/311-data/2024/resolve/main/2024.parquet', // 2024 entire year
-    hfYtd2023:
-      'https://huggingface.co/datasets/311-data/2023/resolve/main/2023.parquet', // 2023 entire year
-    hfYtd2022:
-      'https://huggingface.co/datasets/311-data/2022/resolve/main/2022.parquet', // 2022 entire year
-    hfYtd2021:
-      'https://huggingface.co/datasets/311-data/2021/resolve/main/2021.parquet', // 2021 entire year
-    hfYtd2020:
-      'https://huggingface.co/datasets/311-data/2020/resolve/main/2020.parquet', // 2020 entire year
-  },
-};
+const hf_account = import.meta.env.VITE_ENV === 'DEV' ? '311-Data-Dev' : '311-data';
 
-const dev_datasets = {
+// List of remote dataset locations used by db.registerFileURL
+const datasets = {
   parquet: {
     // huggingface
     hfYtd2025:
-      'https://huggingface.co/datasets/311-Data-Dev/2025/resolve/main/2025.parquet', // 2025 year-to-date
+      `https://huggingface.co/datasets/${hf_account}/2025/resolve/main/2025.parquet`, // 2025 year-to-date
     hfYtd2024:
-      'https://huggingface.co/datasets/311-Data-Dev/2025/resolve/main/2024.parquet', // 2024 entire year
+      `https://huggingface.co/datasets/${hf_account}/2024/resolve/main/2024.parquet`, // 2024 entire year
     hfYtd2023:
-      'https://huggingface.co/datasets/311-Data-Dev/2025/resolve/main/2023.parquet', // 2023 entire year
+      `https://huggingface.co/datasets/${hf_account}/2023/resolve/main/2023.parquet`, // 2023 entire year
     hfYtd2022:
-      'https://huggingface.co/datasets/311-Data-Dev/2025/resolve/main/2022.parquet', // 2022 entire year
+      `https://huggingface.co/datasets/${hf_account}/2022/resolve/main/2022.parquet`, // 2022 entire year
     hfYtd2021:
-      'https://huggingface.co/datasets/311-Data-Dev/2025/resolve/main/2021.parquet', // 2021 entire year
+      `https://huggingface.co/datasets/${hf_account}/2021/resolve/main/2021.parquet`, // 2021 entire year
     hfYtd2020:
-      'https://huggingface.co/datasets/311-Data-Dev/2025/resolve/main/2020.parquet', // 2020 entire year
+      `https://huggingface.co/datasets/${hf_account}/2020/resolve/main/2020.parquet`, // 2020 entire year
   },
 };
-
-// const datasets = dev_datasets; // Force dev datasets for now
-// const datasets = prod_datasets; // Force prod datasets for now
-const datasets = import.meta.env.VITE_ENV === 'DEV' ? dev_datasets : prod_datasets;
-
 function DbProvider({ children, startDate }) {
   const [db, setDb] = useState(null);
   const [conn, setConn] = useState(null);