Merge pull request #501 from laurentg/master

Fix #500 - validate if IDless agency is single.

Author: jarondl

tests/data/invalid_agency_ids/agency.txt

@@ -0,0 +1,3 @@
+agency_id,agency_name,agency_url,agency_timezone
+DTA,Demo Transit Authority,http://google.com,America/Los_Angeles
+,IDless Demo Transit Authority,http://google.com,America/Los_Angeles

tests/data/invalid_agency_ids/calendar.txt

@@ -0,0 +1,3 @@
+service_id,monday,tuesday,wednesday,thursday,friday,saturday,sunday,start_date,end_date
+FULLW,1,1,1,1,1,1,1,20070101,20101231
+WE,0,0,0,0,0,1,1,20070101,20101231

tests/data/invalid_agency_ids/calendar_dates.txt

@@ -0,0 +1,2 @@
+service_id,date,exception_type
+FULLW,20070604,2

tests/data/invalid_agency_ids/routes.txt

@@ -0,0 +1,6 @@
+route_id,agency_id,route_short_name,route_long_name,route_desc,route_type,route_url,route_color,route_text_color
+AB,DTA,,Airport - Bullfrog,,3,,,
+BFC,DTA,,Bullfrog - Furnace Creek Resort,,3,,,
+STBA,,,Stagecoach - Airport Shuttle,,3,,,
+CITY,DTA,,City,,3,,,
+AAMV,DTA,,Airport - Amargosa Valley,,3,,,

tests/data/invalid_agency_ids/stop_times.txt

@@ -0,0 +1,29 @@
+trip_id,arrival_time,departure_time,stop_id,stop_sequence,stop_headsign,pickup_type,drop_off_type,shape_dist_traveled
+STBA,6:00:00,6:00:00,STAGECOACH,1,,,,
+STBA,6:20:00,6:20:00,BEATTY_AIRPORT,2,,,,
+CITY1,6:00:00,6:00:00,STAGECOACH,1,,,,
+CITY1,6:05:00,6:07:00,NANAA,2,,,,
+CITY1,6:12:00,6:14:00,NADAV,3,,,,
+CITY1,6:19:00,6:21:00,DADAN,4,,,,
+CITY1,6:26:00,6:28:00,EMSI,5,,,,
+CITY2,6:28:00,6:30:00,EMSI,1,,,,
+CITY2,6:35:00,6:37:00,DADAN,2,,,,
+CITY2,6:42:00,6:44:00,NADAV,3,,,,
+CITY2,6:49:00,6:51:00,NANAA,4,,,,
+CITY2,6:56:00,6:58:00,STAGECOACH,5,,,,
+AB1,8:00:00,8:00:00,BEATTY_AIRPORT,1,,,,
+AB1,8:10:00,8:15:00,BULLFROG,2,,,,
+AB2,12:05:00,12:05:00,BULLFROG,1,,,,
+AB2,12:15:00,12:15:00,BEATTY_AIRPORT,2,,,,
+BFC1,8:20:00,8:20:00,BULLFROG,1,,,,
+BFC1,9:20:00,9:20:00,FUR_CREEK_RES,2,,,,
+BFC2,11:00:00,11:00:00,FUR_CREEK_RES,1,,,,
+BFC2,12:00:00,12:00:00,BULLFROG,2,,,,
+AAMV1,8:00:00,8:00:00,BEATTY_AIRPORT,1,,,,
+AAMV1,9:00:00,9:00:00,AMV,2,,,,
+AAMV2,10:00:00,10:00:00,AMV,1,,,,
+AAMV2,11:00:00,11:00:00,BEATTY_AIRPORT,2,,,,
+AAMV3,13:00:00,13:00:00,BEATTY_AIRPORT,1,,,,
+AAMV3,14:00:00,14:00:00,AMV,2,,,,
+AAMV4,15:00:00,15:00:00,AMV,1,,,,
+AAMV4,16:00:00,16:00:00,BEATTY_AIRPORT,2,,,,

tests/data/invalid_agency_ids/stops.txt

@@ -0,0 +1,10 @@
+stop_id,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url
+FUR_CREEK_RES,Furnace Creek Resort (Demo),,36.425288,-117.133162,,
+BEATTY_AIRPORT,Nye County Airport (Demo),,36.868446,-116.784582,,
+BULLFROG,Bullfrog (Demo),,36.88108,-116.81797,,
+STAGECOACH,Stagecoach Hotel & Casino (Demo),,36.915682,-116.751677,,
+NADAV,North Ave / D Ave N (Demo),,36.914893,-116.76821,,
+NANAA,North Ave / N A Ave (Demo),,36.914944,-116.761472,,
+DADAN,Doing Ave / D Ave N (Demo),,36.909489,-116.768242,,
+EMSI,E Main St / S Irving St (Demo),,36.905697,-116.76218,,
+AMV,Amargosa Valley (Demo),,36.641496,-116.40094,,

tests/data/invalid_agency_ids/trips.txt

@@ -0,0 +1,12 @@
+route_id,service_id,trip_id,trip_headsign,direction_id,block_id,shape_id
+AB,FULLW,AB1,to Bullfrog,0,1,
+AB,FULLW,AB2,to Airport,1,2,
+STBA,FULLW,STBA,Shuttle,,,
+CITY,FULLW,CITY1,,0,,
+CITY,FULLW,CITY2,,1,,
+BFC,FULLW,BFC1,to Furnace Creek Resort,0,1,
+BFC,FULLW,BFC2,to Bullfrog,1,2,
+AAMV,WE,AAMV1,to Amargosa Valley,0,,
+AAMV,WE,AAMV2,to Airport,1,,
+AAMV,WE,AAMV3,to Amargosa Valley,0,,
+AAMV,WE,AAMV4,to Airport,1,,

tests/transitfeed/testtrip.py

@@ -615,6 +615,13 @@ def runTest(self):
     self.accumulator.AssertNoMoreExceptions()
 
 
+class InvalidAgencyIdsTestCase(util.LoadTestCase):
+  def runTest(self):
+    self.Load('invalid_agency_ids')
+    self.accumulator.PopException('OtherProblem')
+    self.accumulator.AssertNoMoreExceptions()
+
+
 class AddStopTimeParametersTestCase(util.TestCase):
   def runTest(self):
     problem_reporter = util.GetTestFailureProblemReporter(self)

transitfeed/schedule.py

@@ -1278,6 +1278,15 @@ def ValidateBlocks(self, problems, trip_intervals_by_block_id):
                                                    trip_b.trip_id,
                                                    block_id)
 
+  def ValidateIdlessAgency(self, problems):
+    # Check that only one agency is IDless
+    if len(self._agencies) > 1:
+      for agency in self._agencies.values():
+        if util.IsEmpty(agency.agency_id):
+          problems.OtherProblem('Agency "%s" does not have an ID. '
+                                'This is only allowed if a single agency is defined, '
+                                'whereas there are %d in total.' % (agency.agency_name, len(self._agencies)))
+
   def ValidateRouteAgencyId(self, problems):
     # Check that routes' agency IDs are valid, if set
     for route in self.routes.values():
@@ -1346,6 +1355,7 @@ def Validate(self,
     self.ValidateNearbyStops(problems)
     self.ValidateRouteNames(problems, validate_children)
     self.ValidateTrips(problems)
+    self.ValidateIdlessAgency(problems)
     self.ValidateRouteAgencyId(problems)
     self.ValidateTripStopTimes(problems)
     self.ValidateUnusedShapes(problems)