null+****@clear*****
null+****@clear*****
2012年 5月 16日 (水) 14:44:24 JST
HAYASHI Kentaro 2012-05-16 14:44:24 +0900 (Wed, 16 May 2012)
New Revision: c30e037d5d5b7d7939d308d8161cb9c3fe1140c2
Log:
test: move point? definition into GrnTestData
Modified files:
test/function/tools/geo/generate-grntest-data.rb
Modified: test/function/tools/geo/generate-grntest-data.rb (+11 -5)
===================================================================
--- test/function/tools/geo/generate-grntest-data.rb 2012-05-16 14:40:32 +0900 (acb6804)
+++ test/function/tools/geo/generate-grntest-data.rb 2012-05-16 14:44:24 +0900 (3e493b5)
@@ -126,6 +126,16 @@ class GrnTestData
false
end
end
+
+ def point_or_line
+ point?(@longitude_start_degree, @latitude_start_degree,
+ @longitude_end_degree, @latitude_end_degree) ? "point" : "line"
+ end
+
+ def point?(start_longitude, start_latitude, end_longitude, end_latitude)
+ start_longitude == end_longitude and start_latitude == end_latitude
+ end
+
end
@@ -165,10 +175,6 @@ def south_axis?(lng, lat)
lng == 0 and lat <= 0
end
-def point?(start_lng, start_lat, end_lng, end_lat)
- start_lng == end_lng and start_lat == end_lat
-end
-
def get_point(lng, lat)
ret = ""
@@ -283,7 +289,7 @@ if __FILE__ == $0
prefix = grndata.long_or_short
- type = point?(lng_sdeg, lat_sdeg, lng_edeg, lat_edeg) ? "point" : "line"
+ type = grndata.point_or_line
if OPTS.has_key?(:file_name)
filename = get_filename(lng_sdeg, lat_sdeg, lng_edeg, lat_edeg)