rgeo 0.5.0 → 0.5.1

data/ext/geos_c_impl/line_string.h

@@ -1,32 +0,0 @@
-/*
-  Line string methods for GEOS wrapper
-*/
-
-
-#ifndef RGEO_GEOS_LINE_STRING_INCLUDED
-#define RGEO_GEOS_LINE_STRING_INCLUDED
-
-#include <ruby.h>
-#include <geos_c.h>
-
-#include "factory.h"
-
-RGEO_BEGIN_C
-
-
-/*
-  Initializes the line string module. This should be called after
-  the geometry module is initialized.
-*/
-void rgeo_init_geos_line_string(RGeo_Globals* globals);
-
-/*
-  Determines whether the given GEOS line string is closed.
-  Returns Qtrue if true, Qfalse if false, or Qnil on an error.
-*/
-VALUE rgeo_is_geos_line_string_closed(GEOSContextHandle_t context, const GEOSGeometry* geom);
-
-
-RGEO_END_C
-
-#endif

data/ext/geos_c_impl/main.c

@@ -1,40 +0,0 @@
-/*
-  Main initializer for GEOS wrapper
-*/
-
-
-#include "preface.h"
-
-#ifdef RGEO_GEOS_SUPPORTED
-
-#include <ruby.h>
-#include <geos_c.h>
-
-#include "factory.h"
-#include "geometry.h"
-#include "point.h"
-#include "line_string.h"
-#include "polygon.h"
-#include "geometry_collection.h"
-
-#endif
-
-RGEO_BEGIN_C
-
-
-void Init_geos_c_impl()
-{
-#ifdef RGEO_GEOS_SUPPORTED
-  RGeo_Globals* globals;
-
-  globals = rgeo_init_geos_factory();
-  rgeo_init_geos_geometry(globals);
-  rgeo_init_geos_point(globals);
-  rgeo_init_geos_line_string(globals);
-  rgeo_init_geos_polygon(globals);
-  rgeo_init_geos_geometry_collection(globals);
-#endif
-}
-
-
-RGEO_END_C

data/ext/geos_c_impl/mkmf.log

@@ -1,123 +0,0 @@
-find_executable: checking for geos-config... -------------------- yes
-
---------------------
-
-have_header: checking for geos_c.h... -------------------- yes
-
-"clang -o conftest -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe conftest.c  -L. -L/Users/tee/.rubies/ruby-2.2.3/lib -L. -L/Users/tee/.rubies/ruby-2.2.3/lib  -fstack-protector -L/usr/local/lib     -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lruby-static -framework CoreFoundation  -lpthread -lgmp -ldl -lobjc "
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: int main(int argc, char **argv)
-4: {
-5:   return 0;
-6: }
-/* end */
-
-"clang -E -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe  conftest.c -o conftest.i"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: #include <geos_c.h>
-/* end */
-
---------------------
-
-have_func: checking for GEOSSetSRID_r() in geos_c.h... -------------------- yes
-
-"clang -o conftest -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe conftest.c  -L. -L/Users/tee/.rubies/ruby-2.2.3/lib -L. -L/Users/tee/.rubies/ruby-2.2.3/lib  -fstack-protector -L/usr/local/lib     -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lruby-static -framework CoreFoundation  -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lpthread -lgmp -ldl -lobjc "
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: #include <geos_c.h>
- 4: 
- 5: /*top*/
- 6: extern int t(void);
- 7: int main(int argc, char **argv)
- 8: {
- 9:   if (argc > 1000000) {
-10:     printf("%p", &t);
-11:   }
-12: 
-13:   return 0;
-14: }
-15: int t(void) { void ((*volatile p)()); p = (void ((*)()))GEOSSetSRID_r; return 0; }
-/* end */
-
---------------------
-
-have_func: checking for GEOSPreparedContains_r() in geos_c.h... -------------------- yes
-
-"clang -o conftest -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe conftest.c  -L. -L/Users/tee/.rubies/ruby-2.2.3/lib -L. -L/Users/tee/.rubies/ruby-2.2.3/lib  -fstack-protector -L/usr/local/lib     -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lruby-static -framework CoreFoundation  -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lpthread -lgmp -ldl -lobjc "
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: #include <geos_c.h>
- 4: 
- 5: /*top*/
- 6: extern int t(void);
- 7: int main(int argc, char **argv)
- 8: {
- 9:   if (argc > 1000000) {
-10:     printf("%p", &t);
-11:   }
-12: 
-13:   return 0;
-14: }
-15: int t(void) { void ((*volatile p)()); p = (void ((*)()))GEOSPreparedContains_r; return 0; }
-/* end */
-
---------------------
-
-have_func: checking for GEOSPreparedDisjoint_r() in geos_c.h... -------------------- yes
-
-"clang -o conftest -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe conftest.c  -L. -L/Users/tee/.rubies/ruby-2.2.3/lib -L. -L/Users/tee/.rubies/ruby-2.2.3/lib  -fstack-protector -L/usr/local/lib     -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lruby-static -framework CoreFoundation  -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lpthread -lgmp -ldl -lobjc "
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: #include <geos_c.h>
- 4: 
- 5: /*top*/
- 6: extern int t(void);
- 7: int main(int argc, char **argv)
- 8: {
- 9:   if (argc > 1000000) {
-10:     printf("%p", &t);
-11:   }
-12: 
-13:   return 0;
-14: }
-15: int t(void) { void ((*volatile p)()); p = (void ((*)()))GEOSPreparedDisjoint_r; return 0; }
-/* end */
-
---------------------
-
-have_func: checking for rb_memhash() in ruby.h... -------------------- yes
-
-"clang -o conftest -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/x86_64-darwin14 -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0/ruby/backward -I/Users/tee/.rubies/ruby-2.2.3/include/ruby-2.2.0 -I. -I/usr/local/Cellar/geos/3.5.0/include -I/Users/tee/.rubies/ruby-2.2.3/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -Wno-error=shorten-64-to-32  -pipe conftest.c  -L. -L/Users/tee/.rubies/ruby-2.2.3/lib -L. -L/Users/tee/.rubies/ruby-2.2.3/lib  -fstack-protector -L/usr/local/lib     -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lruby-static -framework CoreFoundation  -L/usr/local/Cellar/geos/3.5.0/lib -lgeos_c -lpthread -lgmp -ldl -lobjc "
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: #include <ruby.h>
- 4: 
- 5: /*top*/
- 6: extern int t(void);
- 7: int main(int argc, char **argv)
- 8: {
- 9:   if (argc > 1000000) {
-10:     printf("%p", &t);
-11:   }
-12: 
-13:   return 0;
-14: }
-15: int t(void) { void ((*volatile p)()); p = (void ((*)()))rb_memhash; return 0; }
-/* end */
-
---------------------
-

data/ext/geos_c_impl/point.c

@@ -1,236 +0,0 @@
-/*
-  Point methods for GEOS wrapper
-*/
-
-#include "preface.h"
-
-#ifdef RGEO_GEOS_SUPPORTED
-
-#include <ruby.h>
-#include <geos_c.h>
-
-#include "factory.h"
-#include "geometry.h"
-#include "point.h"
-
-#include "coordinates.h"
-
-RGEO_BEGIN_C
-
-
-static VALUE method_point_geometry_type(VALUE self)
-{
-  VALUE result;
-  RGeo_GeometryData* self_data;
-
-  result = Qnil;
-  self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  if (self_data->geom) {
-    result = RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->feature_point;
-  }
-  return result;
-}
-
-
-static VALUE method_point_coordinates(VALUE self)
-{
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data;
-  const GEOSGeometry* self_geom;
-  GEOSContextHandle_t context;
-  const GEOSCoordSequence* coord_sequence;
-  int zCoordinate;
-
-  self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  self_geom = self_data->geom;
-
-  if (self_geom) {
-    zCoordinate = RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M;
-    context = self_data->geos_context;
-    coord_sequence = GEOSGeom_getCoordSeq_r(context, self_geom);
-    if(coord_sequence) {
-      result = rb_ary_pop(extract_points_from_coordinate_sequence(context, coord_sequence, zCoordinate));
-    }
-  }
-  return result;
-}
-
-
-static VALUE method_point_x(VALUE self)
-{
-  VALUE result;
-  RGeo_GeometryData* self_data;
-  const GEOSGeometry* self_geom;
-  GEOSContextHandle_t self_context;
-  const GEOSCoordSequence* coord_seq;
-  double val;
-
-  result = Qnil;
-  self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  self_geom = self_data->geom;
-  if (self_geom) {
-    self_context = self_data->geos_context;
-    coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
-    if (coord_seq) {
-      if (GEOSCoordSeq_getX_r(self_context, coord_seq, 0, &val)) {
-        result = rb_float_new(val);
-      }
-    }
-  }
-  return result;
-}
-
-
-static VALUE method_point_y(VALUE self)
-{
-  VALUE result;
-  RGeo_GeometryData* self_data;
-  const GEOSGeometry* self_geom;
-  GEOSContextHandle_t self_context;
-  const GEOSCoordSequence* coord_seq;
-  double val;
-
-  result = Qnil;
-  self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  self_geom = self_data->geom;
-  if (self_geom) {
-    self_context = self_data->geos_context;
-    coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
-    if (coord_seq) {
-      if (GEOSCoordSeq_getY_r(self_context, coord_seq, 0, &val)) {
-        result = rb_float_new(val);
-      }
-    }
-  }
-  return result;
-}
-
-
-static VALUE get_3d_point(VALUE self, int flag)
-{
-  VALUE result;
-  RGeo_GeometryData* self_data;
-  const GEOSGeometry* self_geom;
-  GEOSContextHandle_t self_context;
-  const GEOSCoordSequence* coord_seq;
-  double val;
-
-  result = Qnil;
-  self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  self_geom = self_data->geom;
-  if (self_geom) {
-    if (RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & flag) {
-      self_context = self_data->geos_context;
-      coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
-      if (coord_seq) {
-        if (GEOSCoordSeq_getZ_r(self_context, coord_seq, 0, &val)) {
-          result = rb_float_new(val);
-        }
-      }
-    }
-  }
-  return result;
-}
-
-
-static VALUE method_point_z(VALUE self)
-{
-  return get_3d_point(self, RGEO_FACTORYFLAGS_SUPPORTS_Z);
-}
-
-
-static VALUE method_point_m(VALUE self)
-{
-  return get_3d_point(self, RGEO_FACTORYFLAGS_SUPPORTS_M);
-}
-
-
-static VALUE method_point_eql(VALUE self, VALUE rhs)
-{
-  VALUE result;
-  RGeo_GeometryData* self_data;
-
-  result = rgeo_geos_klasses_and_factories_eql(self, rhs);
-  if (RTEST(result)) {
-    self_data = RGEO_GEOMETRY_DATA_PTR(self);
-    result = rgeo_geos_coordseqs_eql(self_data->geos_context, self_data->geom, RGEO_GEOMETRY_DATA_PTR(rhs)->geom, RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M);
-  }
-  return result;
-}
-
-
-static VALUE method_point_hash(VALUE self)
-{
-  st_index_t hash;
-  RGeo_GeometryData* self_data;
-  VALUE factory;
-
-  self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  factory = self_data->factory;
-  hash = rb_hash_start(0);
-  hash = rgeo_geos_objbase_hash(factory,
-    RGEO_FACTORY_DATA_PTR(factory)->globals->feature_point, hash);
-  hash = rgeo_geos_coordseq_hash(self_data->geos_context, self_data->geom, hash);
-  return LONG2FIX(rb_hash_end(hash));
-}
-
-
-static VALUE cmethod_create(VALUE module, VALUE factory, VALUE x, VALUE y, VALUE z)
-{
-  return rgeo_create_geos_point(factory, rb_num2dbl(x), rb_num2dbl(y),
-    RGEO_FACTORY_DATA_PTR(factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M ? rb_num2dbl(z) : 0);
-}
-
-
-void rgeo_init_geos_point(RGeo_Globals* globals)
-{
-  VALUE geos_point_methods;
-
-  // Class methods for CAPIPointImpl
-  rb_define_module_function(globals->geos_point, "create", cmethod_create, 4);
-
-  // CAPIPointMethods module
-  geos_point_methods = rb_define_module_under(globals->geos_module, "CAPIPointMethods");
-  rb_define_method(geos_point_methods, "rep_equals?", method_point_eql, 1);
-  rb_define_method(geos_point_methods, "eql?", method_point_eql, 1);
-  rb_define_method(geos_point_methods, "hash", method_point_hash, 0);
-  rb_define_method(geos_point_methods, "geometry_type", method_point_geometry_type, 0);
-  rb_define_method(geos_point_methods, "x", method_point_x, 0);
-  rb_define_method(geos_point_methods, "y", method_point_y, 0);
-  rb_define_method(geos_point_methods, "z", method_point_z, 0);
-  rb_define_method(geos_point_methods, "m", method_point_m, 0);
-  rb_define_method(geos_point_methods, "coordinates", method_point_coordinates, 0);
-}
-
-
-VALUE rgeo_create_geos_point(VALUE factory, double x, double y, double z)
-{
-  VALUE result;
-  RGeo_FactoryData* factory_data;
-  GEOSContextHandle_t context;
-  GEOSCoordSequence* coord_seq;
-  GEOSGeometry* geom;
-
-  result = Qnil;
-  factory_data = RGEO_FACTORY_DATA_PTR(factory);
-  context = factory_data->geos_context;
-  coord_seq = GEOSCoordSeq_create_r(context, 1, 3);
-  if (coord_seq) {
-    if (GEOSCoordSeq_setX_r(context, coord_seq, 0, x)) {
-      if (GEOSCoordSeq_setY_r(context, coord_seq, 0, y)) {
-        if (GEOSCoordSeq_setZ_r(context, coord_seq, 0, z)) {
-          geom = GEOSGeom_createPoint_r(context, coord_seq);
-          if (geom) {
-            result = rgeo_wrap_geos_geometry(factory, geom, factory_data->globals->geos_point);
-          }
-        }
-      }
-    }
-  }
-  return result;
-}
-
-
-RGEO_END_C
-
-#endif

data/ext/geos_c_impl/point.h

@@ -1,30 +0,0 @@
-/*
-  Point methods for GEOS wrapper
-*/
-
-
-#ifndef RGEO_GEOS_POINT_INCLUDED
-#define RGEO_GEOS_POINT_INCLUDED
-
-#include <ruby.h>
-
-#include "factory.h"
-
-RGEO_BEGIN_C
-
-
-/*
-  Initializes the point module. This should be called after
-  the geometry module is initialized.
-*/
-void rgeo_init_geos_point(RGeo_Globals* globals);
-
-/*
-  Creates a 3d point and returns the ruby object.
-*/
-VALUE rgeo_create_geos_point(VALUE factory, double x, double y, double z);
-
-
-RGEO_END_C
-
-#endif