fix(stop_code): allow stop_code as none value .. no longer default stop id value

Author: fpurcell

gtfsdb/model/stop.py

@@ -199,14 +199,10 @@ def query_active_stop_ids(cls, session, limit=None, active_filter=True):
     def post_make_record(cls, row, **kwargs):
         """  NOTE: this is a (derived from base.py) method to fix up stop records before committing the record to the db """
 
-        # SMART (5/2024) has a stop record w/out a stop name, so let's fix that here and prevent the 
+        # SMART (5/2024) has a stop record w/out a stop name, so let's fix that here and prevent an empty name
         if row.get('stop_name') is None:
-            row['stop_name'] = "Stop ID {}".format(row.get('stop_id'))
-            log.warning(row['stop_name'])
-
-        # seen a few feeeds w/out a stop_code -- fix that here
-        if row.get('stop_code') is None:
-            row['stop_code'] = row['stop_id']
+            code = row.get('stop_code', row.get('stop_id'))
+            row['stop_name'] = f"Stop ID {code}"
 
         return row
 

gtfsdb/model/stop_base.py

@@ -12,18 +12,15 @@ class StopBase(object):
     """
     StopBase provides a generic set of stop query routines
     """
-
-    def get_stop_code(self):
+    def get_stop_code(self, def_val=""):
         """
-        should this method just return "" if no stop code, ala this blurb from GTFS:
+        will return "" if no stop code in the data, per this blurb from GTFS:
         'This field should be left empty for locations without a code presented to riders.'
         """
-        ret_val = self.stop_id
+        ret_val = def_val
         try:
             if self.stop_code and len(self.stop_code) > 0:
                 ret_val = self.stop_code
-            else:
-                ret_val = self.stop_id
         except Exception as e:
             log.warning(e)
         return ret_val
@@ -121,8 +118,8 @@ def query_stops(cls, session, **kwargs):
         will query the db for a stop, either via bbox, point & distance or just an id
         :return list of stops
         """
-        ret_val = []
         # import pdb; pdb.set_trace()
+        ret_val = []
         if kwargs.get('lat') or kwargs.get('min_lat'):
             bbox = BBox(**kwargs)
             if bbox.is_valid:

gtfsdb/scripts.py

@@ -52,6 +52,8 @@ def get_args(prog_name='gtfsdb-load', do_parse=True, def_db=config.DEFAULT_DATAB
                         help='create new db tables (note: not currently used in gtfsdb, which always creates tables)')
     parser.add_argument('--print', '-p', action="store_true",
                         help='print results from some sql query or data transform to cmdline')
+    parser.add_argument('--ignore_stop_codes', '-nsc', default=False, action='store_true',
+                        help="no public stop codes or ids should be used, so don't publish stop codes to downstream systems")
     parser.add_argument('--current_tables', '-ct', default=False, action='store_true',
                         help="create tables that represent 'current' service (e.g., views)")
     parser.add_argument('--current_tables_all', '-cta', default=False, action='store_true',