rgeo 0.3.3 → 0.3.4

data/ext/geos_c_impl/geometry_collection.h

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Geometry collection methods for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -37,7 +37,7 @@
 
 #ifndef RGEO_GEOS_GEOMETRY_COLLECTION_INCLUDED
 #define RGEO_GEOS_GEOMETRY_COLLECTION_INCLUDED
-  
+
 #include <ruby.h>
 #include <geos_c.h>
 

data/ext/geos_c_impl/line_string.c

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Line string methods for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -469,7 +469,7 @@ static VALUE cmethod_create_line(VALUE module, VALUE factory, VALUE start, VALUE
   has_z = (char)(factory_data->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M);
   point_type = factory_data->globals->feature_point;
   context = factory_data->geos_context;
-  
+
   start_geom = rgeo_convert_to_geos_geometry(factory, start, point_type);
   if (start_geom) {
     end_geom = rgeo_convert_to_geos_geometry(factory, end, point_type);
@@ -485,7 +485,7 @@ static VALUE cmethod_create_line(VALUE module, VALUE factory, VALUE start, VALUE
       }
     }
   }
-  
+
   return result;
 }
 
@@ -554,19 +554,19 @@ void rgeo_init_geos_line_string(RGeo_Globals* globals)
     rb_const_get_at(globals->feature_module, rb_intern("Curve")), geos_line_string_class);
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
     globals->feature_line_string, geos_line_string_class);
-  
+
   geos_linear_ring_class = rb_define_class_under(globals->geos_module, "LinearRingImpl", geos_line_string_class);
   globals->geos_linear_ring = geos_linear_ring_class;
   globals->feature_linear_ring = rb_const_get_at(globals->feature_module, rb_intern("LinearRing"));
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
     globals->feature_linear_ring, geos_linear_ring_class);
-  
+
   geos_line_class = rb_define_class_under(globals->geos_module, "LineImpl", geos_line_string_class);
   globals->geos_line = geos_line_class;
   globals->feature_line = rb_const_get_at(globals->feature_module, rb_intern("Line"));
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
     globals->feature_line, geos_line_class);
-  
+
   rb_define_module_function(geos_line_string_class, "create", cmethod_create_line_string, 2);
   rb_define_module_function(geos_line_string_class, "_copy_from", cmethod_line_string_copy_from, 2);
   rb_define_method(geos_line_string_class, "eql?", method_line_string_eql, 1);
@@ -579,11 +579,11 @@ void rgeo_init_geos_line_string(RGeo_Globals* globals)
   rb_define_method(geos_line_string_class, "end_point", method_line_string_end_point, 0);
   rb_define_method(geos_line_string_class, "is_closed?", method_line_string_is_closed, 0);
   rb_define_method(geos_line_string_class, "is_ring?", method_line_string_is_ring, 0);
-  
+
   rb_define_module_function(geos_linear_ring_class, "create", cmethod_create_linear_ring, 2);
   rb_define_module_function(geos_linear_ring_class, "_copy_from", cmethod_linear_ring_copy_from, 2);
   rb_define_method(geos_linear_ring_class, "geometry_type", method_linear_ring_geometry_type, 0);
-  
+
   rb_define_module_function(geos_line_class, "create", cmethod_create_line, 3);
   rb_define_module_function(geos_line_class, "_copy_from", cmethod_line_copy_from, 2);
   rb_define_method(geos_line_class, "geometry_type", method_line_geometry_type, 0);

data/ext/geos_c_impl/line_string.h

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Line string methods for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

data/ext/geos_c_impl/main.c

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Main initializer for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

data/ext/geos_c_impl/point.c

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Point methods for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -182,9 +182,9 @@ void rgeo_init_geos_point(RGeo_Globals* globals)
   globals->feature_point = rb_const_get_at(globals->feature_module, rb_intern("Point"));
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
     globals->feature_point, geos_point_class);
-  
+
   rb_define_module_function(geos_point_class, "create", cmethod_create, 4);
-  
+
   rb_define_method(geos_point_class, "eql?", method_point_eql, 1);
   rb_define_method(geos_point_class, "geometry_type", method_point_geometry_type, 0);
   rb_define_method(geos_point_class, "x", method_point_x, 0);

data/ext/geos_c_impl/point.h

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Point methods for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

data/ext/geos_c_impl/polygon.c

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Polygon methods for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -281,9 +281,9 @@ void rgeo_init_geos_polygon(RGeo_Globals* globals)
     rb_const_get_at(globals->feature_module, rb_intern("Surface")), geos_polygon_class);
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
     globals->feature_polygon, geos_polygon_class);
-  
+
   rb_define_module_function(geos_polygon_class, "create", cmethod_create, 3);
-  
+
   rb_define_method(geos_polygon_class, "eql?", method_polygon_eql, 1);
   rb_define_method(geos_polygon_class, "geometry_type", method_polygon_geometry_type, 0);
   rb_define_method(geos_polygon_class, "area", method_polygon_area, 0);

data/ext/geos_c_impl/polygon.h

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Polygon methods for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

data/ext/geos_c_impl/preface.h

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Preface header for GEOS wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

data/ext/proj4_c_impl/extconf.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Makefile builder for Proj4 wrapper
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 Daniel Azuma
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,13 +35,13 @@
 
 
 if ::RUBY_DESCRIPTION =~ /^jruby\s/
-  
+
   ::File.open('Makefile', 'w'){ |f_| f_.write(".PHONY: install\ninstall:\n") }
-  
+
 else
-  
+
   require 'mkmf'
-  
+
   header_dirs_ =
     [
      '/usr/local/include',
@@ -70,7 +70,7 @@ else
     ]
   header_dirs_.delete_if{ |path_| !::File.directory?(path_) }
   lib_dirs_.delete_if{ |path_| !::File.directory?(path_) }
-  
+
   found_proj_ = false
   header_dirs_, lib_dirs_ = dir_config('proj', header_dirs_, lib_dirs_)
   if have_header('proj_api.h')
@@ -86,5 +86,5 @@ else
     puts "**** Compiling without Proj support."
   end
   create_makefile('rgeo/coord_sys/proj4_c_impl')
-  
+
 end

data/ext/proj4_c_impl/main.c

@@ -1,16 +1,16 @@
 /*
   -----------------------------------------------------------------------------
-  
+
   Main initializer for Proj4 wrapper
-  
+
   -----------------------------------------------------------------------------
-  Copyright 2010 Daniel Azuma
-  
+  Copyright 2010-2012 Daniel Azuma
+
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-  
+
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
@@ -19,7 +19,7 @@
   * Neither the name of the copyright holder, nor the names of any other
     contributors to this software, may be used to endorse or promote products
     derived from this software without specific prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -125,7 +125,7 @@ static VALUE method_proj4_initialize_copy(VALUE self, VALUE orig)
     self_data->pj = NULL;
     self_data->original_str = Qnil;
   }
-  
+
   // Copy value from orig
   orig_data = RGEO_PROJ4_DATA_PTR(orig);
   if (!NIL_P(orig_data->original_str)) {
@@ -138,7 +138,7 @@ static VALUE method_proj4_initialize_copy(VALUE self, VALUE orig)
   }
   self_data->original_str = orig_data->original_str;
   self_data->uses_radians = orig_data->uses_radians;
-  
+
   return self;
 }
 
@@ -149,7 +149,7 @@ static VALUE method_proj4_set_value(VALUE self, VALUE str, VALUE uses_radians)
   projPJ pj;
 
   Check_Type(str, T_STRING);
-  
+
   // Clear out any existing value
   self_data = RGEO_PROJ4_DATA_PTR(self);
   pj = self_data->pj;
@@ -158,12 +158,12 @@ static VALUE method_proj4_set_value(VALUE self, VALUE str, VALUE uses_radians)
     self_data->pj = NULL;
     self_data->original_str = Qnil;
   }
-  
+
   // Set new data
   self_data->pj = pj_init_plus(RSTRING_PTR(str));
   self_data->original_str = str;
   self_data->uses_radians = RTEST(uses_radians) ? 1 : 0;
-  
+
   return self;
 }