Use regionCode (state) for US

site/src/analytics-map.ts

@@ -27,9 +27,19 @@ export class AnalyticsMap extends UpdatingElement {
     if (this.showMap) {
       const countries: Record<string, Record<string, number>> = {};
       for (const country of Object.keys(this.lastDataEntry?.countries || {})) {
-        countries[country] = {
-          installations: this.lastDataEntry?.countries[country] || 0,
-        };
+        if (country.startsWith("US_")) {
+          const value = this.lastDataEntry?.countries[country] || 0;
+          if (!countries["US"]) {
+            countries["US"] = { installations: value };
+          } else {
+            countries["US"].installations =
+              countries["US"].installations + value;
+          }
+        } else {
+          countries[country] = {
+            installations: this.lastDataEntry?.countries[country] || 0,
+          };
+        }
       }
       if (this._svgMap) {
         this._svgMap.applyData({

worker/src/handlers/post.ts

@@ -18,7 +18,10 @@ export async function handlePost(request: Request): Promise<Response> {
   }
 
   const storageKey = `${KV_PREFIX_UUID}:${payload.uuid}`;
-  const country = request.headers.get("cf-ipcountry");
+  let country = request.cf.country;
+  if (country === "US" && request.cf.regionCode) {
+    country = `${country}_${request.cf.regionCode}`;
+  }
 
   let sanitizedPayload: SanitizedPayload;