null+****@clear*****
null+****@clear*****
2012年 5月 31日 (木) 15:53:04 JST
HAYASHI Kentaro 2012-05-31 15:53:04 +0900 (Thu, 31 May 2012)
New Revision: 3f3bf7a572239aa3425d1c399a9db97a1e1a3276
Log:
test: add start point check according to quadrant
Modified files:
test/function/tools/geo/generate-grntest-data.rb
Modified: test/function/tools/geo/generate-grntest-data.rb (+38 -1)
===================================================================
--- test/function/tools/geo/generate-grntest-data.rb 2012-05-31 14:54:52 +0900 (139a7ab)
+++ test/function/tools/geo/generate-grntest-data.rb 2012-05-31 15:53:04 +0900 (fc2143f)
@@ -197,7 +197,44 @@ class GrnTestData
"4th"
end
elsif not squadrant
- equadrant
+ case equadrant
+ when "1st"
+ if north_axis?(@longitude_start_degree, @latitude_start_degree) or
+ east_axis?(@longitude_start_degree, @latitude_start_degree)
+ "1st"
+ elsif west_axis?(@longitude_start_degree, @latitude_start_degree)
+ "2ndto1st"
+ elsif south_axis?(@longitude_start_degree, @latitude_start_degree)
+ "4thto1st"
+ end
+ when "2nd"
+ if north_axis?(@longitude_start_degree, @latitude_start_degree) or
+ west_axis?(@longitude_start_degree, @latitude_start_degree)
+ "2nd"
+ elsif east_axis?(@longitude_start_degree, @latitude_start_degree)
+ "1stto2nd"
+ elsif south_axis?(@longitude_start_degree, @latitude_start_degree)
+ "3rdto2nd"
+ end
+ when "3rd"
+ if south_axis?(@longitude_start_degree, @latitude_start_degree) or
+ west_axis?(@longitude_start_degree, @latitude_start_degree)
+ "3rd"
+ elsif east_axis?(@longitude_start_degree, @latitude_start_degree)
+ "4thto3rd"
+ elsif north_axis?(@longitude_start_degree, @latitude_start_degree)
+ "2ndto3rd"
+ end
+ when "4th"
+ if south_axis?(@longitude_start_degree, @latitude_start_degree) or
+ east_axis?(@longitude_start_degree, @latitude_start_degree)
+ "4th"
+ elsif west_axis?(@longitude_start_degree, @latitude_start_degree)
+ "3rdto4th"
+ elsif north_axis?(@longitude_start_degree, @latitude_start_degree)
+ "1stto4th"
+ end
+ end
elsif not equadrant
case squadrant
when "1st"