ok6

app.py

@@ -28,91 +28,72 @@ class RainViewerMap:
         active_storms = []
         error_messages = []
         
-        # Try multiple approaches to get hurricane data
         try:
-            # Approach 1: Try the simplified hurricane data endpoint
-            simple_url = "https://www.nhc.noaa.gov/CurrentStorms.json"
-            try:
-                response = requests.get(simple_url, timeout=10)
-                if response.status_code == 200:
-                    storms_data = response.json()
-                    for storm in storms_data.get('activeStorms', []):
-                        active_storms.append({
-                            'source': 'NHC CurrentStorms',
-                            'data': storm,
-                            'type': 'current_storms'
-                        })
-            except Exception as e:
-                error_messages.append(f"CurrentStorms.json failed: {e}")
+            # Get specific Eastern Pacific storms (EP1-EP5) and Atlantic storms (AT1-AT5)
+            storm_layers = [
+                {'name': 'EP1', 'forecast_points_id': 136, 'forecast_track_id': 137, 'forecast_cone_id': 138},
+                {'name': 'EP2', 'forecast_points_id': 154, 'forecast_track_id': 155, 'forecast_cone_id': 156},
+                {'name': 'AT1', 'forecast_points_id': 6, 'forecast_track_id': 7, 'forecast_cone_id': 8},
+                {'name': 'AT2', 'forecast_points_id': 24, 'forecast_track_id': 25, 'forecast_cone_id': 26},
+                {'name': 'AT3', 'forecast_points_id': 42, 'forecast_track_id': 43, 'forecast_cone_id': 44}
+            ]
             
-            # Approach 2: Try NOAA GIS layers for specific storm data
-            if not active_storms:
-                layers_url = f"{self.nhc_api_base}/layers?f=json"
+            for storm_info in storm_layers:
+                storm_name = storm_info['name']
+                points_id = storm_info['forecast_points_id']
+                track_id = storm_info['forecast_track_id']
+                cone_id = storm_info['forecast_cone_id']
+                
                 try:
-                    layers_response = requests.get(layers_url, timeout=15)
-                    if layers_response.status_code == 200:
-                        layers_data = layers_response.json()
-                        
-                        # Look for Atlantic storms (AT1-AT5) forecast points
-                        for layer in layers_data.get('layers', []):
-                            layer_name = layer.get('name', '').lower()
-                            layer_id = layer.get('id')
+                    # Get forecast points
+                    points_url = f"{self.nhc_api_base}/{points_id}/query"
+                    points_params = {
+                        'where': '1=1',
+                        'outFields': '*',
+                        'f': 'geojson',
+                        'returnGeometry': 'true'
+                    }
+                    
+                    points_response = requests.get(points_url, params=points_params, timeout=15)
+                    if points_response.status_code == 200:
+                        points_data = points_response.json()
+                        if points_data.get('features'):
+                            # Get track data
+                            track_url = f"{self.nhc_api_base}/{track_id}/query"
+                            track_response = requests.get(track_url, params=points_params, timeout=15)
+                            track_data = None
+                            if track_response.status_code == 200:
+                                track_data = track_response.json()
                             
-                            if ('at1' in layer_name or 'at2' in layer_name or 'at3' in layer_name) and 'forecast points' in layer_name:
-                                query_url = f"{self.nhc_api_base}/{layer_id}/query"
-                                params = {
-                                    'where': '1=1',
-                                    'outFields': '*',
-                                    'f': 'geojson',
-                                    'returnGeometry': 'true'
-                                }
-                                
-                                try:
-                                    query_response = requests.get(query_url, params=params, timeout=15)
-                                    if query_response.status_code == 200:
-                                        geojson_data = query_response.json()
-                                        if geojson_data.get('features'):
-                                            active_storms.append({
-                                                'source': 'NOAA GIS',
-                                                'layer_name': layer.get('name', ''),
-                                                'layer_id': layer_id,
-                                                'geojson': geojson_data,
-                                                'type': 'gis_layer'
-                                            })
-                                except Exception as e:
-                                    error_messages.append(f"Layer {layer_id} query failed: {e}")
+                            # Get cone data
+                            cone_url = f"{self.nhc_api_base}/{cone_id}/query"
+                            cone_response = requests.get(cone_url, params=points_params, timeout=15)
+                            cone_data = None
+                            if cone_response.status_code == 200:
+                                cone_data = cone_response.json()
+                            
+                            active_storms.append({
+                                'source': f'NOAA NHC {storm_name}',
+                                'storm_id': storm_name,
+                                'forecast_points': points_data,
+                                'forecast_track': track_data,
+                                'forecast_cone': cone_data,
+                                'type': 'nhc_storm'
+                            })
+                            
+                            # Get storm name from first feature for logging
+                            first_feature = points_data['features'][0]
+                            storm_actual_name = first_feature['properties'].get('stormname', storm_name)
+                            error_messages.append(f"Successfully loaded {storm_actual_name} ({storm_name})")
+                        
                 except Exception as e:
-                    error_messages.append(f"Layers API failed: {e}")
+                    error_messages.append(f"Error fetching {storm_name}: {e}")
             
-            # Approach 3: Add sample data if no real data available (for testing)
+            # If no real storms found, add informational message
             if not active_storms:
-                sample_storm = {
-                    'source': 'Sample Data',
-                    'type': 'sample',
-                    'geojson': {
-                        'type': 'FeatureCollection',
-                        'features': [
-                            {
-                                'type': 'Feature',
-                                'geometry': {
-                                    'type': 'Point',
-                                    'coordinates': [-80.0, 26.0]
-                                },
-                                'properties': {
-                                    'STORMNAME': 'Sample Hurricane',
-                                    'STORMTYPE': 'Hurricane',
-                                    'MAXWIND': '75',
-                                    'MSLP': '980',
-                                    'FHOUR': 'Current'
-                                }
-                            }
-                        ]
-                    }
-                }
-                active_storms.append(sample_storm)
-                error_messages.append("No real storm data available, showing sample data")
+                error_messages.append("No active storms found - this could mean no storms are currently active")
             
-            # Store error messages for debugging
+            # Store debug info
             self.storm_cache['errors'] = error_messages
             self.storm_cache['last_update'] = datetime.now().isoformat()