earth 1.0.3 → 1.1.0

data/data/air/aircraft.csv

@@ -0,0 +1,7 @@
+icao_code,manufacturer_name,model_name,aircraft_type,engine_type,engines,weight_class,source,
+A388,AIRBUS,A380-800,Landplane,Jet,4,Heavy,Brighter Planet
+B77L,BOEING,777-200LR,Landplane,Jet,2,Heavy,Brighter Planet
+B788,BOEING,787-800,Landplane,Jet,2,Heavy,Brighter Planet
+C130,LOCKHEED,L-100 Hercules,Landplane,Turboprop,4,Medium,Brighter Planet
+FA7X,DASSAULT,Falcon 7X,Landplane,Jet,3,Medium,Brighter Planet
+G150,GULFSTREAM AEROSPACE,Gulfstream G150,Landplane,Jet,2,Medium,Brighter Planet

data/data/air/airports.csv

@@ -9,3 +9,4 @@ AMO,Mao,Mao,Chad,8.248,16.663,Brighter Planet
 BTZ,Bursa,Bursa,Turkey,40.234,29.01,Brighter Planet
 NBC,Naberevnye Chelny,Naberevnye Chelny,Russian Federation,55.564,52.103,Brighter Planet
 QUG,Chichester/Goodwood,Chichester,United Kingdom,50.859,-0.759,Brighter Planet
+MAY,Clarence A. Bain,Mangrove Cay,Bahamas,24.287664,-77.684613,Great Circle Mapper

data/earth.gemspec

@@ -24,17 +24,18 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'falls_back_on'
   s.add_runtime_dependency 'fixed_width-multibyte'
   s.add_runtime_dependency 'fuzzy_match', '>=1.3.3'
-  s.add_runtime_dependency 'geokit'
-  s.add_runtime_dependency 'remote_table', '>=2.0.2'
+  s.add_runtime_dependency 'remote_table', '>=2.1.0'
   s.add_runtime_dependency 'table_warnings', '>=1.0.1'
   s.add_runtime_dependency 'to_regexp'
   s.add_runtime_dependency 'weighted_average', '>=1.0.2'
   s.add_runtime_dependency 'timeframe'
-  s.add_development_dependency 'bueller'
+  s.add_runtime_dependency 'geocoder'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'charisma'
   s.add_development_dependency 'cucumber'
+  s.add_development_dependency 'dbf'
   s.add_development_dependency 'factory_girl'
+  s.add_development_dependency 'georuby'
   s.add_development_dependency 'mysql2' # for bin/earth_tester.rb; use mysql2 for utf-8 compatibility
   s.add_development_dependency 'pg'
   s.add_development_dependency 'rake'

data/errata/airline/bts_carrier_codes_errata.csv

@@ -1,46 +1,110 @@
 date,name,email,type,section,action,x,y,condition,notes
 5/15/12,Ian Hough,ian@brighterplanet.com,meta,Intended use,,http://www.transtats.bts.gov/Download_Lookup.asp?Lookup=L_UNIQUE_CARRIERS,,,
+5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Code,reject,0YQ,,,duplicate name; not the code we have flights for
+5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Code,reject,FDM,,,duplicate name; not the code we have flights for
+5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Code,reject,ISL,,,duplicate name; not the code we have flights for
+5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Code,reject,IS,,,duplicate name; not the code we have flights for
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Code,reject,4C,,,now LAN Colombia
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,.,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,",",,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,(
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,)
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ ca$/i,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ co(rp)?(oration)?$/i,,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,/ co /i, ,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete, GmbH,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ inc(orporated)?/i,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ llc/i,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ l(imi)?te?d/i,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ lt$/i,,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ ltd$/i,,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,/ ltd /i, ,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ nv$/i,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ plc( and)?/i,,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ pty$/i,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ sa( de cv)?$/i,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ sa de cv/i,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ s a( aerogal)?$/i,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ spa$/i,,,
-5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ \(merged.+\)/i,,,
+5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete,/ merged with.+/i,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,delete, and Everts Air Cargo,,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,/internat'l/i,international,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,/.+/i,Atlantic Southeast Airlines,bts EV,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,/.+/i,ExpressJet,bts XE,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,/.+/i,SkyWest Airlines USA,bts OO,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,AAA-Action Air Carrier,Action Air Carrier,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,ABC Aerolineas dba Interjet,Interjet,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,ABSA-Aerolinhas Brasileiras,ABSA Cargo|Aerolineas Brasileiras,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Aeroenlaces Nacionales,vivaAerobus,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Aerolineas Galapagos,Aerogal,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Aerolitoral,Aeromexico Connect,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Aeropostal Alas De Venezuel,Aeropostal Alas de Venezuela,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Aerovias Nac'l De Colombia,Avianca|Aerovias Nacionales de Colombia,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Aerovias Venezolanas-Avensa,Avensa|Aerovias Venezolanas,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Aerosvit Ukranian Airlines,Aerosvit Airlines,,
-5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Alia-(The) Royal Jordanian,Royal Jordanian|Alia,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Air North,Air North Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Air Wisconsin Airlines,Air Wisconsin,,match name for ICAO/IATA codes
+5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Alia-The Royal Jordanian,Royal Jordanian|Alia,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Arik Air International,Arik Air,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Arrow Air,Arrow Cargo,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Bahamasair Holding,Bahamasair,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Bemidji Airlines,Bemidji Aviation,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,British Midland Airways,British Midland International,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Britannia Airways,Thomson Airways,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Cargolux Airlines International,Cargolux,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Casino Express,Xtra Airways,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Cielos De Peru,Cielos Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Compagnia Aerea Italiana,Alitalia,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Compagnie Nat'l Air France,Air France,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Compania Panamena Copa,COPA Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Concesionaria Vuela Compania De Aviacion Volaris,Volaris,,match name for ICAO/IATA codes
 6/22/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Continental Air Lines,Continental Airlines,,typo
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Corsair International,Corsairfly,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,China Cargo Airline,China Cargo Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Eva Airways,Eva Air,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Federal Express,FedEx,,match name for ICAO/IATA codes
-5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,/Grand Canyon Airlines.+Scenic Airlines/i,Grand Canyon Airlines|Scenic Airlines,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Finnair Oy,Finnair,,match name for ICAO/IATA codes
+5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,/Grand Canyon Airlines.+Scenic Airlines/i,Scenic Airways|Grand Canyon Airlines,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Great Lakes Airlines,Great Lakes Aviation,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Great Wall Airlines Company,Great Wall Airlines,,
-5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Compania Mexicana De Aviaci,Mexicana|Compania Mexicana De Aviacion,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Gulfstream Int,Gulfstream International Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Hainan Airlines Company,Hainan Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Iberia Air Lines Of Spain,Iberia,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Insel Air International B V,Insel Air,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Japan Air Lines,Japan Airlines International,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Jazz Aviation LP,Jazz Air,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Korean Air Lines,Korean Air,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Lan-Chile Airlines,LAN Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Lan Peru Airlines,Lan Peru,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Lufthansa German Airlines,Lufthansa,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Malaysian Airline System,Malaysia Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Meridiana,Meridiana Fly,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,National Aviation Company of India,Air India,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Nippon Cargo Airlines,NCA|Nippon Cargo Airlines,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Olympic Airways,Olympic Air,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Pakistan International Airlines,PIA,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Pan American World Airways Dominicana,PAWA Dominicana,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Peninsula Airways,Penair,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Polar Air Cargo Airways,Polar Air Cargo,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Polskie Linie Lotnicze,LOT Polish Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Qantas Airways,QANTAS,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Qatar Airways QCSC,Qatar Airways,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Santa Barbara Airlines,SBA Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Sata Internacional,SATA International,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Scandinavian Airlines Sys,SAS,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Sociedad Aeronautica De Med,SAM|Sociedad Aeronautica De Medellin,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Spirit Air Lines,Spirit Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Swiss International Airlines,Swiss,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Tap-Portuguese Airlines,TAP Portugal,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Transportes Aereos De Cabo,TACV Cabo Verde Airlines,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Transportes Aeros Meridiona,TAM Linhas Aereas,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,TUI Airlines Belgium NV d/b/a Jetairfly,Jetairfly,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,TUI Airlines Nederland BV,Arkefly,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Turk Hava Yollari AO,Turkish Airlines,,match name for ICAO/IATA codes
 6/22/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,United Air Lines,United Airlines,,typo
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,USA 3000 Airlines,USA 3000,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Varig Logistica S/A,VarigLog,,
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Virgin Blue International Airlines t/a V Australia,Virgin Australia,,match name for ICAO/IATA codes
+9/12/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Warbelow,Warbelows Air,,match name for ICAO/IATA codes
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,Yangtze River Express Airlines Company,Yangtze River Express,,
 5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,replace,/ d\/b\/a /i,|,,
-5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,reject,/\(1\)/,,not expressjet,
-5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Description,reject,/\(2\)/,,,
-5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Code,reject,0YQ,,,duplicate name; not the code we have flights for
-5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Code,reject,FDM,,,duplicate name; not the code we have flights for
-5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Code,reject,ISL,,,duplicate name; not the code we have flights for
-5/15/12,Ian Hough,ian@brighterplanet.com,editorial,Code,reject,IS,,,duplicate name; not the code we have flights for

data/errata/airport/openflights_errata.csv

@@ -271,6 +271,8 @@ date,name,email,type,section,action,x,y,condition,notes
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,longitude,replace,/.+/,-112.457,iata is dvt,wrong lng
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,latitude,replace,/.+/,28.398,iata is dws,wrong lat/lng
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,longitude,replace,/.+/,-81.57,iata is dws,wrong lat/lng
+9/11/12,Ian Hough,ian@brighterplanet.com,technical,name,replace,/^Dayong$/,Zhangjiajie,iata is dyg,fix name
+9/11/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Dayong$/,Zhangjiajie,iata is dyg,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/.+/,Basel,iata is eap,bsl/eap/mlh is one airport with three codes
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,country_name,replace,/.+/,Switzerland,iata is eap,bsl/eap/mlh is one airport with three codes
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,name,replace,/.+/,EuroAirport Basel-Mulhouse-Freiburg,iata is eap,bsl/eap/mlh is one airport with three codes
@@ -286,6 +288,7 @@ date,name,email,type,section,action,x,y,condition,notes
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Elat$/i,Eilat,iata is eth,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Harstad/Narvik$/i,Evenes,iata is eve,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,name,replace,/^Evenes$/i,Harstad/Narvik,iata is eve,fix name
+9/11/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Lubumashi$/i,Lubumbashi,iata is fbm,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,latitude,replace,/.+/,61.392,iata is fde,wrong lat/lng
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,longitude,replace,/.+/,5.763,iata is fde,wrong lat/lng
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Fez$/i,Fes,iata is fez,fix city
@@ -299,6 +302,7 @@ date,name,email,type,section,action,x,y,condition,notes
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,name,replace,/^Tolagnaro$/i,Taolagnaro,iata is ftu,fix name
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Governor's Harbor$/i,Governors Harbour,iata is ghb,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,,La Gomera,iata is gmz,fix city
+9/11/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Gaberone$/i,Gaborone,iata is gbe,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Gerona$/i,Girona,iata is gro,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,latitude,replace,/.+/,52.475,iata is gww,wrong lat/lng
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,longitude,replace,/.+/,13.139,iata is gww,wrong lat/lng
@@ -314,6 +318,8 @@ date,name,email,type,section,action,x,y,condition,notes
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Wheeler Afb\.$/i,Wahiawa,iata is hhi,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Hassi-messaoud$/i,Hassi Messaoud,iata is hme,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Bahias Dehuatulco$/i,Huatulco,iata is hux,fix city
+9/11/12,Ian Hough,ian@brighterplanet.com,technical,name,replace,/^Hyakuri$/i,Ibaraki,iata is ibr,fix city
+9/11/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Ibaraki$/i,Omitama,iata is ibr,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Isfahan$/i,Esfahan,iata is ifn,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,latitude,replace,/.+/,35.416111,iata is ika,wrong lat/lng
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,longitude,replace,/.+/,51.152222,iata is ika,wrong lat/lng
@@ -340,6 +346,7 @@ date,name,email,type,section,action,x,y,condition,notes
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Paraguana$/i,Punto Fijo,iata is lsp,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,latitude,replace,/.+/,-0.906833,iata is ltx,wrong lat/lng
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,longitude,replace,/.+/,-78.615756,iata is ltx,wrong lat/lng
+9/11/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Luxi$/i,Dehong,iata is lum,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Luxemburg$/i,Luxembourg,iata is lux,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,city,replace,/^Madras$/i,Chennai,iata is maa,fix city
 3/29/12,Ian Hough,ian@brighterplanet.com,technical,latitude,replace,/.+/,36.234,iata is mhd,wrong lat/lng

data/errata/flight_segment/bts_errata.csv

@@ -2,6 +2,7 @@ date,name,email,type,section,action,x,y,condition,notes
 6/7/11,Ian Hough,ian@brighterplanet.com,meta,Intended use,,http://www.transtats.bts.gov/DL_SelectFields.asp?Table_ID=293
 6/7/11,Ian Hough,ian@brighterplanet.com,technical,UNIQUE_CARRIER,replace,/^$/i,0OQ,in may 2009,unique carrier code for OpenSkies is missing in May 2009
 6/7/11,Ian Hough,ian@brighterplanet.com,technical,UNIQUE_CARRIER,replace,/^$/i,0OQ,in july 2009,unique carrier code for OpenSkies is missing in July 2009
+9/12/12,Ian Hough,ian@brighterplanet.com,technical,UNIQUE_CARRIER,replace,/^4C$/,L7,,now LAN Colombia
 8/6/12,Ian Hough,ian@brighterplanet.com,technical,ORIGIN_COUNTRY,replace,/^an$/i,CW,origin iata CUR,deal with netherlands antilles
 8/6/12,Ian Hough,ian@brighterplanet.com,technical,ORIGIN_COUNTRY,replace,/^an$/i,NL,origin iata BON,deal with netherlands antilles
 8/6/12,Ian Hough,ian@brighterplanet.com,technical,ORIGIN_COUNTRY,replace,/^an$/i,SX,origin iata SXM,deal with netherlands antilles

data/lib/earth/air/aircraft.rb

@@ -173,5 +173,5 @@ EOS
     :fuel_use_specificity
   )
   
-  warn_unless_size 437
+  warn_unless_size 438
 end

data/lib/earth/air/aircraft/data_miner.rb

@@ -41,7 +41,7 @@ Aircraft.class_eval do
     end
     
     import "aircraft not included in the FAA database",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHRNaVpSUWw2Z2VhN3RUV25yYWdQX2c&output=csv' do
+           :url => "file:///#{Earth::DATA_DIR}/air/aircraft.csv" do
       key 'icao_code'
       store 'manufacturer_name'
       store 'model_name'

data/lib/earth/air/airline.rb

@@ -24,5 +24,5 @@ EOS
     :primary_key => :bts_code,
     :foreign_key => :airline_bts_code
   
-  warn_unless_size 1524 # this is overridden in data1, which imports extra airlines from proprietary data
+  warn_unless_size 1519 # this is overridden in data1, which imports extra airlines from proprietary data
 end

data/lib/earth/air/airline/data_miner.rb

@@ -1,8 +1,12 @@
 Airline.class_eval do
   # for errata
   class Airline::Guru
-    def not_expressjet?(row)
-      not row['Description'] =~ /expressjet/i
+    def method_missing(method_id, *args, &block)
+      if method_id.to_s =~ /\A(bts)_([^\?]+)/
+        args.first['Code'].downcase == $2 # row['Code'] == 'EV'
+      else
+        super
+      end
     end
   end
   
@@ -14,13 +18,5 @@ Airline.class_eval do
       store 'secondary_name', :synthesize => proc { |row| row['Description'].split("|")[1] }
       store 'bts_code', :field_name => 'Code'
     end
-    
-    import "a Brighter Planet-curated list of airlines and codes not included in our proprietary sources",
-           :url => "#{Earth::DATA_DIR}/air/airlines.csv" do
-      key 'name'
-      store 'secondary_name', :nullify => true
-      store 'iata_code',      :nullify => true
-      store 'icao_code',      :nullify => true
-    end
   end
 end

data/lib/earth/air/airport.rb

@@ -1,12 +1,14 @@
 require 'earth/model'
 require 'earth/loader'
-Earth::Loader.load_plugins
 
 require 'earth/locality/country'
 require 'earth/air/flight_segment'
 
+require 'geocoder'
+
 class Airport < ActiveRecord::Base
   extend Earth::Model
+  extend Geocoder::Model::ActiveRecord
 
   TABLE_STRUCTURE = <<-EOS
 
@@ -34,10 +36,8 @@ EOS
   has_many :arriving_flight_segments, # FIXME TODO consider replacing with a method that also matches ICAO segments by city
     :class_name => 'FlightSegment',
     :foreign_key => :destination_airport_iata_code
+
+  reverse_geocoded_by :latitude, :longitude
   
-  acts_as_mappable :default_units => :nms,
-                   :lat_column_name => :latitude,
-                   :lng_column_name => :longitude
-  
-  warn_unless_size 5324
+  warn_unless_size 5325
 end

data/lib/earth/air/bts_aircraft.rb

@@ -15,5 +15,5 @@ EOS
 
   self.primary_key = "bts_code"
 
-  warn_unless_size 378
+  warn_unless_size 379
 end

data/lib/earth/air/flight_segment.rb

@@ -101,5 +101,5 @@ EOS
     :freight_share
   )
   
-  warn_unless_size 1_288_493
+  warn_unless_size 1_321_586..1_830_000
 end

data/lib/earth/automobile/automobile_activity_year_type.rb

@@ -24,7 +24,7 @@ EOS
   
   # Used by Automobile and AutomobileTrip
   def self.find_by_type_name_and_closest_year(type_name, year)
-    candidates = where(:type_name => type_name)
+    return if (candidates = where(:type_name => type_name)).none?
     if year > (max_year = candidates.maximum(:activity_year))
       candidates.where(:activity_year => max_year).first
     else

data/lib/earth/automobile/automobile_activity_year_type_fuel/data_miner.rb

@@ -2,7 +2,7 @@ AutomobileActivityYearTypeFuel.class_eval do
   data_miner do
     ['Passenger cars', 'Light-duty trucks'].each do |type|
       import "annual vehicle miles travelled by gasoline #{type.downcase} from the 2011 EPA GHG Inventory",
-             :url => 'http://www.epa.gov/climatechange/emissions/downloads11/Annex%20Tables.zip',
+             :url => 'http://www.epa.gov/climatechange/Downloads/ghgemissions/2011-Annex-Tables.zip',
              :filename => 'Annex Tables/Table A-89.csv',
              :skip => 1,
              :headers => ['Year', 'Passenger cars', 'Light-duty trucks', 'ignore', 'ignore'],
@@ -15,7 +15,7 @@ AutomobileActivityYearTypeFuel.class_eval do
       end
       
       import "annual vehicle miles travelled by diesel #{type.downcase} from the 2011 EPA GHG Inventory",
-             :url => 'http://www.epa.gov/climatechange/emissions/downloads11/Annex%20Tables.zip',
+             :url => 'http://www.epa.gov/climatechange/Downloads/ghgemissions/2011-Annex-Tables.zip',
              :filename => 'Annex Tables/Table A-90.csv',
              :skip => 1,
              :headers => ['Year', 'Passenger cars', 'Light-duty trucks', 'ignore', 'ignore'],
@@ -28,7 +28,7 @@ AutomobileActivityYearTypeFuel.class_eval do
       end
       
       import "annual vehicle miles travelled by alternative fuel #{type.downcase} from the 2011 EPA GHG Inventory",
-             :url => 'http://www.epa.gov/climatechange/emissions/downloads11/Annex%20Tables.zip',
+             :url => 'http://www.epa.gov/climatechange/Downloads/ghgemissions/2011-Annex-Tables.zip',
              :filename => 'Annex Tables/Table A-91.csv',
              :skip => 1,
              :headers => ['Year', 'Passenger cars', 'Light-duty trucks', 'ignore', 'ignore'],

data/lib/earth/automobile/automobile_make_model_year_variant.rb

@@ -51,7 +51,7 @@ EOS
   # because it will be a bunch of work to include all the columns and the names will be really long and obtuse
   # -Ian 10/18/2011
   
-  warn_unless_size 28433
+  warn_unless_size 28427
   warn_unless_size 1152, :conditions => { :year => 1985 }
   warn_unless_size 1183, :conditions => { :year => 1986 }
   warn_unless_size 1206, :conditions => { :year => 1987 }
@@ -79,7 +79,7 @@ EOS
   warn_unless_size 1092, :conditions => { :year => 2009 }
   warn_unless_size 1107, :conditions => { :year => 2010 }
   warn_unless_size 1097, :conditions => { :year => 2011 }
-  warn_unless_size 1129, :conditions => { :year => 2012 }
+  warn_unless_size 1123, :conditions => { :year => 2012 }
   warn_if_nulls_except(
     :alt_fuel_code,
     :cylinders

data/lib/earth/automobile/automobile_make_model_year_variant/data_miner.rb

@@ -110,7 +110,7 @@ AutomobileMakeModelYearVariant.class_eval do
       2009 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/09data.zip',   :filename => '2009_FE_guide for DOE_ALL-rel dates-no-sales-8-28-08download.csv' },
       2010 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/10data.zip',   :filename => '2010FEGuide for DOE-all rel dates-no-sales-02-22-2011public.xlsx' },
       2011 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/11data.zip',   :filename => '2011FEGuide-for DOE rel-dates before 1-23-2011-no-sales-01-10-2011_All_public.xlsx' },
-      2012 => { :url => 'http://www.fueleconomy.gov/feg/epadata/12data.zip',   :filename => '2012 FEGuide for DOE-rev1-rel dates before 3-13-2012-no-sales-3-7-2012public3-20.xlsx' }
+      2012 => { :url => 'http://www.fueleconomy.gov/feg/epadata/12data.zip',   :filename => '2012 FEGuide for DOE-rev99-rel dates before 3-13-2012-no-sales_public.xlsx' }
     })
     
     fuel_economy_guides.each do |year, options|

data/lib/earth/automobile/automobile_type_fuel_year.rb

@@ -28,7 +28,7 @@ EOS
   
   # Used by Automobile and AutomobileTrip
   def self.find_by_type_name_and_fuel_family_and_closest_year(type_name, fuel_family, year)
-    candidates = where(:type_name => type_name, :fuel_family => fuel_family)
+    return if (candidates = where(:type_name => type_name, :fuel_family => fuel_family)).none?
     if year > (max_year = candidates.maximum(:year))
       candidates.where(:year => max_year).first
     else

data/lib/earth/automobile/automobile_type_fuel_year/data_miner.rb

@@ -7,7 +7,7 @@ AutomobileTypeFuelYear.class_eval do
         code = "LD" + fuel_code + type_code
         
         import "age distribution of #{fuel} #{type.downcase} from the 2011 EPA GHG Inventory",
-               :url => 'http://www.epa.gov/climatechange/emissions/downloads11/Annex%20Tables.zip',
+               :url => 'http://www.epa.gov/climatechange/Downloads/ghgemissions/2011-Annex-Tables.zip',
                :filename => 'Annex Tables/Table A-93.csv',
                :skip => 1,
                :headers => %w{ age LDGV LDGT HDGV LDDV LDDT HDDT MC },
@@ -20,7 +20,7 @@ AutomobileTypeFuelYear.class_eval do
         end
         
         import "average distance per vehicle for gasoline passenger cars from the 2011 EPA GHG Inventory",
-               :url => 'http://www.epa.gov/climatechange/emissions/downloads11/Annex%20Tables.zip',
+               :url => 'http://www.epa.gov/climatechange/Downloads/ghgemissions/2011-Annex-Tables.zip',
                :filename => 'Annex Tables/Table A-94.csv',
                :skip => 1,
                :headers => %w{ age LDGV LDGT HDGV LDDV LDDT HDDT MC },

data/lib/earth/automobile/automobile_type_fuel_year_control.rb

@@ -30,7 +30,7 @@ EOS
   
   # Used by AutomobileTypeFuelYear
   def self.find_all_by_type_name_and_fuel_family_and_closest_year(type_name, fuel_family, year)
-    candidates = where(:type_name => type_name, :fuel_family => fuel_family)
+    return if (candidates = where(:type_name => type_name, :fuel_family => fuel_family)).none?
     if year > (max_year = candidates.maximum(:year))
       candidates.where :year => max_year
     else

data/lib/earth/insolation_scopes.rb

@@ -0,0 +1,10 @@
+module Earth
+  module InsolationScopes
+    def self.included(target)
+      target.scope :at_lat_lon, lambda { |lat, lon|
+        target.where('nw_lat > ? AND nw_lon > ? AND se_lat < ? AND se_lon < ?', lat, lon, lat, lon)
+      }
+      target.scope :at_zip, lambda { |zip| target.at_lat_lon(zip.latitude, zip.longitude) }
+    end
+  end
+end

data/lib/earth/loader.rb

@@ -36,12 +36,5 @@ module Earth
       end if options[:load_data_miner] || options[:mine_original_sources]
       nil
     end
-    
-    def Loader.load_plugins
-      Dir[File.expand_path('../../../vendor/**/init.rb', __FILE__)].each do |pluginit|
-        $LOAD_PATH.unshift ::File.join(::File.dirname(pluginit), 'lib')
-        Kernel.load pluginit
-      end
-    end
   end
 end

data/lib/earth/locality/climate_division.rb

@@ -1,5 +1,5 @@
 require 'earth/model'
-  
+
 require 'earth/locality/state'
 require 'earth/locality/zip_code'
 
@@ -17,13 +17,13 @@ CREATE TABLE climate_divisions
      cooling_degree_days_units CHARACTER VARYING(255),
      state_postal_abbreviation CHARACTER VARYING(255)
   );
-
 EOS
 
   self.primary_key = "name"
   
+  has_many :months,    :foreign_key => 'climate_division_name', :class_name => 'ClimateDivisionMonth'
   has_many :zip_codes, :foreign_key => 'climate_division_name'
-  belongs_to :state, :foreign_key => 'state_postal_abbreviation'
+  belongs_to :state,   :foreign_key => 'state_postal_abbreviation'
   
   RADIUS = 750