tzinfo 0.3.38 → 0.3.39

data/CHANGES

@@ -1,3 +1,9 @@
+== Version 0.3.39 (tzdata v2014a) - 9-Mar-2014
+
+* Updated to tzdata version 2014a
+  (http://mm.icann.org/pipermail/tz-announce/2014-March/000018.html).
+
+
 == Version 0.3.38 (tzdata v2013g) - 8-Oct-2013
 
 * Updated to tzdata version 2013g

data/Rakefile

@@ -40,40 +40,9 @@ def sh(*cmd, &block)
 end
 
 
-PKG_VERSION = "0.3.38"
-PKG_FILES = FileList[
-  'CHANGES',
-  'LICENSE',
-  'Rakefile',
-  'README',
-  '.yardopts',
-  'lib',
-  'lib/**/*'
-].delete_if {|f| f.include?('.svn')}
-PKG_TEST_FILES = FileList['test', 'test/**/*'].delete_if {|f| f.include?('.svn')}
-
-RDOC_OPTIONS = %w[--exclude definitions --exclude indexes]
-RDOC_EXTRA_FILES = %w[README CHANGES]
-
 BUILD_TZ_CLASSES_DIR = 'lib/tzinfo.build_tz_classes'
 
-SPEC = Gem::Specification.new do |s|
-  s.name = "tzinfo"
-  s.version = PKG_VERSION
-  s.author = "Philip Ross"
-  s.email = "phil.ross@gmail.com"
-  s.homepage = "http://tzinfo.github.io"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "Daylight-savings aware timezone library"  
-  s.description = "TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones."
-  s.files = PKG_FILES
-  s.test_files = PKG_TEST_FILES
-  s.require_path = "lib"
-  s.has_rdoc = true
-  s.extra_rdoc_files = RDOC_EXTRA_FILES
-  s.rdoc_options = RDOC_OPTIONS
-  s.rubyforge_project = "tzinfo"
-end
+SPEC = eval(File.read('tzinfo.gemspec'))
 
 package_task = Rake::GemPackageTask.new(SPEC) do |pkg|
   pkg.need_zip = true
@@ -136,8 +105,8 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title = "TZInfo"
   rdoc.options << '--inline-source'
-  rdoc.options.concat RDOC_OPTIONS
-  rdoc.rdoc_files.include(*RDOC_EXTRA_FILES) 
+  rdoc.options.concat SPEC.rdoc_options
+  rdoc.rdoc_files.include(*SPEC.extra_rdoc_files) 
   rdoc.rdoc_files.include('lib')  
 end
 
@@ -146,10 +115,10 @@ task :build_tz_modules do
   
   FileUtils.mkdir_p(BUILD_TZ_CLASSES_DIR)
   begin  
-    p = TZInfo::TZDataParser.new('../data', BUILD_TZ_CLASSES_DIR)
+    p = TZInfo::TZDataParser.new('data', BUILD_TZ_CLASSES_DIR)
     p.execute
     
-    scm = Scm.create(File.join(File.dirname(__FILE__), '..'))
+    scm = Scm.create(File.dirname(__FILE__))
     
     ['indexes', 'definitions'].each do |dir|
       scm.sync("#{BUILD_TZ_CLASSES_DIR}/#{dir}", "lib/tzinfo/#{dir}")
@@ -298,7 +267,7 @@ end
 
 task :build_tz_module do
   require 'lib/tzinfo/tzdataparser'
-  p = TZInfo::TZDataParser.new('../data', 'lib/tzinfo')
+  p = TZInfo::TZDataParser.new('data', 'lib/tzinfo')
   p.generate_countries = false
   p.only_zones = [ENV['zone']]
   p.execute
@@ -306,7 +275,7 @@ end
 
 task :build_countries do
   require 'lib/tzinfo/tzdataparser'
-  p = TZInfo::TZDataParser.new('../data', 'lib/tzinfo')
+  p = TZInfo::TZDataParser.new('data', 'lib/tzinfo')
   p.generate_countries = true
   p.generate_zones = false
   p.execute

data/lib/tzinfo/definitions/Africa/Casablanca.rb

@@ -112,6 +112,33 @@ module TZInfo
           tz.transition 2037, 3, :o2, 2121904800
           tz.transition 2037, 10, :o1, 2138839200
           tz.transition 2038, 3, :o2, 29586127, 12
+          tz.transition 2038, 9, :o1, 29588359, 12
+          tz.transition 2038, 10, :o2, 29588719, 12
+          tz.transition 2038, 10, :o1, 29588731, 12
+          tz.transition 2039, 3, :o2, 29590495, 12
+          tz.transition 2039, 10, :o1, 29593099, 12
+          tz.transition 2040, 3, :o2, 29594863, 12
+          tz.transition 2040, 10, :o1, 29597467, 12
+          tz.transition 2041, 3, :o2, 29599315, 12
+          tz.transition 2041, 10, :o1, 29601835, 12
+          tz.transition 2042, 3, :o2, 29603683, 12
+          tz.transition 2042, 10, :o1, 29606203, 12
+          tz.transition 2043, 3, :o2, 29608051, 12
+          tz.transition 2043, 10, :o1, 29610571, 12
+          tz.transition 2044, 3, :o2, 29612419, 12
+          tz.transition 2044, 10, :o1, 29615023, 12
+          tz.transition 2045, 3, :o2, 29616787, 12
+          tz.transition 2045, 10, :o1, 29619391, 12
+          tz.transition 2046, 3, :o2, 29621155, 12
+          tz.transition 2046, 10, :o1, 29623759, 12
+          tz.transition 2047, 3, :o2, 29625607, 12
+          tz.transition 2047, 10, :o1, 29628127, 12
+          tz.transition 2048, 3, :o2, 29629975, 12
+          tz.transition 2048, 10, :o1, 29632495, 12
+          tz.transition 2049, 3, :o2, 29634343, 12
+          tz.transition 2049, 10, :o1, 29636947, 12
+          tz.transition 2050, 3, :o2, 29638711, 12
+          tz.transition 2050, 10, :o1, 29641315, 12
         end
       end
     end

data/lib/tzinfo/definitions/Africa/El_Aaiun.rb

@@ -8,9 +8,126 @@ module TZInfo
           tz.offset :o0, -3168, 0, :LMT
           tz.offset :o1, -3600, 0, :WAT
           tz.offset :o2, 0, 0, :WET
+          tz.offset :o3, 0, 3600, :WEST
           
           tz.transition 1934, 1, :o1, 728231561, 300
           tz.transition 1976, 4, :o2, 198291600
+          tz.transition 1976, 5, :o3, 199756800
+          tz.transition 1976, 7, :o2, 207702000
+          tz.transition 1977, 5, :o3, 231292800
+          tz.transition 1977, 9, :o2, 244249200
+          tz.transition 1978, 6, :o3, 265507200
+          tz.transition 1978, 8, :o2, 271033200
+          tz.transition 2008, 6, :o3, 1212278400
+          tz.transition 2008, 8, :o2, 1220223600
+          tz.transition 2009, 6, :o3, 1243814400
+          tz.transition 2009, 8, :o2, 1250809200
+          tz.transition 2010, 5, :o3, 1272758400
+          tz.transition 2010, 8, :o2, 1281222000
+          tz.transition 2011, 4, :o3, 1301788800
+          tz.transition 2011, 7, :o2, 1312066800
+          tz.transition 2012, 4, :o3, 1335664800
+          tz.transition 2012, 7, :o2, 1342749600
+          tz.transition 2012, 8, :o3, 1345428000
+          tz.transition 2012, 9, :o2, 1348970400
+          tz.transition 2013, 4, :o3, 1367114400
+          tz.transition 2013, 7, :o2, 1373162400
+          tz.transition 2013, 8, :o3, 1376100000
+          tz.transition 2013, 10, :o2, 1382839200
+          tz.transition 2014, 3, :o3, 1396144800
+          tz.transition 2014, 6, :o2, 1404007200
+          tz.transition 2014, 7, :o3, 1406599200
+          tz.transition 2014, 10, :o2, 1414288800
+          tz.transition 2015, 3, :o3, 1427594400
+          tz.transition 2015, 6, :o2, 1434592800
+          tz.transition 2015, 7, :o3, 1437184800
+          tz.transition 2015, 10, :o2, 1445738400
+          tz.transition 2016, 3, :o3, 1459044000
+          tz.transition 2016, 6, :o2, 1465264800
+          tz.transition 2016, 7, :o3, 1467856800
+          tz.transition 2016, 10, :o2, 1477792800
+          tz.transition 2017, 3, :o3, 1490493600
+          tz.transition 2017, 5, :o2, 1495850400
+          tz.transition 2017, 6, :o3, 1498442400
+          tz.transition 2017, 10, :o2, 1509242400
+          tz.transition 2018, 3, :o3, 1521943200
+          tz.transition 2018, 5, :o2, 1526436000
+          tz.transition 2018, 6, :o3, 1529028000
+          tz.transition 2018, 10, :o2, 1540692000
+          tz.transition 2019, 3, :o3, 1553997600
+          tz.transition 2019, 5, :o2, 1557108000
+          tz.transition 2019, 6, :o3, 1559700000
+          tz.transition 2019, 10, :o2, 1572141600
+          tz.transition 2020, 3, :o3, 1585447200
+          tz.transition 2020, 4, :o2, 1587693600
+          tz.transition 2020, 5, :o3, 1590285600
+          tz.transition 2020, 10, :o2, 1603591200
+          tz.transition 2021, 3, :o3, 1616896800
+          tz.transition 2021, 4, :o2, 1618279200
+          tz.transition 2021, 5, :o3, 1620871200
+          tz.transition 2021, 10, :o2, 1635645600
+          tz.transition 2022, 3, :o3, 1648346400
+          tz.transition 2022, 4, :o2, 1648951200
+          tz.transition 2022, 5, :o3, 1651543200
+          tz.transition 2022, 10, :o2, 1667095200
+          tz.transition 2023, 4, :o3, 1682128800
+          tz.transition 2023, 10, :o2, 1698544800
+          tz.transition 2024, 4, :o3, 1712714400
+          tz.transition 2024, 10, :o2, 1729994400
+          tz.transition 2025, 3, :o3, 1743386400
+          tz.transition 2025, 10, :o2, 1761444000
+          tz.transition 2026, 3, :o3, 1774749600
+          tz.transition 2026, 10, :o2, 1792893600
+          tz.transition 2027, 3, :o3, 1806199200
+          tz.transition 2027, 10, :o2, 1824948000
+          tz.transition 2028, 3, :o3, 1837648800
+          tz.transition 2028, 10, :o2, 1856397600
+          tz.transition 2029, 3, :o3, 1869098400
+          tz.transition 2029, 10, :o2, 1887847200
+          tz.transition 2030, 3, :o3, 1901152800
+          tz.transition 2030, 10, :o2, 1919296800
+          tz.transition 2031, 3, :o3, 1932602400
+          tz.transition 2031, 10, :o2, 1950746400
+          tz.transition 2032, 3, :o3, 1964052000
+          tz.transition 2032, 10, :o2, 1982800800
+          tz.transition 2033, 3, :o3, 1995501600
+          tz.transition 2033, 10, :o2, 2014250400
+          tz.transition 2034, 3, :o3, 2026951200
+          tz.transition 2034, 10, :o2, 2045700000
+          tz.transition 2035, 3, :o3, 2058400800
+          tz.transition 2035, 10, :o2, 2077149600
+          tz.transition 2036, 3, :o3, 2090455200
+          tz.transition 2036, 10, :o2, 2108167200
+          tz.transition 2037, 3, :o3, 2121904800
+          tz.transition 2037, 10, :o2, 2138839200
+          tz.transition 2038, 3, :o3, 29586127, 12
+          tz.transition 2038, 9, :o2, 29588359, 12
+          tz.transition 2038, 10, :o3, 29588719, 12
+          tz.transition 2038, 10, :o2, 29588731, 12
+          tz.transition 2039, 3, :o3, 29590495, 12
+          tz.transition 2039, 10, :o2, 29593099, 12
+          tz.transition 2040, 3, :o3, 29594863, 12
+          tz.transition 2040, 10, :o2, 29597467, 12
+          tz.transition 2041, 3, :o3, 29599315, 12
+          tz.transition 2041, 10, :o2, 29601835, 12
+          tz.transition 2042, 3, :o3, 29603683, 12
+          tz.transition 2042, 10, :o2, 29606203, 12
+          tz.transition 2043, 3, :o3, 29608051, 12
+          tz.transition 2043, 10, :o2, 29610571, 12
+          tz.transition 2044, 3, :o3, 29612419, 12
+          tz.transition 2044, 10, :o2, 29615023, 12
+          tz.transition 2045, 3, :o3, 29616787, 12
+          tz.transition 2045, 10, :o2, 29619391, 12
+          tz.transition 2046, 3, :o3, 29621155, 12
+          tz.transition 2046, 10, :o2, 29623759, 12
+          tz.transition 2047, 3, :o3, 29625607, 12
+          tz.transition 2047, 10, :o2, 29628127, 12
+          tz.transition 2048, 3, :o3, 29629975, 12
+          tz.transition 2048, 10, :o2, 29632495, 12
+          tz.transition 2049, 3, :o3, 29634343, 12
+          tz.transition 2049, 10, :o2, 29636947, 12
+          tz.transition 2050, 3, :o3, 29638711, 12
+          tz.transition 2050, 10, :o2, 29641315, 12
         end
       end
     end

data/lib/tzinfo/definitions/Africa/Tripoli.rb

@@ -41,81 +41,7 @@ module TZInfo
           tz.transition 1997, 10, :o3, 875916000
           tz.transition 2012, 11, :o1, 1352505600
           tz.transition 2013, 3, :o2, 1364515200
-          tz.transition 2013, 10, :o1, 1382659200
-          tz.transition 2014, 3, :o2, 1395964800
-          tz.transition 2014, 10, :o1, 1414713600
-          tz.transition 2015, 3, :o2, 1427414400
-          tz.transition 2015, 10, :o1, 1446163200
-          tz.transition 2016, 3, :o2, 1458864000
-          tz.transition 2016, 10, :o1, 1477612800
-          tz.transition 2017, 3, :o2, 1490918400
-          tz.transition 2017, 10, :o1, 1509062400
-          tz.transition 2018, 3, :o2, 1522368000
-          tz.transition 2018, 10, :o1, 1540512000
-          tz.transition 2019, 3, :o2, 1553817600
-          tz.transition 2019, 10, :o1, 1571961600
-          tz.transition 2020, 3, :o2, 1585267200
-          tz.transition 2020, 10, :o1, 1604016000
-          tz.transition 2021, 3, :o2, 1616716800
-          tz.transition 2021, 10, :o1, 1635465600
-          tz.transition 2022, 3, :o2, 1648166400
-          tz.transition 2022, 10, :o1, 1666915200
-          tz.transition 2023, 3, :o2, 1680220800
-          tz.transition 2023, 10, :o1, 1698364800
-          tz.transition 2024, 3, :o2, 1711670400
-          tz.transition 2024, 10, :o1, 1729814400
-          tz.transition 2025, 3, :o2, 1743120000
-          tz.transition 2025, 10, :o1, 1761868800
-          tz.transition 2026, 3, :o2, 1774569600
-          tz.transition 2026, 10, :o1, 1793318400
-          tz.transition 2027, 3, :o2, 1806019200
-          tz.transition 2027, 10, :o1, 1824768000
-          tz.transition 2028, 3, :o2, 1838073600
-          tz.transition 2028, 10, :o1, 1856217600
-          tz.transition 2029, 3, :o2, 1869523200
-          tz.transition 2029, 10, :o1, 1887667200
-          tz.transition 2030, 3, :o2, 1900972800
-          tz.transition 2030, 10, :o1, 1919116800
-          tz.transition 2031, 3, :o2, 1932422400
-          tz.transition 2031, 10, :o1, 1951171200
-          tz.transition 2032, 3, :o2, 1963872000
-          tz.transition 2032, 10, :o1, 1982620800
-          tz.transition 2033, 3, :o2, 1995321600
-          tz.transition 2033, 10, :o1, 2014070400
-          tz.transition 2034, 3, :o2, 2027376000
-          tz.transition 2034, 10, :o1, 2045520000
-          tz.transition 2035, 3, :o2, 2058825600
-          tz.transition 2035, 10, :o1, 2076969600
-          tz.transition 2036, 3, :o2, 2090275200
-          tz.transition 2036, 10, :o1, 2109024000
-          tz.transition 2037, 3, :o2, 2121724800
-          tz.transition 2037, 10, :o1, 2140473600
-          tz.transition 2038, 3, :o2, 4931017, 2
-          tz.transition 2038, 10, :o1, 4931451, 2
-          tz.transition 2039, 3, :o2, 4931745, 2
-          tz.transition 2039, 10, :o1, 4932179, 2
-          tz.transition 2040, 3, :o2, 4932487, 2
-          tz.transition 2040, 10, :o1, 4932907, 2
-          tz.transition 2041, 3, :o2, 4933215, 2
-          tz.transition 2041, 10, :o1, 4933635, 2
-          tz.transition 2042, 3, :o2, 4933943, 2
-          tz.transition 2042, 10, :o1, 4934377, 2
-          tz.transition 2043, 3, :o2, 4934671, 2
-          tz.transition 2043, 10, :o1, 4935105, 2
-          tz.transition 2044, 3, :o2, 4935399, 2
-          tz.transition 2044, 10, :o1, 4935833, 2
-          tz.transition 2045, 3, :o2, 4936141, 2
-          tz.transition 2045, 10, :o1, 4936561, 2
-          tz.transition 2046, 3, :o2, 4936869, 2
-          tz.transition 2046, 10, :o1, 4937289, 2
-          tz.transition 2047, 3, :o2, 4937597, 2
-          tz.transition 2047, 10, :o1, 4938017, 2
-          tz.transition 2048, 3, :o2, 4938325, 2
-          tz.transition 2048, 10, :o1, 4938759, 2
-          tz.transition 2049, 3, :o2, 4939053, 2
-          tz.transition 2049, 10, :o1, 4939487, 2
-          tz.transition 2050, 3, :o2, 4939781, 2
-          tz.transition 2050, 10, :o1, 4940215, 2
+          tz.transition 2013, 10, :o3, 1382659200
         end
       end
     end

data/lib/tzinfo/definitions/America/Eirunepe.rb

@@ -42,6 +42,7 @@ module TZInfo
           tz.transition 1993, 10, :o2, 750834000
           tz.transition 1994, 2, :o1, 761716800
           tz.transition 2008, 6, :o3, 1214283600
+          tz.transition 2013, 11, :o1, 1384056000
         end
       end
     end

data/lib/tzinfo/definitions/America/Havana.rb

@@ -102,7 +102,7 @@ module TZInfo
           tz.transition 2002, 10, :o2, 1035694800
           tz.transition 2003, 4, :o3, 1049605200
           tz.transition 2003, 10, :o2, 1067144400
-          tz.transition 2004, 4, :o3, 1081054800
+          tz.transition 2004, 3, :o3, 1080450000
           tz.transition 2006, 10, :o2, 1162098000
           tz.transition 2007, 3, :o3, 1173589200
           tz.transition 2007, 10, :o2, 1193547600

data/lib/tzinfo/definitions/America/Rio_Branco.rb

@@ -40,6 +40,7 @@ module TZInfo
           tz.transition 1987, 10, :o2, 562136400
           tz.transition 1988, 2, :o1, 571204800
           tz.transition 2008, 6, :o3, 1214283600
+          tz.transition 2013, 11, :o1, 1384056000
         end
       end
     end

data/lib/tzinfo/definitions/Asia/Amman.rb

@@ -8,7 +8,6 @@ module TZInfo
           tz.offset :o0, 8624, 0, :LMT
           tz.offset :o1, 7200, 0, :EET
           tz.offset :o2, 7200, 3600, :EEST
-          tz.offset :o3, 10800, 0, :AST
           
           tz.transition 1930, 12, :o1, 13102248961, 5400
           tz.transition 1973, 6, :o2, 108165600
@@ -78,7 +77,81 @@ module TZInfo
           tz.transition 2011, 3, :o2, 1301608800
           tz.transition 2011, 10, :o1, 1319752800
           tz.transition 2012, 3, :o2, 1333058400
-          tz.transition 2012, 10, :o3, 1351202400
+          tz.transition 2013, 12, :o1, 1387486800
+          tz.transition 2014, 3, :o2, 1395957600
+          tz.transition 2014, 10, :o1, 1414706400
+          tz.transition 2015, 3, :o2, 1427407200
+          tz.transition 2015, 10, :o1, 1446156000
+          tz.transition 2016, 3, :o2, 1459461600
+          tz.transition 2016, 10, :o1, 1477605600
+          tz.transition 2017, 3, :o2, 1490911200
+          tz.transition 2017, 10, :o1, 1509055200
+          tz.transition 2018, 3, :o2, 1522360800
+          tz.transition 2018, 10, :o1, 1540504800
+          tz.transition 2019, 3, :o2, 1553810400
+          tz.transition 2019, 10, :o1, 1571954400
+          tz.transition 2020, 3, :o2, 1585260000
+          tz.transition 2020, 10, :o1, 1604008800
+          tz.transition 2021, 3, :o2, 1616709600
+          tz.transition 2021, 10, :o1, 1635458400
+          tz.transition 2022, 3, :o2, 1648764000
+          tz.transition 2022, 10, :o1, 1666908000
+          tz.transition 2023, 3, :o2, 1680213600
+          tz.transition 2023, 10, :o1, 1698357600
+          tz.transition 2024, 3, :o2, 1711663200
+          tz.transition 2024, 10, :o1, 1729807200
+          tz.transition 2025, 3, :o2, 1743112800
+          tz.transition 2025, 10, :o1, 1761861600
+          tz.transition 2026, 3, :o2, 1774562400
+          tz.transition 2026, 10, :o1, 1793311200
+          tz.transition 2027, 3, :o2, 1806012000
+          tz.transition 2027, 10, :o1, 1824760800
+          tz.transition 2028, 3, :o2, 1838066400
+          tz.transition 2028, 10, :o1, 1856210400
+          tz.transition 2029, 3, :o2, 1869516000
+          tz.transition 2029, 10, :o1, 1887660000
+          tz.transition 2030, 3, :o2, 1900965600
+          tz.transition 2030, 10, :o1, 1919109600
+          tz.transition 2031, 3, :o2, 1932415200
+          tz.transition 2031, 10, :o1, 1951164000
+          tz.transition 2032, 3, :o2, 1963864800
+          tz.transition 2032, 10, :o1, 1982613600
+          tz.transition 2033, 3, :o2, 1995919200
+          tz.transition 2033, 10, :o1, 2014063200
+          tz.transition 2034, 3, :o2, 2027368800
+          tz.transition 2034, 10, :o1, 2045512800
+          tz.transition 2035, 3, :o2, 2058818400
+          tz.transition 2035, 10, :o1, 2076962400
+          tz.transition 2036, 3, :o2, 2090268000
+          tz.transition 2036, 10, :o1, 2109016800
+          tz.transition 2037, 3, :o2, 2121717600
+          tz.transition 2037, 10, :o1, 2140466400
+          tz.transition 2038, 3, :o2, 29586101, 12
+          tz.transition 2038, 10, :o1, 29588705, 12
+          tz.transition 2039, 3, :o2, 29590553, 12
+          tz.transition 2039, 10, :o1, 29593073, 12
+          tz.transition 2040, 3, :o2, 29594921, 12
+          tz.transition 2040, 10, :o1, 29597441, 12
+          tz.transition 2041, 3, :o2, 29599289, 12
+          tz.transition 2041, 10, :o1, 29601809, 12
+          tz.transition 2042, 3, :o2, 29603657, 12
+          tz.transition 2042, 10, :o1, 29606261, 12
+          tz.transition 2043, 3, :o2, 29608025, 12
+          tz.transition 2043, 10, :o1, 29610629, 12
+          tz.transition 2044, 3, :o2, 29612477, 12
+          tz.transition 2044, 10, :o1, 29614997, 12
+          tz.transition 2045, 3, :o2, 29616845, 12
+          tz.transition 2045, 10, :o1, 29619365, 12
+          tz.transition 2046, 3, :o2, 29621213, 12
+          tz.transition 2046, 10, :o1, 29623733, 12
+          tz.transition 2047, 3, :o2, 29625581, 12
+          tz.transition 2047, 10, :o1, 29628101, 12
+          tz.transition 2048, 3, :o2, 29629949, 12
+          tz.transition 2048, 10, :o1, 29632553, 12
+          tz.transition 2049, 3, :o2, 29634317, 12
+          tz.transition 2049, 10, :o1, 29636921, 12
+          tz.transition 2050, 3, :o2, 29638769, 12
+          tz.transition 2050, 10, :o1, 29641289, 12
         end
       end
     end