gitphp 0.2.9.1 :: bus.git/commitdiff

Add geopo to timing points

3 files changed: (show all)
maxious-canberra-transit-feed/04-generateymlinclude.rb
maxious-canberra-transit-feed/cbrtable.yml.in
origin-src/transitfeed-1.2.6/transitfeed/trip.py

file:a/maxious-canberra-transit-feed/04-generateymlinclude.rb -> file:b/maxious-canberra-transit-feed/04-generateymlinclude.rb

#!/usr/bin/ruby	#!/usr/bin/ruby

require 'highline.rb'	require 'highline.rb'
include HighLine	include HighLine

	#
	# GeoPo Encode in Ruby
	# @author : Shintaro Inagaki
	# @param location (Hash) [lat (Float), lng (Float), scale(Int)]
	# @return geopo (String)
	#
	def geopoEncode(lat, lng, scale)
	# 64characters (number + big and small letter + hyphen + underscore)
	chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"

	geopo = ""

	# Change a degree measure to a decimal number
	lat = (lat + 90.0) / 180 * 8 ** 10; # 90.0 is forced FLOAT type when lat is INT
	lng = (lng + 180.0) / 360 * 8 ** 10; # 180.0 is same

	# Compute a GeoPo code from head and concatenate
	for i in 0..scale
	geopo += chars[(lat / 8 (9 - i) % 8).floor + (lng / 8 (9 - i) % 8).floor * 8, 1];
	end
	return geopo;
	end

require 'rubygems'	require 'rubygems'
require 'postgres'	require 'postgres'
require 'json'	require 'json'
require 'yaml'	require 'yaml'
require 'pp'	require 'pp'
# make - { name: Civic Interchange Platform 1,stop_code: civic_platform_1, lat: -35.2794347, lng: 149.130588}	# make - { name: Civic Interchange Platform 1,stop_code: civic_platform_1, lat: -35.2794347, lng: 149.130588}
connbus = PGconn.connect("localhost", 5432, '', '', "bus", "postgres", "snmc")	connbus = PGconn.connect("localhost", 5432, '', '', "bus", "postgres", "snmc")

f = File.open('cbrtable.yml.in.in')	f = File.open('cbrtable.yml.in.in')
header = f.readlines	header = f.readlines
f.close	f.close

File.open('cbrtable.yml.in', 'w') do \|f2\|	File.open('cbrtable.yml.in', 'w') do \|f2\|
f2.puts header	f2.puts header
f2.puts "stops:\n";	f2.puts "stops:\n";
begin	begin
time_points = connbus.exec("SELECT * from timing_point ORDER BY name")	time_points = connbus.exec("SELECT * from timing_point ORDER BY name")
rescue PGError => e	rescue PGError => e
puts "Error reading from DB #{e}"	puts "Error reading from DB #{e}"
#conn.close() if conn	#conn.close() if conn
end	end
time_points.each do \|time_point\|	time_points.each do \|time_point\|
#pp time_point	#pp time_point
# 0 = name	# 0 = name
# 1 = lat*100000	# 1 = lat*100000
# 2 = lng*100000	# 2 = lng*100000
# 7 = suburb(s)	# 7 = suburb(s)
#pp time_point[0]	#pp time_point[0]
f2.puts " - { name: #{time_point[0]},stop_code: #{time_point[0]}, lat: #{Float(time_point[1])/10000000}, lng: #{Float(time_point[2])/10000000}, zone_id: #{time_point[7]} }"	f2.puts " - { name: #{time_point[0]},stop_code: #{time_point[0]}, lat: #{Float(time_point[1])/10000000}, lng: #{Float(time_point[2])/10000000}, zone_id: #{geopoEncode(Float(time_point[1])/10000000,Float(time_point[2])/10000000,7)}@#{time_point[7]} }"
end	end
begin	begin
stops = connbus.exec("SELECT * from stops")	stops = connbus.exec("SELECT * from stops")
rescue PGError => e	rescue PGError => e
puts "Error reading from DB #{e}"	puts "Error reading from DB #{e}"
#conn.close() if conn	#conn.close() if conn
end	end
stops.each do \|stop\|	stops.each do \|stop\|
#pp stop	#pp stop
# 0 = geoPo	# 0 = geoPo
# 1 = lat*100000	# 1 = lat*100000
# 2 = lng*100000	# 2 = lng*100000
# 3 = name	# 3 = name
# 4 = suburb(s)	# 4 = suburb(s)
#pp time_point[0]	#pp time_point[0]
f2.puts " - { name: #{stop[3]},stop_code: #{stop[0]}, lat: #{Float(stop[1])/10000000}, lng: #{Float(stop[2])/10000000}, zone_id: #{stop[4]} }"	f2.puts " - { name: #{stop[3]},stop_code: #{stop[0]}, lat: #{Float(stop[1])/10000000}, lng: #{Float(stop[2])/10000000}, zone_id: #{stop[0]}@#{stop[4]} }"
end	end
f2.puts "routes:\n";	f2.puts "routes:\n";
end	end

file:a/maxious-canberra-transit-feed/cbrtable.yml.in -> file:b/maxious-canberra-transit-feed/cbrtable.yml.in

file:a/origin-src/transitfeed-1.2.6/transitfeed/trip.py -> file:b/origin-src/transitfeed-1.2.6/transitfeed/trip.py

options:	options:
start_date: 20101115	start_date: 20101115
end_date: 20111231	end_date: 20111231
remove_date: 20111231	remove_date: 20111231
agency_name: ACT Internal Omnibus Network (ACTION)	agency_name: ACT Internal Omnibus Network (ACTION)
agency_url: http://www.action.act.gov.au/	agency_url: http://www.action.act.gov.au/
agency_timezone: Australia/Sydney	agency_timezone: Australia/Sydney
agency_phone: 131710	agency_phone: 131710
agency_lang: en	agency_lang: en

stops:	stops:
- { name: ACTEW AGL House,stop_code: ACTEW AGL House, lat: -35.282374, lng: 149.132047, zone_id: Unclassified ACT;City; }	- { name: ACTEW AGL House,stop_code: ACTEW AGL House, lat: -35.282374, lng: 149.132047, zone_id: Wjz5NgGc@Unclassified ACT;City; }
- { name: ADFA,stop_code: ADFA, lat: -35.2937972, lng: 149.1643403, zone_id: Unclassified ACT;Campbell; }	- { name: ADFA,stop_code: ADFA, lat: -35.2937972, lng: 149.1643403, zone_id: Wjzcendj@Unclassified ACT;Campbell; }
- { name: Ainslie,stop_code: Ainslie, lat: -35.2620105, lng: 149.1443302, zone_id: Unclassified ACT;Ainslie; }	- { name: Ainslie,stop_code: Ainslie, lat: -35.2620105, lng: 149.1443302, zone_id: Wjz5YtDK@Unclassified ACT;Ainslie; }
- { name: Alexander Maconochie Centre,stop_code: Alexander Maconochie Centre, lat: -35.3720651, lng: 149.1696618, zone_id: Unclassified ACT;Hume; }	- { name: Alexander Maconochie Centre,stop_code: Alexander Maconochie Centre, lat: -35.3720651, lng: 149.1696618, zone_id: Wjzb8R5k@Unclassified ACT;Hume; }
- { name: Anthony Rolfe Av / Moonlight Av,stop_code: Anthony Rolfe Av / Moonlight Av, lat: -35.1856021, lng: 149.1543639, zone_id: Unclassified ACT;Bonner;Gungahlin; }	- { name: Anthony Rolfe Av / Moonlight Av,stop_code: Anthony Rolfe Av / Moonlight Av, lat: -35.1856021, lng: 149.1543639, zone_id: Wjzf2lW8@Unclassified ACT;Bonner;Gungahlin; }
- { name: Aranda,stop_code: Aranda, lat: -35.257534, lng: 149.0762963, zone_id: Unclassified ACT;Aranda;Bruce;Acton; }	- { name: Aranda,stop_code: Aranda, lat: -35.257534, lng: 149.0762963, zone_id: Wjz5dk3n@Unclassified ACT;Aranda;Bruce;Acton; }
- { name: Athllon / Sulwood Kambah,stop_code: Athllon / Sulwood Kambah, lat: -35.38442, lng: 149.09328, zone_id: Wanniassa;Unclassified ACT; }	- { name: Athllon / Sulwood Kambah,stop_code: Athllon / Sulwood Kambah, lat: -35.38442, lng: 149.09328, zone_id: Wjz2mPtl@Wanniassa;Unclassified ACT; }
- { name: Australian Institute of Sport,stop_code: Australian Institute of Sport, lat: -35.246351, lng: 149.101478, zone_id: Unclassified ACT;O'Connor;Bruce; }	- { name: Australian Institute of Sport,stop_code: Australian Institute of Sport, lat: -35.246351, lng: 149.101478, zone_id: Wjz5vAu1@Unclassified ACT;O'Connor;Bruce; }
- { name: Belconnen Community Bus Station,stop_code: Belconnen Community Bus Station, lat: -35.2398858, lng: 149.0690795, zone_id: Unclassified ACT;Belconnen; }	- { name: Belconnen Community Bus Station,stop_code: Belconnen Community Bus Station, lat: -35.2398858, lng: 149.0690795, zone_id: Wjz60CNk@Unclassified ACT;Belconnen; }
- { name: Belconnen Community Bus Station (Platform 1),stop_code: Belconnen Community Bus Station (Platform 1), lat: -35.23982, lng: 149.06978, zone_id: Unclassified ACT;Belconnen; }	- { name: Belconnen Community Bus Station (Platform 1),stop_code: Belconnen Community Bus Station (Platform 1), lat: -35.23982, lng: 149.06978, zone_id: Wjz60Kiq@Unclassified ACT;Belconnen; }
- { name: Belconnen Community Bus Station (Platform 2),stop_code: Belconnen Community Bus Station (Platform 2), lat: -35.23982, lng: 149.06926, zone_id: Unclassified ACT;Belconnen; }	- { name: Belconnen Community Bus Station (Platform 2),stop_code: Belconnen Community Bus Station (Platform 2), lat: -35.23982, lng: 149.06926, zone_id: Wjz60CWq@Unclassified ACT;Belconnen; }
- { name: Belconnen Community Bus Station (Platform 3),stop_code: Belconnen Community Bus Station (Platform 3), lat: -35.23986, lng: 149.06847, zone_id: Unclassified ACT;Belconnen; }	- { name: Belconnen Community Bus Station (Platform 3),stop_code: Belconnen Community Bus Station (Platform 3), lat: -35.23986, lng: 149.06847, zone_id: Wjz60ChS@Unclassified ACT;Belconnen; }
- { name: Belconnen Community Bus Station (Platform 4),stop_code: Belconnen Community Bus Station (Platform 4), lat: -35.23994, lng: 149.06887, zone_id: Unclassified ACT;Belconnen; }	- { name: Belconnen Community Bus Station (Platform 4),stop_code: Belconnen Community Bus Station (Platform 4), lat: -35.23994, lng: 149.06887, zone_id: Wjz60CE7@Unclassified ACT;Belconnen; }
- { name: Belconnen Community Bus Station (Platform 5),stop_code: Belconnen Community Bus Station (Platform 5), lat: -35.23994, lng: 149.06928, zone_id: Unclassified ACT;Belconnen; }	- { name: Belconnen Community Bus Station (Platform 5),stop_code: Belconnen Community Bus Station (Platform 5), lat: -35.23994, lng: 149.06928, zone_id: Wjz60CUv@Unclassified ACT;Belconnen; }
- { name: Belconnen Community Bus Station (Platform 6),stop_code: Belconnen Community Bus Station (Platform 6), lat: -35.23994, lng: 149.0698, zone_id: Unclassified ACT;Belconnen; }	- { name: Belconnen Community Bus Station (Platform 6),stop_code: Belconnen Community Bus Station (Platform 6), lat: -35.23994, lng: 149.0698, zone_id: Wjz60KgD@Unclassified ACT;Belconnen; }
- { name: Belconnen Way,stop_code: Belconnen Way, lat: -35.2410162, lng: 149.0409512, zone_id: Scullin;Unclassified ACT;Hawker; }	- { name: Belconnen Way,stop_code: Belconnen Way, lat: -35.2410162, lng: 149.0409512, zone_id: Wjr-M4kr@Scullin;Unclassified ACT;Hawker; }
- { name: Bimberi Centre,stop_code: Bimberi Centre, lat: -35.2219941, lng: 149.1546928, zone_id: Unclassified ACT;Bonner; }	- { name: Bimberi Centre,stop_code: Bimberi Centre, lat: -35.2219941, lng: 149.1546928, zone_id: Wjze4oa0@Unclassified ACT;Bonner; }
- { name: Black Mountain Telstra Tower,stop_code: Black Mountain Telstra Tower, lat: -35.2748058, lng: 149.0972461, zone_id: Unclassified ACT;Acton; }	- { name: Black Mountain Telstra Tower,stop_code: Black Mountain Telstra Tower, lat: -35.2748058, lng: 149.0972461, zone_id: Wjz5qbit@Unclassified ACT;Acton; }
- { name: Bonython Primary School,stop_code: Bonython Primary School, lat: -35.4297416, lng: 149.0814517, zone_id: Unclassified ACT;Bonython;Isabella Plains; }	- { name: Bonython Primary School,stop_code: Bonython Primary School, lat: -35.4297416, lng: 149.0814517, zone_id: Wjz1eFRs@Unclassified ACT;Bonython;Isabella Plains; }
- { name: Botanic Gardens,stop_code: Botanic Gardens, lat: -35.278643, lng: 149.1093237, zone_id: Unclassified ACT;Acton; }	- { name: Botanic Gardens,stop_code: Botanic Gardens, lat: -35.278643, lng: 149.1093237, zone_id: Wjz5xl6M@Unclassified ACT;Acton; }
- { name: Brindabella Business Park,stop_code: Brindabella Business Park, lat: -35.314496, lng: 149.189145, zone_id: Unclassified ACT;Pialligo;Fyshwick; }	- { name: Brindabella Business Park,stop_code: Brindabella Business Park, lat: -35.314496, lng: 149.189145, zone_id: WjzcrxcO@Unclassified ACT;Pialligo;Fyshwick; }
- { name: Brindabella Gardens Nursing Home,stop_code: Brindabella Gardens Nursing Home, lat: -35.3294459, lng: 149.0806116, zone_id: Unclassified ACT;Curtin; }	- { name: Brindabella Gardens Nursing Home,stop_code: Brindabella Gardens Nursing Home, lat: -35.3294459, lng: 149.0806116, zone_id: Wjz48Hew@Unclassified ACT;Curtin; }
- { name: Bugden Sternberg,stop_code: Bugden Sternberg, lat: -35.403233, lng: 149.1073117, zone_id: Unclassified ACT;Fadden;Gowrie; }	- { name: Bugden Sternberg,stop_code: Bugden Sternberg, lat: -35.403233, lng: 149.1073117, zone_id: Wjz2z0G3@Unclassified ACT;Fadden;Gowrie; }
- { name: Burton and Garran Hall Daley Road,stop_code: Burton and Garran Hall Daley Road, lat: -35.2753671, lng: 149.1172822, zone_id: Turner;Unclassified ACT;Acton; }	- { name: Burton and Garran Hall Daley Road,stop_code: Burton and Garran Hall Daley Road, lat: -35.2753671, lng: 149.1172822, zone_id: Wjz5yWY9@Turner;Unclassified ACT;Acton; }
- { name: Calvary Hospital,stop_code: Calvary Hospital, lat: -35.25212, lng: 149.09088, zone_id: Unclassified ACT;Bruce; }	- { name: Calvary Hospital,stop_code: Calvary Hospital, lat: -35.25212, lng: 149.09088, zone_id: Wjz5mAHg@Unclassified ACT;Bruce; }
- { name: Calwell,stop_code: Calwell, lat: -35.43524, lng: 149.113942, zone_id: Unclassified ACT;Richardson;Calwell; }	- { name: Calwell,stop_code: Calwell, lat: -35.43524, lng: 149.113942, zone_id: Wjz1BFtI@Unclassified ACT;Richardson;Calwell; }
- { name: Campbell Park Offices,stop_code: Campbell Park Offices, lat: -35.28368, lng: 149.17045, zone_id: Unclassified ACT;Campbell; }	- { name: Campbell Park Offices,stop_code: Campbell Park Offices, lat: -35.28368, lng: 149.17045, zone_id: Wjzd8SzO@Unclassified ACT;Campbell; }
- { name: Canberra College Weston Campus,stop_code: Canberra College Weston Campus, lat: -35.3490278, lng: 149.0486277, zone_id: Stirling;Unclassified ACT;Rivett;Chapman; }	- { name: Canberra College Weston Campus,stop_code: Canberra College Weston Campus, lat: -35.3490278, lng: 149.0486277, zone_id: WjrXQLVf@Stirling;Unclassified ACT;Rivett;Chapman; }
- { name: Canberra Hospital,stop_code: Canberra Hospital, lat: -35.3459462, lng: 149.1012001, zone_id: Unclassified ACT;O'Malley;Garran; }	- { name: Canberra Hospital,stop_code: Canberra Hospital, lat: -35.3459462, lng: 149.1012001, zone_id: Wjz3tzdv@Unclassified ACT;O'Malley;Garran; }

#!/usr/bin/python2.5	#!/usr/bin/python2.5

# Copyright (C) 2007 Google Inc.	# Copyright (C) 2007 Google Inc.
#	#
# Licensed under the Apache License, Version 2.0 (the "License");	# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.	# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at	# You may obtain a copy of the License at
#	#
# http://www.apache.org/licenses/LICENSE-2.0	# http://www.apache.org/licenses/LICENSE-2.0
#	#
# Unless required by applicable law or agreed to in writing, software	# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,	# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and	# See the License for the specific language governing permissions and
# limitations under the License.	# limitations under the License.

import warnings	import warnings

from gtfsobjectbase import GtfsObjectBase	from gtfsobjectbase import GtfsObjectBase
import problems as problems_module	import problems as problems_module
import util	import util

class Trip(GtfsObjectBase):	class Trip(GtfsObjectBase):
_REQUIRED_FIELD_NAMES = ['route_id', 'service_id', 'trip_id']	_REQUIRED_FIELD_NAMES = ['route_id', 'service_id', 'trip_id']
_FIELD_NAMES = _REQUIRED_FIELD_NAMES + [	_FIELD_NAMES = _REQUIRED_FIELD_NAMES + [
'trip_headsign', 'direction_id', 'block_id', 'shape_id'	'trip_headsign', 'direction_id', 'block_id', 'shape_id'
]	]
_TABLE_NAME= "trips"	_TABLE_NAME= "trips"

def __init__(self, headsign=None, service_period=None,	def __init__(self, headsign=None, service_period=None,
route=None, trip_id=None, field_dict=None):	route=None, trip_id=None, field_dict=None):
self._schedule = None	self._schedule = None
self._headways = [] # [(start_time, end_time, headway_secs)]	self._headways = [] # [(start_time, end_time, headway_secs)]
if not field_dict:	if not field_dict:
field_dict = {}	field_dict = {}
if headsign is not None:	if headsign is not None:
field_dict['trip_headsign'] = headsign	field_dict['trip_headsign'] = headsign
if route:	if route:
field_dict['route_id'] = route.route_id	field_dict['route_id'] = route.route_id
if trip_id is not None:	if trip_id is not None: