Move backend to AWS

Author: akittredge

Untitled-1

@@ -0,0 +1,46 @@
+@app.route("/district_int")
+def district_intersections():
+    id = request.args.get("boundid")
+    namecol = request.args.get("featureid")
+
+    if not id or not namecol:
+        return jsonify({"error": "boundid and featureid are required"}), 400
+
+    conn = pg_pool.getconn()
+    try:
+        with conn.cursor() as cur:
+            cur.execute("""
+            SELECT 
+                id_right AS id, 
+                namecol_right AS namecol, 
+                namealt_right AS namealt, 
+                ST_AsGeoJSON(geom),
+                intersection_pct
+            FROM all_intersections
+            WHERE id_left = %s AND namecol_left = %s
+            """, (id, namecol))
+
+            rows = cur.fetchall()
+        if not rows:
+            return jsonify({"error": "No boundaries found"}), 404
+
+        features = []
+        for row in rows:
+                feature = {
+                    "type": "Feature",
+                    "geometry": json.loads(row[3]),
+                    "properties": {
+                        "id": row[0],
+                        "namecol": row[1],
+                        "namealt": row[2],
+                        "intersection_pct": float(row[4]) if row[4] is not None else None
+                    }
+                }
+                features.append(feature)
+
+        return jsonify({
+            "type": "FeatureCollection",
+            "features": features
+        })
+    finally:
+        pg_pool.putconn(conn) 

src/assets/boundaries/index.ts

@@ -16,9 +16,7 @@
   async function queryAllDistrictsForCoordinates(lng: number, lat: number) {
     districtsIntersectingAddress = [];
     isLoading = true;
-    //const intersectsUrl = `https://betanyc.carto.com/api/v2/sql/?q=SELECT * FROM all_bounds WHERE ST_Intersects(ST_SetSRID(ST_MakePoint(${lng}, ${lat}), 4326),the_geom)&api_key=2J6__p_IWwUmOHYMKuMYjw&format=geojson`;
-    //const intersectsUrl = `https://yhatmsxmjxmpgnnzdrzy.supabase.co/rest/v1/rpc/address_details?apikey=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InloYXRtc3htanhtcGdubnpkcnp5Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDM2OTA4OTQsImV4cCI6MjA1OTI2Njg5NH0.03AZcgwuHf2fAzIuCq8-O8UcSGVGfmvNdMYT6FH08b0&p_lng=${lng}&p_lat=${lat}`;
-    const intersectsUrl = `https://ycdpugzzikjzmnatwzsq.supabase.co/rest/v1/rpc/address_details?apikey=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InljZHB1Z3p6aWtqem1uYXR3enNxIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDU1MjQ1ODcsImV4cCI6MjA2MTEwMDU4N30.Yp8yESCWzz5ccqaP1crVwRJS50jDYCcK_2Qk2aEoZVg&p_lng=${lng}&p_lat=${lat}`;
+    const intersectsUrl = `https://bm-api.beta.nyc/pt_int?p_lng=${lng}&p_lat=${lat}`;
     const options = {
       headers: {
         'Accept': 'application/geo+json'

src/components/Sidebar/AddressDetails.svelte

@@ -162,8 +162,7 @@
         onClick={() => ($selectedDistrict = district.properties?.namecol)}
         icon={layers[district.properties?.id].icon}
         nameCol={district.properties?.namecol}
-        area={district.properties?.area}
-        searea={district.properties?.searea}
+        intersection_pct={district.properties?.intersection_pct}
         formatContent={layers[district.properties?.id].formatContent}
         formatUrl={layers[district.properties?.id].formatUrl}
       />

src/components/Sidebar/BoundaryDetails.svelte

@@ -20,9 +20,7 @@
   async function queryAllDistrictsForCoordinates(lngLat: LngLat) {
     districtsIntersectingAddress = [];
     isLoading = true;
-    //const intersectsUrl = `https://betanyc.carto.com/api/v2/sql/?q=SELECT * FROM all_bounds WHERE ST_Intersects(ST_SetSRID(ST_MakePoint(${lngLat.lng}, ${lngLat.lat}), 4326),the_geom)&api_key=2J6__p_IWwUmOHYMKuMYjw&format=geojson`;
-    //const intersectsUrl = `https://yhatmsxmjxmpgnnzdrzy.supabase.co/rest/v1/rpc/address_details?apikey=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InloYXRtc3htanhtcGdubnpkcnp5Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDM2OTA4OTQsImV4cCI6MjA1OTI2Njg5NH0.03AZcgwuHf2fAzIuCq8-O8UcSGVGfmvNdMYT6FH08b0&p_lng=${lngLat.lng}&p_lat=${lngLat.lat}`;
-    const intersectsUrl = `https://ycdpugzzikjzmnatwzsq.supabase.co/rest/v1/rpc/address_details?apikey=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InljZHB1Z3p6aWtqem1uYXR3enNxIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDU1MjQ1ODcsImV4cCI6MjA2MTEwMDU4N30.Yp8yESCWzz5ccqaP1crVwRJS50jDYCcK_2Qk2aEoZVg&p_lng=${lngLat.lng}&p_lat=${lngLat.lat}`;
+    const intersectsUrl = `https://bm-api.beta.nyc/pt_int?p_lng=${lngLat.lng}&p_lat=${lngLat.lat}`;
     const options = {
       headers: {
         'Accept': 'application/geo+json'

src/components/Sidebar/CoordinateDetails.svelte

@@ -11,10 +11,10 @@
       //filter for features with the layerId, then pull out the name and searea
       const features = districts
         .filter(district => district.properties?.id === layerId)
-        .map(({ properties: { searea, area, namecol } }) => [
+        .map(({ properties: { intersection_pct, namecol } }) => [
           layerMeta.name,
           namecol,
-          searea / area
+          intersection_pct
         ]);
 
       return [...rows, ...features];

src/components/Sidebar/DistrictCopyClipboard.svelte

@@ -33,7 +33,7 @@
     boundId: string,
     featureId: string
   ) {
-    const intersectsUrl = `https://ycdpugzzikjzmnatwzsq.supabase.co/rest/v1/rpc/district_details?apikey=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InljZHB1Z3p6aWtqem1uYXR3enNxIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDU1MjQ1ODcsImV4cCI6MjA2MTEwMDU4N30.Yp8yESCWzz5ccqaP1crVwRJS50jDYCcK_2Qk2aEoZVg&boundid=${boundId}&featureid=${featureId}`;
+    const intersectsUrl = `https://bm-api.beta.nyc/district_int?boundid=${boundId}&featureid=${featureId}`;
     const options = {
       headers: {
         'Accept': 'application/geo+json'

src/components/Sidebar/DistrictDetails.svelte

@@ -5,11 +5,11 @@
   export let formatContent: Function;
   export let formatUrl: Function | undefined = undefined;
   export let nameCol: string;
-  export let area: number;
-  export let searea: number;
+  export let intersection_pct: number | string | undefined = undefined;
   export let icon: string;
 
-  $: intersectingPercentage = ((searea / area) * 100).toFixed(1) + '%';
+  $: intersectingPercentage = intersection_pct !== undefined ? 
+    (typeof intersection_pct === 'number' ? intersection_pct.toFixed(1) : parseFloat(intersection_pct).toFixed(1)) + '%' : '';
 </script>
 
 <div
@@ -28,7 +28,7 @@
       <div class="flex flex-row">
         {formatContent(nameCol)}
       </div>
-      {#if area}
+      {#if intersection_pct}
         <p class="text-gray-500 tabular-nums ml-2">
           {intersectingPercentage}
         </p>

src/components/Sidebar/DistrictLink.svelte

@@ -90,8 +90,7 @@
               }}
               icon={layers[district.properties?.id].icon}
               nameCol={district.properties?.namecol}
-              area={district.properties?.area}
-              searea={district.properties?.searea}
+              intersection_pct={district.properties?.intersection_pct}
               formatContent={layers[district.properties?.id].formatContent}
               formatUrl={layers[district.properties?.id].formatUrl}
             />