Merge pull request #223 from mhearne-usgs/typefix

Added more event types to getcsv, fixed bug in getcsv

Author: Mike Hearne

libcomcat/bin/getcsv.py

@@ -14,6 +14,8 @@
                                   get_summary_data_frame)
 from libcomcat.logging import setup_logger
 
+EVTYPES = ['earthquake', 'explosion', 'landslide', 'volcanic eruption']
+
 
 def get_parser():
     desc = '''Download basic earthquake information in line format (csv, tab, etc.).
@@ -219,6 +221,11 @@ def get_parser():
     parser.add_argument('-x', '--count', dest='getCount',
                         action='store_true',
                         help=helpstr)
+    typehelp = '''Select event type other than "earthquake".'''
+
+    parser.add_argument('--event-type', default='earthquake',
+                        choices=EVTYPES,
+                        help=typehelp)
     return parser
 
 
@@ -347,6 +354,7 @@ def main():
                         maxsig=maxsig,
                         producttype=args.limitByProductType,
                         host=args.host,
+                        eventtype=args.event_type,
                         alertlevel=args.alert_level)
     else:
         events = []
@@ -373,6 +381,7 @@ def main():
                              maxsig=maxsig,
                              producttype=args.limitByProductType,
                              host=args.host,
+                             eventtype=args.event_type,
                              alertlevel=args.alert_level)
             events += tevents
 
@@ -401,7 +410,10 @@ def main():
     first_columns = list(events[0].toDict().keys())
     col_list = list(df.columns)
     for column in first_columns:
-        col_list.remove(column)
+        try:
+            col_list.remove(column)
+        except Exception as e:
+            x = 1
     df = df[first_columns + col_list]
 
     if args.country:

libcomcat/classes.py

@@ -344,6 +344,7 @@ def toDict(self):
         edict['magnitude'] = self.magnitude
         edict['alert'] = self.alert
         edict['url'] = self.url
+        edict['eventtype'] = self._jdict['properties']['type']
         edict['significance'] = self['sig']
         return edict
 
@@ -578,7 +579,9 @@ def toDict(self, catalog=None,
             edict['magnitude'] = self.magnitude
             edict['magtype'] = self._jdict['properties']['magType']
             edict['url'] = self.url
+            edict['eventtype'] = self._jdict['properties']['type']
             edict['alert'] = self.alert
+            edict['significance'] = self['sig']
         else:
             try:
                 phase_sources = []