null+****@clear*****
null+****@clear*****
2012年 5月 16日 (水) 16:54:08 JST
HAYASHI Kentaro 2012-05-16 16:54:08 +0900 (Wed, 16 May 2012)
New Revision: 972ece46f87cb2c6b0a105688fdf35713504d5d7
Log:
test: move get_quadrant into GrnTestData
Modified files:
test/function/tools/geo/generate-grntest-data.rb
Modified: test/function/tools/geo/generate-grntest-data.rb (+14 -14)
===================================================================
--- test/function/tools/geo/generate-grntest-data.rb 2012-05-16 15:31:39 +0900 (9695e20)
+++ test/function/tools/geo/generate-grntest-data.rb 2012-05-16 16:54:08 +0900 (837021f)
@@ -56,6 +56,20 @@ class GrnTestData
@latitude_end_degree = @latitude_end_degree.to_i
end
+ def get_quadrant(longitude, latitude)
+ if longitude > 0 and latitude > 0
+ "1st"
+ elsif longitude < 0 and latitude > 0
+ "2nd"
+ elsif longitude < 0 and latitude < 0
+ "3rd"
+ elsif longitude > 0 and latitude < 0
+ "4th"
+ else
+ nil
+ end
+ end
+
def quadrant_to
squadrant = get_quadrant(@longitude_start_degree, @latitude_start_degree)
equadrant = get_quadrant(@longitude_end_degree, @latitude_end_degree)
@@ -176,20 +190,6 @@ class GrnTestData
end
end
-def get_quadrant(lng, lat)
- if lng > 0 and lat > 0
- "1st"
- elsif lng < 0 and lat > 0
- "2nd"
- elsif lng < 0 and lat < 0
- "3rd"
- elsif lng > 0 and lat < 0
- "4th"
- else
- nil
- end
-end
-
def meridian?(lng, lat)
end