Update app.py

app.py

@@ -225,12 +225,15 @@ class AccurateAirQualityMapper:
                     value = float(fields[7]) if fields[7].replace('.','').replace('-','').isdigit() else 0
                     parameter = fields[5]
                     
-                    # Only include air quality parameters
-                    if parameter not in ['OZONE', 'PM2.5', 'PM10', 'NO2', 'SO2', 'CO']:
-                        continue
+                    # Include ALL parameters (air quality + meteorological)
+                    # Don't filter - the original successful run included everything
                     
                     aqi = self.calculate_aqi(parameter, value)
                     
+                    # Determine if it's an air quality or meteorological parameter
+                    air_quality_params = ['OZONE', 'PM2.5', 'PM10', 'NO2', 'SO2', 'CO']
+                    is_air_quality = parameter in air_quality_params
+                    
                     record = {
                         'DateObserved': fields[0],
                         'HourObserved': fields[1],
@@ -243,9 +246,10 @@ class AccurateAirQualityMapper:
                         'Latitude': lat,
                         'Longitude': lon,
                         'AQI': aqi,
-                        'Category': {'Name': self.get_aqi_category(aqi)},
+                        'Category': {'Name': self.get_aqi_category(aqi) if is_air_quality else 'Meteorological'},
                         'ReportingArea': fields[3],
-                        'StateCode': aqs_id[:2] if len(aqs_id) >= 2 else 'US'
+                        'StateCode': aqs_id[:2] if len(aqs_id) >= 2 else 'US',
+                        'IsAirQuality': is_air_quality
                     }
                     
                     data.append(record)
@@ -288,39 +292,62 @@ class AccurateAirQualityMapper:
                 units = item['ReportingUnits']
                 category = item['Category']['Name']
                 
-                # Create popup
-                popup_content = f"""
-                <div style="width: 250px;">
-                    <h4>{site_name}</h4>
-                    <p><b>Parameter:</b> {parameter}</p>
-                    <p><b>Value:</b> {value} {units}</p>
-                    <p><b>AQI:</b> {aqi} ({category})</p>
-                    <p><b>Coordinates:</b> {lat:.4f}, {lon:.4f}</p>
-                    <p><b>Time:</b> {item['DateObserved']} {item['HourObserved']}:00 GMT</p>
-                    <p><b>Station ID:</b> {item['AQSID']}</p>
-                </div>
-                """
+                # Create popup content
+                if is_air_quality:
+                    popup_content = f"""
+                    <div style="width: 250px;">
+                        <h4>{site_name} <span style="color: red;">🌬️ Air Quality</span></h4>
+                        <p><b>Parameter:</b> {parameter}</p>
+                        <p><b>Value:</b> {value} {units}</p>
+                        <p><b>AQI:</b> {aqi} ({category})</p>
+                        <p><b>Coordinates:</b> {lat:.4f}, {lon:.4f}</p>
+                        <p><b>Time:</b> {item['DateObserved']} {item['HourObserved']}:00 GMT</p>
+                        <p><b>Station ID:</b> {item['AQSID']}</p>
+                    </div>
+                    """
+                    tooltip_text = f"{site_name}: {parameter} = {value} {units} (AQI: {aqi})"
+                else:
+                    popup_content = f"""
+                    <div style="width: 250px;">
+                        <h4>{site_name} <span style="color: blue;">🌡️ Meteorological</span></h4>
+                        <p><b>Parameter:</b> {parameter}</p>
+                        <p><b>Value:</b> {value} {units}</p>
+                        <p><b>Coordinates:</b> {lat:.4f}, {lon:.4f}</p>
+                        <p><b>Time:</b> {item['DateObserved']} {item['HourObserved']}:00 GMT</p>
+                        <p><b>Station ID:</b> {item['AQSID']}</p>
+                    </div>
+                    """
+                    tooltip_text = f"{site_name}: {parameter} = {value} {units}"
                 
-                # Color based on AQI
-                if aqi <= 50:
-                    marker_color = 'green'
-                elif aqi <= 100:
-                    marker_color = 'orange'
-                elif aqi <= 150:
-                    marker_color = 'orange'
-                elif aqi <= 200:
-                    marker_color = 'red'
-                elif aqi <= 300:
-                    marker_color = 'purple'
+                # Determine marker appearance based on parameter type
+                is_air_quality = item.get('IsAirQuality', False)
+                
+                if is_air_quality:
+                    # Color based on AQI for air quality parameters
+                    if aqi <= 50:
+                        marker_color = 'green'
+                    elif aqi <= 100:
+                        marker_color = 'orange'
+                    elif aqi <= 150:
+                        marker_color = 'orange'
+                    elif aqi <= 200:
+                        marker_color = 'red'
+                    elif aqi <= 300:
+                        marker_color = 'purple'
+                    else:
+                        marker_color = 'darkred'
+                    icon_type = 'cloud'
                 else:
-                    marker_color = 'darkred'
+                    # Meteorological parameters use blue/gray
+                    marker_color = 'blue'
+                    icon_type = 'info-sign'
                 
                 # Add marker
                 folium.Marker(
                     [lat, lon],
                     popup=folium.Popup(popup_content, max_width=300),
-                    tooltip=f"{site_name}: {parameter} = {value} {units} (AQI: {aqi})",
-                    icon=folium.Icon(color=marker_color, icon='cloud')
+                    tooltip=tooltip_text,
+                    icon=folium.Icon(color=marker_color, icon=icon_type)
                 ).add_to(m)
                 
             except Exception as e:
@@ -329,16 +356,19 @@ class AccurateAirQualityMapper:
         # Add legend
         legend_html = """
         <div style="position: fixed; 
-                    bottom: 50px; left: 50px; width: 180px; height: 200px; 
+                    bottom: 50px; left: 50px; width: 200px; height: 260px; 
                     background-color: white; border:2px solid grey; z-index:9999; 
-                    font-size:14px; padding: 10px">
-        <h4>AQI Legend</h4>
+                    font-size:12px; padding: 10px">
+        <h4>Station Legend</h4>
+        <p><b>🌬️ Air Quality (AQI):</b></p>
         <p><i class="fa fa-circle" style="color:green"></i> Good (0-50)</p>
         <p><i class="fa fa-circle" style="color:orange"></i> Moderate (51-100)</p>
         <p><i class="fa fa-circle" style="color:orange"></i> Unhealthy for Sensitive (101-150)</p>
         <p><i class="fa fa-circle" style="color:red"></i> Unhealthy (151-200)</p>
         <p><i class="fa fa-circle" style="color:purple"></i> Very Unhealthy (201-300)</p>
         <p><i class="fa fa-circle" style="color:darkred"></i> Hazardous (301+)</p>
+        <p><b>🌡️ Meteorological:</b></p>
+        <p><i class="fa fa-circle" style="color:blue"></i> Weather Data</p>
         </div>
         """
         m.get_root().html.add_child(folium.Element(legend_html))
@@ -352,13 +382,15 @@ class AccurateAirQualityMapper:
         
         table_data = []
         for item in data:
+            is_air_quality = item.get('IsAirQuality', False)
             table_data.append({
                 'Site Name': item['SiteName'],
                 'State': item['StateCode'],
                 'Parameter': item['ParameterName'],
+                'Type': '🌬️ Air Quality' if is_air_quality else '🌡️ Meteorological',
                 'Value': item['Value'],
                 'Units': item['ReportingUnits'],
-                'AQI': item['AQI'],
+                'AQI': item['AQI'] if is_air_quality else 'N/A',
                 'Category': item['Category']['Name'],
                 'Latitude': round(item['Latitude'], 4),
                 'Longitude': round(item['Longitude'], 4),
@@ -375,11 +407,30 @@ mapper = AccurateAirQualityMapper()
 
 def update_map():
     """Update map with accurate coordinates"""
-    print("🚀 Starting accurate air quality mapping...")
+    print("🚀 Starting comprehensive air quality and meteorological mapping...")
     
     # Fetch data
     data, status = mapper.fetch_airnow_bulk_data()
     
+    if data:
+        # Show parameter breakdown like the original
+        df_temp = pd.DataFrame(data)
+        param_counts = df_temp['ParameterName'].value_counts()
+        
+        print(f"\n📈 Data Summary:")
+        print(f"Total stations: {len(df_temp)}")
+        print(f"Parameters monitored: {df_temp['ParameterName'].nunique()}")
+        print(f"Unique sites: {df_temp['SiteName'].nunique()}")
+        
+        print(f"\nParameter breakdown:")
+        for param, count in param_counts.head(10).items():
+            print(f"{param}: {count}")
+        
+        # Update status to include breakdown
+        air_quality_count = len([d for d in data if d.get('IsAirQuality', False)])
+        met_count = len(data) - air_quality_count
+        status = f"✅ SUCCESS: {len(data)} total stations ({air_quality_count} air quality + {met_count} meteorological) from {len(set(d['SiteName'] for d in data))} unique sites"
+    
     # Create map
     map_html = mapper.create_map(data)
     
@@ -393,39 +444,40 @@ with gr.Blocks(title="Accurate AirNow Sensor Map", theme=gr.themes.Soft()) as de
     
     gr.Markdown(
         """
-        # 🎯 Accurate AirNow Air Quality Map
+        # 🎯 Complete AirNow Monitoring Network Map
         
-        **✅ PRECISE COORDINATES** - Uses EPA's official monitor coordinate database!
+        **✅ PRECISE COORDINATES + ALL STATIONS** - Every sensor with exact locations!
         
-        This map displays real-time air quality data with **accurate station locations** by:
-        1. **Downloading EPA coordinates**: Gets precise lat/lon for every monitoring station
-        2. **Fetching AirNow bulk data**: Current hourly readings from 2,000+ stations  
-        3. **Accurate mapping**: Stations plotted at their exact geographic locations
+        This map displays the **complete AirNow monitoring network** with accurate coordinates:
+        1. **All Parameters**: Air quality (OZONE, PM2.5, PM10, NO2, SO2, CO) + Meteorological (TEMP, WIND, HUMIDITY, etc.)
+        2. **EPA Coordinates**: Precise lat/lon for every monitoring station  
+        3. **Real-time Data**: Current hourly readings from 2,000+ stations
+        4. **Visual Distinction**: 🌬️ Air quality (colored by AQI) vs 🌡️ Meteorological (blue)
         
         ## Key Features:
-        - 🎯 **Precise Locations**: EPA's official coordinate database
-        - 🌍 **Complete Coverage**: All active AirNow monitoring stations
-        - ⚡ **Real-time Data**: Latest hourly observations
-        - 📊 **Air Quality Focus**: OZONE, PM2.5, PM10, NO2, SO2, CO
-        - 🔄 **Auto-updated**: Fresh data every hour
+        - 🎯 **All 7,000+ Sensors**: Complete monitoring network coverage
+        - 📍 **Exact Locations**: EPA's official coordinate database
+        - 🌬️ **Air Quality**: Color-coded by AQI health categories  
+        - 🌡️ **Weather Data**: Temperature, wind, humidity, pressure
+        - ⚡ **Real-time**: Latest hourly observations
         
-        **⚠️ Data Note**: This displays preliminary, real-time data for public information. 
+        **⚠️ Data Note**: Real-time preliminary data for public information. 
         For regulatory purposes, use EPA's official AQS data.
         """
     )
     
     with gr.Row():
-        load_button = gr.Button("🎯 Load Accurate Air Quality Map", variant="primary", size="lg")
+        load_button = gr.Button("🎯 Load Complete Monitoring Network", variant="primary", size="lg")
     
-    status_text = gr.Markdown("Click the button above to load current air quality data with precise coordinates.")
+    status_text = gr.Markdown("Click the button above to load ALL monitoring stations with precise coordinates.")
     
     with gr.Tabs():
-        with gr.TabItem("🗺️ Accurate Map"):
-            map_output = gr.HTML(label="Air Quality Map with Precise Coordinates")
+        with gr.TabItem("🗺️ Complete Network Map"):
+            map_output = gr.HTML(label="Complete AirNow Monitoring Network with Precise Coordinates")
         
-        with gr.TabItem("📊 Station Data"):
+        with gr.TabItem("📊 All Station Data"):
             data_table = gr.Dataframe(
-                label="Air Quality Monitoring Stations",
+                label="All Monitoring Stations (Air Quality + Meteorological)",
                 interactive=False
             )
     
@@ -433,13 +485,17 @@ with gr.Blocks(title="Accurate AirNow Sensor Map", theme=gr.themes.Soft()) as de
         """
         ## Data Sources:
         
-        **Coordinates**: EPA Air Quality System (AQS) - Official monitor locations
-        **Air Quality Data**: AirNow hourly bulk files - Real-time observations
-        **Coverage**: 2,000+ monitoring stations across US, Canada, and parts of Mexico
+        **Coordinates**: EPA Air Quality System (AQS) - Official monitor locations (364,377+ records)
+        **Monitoring Data**: AirNow hourly bulk files - Real-time observations from all sensors
+        **Coverage**: 7,000+ monitoring sensors across US, Canada, and parts of Mexico
+        
+        ## Parameters Included:
+        **🌬️ Air Quality**: OZONE, PM2.5, PM10, NO2, SO2, CO (color-coded by AQI)
+        **🌡️ Meteorological**: TEMP, WIND, HUMIDITY, PRESSURE, SOLAR, PRECIP (blue markers)
         
         ## Files Used:
-        - `aqs_monitors.zip` - EPA monitor coordinates (364,377+ records)
-        - `HourlyData_YYYYMMDDHH.dat` - AirNow real-time observations
+        - `aqs_monitors.zip` - EPA monitor coordinates 
+        - `HourlyData_YYYYMMDDHH.dat` - AirNow real-time observations (ALL parameters)
         
         ## Links:
         - [EPA AQS Data](https://aqs.epa.gov/aqsweb/airdata/download_files.html)