@@ -9,3 +9,4 @@ coverage/* doc/* ext/*.bundle ext/*.so +ext/Makefile .gitignore @@ -5,10 +5,10 @@ VALUE rb_distance; double HaversineDistance( double y1, double x1, double y2, double x2 ) { double nRadius = 6370997.0; // Earth’s radius in Kilometers - double rad = 0.0174532925199433; + double rad = 0.0174532925199433; // Get the difference between our two points in radians - double nDLat = (y2 - y1) * rad; - double nDLon = (x2 - x1) * rad; + double nDLat = (y2 - y1) * rad; + double nDLon = (x2 - x1) * rad; y1 *= rad; y2 *= rad; @@ -19,68 +19,69 @@ double HaversineDistance( double y1, double x1, double y2, double x2 ) } // -double PythagoreanDistance( double y1, double x1, double y2, double x2 ) -{ - double nR = sqrt( pow(x2 - x1) + pow( y2 - y1 )); - return nR; -} +/*double PythagoreanDistance( double y1, double x1, double y2, double x2 )*/ +/*{*/ +/* double nR = sqrt( pow(x2 - x1) + pow( y2 - y1 ));*/ +/* return nR;*/ +/*}*/ -double FlatEarthDistance(double y1, double x1, double y2, double x2 ) -{ - double rad = 1.570796326794897; - double nRadius = 6370997.0; // Earth’s radius in Kilometers - double nA = rad - y1; - double nB = rad - y2; - double nC = sqrt( pow(nA) + pow(nB) - 2 * nA * nB * cos(x2 - x1)); - double nR = nRadius * nC; - return nR; -} +/*double FlatEarthDistance(double y1, double x1, double y2, double x2 )*/ +/*{*/ +/* double rad = 1.570796326794897;*/ +/* double nRadius = 6370997.0; // Earth’s radius in Kilometers*/ +/* double nA = rad - y1;*/ +/* double nB = rad - y2;*/ +/* double nC = sqrt( pow(nA) + pow(nB) - 2 * nA * nB * cos(x2 - x1));*/ +/* double nR = nRadius * nC;*/ +/* return nR;*/ +/*}*/ // Using Vincenty Formula //a is the semi-major axis (equatorial radius) of the ellipsoid // b is the semi-minor axis (polar radius) of the ellipsoid // Their values by default are set to the ones of the WGS84 ellipsoid -double EllipsoidalDistance(double y1, double x1, double y2, double x2, double a = 1, double b ) -{ - double rad = 0.0174532925199433; - double f = (a-b)/a; - double l, lambda = (x2 - x1) * rad; - double u1 = atan((1-f) * tan(y1 * rad)); - double u2 = atan((1-f) * tan(y2 * rad)); - double sinU1 = sin(u1); - double cosU1 = cos(u1); - double sinU2 = sin(u2); - double cosU2 = cos(u2); - double lambdaP = 6.283185307179586; - int iterLimit = 20; - - while(abs(lambda-lambdaP) > 1e-12 && iterLimit > 0) { - double sinLambda = sin(lambda); - double cosLambda = cos(lambda); - double sinSigma = sqrt((cosU2*sinLambda) * (cosU2*sinLambda) + (cosU1*sinU2-sinU1*cosU2*cosLambda) * (cosU1*sinU2-sinU1*cosU2*cosLambda)); - if (sinSignma == 0) { - return 0; - } - double cosSigma = sinU1*sinU2 + cosU1*cosU2*cosLambda; - double sigma = atan2(sinSigma, cosSigma); - double sinAlpha = cosU1 * cosU2 * sinLambda / sinSigma; - double cosSqAlpha = 1 - sinAlpha*sinAlpha; - double cos2SigmaM = cosSigma - 2*sinU1*sinU2/cosSqAlpha; - if (nan(cos2SigmaM)){ - cos2SigmaM = 0; //#equatorial line: cosSqAlpha=0 - } - double c = f/16*cosSqAlpha*(4+f*(4-3*cosSqAlpha)); - lambdaP = lambda; - lambda = l + (1-c) * f * sinAlpha * (sigma + c * sinSigma * (cos2SigmaM + c * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM))); - return lambda - } - if(iterLimit == 0){ - return 0; - } - double uSq = cosSqAlpha * (a*a - b*b) / (b*b); - double a_bis = 1 + uSq/16384*(4096+uSq*(-768+uSq*(320-175*uSq))); - double b_bis = uSq/1024 * (256+uSq*(-128+uSq*(74-47*uSq))); - double deltaSigma = b_bis * sinSigma*(cos2SigmaM + b_bis/4*(cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)- b_bis/6*cos2SigmaM*(-3+4*sinSigma*sinSigma)*(-3+4*cos2SigmaM*cos2SigmaM))); - double final = b*a_bis*(sigma-deltaSigma); - return final; -} \ No newline at end of file +/*double EllipsoidalDistance(double y1, double x1, double y2, double x2, double a, double b )*/ +/*{*/ +/* double a = 1;*/ +/* double rad = 0.0174532925199433;*/ +/* double f = (a-b)/a;*/ +/* double l, lambda = (x2 - x1) * rad;*/ +/* double u1 = atan((1-f) * tan(y1 * rad));*/ +/* double u2 = atan((1-f) * tan(y2 * rad));*/ +/* double sinU1 = sin(u1);*/ +/* double cosU1 = cos(u1);*/ +/* double sinU2 = sin(u2);*/ +/* double cosU2 = cos(u2);*/ +/* double lambdaP = 6.283185307179586;*/ +/* int iterLimit = 20;*/ + +/* while(abs(lambda-lambdaP) > 1e-12 && iterLimit > 0) {*/ +/* double sinLambda = sin(lambda);*/ +/* double cosLambda = cos(lambda);*/ +/* double sinSigma = sqrt((cosU2*sinLambda) * (cosU2*sinLambda) + (cosU1*sinU2-sinU1*cosU2*cosLambda) * (cosU1*sinU2-sinU1*cosU2*cosLambda));*/ +/* if (sinSignma == 0) {*/ +/* return 0;*/ +/* }*/ +/* double cosSigma = sinU1*sinU2 + cosU1*cosU2*cosLambda;*/ +/* double sigma = atan2(sinSigma, cosSigma);*/ +/* double sinAlpha = cosU1 * cosU2 * sinLambda / sinSigma;*/ +/* double cosSqAlpha = 1 - sinAlpha*sinAlpha;*/ +/* double cos2SigmaM = cosSigma - 2*sinU1*sinU2/cosSqAlpha;*/ +/* if (nan(cos2SigmaM)){*/ +/* cos2SigmaM = 0; //#equatorial line: cosSqAlpha=0*/ +/* }*/ +/* double c = f/16*cosSqAlpha*(4+f*(4-3*cosSqAlpha));*/ +/* lambdaP = lambda;*/ +/* lambda = l + (1-c) * f * sinAlpha * (sigma + c * sinSigma * (cos2SigmaM + c * cosSigma * (-1 + 2 * cos2SigmaM * cos2SigmaM)));*/ +/* return lambda*/ +/* }*/ +/* if(iterLimit == 0){*/ +/* return 0;*/ +/* }*/ +/* double uSq = cosSqAlpha * (a*a - b*b) / (b*b);*/ +/* double a_bis = 1 + uSq/16384*(4096+uSq*(-768+uSq*(320-175*uSq)));*/ +/* double b_bis = uSq/1024 * (256+uSq*(-128+uSq*(74-47*uSq)));*/ +/* double deltaSigma = b_bis * sinSigma*(cos2SigmaM + b_bis/4*(cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)- b_bis/6*cos2SigmaM*(-3+4*sinSigma*sinSigma)*(-3+4*cos2SigmaM*cos2SigmaM)));*/ +/* double final = b*a_bis*(sigma-deltaSigma);*/ +/* return final;*/ +/*}*/ ext/distance.c @@ -11,12 +11,12 @@ module GeorubyC super(srid,with_z,with_m) @points=[] end - + #Delegate the unknown methods to the points array def method_missing(method_name,*args,&b) @points.send(method_name,*args,&b) end - + #tests if the line string is closed def is_closed #a bit naive... @@ -33,9 +33,9 @@ module GeorubyC max_y = point.y if point.y > max_y min_y = point.y if point.y < min_y max_x = point.x if point.x > max_x - min_x = point.x if point.x < min_x + min_x = point.x if point.x < min_x max_z = point.z if point.z > max_z - min_z = point.z if point.z < min_z + min_z = point.z if point.z < min_z end [Point.from_x_y_z(min_x,min_y,min_z),Point.from_x_y_z(max_x,max_y,max_z)] else @@ -43,7 +43,7 @@ module GeorubyC max_y = point.y if point.y > max_y min_y = point.y if point.y < min_y max_x = point.x if point.x > max_x - min_x = point.x if point.x < min_x + min_x = point.x if point.x < min_x end [Point.from_x_y(min_x,min_y),Point.from_x_y(max_x,max_y)] end @@ -61,10 +61,10 @@ module GeorubyC [0,0] end end - + #Tests the equality of line strings def ==(other_line_string) - if(other_line_string.class != self.class or + if(other_line_string.class != self.class or other_line_string.length != self.length) false else @@ -79,67 +79,67 @@ module GeorubyC #call to native Geo intersect, return true or false def intersects?(other_line_string) - + end def to_c f = [] points.each do |p| - f << Native::LineString.new(p[0],p[1]) + f << Native::LineString.new(p[0],p[1]) next end f end #Binary representation of a line string - def binary_representation(allow_z=true,allow_m=true) #:nodoc: + def binary_representation(allow_z=true,allow_m=true) #:nodoc: rep = [length].pack("V") each {|point| rep << point.binary_representation(allow_z,allow_m) } rep end - + #WKB geometry type - def binary_geometry_type #:nodoc: + def binary_geometry_type #:nodoc: 2 end #Text representation of a line string - def text_representation(allow_z=true,allow_m=true) #:nodoc: - @points.collect{|point| point.text_representation(allow_z,allow_m) }.join(",") + def text_representation(allow_z=true,allow_m=true) #:nodoc: + @points.collect{|point| point.text_representation(allow_z,allow_m) }.join(",") end #WKT geometry type - def text_geometry_type #:nodoc: + def text_geometry_type #:nodoc: "LINESTRING" end #georss simple representation - def georss_simple_representation(options) #:nodoc: + def georss_simple_representation(options) #:nodoc: georss_ns = options[:georss_ns] || "georss" geom_attr = options[:geom_attr] "<#{georss_ns}:line#{geom_attr}>" + georss_poslist + "</#{georss_ns}:line>\n" end #georss w3c representation : outputs the first point of the line - def georss_w3cgeo_representation(options) #:nodoc: + def georss_w3cgeo_representation(options) #:nodoc: w3cgeo_ns = options[:w3cgeo_ns] || "geo" "<#{w3cgeo_ns}:lat>#{self[0].y}</#{w3cgeo_ns}:lat>\n<#{w3cgeo_ns}:long>#{self[0].x}</#{w3cgeo_ns}:long>\n" end #georss gml representation - def georss_gml_representation(options) #:nodoc: + def georss_gml_representation(options) #:nodoc: georss_ns = options[:georss_ns] || "georss" gml_ns = options[:gml_ns] || "gml" - + result = "<#{georss_ns}:where>\n<#{gml_ns}:LineString>\n<#{gml_ns}:posList>\n" result += georss_poslist result += "\n</#{gml_ns}:posList>\n</#{gml_ns}:LineString>\n</#{georss_ns}:where>\n" end - def georss_poslist #:nodoc: + def georss_poslist #:nodoc: map {|point| "#{point.y} #{point.x}"}.join(" ") end #outputs the geometry in kml format : options are <tt>:id</tt>, <tt>:tesselate</tt>, <tt>:extrude</tt>, #<tt>:altitude_mode</tt>. If the altitude_mode option is not present, the Z (if present) will not be output (since #it won't be used by GE anyway: clampToGround is the default) - def kml_representation(options = {}) #:nodoc: + def kml_representation(options = {}) #:nodoc: result = "<LineString#{options[:id_attr]}>\n" result += options[:geom_data] if options[:geom_data] result += "<coordinates>" @@ -147,8 +147,8 @@ module GeorubyC result += "</coordinates>\n" result += "</LineString>\n" end - - def kml_poslist(options) #:nodoc: + + def kml_poslist(options) #:nodoc: pos_list = if options[:allow_z] map {|point| "#{point.x},#{point.y},#{options[:fixed_z] || point.z || 0}" } else @@ -157,7 +157,7 @@ module GeorubyC pos_list.reverse! if(options[:reverse]) pos_list.join(" ") end - + #Creates a new line string. Accept an array of points as argument def self.from_points(points,srid=@@srid,with_z=false,with_m=false) line_string = new(srid,with_z,with_m) @@ -171,7 +171,6 @@ module GeorubyC line_string.concat( points.map {|p| Point.from_coordinates(p,srid,with_z,with_m) } ) line_string end - - end + end end end lib/georuby_c/base/line_string.rb @@ -3,82 +3,84 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') module LineSpecHelper def mock_points # @point = mock(Point, :x => 1.0, :y => 2.0) - Array.new(7) { |i| mock(Point, :x => i, :y => i, :text_representation => "#{i} #{i}") } + Array.new(7) { |i| mock_point(i,i) } + end + + def mock_point(x=1,y=2) + mock(Point, :x => x, :y => y, :text_representation => "#{x} #{y}") end end -describe LineString do +describe LineString do + include LineSpecHelper before(:each) do @line = LineString.from_points([mock(Point)]) end - + it "should instantiate" do violated unless @line end - + it "should have binary_geometry_type 2" do @line.binary_geometry_type.should eql(2) end - + it "should have text_geometry_type" do @line.text_geometry_type.should eql("LINESTRING") end - + it "should have a points array" do @line.points.should be_instance_of(Array) end - + describe ", from coordinates" do before(:each) do - Point.should_receive(:anything)#.with('') - @line = LineString.from_coordinates([[1,2][2.2,4.5]]) + Point.should_receive(:from_coordinates). + exactly(4).with(anything, 4326, false, false).and_return(mock_point) + @line = LineString.from_coordinates([1.2,2.5,2.2,4.5]) end - - it "should instantiate from coordinates" do - @line.should be_instance_of(LineString) + + it "should instantiate from coordinates" do + @line.points.length.should eql(4) end - - end + describe ", Instantiated" do - include LineSpecHelper + before(:each) do @line = LineString.from_points(mock_points) end - - + it "should be closed if the last point equals the first" do @line.push(@line.first) @line.should be_closed @line.length.should eql(8) end - + it "should print the text representation" do - @line.text_representation.should eql("0 0,1 1,2 2,3 3,4 4,5 5,6 6") + @line.text_representation.should eql("0 0,1 1,2 2,3 3,4 4,5 5,6 6") end - + it "should print the georss_simple_representation" do @line.georss_simple_representation({:geom_attr => nil}). should eql("<georss:line>0 0 1 1 2 2 3 3 4 4 5 5 6 6</georss:line>\n") end - + it "should map the georss_poslist" do @line.georss_poslist.should eql("0 0 1 1 2 2 3 3 4 4 5 5 6 6") end - + it "should print the kml_representation" do - @line.kml_representation.should - eql("<LineString>\n<coordinates>0,0 1,1 2,2 3,3 4,4 5,5 6,6</coordinates>\n</LineString>\n") + @line.kml_representation.should + eql("<LineString>\n<coordinates>0,0 1,1 2,2 3,3 4,4 5,5 6,6</coordinates>\n</LineString>\n") end - + it "should print the kml_poslist without reverse or z" do @line.kml_poslist({}).should eql("0,0 1,1 2,2 3,3 4,4 5,5 6,6") end - + it "should print the kml_poslist reverse" do @line.kml_poslist({:reverse => true}).should eql("6,6 5,5 4,4 3,3 2,2 1,1 0,0") - end + end end - - -end \ No newline at end of file +end spec/georuby_c/base/line_string_spec.rb @@ -1,6 +1,3 @@ -lib_path = File.expand_path("#{File.dirname(__FILE__)}/../../lib") -$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path) - begin require 'spec' rescue LoadError @@ -9,12 +6,13 @@ rescue LoadError require 'spec' end +$:.unshift(File.dirname(__FILE__) + '/../lib') require 'georuby_c' include GeorubyC include Base Spec::Runner.configure do |config| - - -end \ No newline at end of file + + +end spec/spec_helper.rb ext/Makefile 0b012a1ab1c29ad0493172b19009a1c45874df8d Marcos Augusto x@nofxx.com http://github.com/nofxx/georuby_c/commit/0a9571d3344007af00eb8c2acb4021171de01726 0a9571d3344007af00eb8c2acb4021171de01726 2008-09-29T16:06:56-07:00 2008-09-29T16:06:56-07:00 testing on linux b6bf0c0c70e8209ac16acf8d3ca16fe09c0abc48 Marcos Augusto x@nofxx.com