stop.py

@@ -17,16 +17,7 @@ line_types = (
 	'Lianes',
 	'Ligne',
 	'Bus Relais',
-	'Citéis',
 )
-line_translate = {
-	'Tram A': 'A',
-	'Tram B': 'B',
-	'Tram C': 'C',
-	'Tram D': 'D',
-	'TBNight': '58',
-	'BAT3': '69',
-}
 
 
 def search_stop_by_name (keyword):
@@ -102,25 +93,23 @@ def show_stops_from_ref (ref):
 				'terminus': j ['name'],
 				'line_human': j ['line'] ['name'],
 			}
-			add = False
-			if rte ['line_human'] in line_translate:
-				line_id = line_translate [rte ['line_human']]
-				add = True
-			else:
-				try:
-					line_id = search ('[0-9]+$', rte ['line_human']).group ()
-				except AttributeError:
-					continue
+			try:
+				line_id = search ('[0-9A-D]+$', rte ['line_human']).group ()
+			except AttributeError:
+				continue
+			try:
 				line_id = '%02d' % int (line_id)
-				for i in line_types:
-					if rte ['line_human'] [0:len (i)] == i:
-						add = True
-						break
-			if add:
+			except ValueError:
+				pass
+			a = False
+			for i in line_types:
+				if rte ['line_human'] [0:len (i)] == i:
+					a = True
+					break
+			if a:
 				rte ['line_id'] = line_id
 				s ['routes'].append (rte)
-		if s ['routes'] != []:
-			r ['stop_points'].append (s)
+		r ['stop_points'].append (s)
 	return (r)