Mercurial > bus-service / changeset

--- a/buses.py	Wed Jun 21 18:25:09 2017 +0300
+++ b/buses.py	Thu Jun 22 19:01:31 2017 +0300
@@ -59,8 +59,9 @@
 		return 'services[%r]' % self.reference
 
 class BusStop:
-	def __init__(self, reference, name, location):
+	def __init__(self, reference, name, location, code = None):
 		self.reference, self.name, self.location = reference, name, location
+		self.code = code or reference
 		self.cluster = None
 		self.pairs = set() # samannimiset lähellä olevat pysäkit
 		self.involved_trips = set()
@@ -108,7 +109,7 @@
 				# ja jos tämä trip pysähtyy tällä pysäkillä, ei kuitenkaan saapuen
 				# päätepysäkille,
 				stop = trip.contains_stop(self)
-				if stop and not stop.isArrival: # stop is not trip.schedule[-1]:
+				if stop and not stop.is_arrival: # stop is not trip.schedule[-1]:
 					# ja jos tämä halt on tulevaisuudessa,
 					stop_time = datetime.combine(date, time()) + stop.arrival_time
 					if stop_time >= now():
@@ -128,18 +129,21 @@
 			stop, trip
 		self.traveled_distance = traveled_distance
 	@property
-	def isArrival(self):
+	def is_arrival(self):
 		if not hasattr(self, 'cachedIsArrival'):
-			iterator = iter(self.trip.schedule)
-			stop = next(iterator)
-			while stop is not self:
+			if self.stop.region:
+				iterator = iter(self.trip.schedule)
 				stop = next(iterator)
-			for stop in iterator:
-				if stop.stop.region != self.stop.region:
-					self.cachedIsArrival = False
-					break
+				while stop is not self:
+					stop = next(iterator)
+				for stop in iterator:
+					if stop.stop.region != self.stop.region:
+						self.cachedIsArrival = False
+						break
+				else:
+					self.cachedIsArrival = True
 			else:
-				self.cachedIsArrival = True
+				self.cachedIsArrival = False
 		return self.cachedIsArrival
 	def __repr__(self):
 		return 'BusHalt(%r, %r, %r, %r)' % (self.arrival_time, self.departure_time, self.stop, self.trip)
@@ -182,7 +186,7 @@
 		all_trips[trip.name] = trip
 print('%d ajoa' % len(all_trips), file = stderr)
 
-def lue_päiväys(teksti):
+def read_date(teksti):
 	return date(int(teksti[:4]), int(teksti[4:6]), int(teksti[6:]))
 
 def read_time(teksti):
@@ -194,16 +198,42 @@
 viimeinen_käyttöpäivä = date.today()
 services_for_day = {}
 
-with open('gtfs/calendar_dates.txt') as file:
-	for row in read_csv(file):
-		service = services[row['service_id']]
-		day = lue_päiväys(row['date'])
+def date_range(start_date, end_date, *, include_end = False):
+	''' Generates date from start_date to end_date. If include_end is True, then end_date will be yielded. '''
+	current_date = start_date
+	while current_date < end_date:
+		yield current_date
+		current_date += timedelta(1)
+	if include_end:
+		yield end_date
+
+def add_day_to_service(service_name, day):
+	try:
+		service = services[service_name]
+	except KeyError:
+		return
+	else:
 		service.dates.add(day)
 		if day not in services_for_day:
 			services_for_day[day] = set()
 		services_for_day[day].add(service)
+		global viimeinen_käyttöpäivä
 		viimeinen_käyttöpäivä = max(day, viimeinen_käyttöpäivä)
 
+def filter_day(row, day):
+	day_names = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday']
+	return int(row[day_names[day.isoweekday() - 1]])
+
+with open('gtfs/calendar.txt') as file:
+	for row in read_csv(file):
+		for day in date_range(read_date(row['start_date']), read_date(row['end_date']), include_end = True):
+			if filter_day(row, day):
+				add_day_to_service(service_name = row['service_id'], day = day)
+
+with open('gtfs/calendar_dates.txt') as file:
+	for row in read_csv(file):
+		add_day_to_service(service_name = row['service_id'], day = read_date(row['date']))
+
 def services_available_at(day):
 	for service in services.values():
 		if day in service.dates:
@@ -213,7 +243,12 @@
 with open('gtfs/stops.txt') as file:
 	for row in read_csv(file):
 		location = Sijainti(float(row['stop_lat']), float(row['stop_lon']))
-		stop = BusStop(row['stop_id'], row['stop_name'], location)
+		stop = BusStop(
+			reference = row['stop_id'],
+			name = row['stop_name'],
+			location = location, 
+			code = row['stop_code'],
+		)
 		bus_stops[stop.reference] = stop
 with open('regions-per-stop.json') as file:
 	for stop_reference, region in json.load(file).items():
@@ -276,7 +311,7 @@
 			# etsi pysäkin samannimiset vastaparit
 			for pair_candidate in bus_stops_by_name[bus_stop.name]:
 				distance = pair_candidate.location.etäisyys(bus_stop.location)
-				if pair_candidate is not bus_stop and distance <= 0.3:
+				if pair_candidate is not bus_stop and distance <= 0.4:
 					stops_to_cluster.add(pair_candidate)
 			for stop_to_cluster in stops_to_cluster:
 				if stop_to_cluster.cluster:
@@ -299,7 +334,7 @@
 			for cluster in all_clusters:
 				if cluster is not bus_stop.cluster:
 					distance = cluster.center.etäisyys(bus_stop.location)
-					if distance <= 0.3:
+					if distance <= 0.4:
 						possibilities.add((distance, cluster))
 			if possibilities:
 				best = min(possibilities)[1]
@@ -356,8 +391,10 @@
 
 clusters_by_name = {}
 for cluster in all_clusters:
-	assert cluster.url_name not in clusters_by_name
-	clusters_by_name[cluster.url_name] = cluster
+	if cluster.url_name in clusters_by_name:
+		print('Warning: Clusters %r and %r share the same URL name: %r' % (cluster.name, clusters_by_name[cluster.url_name].name, cluster.url_name))
+	else:
+		clusters_by_name[cluster.url_name] = cluster
 
 print('Ladataan aikataulut... ', end = '', flush = True, file = stderr)
 with open('gtfs/stop_times.txt') as file:

--- a/service.py	Wed Jun 21 18:25:09 2017 +0300
+++ b/service.py	Thu Jun 22 19:01:31 2017 +0300
@@ -60,12 +60,15 @@
 	from math import ceil
 	trip_length = schedule_entry['trip'].length - schedule_entry['stop'].traveled_distance
 	sign = reduce_schedule(schedule_entry['trip'].concise_schedule(schedule_entry['stop']), trip_length = trip_length)
-	sign = [tr(place, 'paikat') for place in sign]
-	sign_representation = ' - '.join(sign)
-	#if len(sign_representation) > 25:
-	#	k = ceil(len(sign) / 2)
-	#	sign_representation = ' - '.join(sign[:k]) + '\n' + ' - '.join(sign[k:])
-	return sign_representation
+	if sign:
+		sign = [tr(place, 'paikat') for place in sign]
+		sign_representation = ' - '.join(sign)
+		#if len(sign_representation) > 25:
+		#	k = ceil(len(sign) / 2)
+		#	sign_representation = ' - '.join(sign[:k]) + '\n' + ' - '.join(sign[k:])
+		return sign_representation
+	else:
+		return schedule_entry['trip'].schedule[-1].stop.name
 
 @app.route('/pysäkki/<reference>')
 def bus_stop_schedule(reference):
@@ -86,7 +89,7 @@
 	return render_template(
 		'stop.html',
 		schedule = schedule,
-		name = reference + ' ' + tr(bus_stop.name, 'bus_stops'),
+		name = bus_stop.code + ' ' + tr(bus_stop.name, 'bus_stops'),
 		link_to_map = bus_stop.location.link_to_map,
 		region = bus_stop.region,
 		location = bus_stop.location,
@@ -125,11 +128,13 @@
 			'trip': schedule_entry['stop'].trip.name,
 			'night': is_night_time(schedule_entry['time']),
 			'stop_id': schedule_entry['stop'].stop.reference,
+			'stop_code': schedule_entry['stop'].stop.code, 
 			'stop_name': tr(schedule_entry['stop'].stop.name, 'bus_stops'),
 		})
 	stops_in_cluster = sorted(
 		({
 			'id': stop.reference,
+			'code': stop.code,
 			'name': tr(stop.name, 'bus_stops'),
 		} for stop in cluster.stops),
 		key = lambda stop: (len(stop['id']), stop['id'])
@@ -161,7 +166,8 @@
 		formatted_time = time_representation(stop_time)
 		schedule.append({
 			'time': formatted_time,
-			'reference': halt.stop.reference,
+			'id': halt.stop.reference,
+			'code': halt.stop.code,
 			'region': tr(halt.stop.region or '', 'paikat'),
 			'name': tr(halt.stop.name, 'bus_stops'),
 		})
@@ -174,7 +180,10 @@
 				})
 				used_areas.add(region)
 	sign = reduce_schedule([k['region'] for k in concise_schedule], whole = True, trip_length = trip.length)
-	sign = [sign[0], sign[-1]]
+	try:
+		sign = [sign[0], sign[-1]]
+	except IndexError:
+		sign = [trip.schedule[0].stop.name, trip.schedule[-1].stop.name]
 	for entry in concise_schedule:
 		entry['region'] = tr(entry['region'], 'paikat')
 	return render_template('trip.html',

Binary file static/iso-pysäkki.png has changed

Binary file static/pysäkki.png has changed

--- a/templates/cluster.html	Wed Jun 21 18:25:09 2017 +0300
+++ b/templates/cluster.html	Thu Jun 22 19:01:31 2017 +0300
@@ -39,7 +39,7 @@
 	<div class="stops-in-cluster">
 	<ul>
 	{% for stop in stops_in_cluster %}
-		<li><a href="/pysäkki/{{stop['id']}}"><img src="/static/pysäkki.png" height="24" /> {{stop['id']}} {{stop['name']}}</a></li>
+		<li><a href="/pysäkki/{{stop['id']}}"><img src="/static/pysäkki.png" height="24" /> {{stop['code']}} {{stop['name']}}</a></li>
 	{% endfor %}
 	</ul>
 	</div>
@@ -60,7 +60,7 @@
 				<a href="/ajovuoro/{{halt['trip']}}">{{halt['sign']}}</a>
 			</td>
 			<td class='sarake-pysäkki'>
-				<a href="/pysäkki/{{halt['stop_id']}}"><img src="/static/pysäkki.png" height="24" /> {{halt['stop_id']}}</a>
+				<a href="/pysäkki/{{halt['stop_id']}}"><img src="/static/pysäkki.png" height="24" /> {{halt['stop_code']}}</a>
 			</td>
 		</tr>
 		{% endfor %}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/route.html	Thu Jun 22 19:01:31 2017 +0300
@@ -0,0 +1,27 @@
+<html>
+<head>
+	<link rel="icon" type="image/png" href="/static/favicon.png" />
+	<link rel="stylesheet" type="text/css" href="/static/style.css" />
+	<meta charset='UTF-8' />
+	<title>{{name}}</title>
+</head>
+<body>
+	<h1><span>{{name}}</span></h1>
+	<table class='aikataulu' cellspacing="0">
+		<tr>
+			<th class='sarake-aika'>{{tr('time', 'headings')}}</th>
+			<th class='sarake-lähtö'>{{tr('from', 'headings')}}</th>
+			<th class='sarake-määränpää'>{{tr('destination', 'headings')}}</th>
+			<th class='sarake-status'>{{tr('status', 'headings')}}</th>
+		</tr>
+		{% for trip in schedule %}
+		<tr>
+			<td>{{trip['time']}}</td>
+			<td><a href="/ajovuoro/{{trip['name']}}">{{trip['from']}}</a></td>
+			<td><a href="/ajovuoro/{{trip['name']}}">{{trip['to']}}</a></td>
+			<td><a href="/ajovuoro/{{trip['name']}}">{{trip['status']}}</a></td>
+		</tr>
+		{% endfor %}
+	</table>
+</body>
+</html>

--- a/templates/trip.html	Wed Jun 21 18:25:09 2017 +0300
+++ b/templates/trip.html	Thu Jun 22 19:01:31 2017 +0300
@@ -76,10 +76,10 @@
 			<tr>
 				<td class='sarake-aika'>{{halt['time']}}</td>
 				<td class='sarake-pysäkkiviite'>
-					<a href="/pysäkki/{{halt['reference']}}"><img src='/static/pysäkki.png' height='24' /> {{halt['reference']}}</a>
+					<a href="/pysäkki/{{halt['id']}}"><img src='/static/pysäkki.png' height='24' /> {{halt['code']}}</a>
 				</td>
 				<td class='sarake-pysäkki'>
-					<a href="/pysäkki/{{halt['reference']}}">{{halt['name']}}</a>
+					<a href="/pysäkki/{{halt['id']}}">{{halt['name']}}</a>
 				</td>
 			</tr>
 			{% endfor %}