Remove redundant lines, fix variable names, make requests async

frontend/src/App.js

@@ -1,11 +1,11 @@
 // import logo from './logo.svg';
 import './App.css';
-import Map from './components/Map';
+import WikiMap from './components/Map';
 import React, { useState, 
   // useEffect,
   //  useCallback
    } from 'react';
-// import { MapContainer, TileLayer, useMapEvents } from 'react-leaflet';
+
 
 
 function App() {
@@ -44,7 +44,7 @@ function App() {
           <button type="submit">Search</button>
         </form>
       </div>
-      <Map 
+      <WikiMap 
         onMapClick={handleMapClick} 
         searchQuery={submittedQuery}
         contentType={contentType}

frontend/src/components/Map.js

@@ -48,7 +48,7 @@ const ResizeHandler = ({ trigger }) => {
     }, [trigger, map]);
     return null;
 };
-const Map = ( { onMapClick, searchQuery, contentType, setSearchQuery, setSubmittedQuery } ) => {
+const WikiMap = ( { onMapClick, searchQuery, contentType, setSearchQuery, setSubmittedQuery } ) => {
     const [baseLayer, setBaseLayer] = useState("base"); // "base" | "satellite"
 
     const [markerPosition, setMarkerPosition] = useState(null);
@@ -182,7 +182,7 @@ const Map = ( { onMapClick, searchQuery, contentType, setSearchQuery, setSubmitt
 
             if (contentType === 'summary') {
                 setWikiContent(data);
-                if (data && data.latitude && data.longitude) {
+                if (data?.latitude && data?.longitude) {
                   setMarkerPosition([data.latitude, data.longitude]);
                 }
               } else if (contentType === 'full') {
@@ -210,9 +210,8 @@ const Map = ( { onMapClick, searchQuery, contentType, setSearchQuery, setSubmitt
                 const blob = new Blob([htmlContent], { type: 'text/html' });
                 const blobUrl = URL.createObjectURL(blob);
                 setIframeSrc(blobUrl);
-                // const dataUrl = 'data:text/html;charset=utf-8,' + encodeURIComponent(htmlContent);
-                // setIframeSrc(dataUrl);;
-                if (data && data.latitude && data.longitude) {
+
+                if (data?.latitude && data?.longitude) {
                   setMarkerPosition([data.latitude, data.longitude]);
                 }
               }
@@ -1376,4 +1375,4 @@ const Map = ( { onMapClick, searchQuery, contentType, setSearchQuery, setSubmitt
 };
 
 
-export default Map;
+export default WikiMap;

frontend/src/utils/mapUtils.js

@@ -88,9 +88,6 @@ function formatArea(area, unit = 'sqm', format = "normal") {
         case "ha":
             value = area / 1e4;
             return (format === "scientific" ? value.toExponential(2) : value.toLocaleString(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 2 })) + ' ha';
-        case "sqm":
-            value = area;
-            return (format === "scientific" ? value.toExponential(2) : value.toLocaleString(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 2 })) + ' m²';
         case "acres":
             value = area / 4046.8564224;
             return (format === "scientific" ? value.toExponential(2) : value.toLocaleString(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 2 })) + ' acres';
@@ -100,6 +97,7 @@ function formatArea(area, unit = 'sqm', format = "normal") {
         case "sqft":
             value = area * 10.76391041671;
             return (format === "scientific" ? value.toExponential(2) : value.toLocaleString(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 2 })) + ' ft²';
+        case "sqm":
         default:
             value = area;
             return (format === "scientific" ? value.toExponential(2) : value.toLocaleString(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 2 })) + ' m²';
@@ -113,25 +111,20 @@ function formatPerimeter(perimeter, unit = 'sqm', format = "normal") {
     let value;
     switch (unit) {
         case "km2":
-            value = perimeter / 1000;
-            return (format === "scientific" ? value.toExponential(2) : value.toLocaleString(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 2 })) + ' km';
         case "ha":
             value = perimeter / 1000;
             return (format === "scientific" ? value.toExponential(2) : value.toLocaleString(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 2 })) + ' km';
-        case "m2":
-            value = perimeter;
-            return (format === "scientific" ? value.toExponential(2) : value.toLocaleString(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 2 })) + ' m';
         case "mi2":
             value = perimeter / 1609.344;
             return (format === "scientific" ? value.toExponential(2) : value.toLocaleString(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 2 })) + ' mi';
         case "sqft":
             value = perimeter * 3.280839895013123; // meters to feet
             return (format === "scientific" ? value.toExponential(2) : value.toLocaleString(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 2 })) + ' ft';
+        case "m2":
         default:
             value = perimeter;
             return (format === "scientific" ? value.toExponential(2) : value.toLocaleString(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 2 })) + ' m';
     }
 }
 
-export {generateGeodesicPoints, calculatePolygonArea, getPolygonCentroid, formatArea, formatPerimeter};
-    // calculatePolygonArea
+export {generateGeodesicPoints, calculatePolygonArea, getPolygonCentroid, formatArea, formatPerimeter};

main.py

@@ -58,7 +58,8 @@ async def get_wiki_summary(summary_page_name: str, background_tasks: BackgroundT
         # print("Cache hit for summary:", page_name) #Working
         return JSONResponse(content=summary_cache[summary_page_name], status_code=200)
     try:
-        response = requests.get(f"https://en.wikipedia.org/api/rest_v1/page/summary/{summary_page_name}", timeout=10)
+        async with httpx.AsyncClient() as client:
+            response = await client.get(f"https://en.wikipedia.org/api/rest_v1/page/summary/{summary_page_name}", timeout=10)
 
         if response.status_code != 200:
             return JSONResponse(
@@ -102,7 +103,8 @@ async def search_wiki_full_page(full_page: str, background_tasks: BackgroundTask
         # print("Cache hit for full_page:", full_page) #Working
         return JSONResponse(content=full_page_cache[full_page], status_code=200)
     
-    response = requests.get(f"https://en.wikipedia.org/wiki/{full_page}", timeout=10)
+    async with httpx.AsyncClient() as client:
+        response = await client.get(f"https://en.wikipedia.org/wiki/{full_page}", timeout=10)
     try:
         if response.status_code != 200:
             return JSONResponse(
@@ -217,9 +219,10 @@ async def get_nearby_wiki_pages(payload: NearbyWikiPage):
                 f"&gsradius={radius}"
                 f"&gslimit={limit}"
                 "&format=json")
-        # print(url)
+
         try:
-            response = requests.get(url, timeout=10)
+            async with httpx.AsyncClient() as client:
+                response = await client.get(url, timeout=10)
             if response.status_code != 200:
                 return JSONResponse(
                     content={"error": "Failed to fetch nearby pages"},
@@ -258,7 +261,6 @@ async def get_nearby_wiki_pages(payload: NearbyWikiPage):
                 tasks = [fetch_url(client, url) for url in urls]
                 results = await asyncio.gather(*tasks)
             
-            # print(results)
             for result in results:
 
                 for unit in result.get("data", {}).get("query", {}).get("geosearch", []):