Changeset 160:895341a3509f for StormSiren/AlertDevice.py

Timestamp:

11/16/08 22:36:24 (3 years ago)

Author:

chris

Branch:

unix

Message:

reworked area filtering to work on the new areaDesc that has replaced a single county in the original CAP feed.

Files:

• StormSiren/AlertDevice.py (modified) (2 diffs)

StormSiren/AlertDevice.py

@@ -135 +135 @@
                 return False
 
-        def isCountyWanted(self,state,county):
+        def isAreaWanted(self,state,alert_areas):
                 if(self.__areas.has_key(state)):
-                        if(county.lower() in self.__areas[state]):
-                                return True
+                        for area in alert_areas:
+                                if(area.lower() in self.__areas[state]):
+                                        return True
                 return False
 
@@ -145 +146 @@
                 if(self.isTypeWanted(cap_alert.type) and self.isStateWanted(cap_alert.state)):
                         self.log.debug("Testing[%s]: type and state match(%s/%i)" % (cap_alert.id, cap_alert.state, cap_alert.type))
-                        if(self.isCountyWanted(cap_alert.state, cap_alert.county)):
-                                self.log.info("Alert hit on county[%s/%s]: %s" % (cap_alert.county, cap_alert.state, cap_alert.id))
+                        if(self.isAreaWanted(cap_alert.state, cap_alert.areas)):
+                                self.log.debug("Alert hit on area[%s/%s]: %s" % (cap_alert.state, cap_alert.id, cap_alert.areas))
                                 return True
-                        else:
-                                for loc in self.__areas[cap_alert.state]:
-                                        if(cap_alert.isLocationInDesc(loc)):
-                                                self.log.info("Alert hit on location[%s/%s]: %s" % (loc, cap_alert.state, cap_alert.id))
-                                                return True
                 return False
 #CODE END