Spaces:

sairika
/

Safeher

Sleeping

App Files Files Community

sairika commited on Nov 5, 2025

Commit

2600c96

verified ·

1 Parent(s): 4bb1a1c

Update app.py

Browse files

Files changed (1) hide show

app.py +80 -18

app.py CHANGED Viewed

@@ -71,22 +71,32 @@ def get_location_coords(location):
         if "chittagong" not in location.lower() and "chattogram" not in location.lower():
             search_location = f"{location}, Chittagong, Bangladesh"
         response = requests.get(
             "https://nominatim.openstreetmap.org/search",
             params={
                 "q": search_location,
                 "format": "json",
-                "limit": 1
             },
-            headers={"User-Agent": "SafeHer-App-Chittagong"},
-            timeout=10
         )
         if response.status_code == 200 and response.json():
             data = response.json()[0]
-            return float(data["lat"]), float(data["lon"])
-        return None
     except Exception as e:
-        print(f"Geocoding error: {e}")
         return None
 def assess_area_safety(area_name, current_hour):
@@ -119,19 +129,40 @@ def assess_area_safety(area_name, current_hour):
 def create_interactive_map(start_loc, end_loc, route_info=""):
     """Create interactive Leaflet map with route for Chittagong"""
     start_coords = get_location_coords(start_loc)
     end_coords = get_location_coords(end_loc)
     if not start_coords or not end_coords:
-        return f"""<div style='padding: 20px; background: #fff3cd; border-left: 4px solid #ffc107; border-radius: 5px;'>
-        <h3>⚠️ Could not map exact locations</h3>
-        <p>Try using specific landmarks like: "Agrabad", "GEC Circle", "Khulshi", "New Market"</p>
         <a href='https://www.google.com/maps/dir/?api=1&origin={start_loc},Chittagong&destination={end_loc},Chittagong'
-           target='_blank' style='color: #007bff; text-decoration: underline;'>
-           📍 Open in Google Maps
         </a>
         </div>"""
     center_lat = (start_coords[0] + end_coords[0]) / 2
     center_lon = (start_coords[1] + end_coords[1]) / 2
@@ -146,6 +177,7 @@ def create_interactive_map(start_loc, end_loc, route_info=""):
     <html>
     <head>
         <meta charset="utf-8">
         <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"/>
         <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
         <style>
@@ -160,7 +192,7 @@ def create_interactive_map(start_loc, end_loc, route_info=""):
                 box-shadow: 0 2px 4px rgba(0,0,0,0.1);
             }}
             .info-box h3 {{ margin: 0 0 10px 0; color: #333; }}
-            .info-box p {{ margin: 5px 0; color: #666; }}
             .safety-badge {{
                 display: inline-block;
                 padding: 5px 12px;
@@ -174,7 +206,7 @@ def create_interactive_map(start_loc, end_loc, route_info=""):
     </head>
     <body>
         <div class="info-box">
-            <h3>🗺️ Route: {start_loc} → {end_loc}</h3>
             <p><strong>📍 Location:</strong> Chittagong, Bangladesh</p>
             <p><strong>🕐 Current Time:</strong> {datetime.now().strftime('%I:%M %p, %B %d, %Y')}</p>
             <p><strong>🛡️ Safety Status:</strong>
@@ -188,6 +220,7 @@ def create_interactive_map(start_loc, end_loc, route_info=""):
         </div>
         <div id="map"></div>
         <script>
             var map = L.map('map').setView([{center_lat}, {center_lon}], 13);
             L.tileLayer('https://{{s}}.tile.openstreetmap.org/{{z}}/{{x}}/{{y}}.png', {{
@@ -195,6 +228,8 @@ def create_interactive_map(start_loc, end_loc, route_info=""):
                 maxZoom: 19
             }}).addTo(map);
             var startIcon = L.divIcon({{
                 html: '<div style="background: #28a745; color: white; padding: 8px 12px; border-radius: 20px; font-weight: bold; box-shadow: 0 2px 8px rgba(0,0,0,0.3); white-space: nowrap;">📍 START</div>',
                 iconSize: [80, 35],
@@ -209,14 +244,16 @@ def create_interactive_map(start_loc, end_loc, route_info=""):
                 className: ''
             }});
-            L.marker([{start_coords[0]}, {start_coords[1]}], {{icon: startIcon}})
                 .addTo(map)
                 .bindPopup("<b>Start Location:</b><br>{start_loc}");
-            L.marker([{end_coords[0]}, {end_coords[1]}], {{icon: endIcon}})
                 .addTo(map)
                 .bindPopup("<b>Destination:</b><br>{end_loc}");
             var routeLine = L.polyline([
                 [{start_coords[0]}, {start_coords[1]}],
                 [{end_coords[0]}, {end_coords[1]}]
@@ -227,7 +264,16 @@ def create_interactive_map(start_loc, end_loc, route_info=""):
                 dashArray: '10, 10'
             }}).addTo(map);
             map.fitBounds(routeLine.getBounds(), {{padding: [50, 50]}});
         </script>
     </body>
     </html>
@@ -305,11 +351,15 @@ def enhanced_chat(message, history, api_key):
     response = call_groq(messages, api_key.strip())
-    # Extract locations for map
     map_html = None
     route_patterns = [
-        r'(?:from|start|starting)\s+([^to]+?)\s+(?:to|destination|ending|till)\s+(.+?)(?:\.|$|,|\?)',
-        r'(?:route|travel|go)\s+(?:from\s+)?([a-zA-Z\s]+?)\s+to\s+([a-zA-Z\s]+?)(?:\.|$|,|\?)'
     ]
     for pattern in route_patterns:
@@ -317,9 +367,21 @@ def enhanced_chat(message, history, api_key):
         if route_match:
             start_loc = route_match.group(1).strip()
             end_loc = route_match.group(2).strip()
             map_html = create_interactive_map(start_loc, end_loc, response[:300])
             break
     return history + [[message, response]], map_html
 def show_legal_info():

         if "chittagong" not in location.lower() and "chattogram" not in location.lower():
             search_location = f"{location}, Chittagong, Bangladesh"
+        print(f"DEBUG: Searching for coordinates of: {search_location}")
         response = requests.get(
             "https://nominatim.openstreetmap.org/search",
             params={
                 "q": search_location,
                 "format": "json",
+                "limit": 1,
+                "countrycodes": "bd"
             },
+            headers={"User-Agent": "SafeHer-App-Chittagong/1.0"},
+            timeout=15
         )
+        print(f"DEBUG: Geocoding response status: {response.status_code}")
         if response.status_code == 200 and response.json():
             data = response.json()[0]
+            lat, lon = float(data["lat"]), float(data["lon"])
+            print(f"DEBUG: Found coordinates - Lat: {lat}, Lon: {lon}")
+            return lat, lon
+        else:
+            print(f"DEBUG: No results found for {search_location}")
+            return None
     except Exception as e:
+        print(f"DEBUG: Geocoding error: {e}")
         return None
 def assess_area_safety(area_name, current_hour):
 def create_interactive_map(start_loc, end_loc, route_info=""):
     """Create interactive Leaflet map with route for Chittagong"""
+    print(f"DEBUG: Creating map for {start_loc} to {end_loc}")
     start_coords = get_location_coords(start_loc)
     end_coords = get_location_coords(end_loc)
     if not start_coords or not end_coords:
+        error_msg = ""
+        if not start_coords:
+            error_msg += f"❌ Could not find: {start_loc}<br>"
+        if not end_coords:
+            error_msg += f"❌ Could not find: {end_loc}<br>"
+        return f"""<div style='padding: 20px; background: #fff3cd; border-left: 4px solid #ffc107; border-radius: 8px;'>
+        <h3>⚠️ Could not map locations</h3>
+        {error_msg}
+        <p style='margin-top: 15px;'><strong>Try these specific locations:</strong></p>
+        <ul>
+            <li>Agrabad</li>
+            <li>GEC Circle</li>
+            <li>Khulshi</li>
+            <li>New Market</li>
+            <li>Panchlaish</li>
+            <li>CDA Avenue</li>
+            <li>Nasirabad</li>
+            <li>Halishahar</li>
+        </ul>
         <a href='https://www.google.com/maps/dir/?api=1&origin={start_loc},Chittagong&destination={end_loc},Chittagong'
+           target='_blank' style='display: inline-block; margin-top: 10px; padding: 10px 20px; background: #007bff; color: white; text-decoration: none; border-radius: 5px;'>
+           📍 Open in Google Maps Instead
         </a>
         </div>"""
+    print(f"DEBUG: Successfully got coordinates for both locations")
     center_lat = (start_coords[0] + end_coords[0]) / 2
     center_lon = (start_coords[1] + end_coords[1]) / 2
     <html>
     <head>
         <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"/>
         <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
         <style>
                 box-shadow: 0 2px 4px rgba(0,0,0,0.1);
             }}
             .info-box h3 {{ margin: 0 0 10px 0; color: #333; }}
+            .info-box p {{ margin: 5px 0; color: #666; font-size: 14px; }}
             .safety-badge {{
                 display: inline-block;
                 padding: 5px 12px;
     </head>
     <body>
         <div class="info-box">
+            <h3>🗺️ Route Map: {start_loc} → {end_loc}</h3>
             <p><strong>📍 Location:</strong> Chittagong, Bangladesh</p>
             <p><strong>🕐 Current Time:</strong> {datetime.now().strftime('%I:%M %p, %B %d, %Y')}</p>
             <p><strong>🛡️ Safety Status:</strong>
         </div>
         <div id="map"></div>
         <script>
+            console.log('Initializing map...');
             var map = L.map('map').setView([{center_lat}, {center_lon}], 13);
             L.tileLayer('https://{{s}}.tile.openstreetmap.org/{{z}}/{{x}}/{{y}}.png', {{
                 maxZoom: 19
             }}).addTo(map);
+            console.log('Map tiles loaded');
             var startIcon = L.divIcon({{
                 html: '<div style="background: #28a745; color: white; padding: 8px 12px; border-radius: 20px; font-weight: bold; box-shadow: 0 2px 8px rgba(0,0,0,0.3); white-space: nowrap;">📍 START</div>',
                 iconSize: [80, 35],
                 className: ''
             }});
+            var startMarker = L.marker([{start_coords[0]}, {start_coords[1]}], {{icon: startIcon}})
                 .addTo(map)
                 .bindPopup("<b>Start Location:</b><br>{start_loc}");
+            var endMarker = L.marker([{end_coords[0]}, {end_coords[1]}], {{icon: endIcon}})
                 .addTo(map)
                 .bindPopup("<b>Destination:</b><br>{end_loc}");
+            console.log('Markers added');
             var routeLine = L.polyline([
                 [{start_coords[0]}, {start_coords[1]}],
                 [{end_coords[0]}, {end_coords[1]}]
                 dashArray: '10, 10'
             }}).addTo(map);
+            console.log('Route line added');
             map.fitBounds(routeLine.getBounds(), {{padding: [50, 50]}});
+            // Open popups after a short delay
+            setTimeout(function() {{
+                startMarker.openPopup();
+            }}, 500);
+            console.log('Map initialization complete');
         </script>
     </body>
     </html>
     response = call_groq(messages, api_key.strip())
+    # Extract locations for map - IMPROVED DETECTION
     map_html = None
+    # More comprehensive route patterns
     route_patterns = [
+        r'(?:from|start|starting|leave|depart)\s+([a-zA-Z\s,]+?)\s+(?:to|destination|ending|till|reach|arrive)\s+([a-zA-Z\s,]+?)(?:\.|$|,|\?|now|right)',
+        r'(?:route|way|path|travel|go|going)\s+(?:from\s+)?([a-zA-Z\s,]+?)\s+to\s+([a-zA-Z\s,]+?)(?:\.|$|,|\?|now|right)',
+        r'([a-zA-Z\s,]+?)\s+(?:to|till)\s+([a-zA-Z\s,]+?)\s+(?:route|safe|safety|now|right)',
+        r'safe.*?(?:from\s+)?([a-zA-Z\s,]+?)\s+(?:to|till)\s+([a-zA-Z\s,]+)',
     ]
     for pattern in route_patterns:
         if route_match:
             start_loc = route_match.group(1).strip()
             end_loc = route_match.group(2).strip()
+            # Clean up locations
+            start_loc = re.sub(r'\s+', ' ', start_loc)
+            end_loc = re.sub(r'\s+', ' ', end_loc)
+            print(f"DEBUG: Detected route - Start: {start_loc}, End: {end_loc}")
             map_html = create_interactive_map(start_loc, end_loc, response[:300])
             break
+    # If no route detected but keywords suggest mapping
+    if not map_html and any(word in keywords for word in ["route", "map", "from", "to", "safe way"]):
+        # Try to extract any two location-like words
+        locations = re.findall(r'\b([A-Z][a-z]+(?:\s+[A-Z][a-z]+)*)\b', message)
+        if len(locations) >= 2:
+            print(f"DEBUG: Fallback detection - Locations: {locations}")
+            map_html = create_interactive_map(locations[0], locations[1], response[:300])
     return history + [[message, response]], map_html
 def show_legal_info():