rgeo 0.3.20 → 0.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/ext/geos_c_impl/extconf.rb +0 -30
- data/ext/geos_c_impl/factory.c +0 -32
- data/ext/geos_c_impl/factory.h +0 -33
- data/ext/geos_c_impl/geometry.c +20 -33
- data/ext/geos_c_impl/geometry.h +0 -32
- data/ext/geos_c_impl/geometry_collection.c +0 -32
- data/ext/geos_c_impl/geometry_collection.h +0 -32
- data/ext/geos_c_impl/line_string.c +0 -32
- data/ext/geos_c_impl/line_string.h +0 -32
- data/ext/geos_c_impl/main.c +0 -32
- data/ext/geos_c_impl/point.c +0 -33
- data/ext/geos_c_impl/point.h +0 -32
- data/ext/geos_c_impl/polygon.c +0 -32
- data/ext/geos_c_impl/polygon.h +0 -32
- data/ext/geos_c_impl/preface.h +0 -32
- data/ext/proj4_c_impl/extconf.rb +0 -30
- data/ext/proj4_c_impl/main.c +0 -33
- data/lib/rgeo.rb +0 -36
- data/lib/rgeo/cartesian.rb +0 -30
- data/lib/rgeo/cartesian/analysis.rb +0 -30
- data/lib/rgeo/cartesian/bounding_box.rb +0 -30
- data/lib/rgeo/cartesian/calculations.rb +0 -30
- data/lib/rgeo/cartesian/factory.rb +0 -30
- data/lib/rgeo/cartesian/feature_classes.rb +0 -30
- data/lib/rgeo/cartesian/feature_methods.rb +0 -30
- data/lib/rgeo/cartesian/interface.rb +0 -30
- data/lib/rgeo/coord_sys.rb +0 -30
- data/lib/rgeo/coord_sys/cs/entities.rb +0 -30
- data/lib/rgeo/coord_sys/cs/factories.rb +0 -30
- data/lib/rgeo/coord_sys/cs/wkt_parser.rb +0 -30
- data/lib/rgeo/coord_sys/proj4.rb +1 -49
- data/lib/rgeo/coord_sys/srs_database/active_record_table.rb +0 -30
- data/lib/rgeo/coord_sys/srs_database/interface.rb +0 -30
- data/lib/rgeo/coord_sys/srs_database/proj4_data.rb +0 -30
- data/lib/rgeo/coord_sys/srs_database/sr_org.rb +0 -30
- data/lib/rgeo/coord_sys/srs_database/url_reader.rb +0 -30
- data/lib/rgeo/error.rb +0 -30
- data/lib/rgeo/feature.rb +0 -30
- data/lib/rgeo/feature/curve.rb +0 -30
- data/lib/rgeo/feature/factory.rb +0 -30
- data/lib/rgeo/feature/factory_generator.rb +0 -30
- data/lib/rgeo/feature/geometry.rb +1 -31
- data/lib/rgeo/feature/geometry_collection.rb +0 -30
- data/lib/rgeo/feature/line.rb +0 -30
- data/lib/rgeo/feature/line_string.rb +0 -30
- data/lib/rgeo/feature/linear_ring.rb +0 -30
- data/lib/rgeo/feature/mixins.rb +0 -30
- data/lib/rgeo/feature/multi_curve.rb +0 -30
- data/lib/rgeo/feature/multi_line_string.rb +0 -30
- data/lib/rgeo/feature/multi_point.rb +0 -30
- data/lib/rgeo/feature/multi_polygon.rb +0 -30
- data/lib/rgeo/feature/multi_surface.rb +0 -30
- data/lib/rgeo/feature/point.rb +0 -30
- data/lib/rgeo/feature/polygon.rb +0 -30
- data/lib/rgeo/feature/surface.rb +0 -30
- data/lib/rgeo/feature/types.rb +0 -30
- data/lib/rgeo/geographic.rb +0 -30
- data/lib/rgeo/geographic/factory.rb +0 -30
- data/lib/rgeo/geographic/interface.rb +2 -32
- data/lib/rgeo/geographic/proj4_projector.rb +0 -30
- data/lib/rgeo/geographic/projected_feature_classes.rb +0 -30
- data/lib/rgeo/geographic/projected_feature_methods.rb +7 -32
- data/lib/rgeo/geographic/projected_window.rb +5 -39
- data/lib/rgeo/geographic/simple_mercator_projector.rb +11 -41
- data/lib/rgeo/geographic/spherical_feature_classes.rb +0 -30
- data/lib/rgeo/geographic/spherical_feature_methods.rb +2 -32
- data/lib/rgeo/geographic/spherical_math.rb +0 -30
- data/lib/rgeo/geos.rb +0 -30
- data/lib/rgeo/geos/capi_factory.rb +8 -38
- data/lib/rgeo/geos/capi_feature_classes.rb +0 -29
- data/lib/rgeo/geos/ffi_factory.rb +0 -30
- data/lib/rgeo/geos/ffi_feature_classes.rb +0 -30
- data/lib/rgeo/geos/ffi_feature_methods.rb +0 -30
- data/lib/rgeo/geos/interface.rb +5 -49
- data/lib/rgeo/geos/utils.rb +0 -30
- data/lib/rgeo/geos/zm_factory.rb +0 -30
- data/lib/rgeo/geos/zm_feature_classes.rb +0 -30
- data/lib/rgeo/geos/zm_feature_methods.rb +0 -30
- data/lib/rgeo/impl_helper.rb +0 -30
- data/lib/rgeo/impl_helper/basic_geometry_collection_methods.rb +0 -30
- data/lib/rgeo/impl_helper/basic_geometry_methods.rb +0 -30
- data/lib/rgeo/impl_helper/basic_line_string_methods.rb +0 -30
- data/lib/rgeo/impl_helper/basic_point_methods.rb +0 -30
- data/lib/rgeo/impl_helper/basic_polygon_methods.rb +0 -30
- data/lib/rgeo/impl_helper/math.rb +0 -30
- data/lib/rgeo/impl_helper/utils.rb +0 -30
- data/lib/rgeo/version.rb +1 -50
- data/lib/rgeo/wkrep.rb +0 -30
- data/lib/rgeo/wkrep/wkb_generator.rb +0 -30
- data/lib/rgeo/wkrep/wkb_parser.rb +0 -30
- data/lib/rgeo/wkrep/wkt_generator.rb +0 -30
- data/lib/rgeo/wkrep/wkt_parser.rb +0 -30
- data/lib/rgeo/yaml.rb +0 -30
- data/test/common/factory_tests.rb +0 -30
- data/test/common/geometry_collection_tests.rb +0 -30
- data/test/common/line_string_tests.rb +0 -30
- data/test/common/multi_line_string_tests.rb +0 -30
- data/test/common/multi_point_tests.rb +0 -30
- data/test/common/multi_polygon_tests.rb +0 -30
- data/test/common/point_tests.rb +0 -30
- data/test/common/polygon_tests.rb +0 -30
- data/test/coord_sys/tc_active_record_table.rb +2 -32
- data/test/coord_sys/tc_ogc_cs.rb +0 -30
- data/test/coord_sys/tc_proj4.rb +1 -31
- data/test/coord_sys/tc_proj4_srs_data.rb +3 -33
- data/test/coord_sys/tc_sr_org.rb +2 -32
- data/test/coord_sys/tc_url_reader.rb +4 -34
- data/test/geos_capi/tc_factory.rb +0 -30
- data/test/geos_capi/tc_geometry_collection.rb +0 -30
- data/test/geos_capi/tc_line_string.rb +0 -30
- data/test/geos_capi/tc_misc.rb +37 -31
- data/test/geos_capi/tc_multi_line_string.rb +0 -30
- data/test/geos_capi/tc_multi_point.rb +0 -30
- data/test/geos_capi/tc_multi_polygon.rb +0 -30
- data/test/geos_capi/tc_parsing_unparsing.rb +0 -30
- data/test/geos_capi/tc_point.rb +0 -30
- data/test/geos_capi/tc_polygon.rb +12 -30
- data/test/geos_capi/tc_zmfactory.rb +0 -30
- data/test/geos_ffi/tc_factory.rb +0 -30
- data/test/geos_ffi/tc_geometry_collection.rb +0 -30
- data/test/geos_ffi/tc_line_string.rb +0 -30
- data/test/geos_ffi/tc_misc.rb +0 -30
- data/test/geos_ffi/tc_multi_line_string.rb +0 -30
- data/test/geos_ffi/tc_multi_point.rb +0 -30
- data/test/geos_ffi/tc_multi_polygon.rb +0 -30
- data/test/geos_ffi/tc_parsing_unparsing.rb +0 -30
- data/test/geos_ffi/tc_point.rb +0 -30
- data/test/geos_ffi/tc_polygon.rb +0 -30
- data/test/geos_ffi/tc_zmfactory.rb +0 -30
- data/test/projected_geographic/tc_factory.rb +0 -30
- data/test/projected_geographic/tc_geometry_collection.rb +0 -30
- data/test/projected_geographic/tc_line_string.rb +0 -30
- data/test/projected_geographic/tc_multi_line_string.rb +0 -30
- data/test/projected_geographic/tc_multi_point.rb +0 -30
- data/test/projected_geographic/tc_multi_polygon.rb +0 -30
- data/test/projected_geographic/tc_point.rb +0 -30
- data/test/projected_geographic/tc_polygon.rb +0 -30
- data/test/simple_cartesian/tc_calculations.rb +0 -30
- data/test/simple_cartesian/tc_factory.rb +0 -30
- data/test/simple_cartesian/tc_geometry_collection.rb +0 -30
- data/test/simple_cartesian/tc_line_string.rb +0 -30
- data/test/simple_cartesian/tc_multi_line_string.rb +0 -30
- data/test/simple_cartesian/tc_multi_point.rb +0 -30
- data/test/simple_cartesian/tc_multi_polygon.rb +0 -30
- data/test/simple_cartesian/tc_point.rb +0 -30
- data/test/simple_cartesian/tc_polygon.rb +0 -30
- data/test/simple_mercator/tc_factory.rb +0 -30
- data/test/simple_mercator/tc_geometry_collection.rb +0 -30
- data/test/simple_mercator/tc_line_string.rb +0 -30
- data/test/simple_mercator/tc_multi_line_string.rb +0 -30
- data/test/simple_mercator/tc_multi_point.rb +0 -30
- data/test/simple_mercator/tc_multi_polygon.rb +0 -30
- data/test/simple_mercator/tc_point.rb +0 -30
- data/test/simple_mercator/tc_polygon.rb +0 -30
- data/test/simple_mercator/tc_window.rb +8 -30
- data/test/spherical_geographic/tc_calculations.rb +0 -30
- data/test/spherical_geographic/tc_factory.rb +0 -30
- data/test/spherical_geographic/tc_geometry_collection.rb +0 -30
- data/test/spherical_geographic/tc_line_string.rb +0 -30
- data/test/spherical_geographic/tc_multi_line_string.rb +0 -30
- data/test/spherical_geographic/tc_multi_point.rb +0 -30
- data/test/spherical_geographic/tc_multi_polygon.rb +0 -30
- data/test/spherical_geographic/tc_point.rb +11 -30
- data/test/spherical_geographic/tc_polygon.rb +0 -30
- data/test/tc_cartesian_analysis.rb +0 -30
- data/test/tc_cartesian_bbox.rb +0 -30
- data/test/tc_mixins.rb +0 -30
- data/test/tc_oneoff.rb +0 -30
- data/test/tc_types.rb +0 -30
- data/test/wkrep/tc_wkb_generator.rb +0 -30
- data/test/wkrep/tc_wkb_parser.rb +0 -30
- data/test/wkrep/tc_wkt_generator.rb +0 -30
- data/test/wkrep/tc_wkt_parser.rb +0 -30
- metadata +94 -47
- data/History.rdoc +0 -351
- data/README.rdoc +0 -184
- data/Spatial_Programming_With_RGeo.rdoc +0 -451
- data/Version +0 -1
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: 7fe1c784476bdba5245f9f43721670aee2aa7204
|
4
|
+
data.tar.gz: b7633c392079dae573a5acaca9706d81f6ec2dd0
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: 4b70c4bc54bacb3e17cac89a04f92de15681d78544a6ebbdaa813e07790bc6a2e7560f74bbf9b2818bd9095ab96817bbce0bb42e85ae8d988a579b3cc7d79a5a
|
7
|
+
data.tar.gz: 12986650a24ce8d255ca93e407fb494ba8fbb5f31e28bbecb66f644cccb8b3d50298f514067cd5b4e85f4e781cbf1fe749be4c7006b5ccfc8a0588aeb0464d15
|
data/ext/geos_c_impl/extconf.rb
CHANGED
@@ -3,36 +3,6 @@
|
|
3
3
|
# Makefile builder for GEOS wrapper
|
4
4
|
#
|
5
5
|
# -----------------------------------------------------------------------------
|
6
|
-
# Copyright 2010-2012 Daniel Azuma
|
7
|
-
#
|
8
|
-
# All rights reserved.
|
9
|
-
#
|
10
|
-
# Redistribution and use in source and binary forms, with or without
|
11
|
-
# modification, are permitted provided that the following conditions are met:
|
12
|
-
#
|
13
|
-
# * Redistributions of source code must retain the above copyright notice,
|
14
|
-
# this list of conditions and the following disclaimer.
|
15
|
-
# * Redistributions in binary form must reproduce the above copyright notice,
|
16
|
-
# this list of conditions and the following disclaimer in the documentation
|
17
|
-
# and/or other materials provided with the distribution.
|
18
|
-
# * Neither the name of the copyright holder, nor the names of any other
|
19
|
-
# contributors to this software, may be used to endorse or promote products
|
20
|
-
# derived from this software without specific prior written permission.
|
21
|
-
#
|
22
|
-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
23
|
-
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
24
|
-
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
25
|
-
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
26
|
-
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
27
|
-
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
28
|
-
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
29
|
-
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
30
|
-
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
31
|
-
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
32
|
-
# POSSIBILITY OF SUCH DAMAGE.
|
33
|
-
# -----------------------------------------------------------------------------
|
34
|
-
;
|
35
|
-
|
36
6
|
|
37
7
|
if ::RUBY_DESCRIPTION =~ /^jruby\s/
|
38
8
|
|
data/ext/geos_c_impl/factory.c
CHANGED
@@ -1,37 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
-----------------------------------------------------------------------------
|
3
|
-
|
4
2
|
Factory and utility functions for GEOS wrapper
|
5
|
-
|
6
|
-
-----------------------------------------------------------------------------
|
7
|
-
Copyright 2010-2012 Daniel Azuma
|
8
|
-
|
9
|
-
All rights reserved.
|
10
|
-
|
11
|
-
Redistribution and use in source and binary forms, with or without
|
12
|
-
modification, are permitted provided that the following conditions are met:
|
13
|
-
|
14
|
-
* Redistributions of source code must retain the above copyright notice,
|
15
|
-
this list of conditions and the following disclaimer.
|
16
|
-
* Redistributions in binary form must reproduce the above copyright notice,
|
17
|
-
this list of conditions and the following disclaimer in the documentation
|
18
|
-
and/or other materials provided with the distribution.
|
19
|
-
* Neither the name of the copyright holder, nor the names of any other
|
20
|
-
contributors to this software, may be used to endorse or promote products
|
21
|
-
derived from this software without specific prior written permission.
|
22
|
-
|
23
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
24
|
-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
25
|
-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
26
|
-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
27
|
-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
28
|
-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
29
|
-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
30
|
-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
31
|
-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
32
|
-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
33
|
-
POSSIBILITY OF SUCH DAMAGE.
|
34
|
-
-----------------------------------------------------------------------------
|
35
3
|
*/
|
36
4
|
|
37
5
|
|
data/ext/geos_c_impl/factory.h
CHANGED
@@ -1,40 +1,7 @@
|
|
1
1
|
/*
|
2
|
-
-----------------------------------------------------------------------------
|
3
|
-
|
4
2
|
Factory and utility functions for GEOS wrapper
|
5
|
-
|
6
|
-
-----------------------------------------------------------------------------
|
7
|
-
Copyright 2010-2012 Daniel Azuma
|
8
|
-
|
9
|
-
All rights reserved.
|
10
|
-
|
11
|
-
Redistribution and use in source and binary forms, with or without
|
12
|
-
modification, are permitted provided that the following conditions are met:
|
13
|
-
|
14
|
-
* Redistributions of source code must retain the above copyright notice,
|
15
|
-
this list of conditions and the following disclaimer.
|
16
|
-
* Redistributions in binary form must reproduce the above copyright notice,
|
17
|
-
this list of conditions and the following disclaimer in the documentation
|
18
|
-
and/or other materials provided with the distribution.
|
19
|
-
* Neither the name of the copyright holder, nor the names of any other
|
20
|
-
contributors to this software, may be used to endorse or promote products
|
21
|
-
derived from this software without specific prior written permission.
|
22
|
-
|
23
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
24
|
-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
25
|
-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
26
|
-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
27
|
-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
28
|
-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
29
|
-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
30
|
-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
31
|
-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
32
|
-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
33
|
-
POSSIBILITY OF SUCH DAMAGE.
|
34
|
-
-----------------------------------------------------------------------------
|
35
3
|
*/
|
36
4
|
|
37
|
-
|
38
5
|
#ifndef RGEO_GEOS_FACTORY_INCLUDED
|
39
6
|
#define RGEO_GEOS_FACTORY_INCLUDED
|
40
7
|
|
data/ext/geos_c_impl/geometry.c
CHANGED
@@ -1,37 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
-----------------------------------------------------------------------------
|
3
|
-
|
4
2
|
Geometry base class methods for GEOS wrapper
|
5
|
-
|
6
|
-
-----------------------------------------------------------------------------
|
7
|
-
Copyright 2010-2012 Daniel Azuma
|
8
|
-
|
9
|
-
All rights reserved.
|
10
|
-
|
11
|
-
Redistribution and use in source and binary forms, with or without
|
12
|
-
modification, are permitted provided that the following conditions are met:
|
13
|
-
|
14
|
-
* Redistributions of source code must retain the above copyright notice,
|
15
|
-
this list of conditions and the following disclaimer.
|
16
|
-
* Redistributions in binary form must reproduce the above copyright notice,
|
17
|
-
this list of conditions and the following disclaimer in the documentation
|
18
|
-
and/or other materials provided with the distribution.
|
19
|
-
* Neither the name of the copyright holder, nor the names of any other
|
20
|
-
contributors to this software, may be used to endorse or promote products
|
21
|
-
derived from this software without specific prior written permission.
|
22
|
-
|
23
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
24
|
-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
25
|
-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
26
|
-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
27
|
-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
28
|
-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
29
|
-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
30
|
-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
31
|
-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
32
|
-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
33
|
-
POSSIBILITY OF SUCH DAMAGE.
|
34
|
-
-----------------------------------------------------------------------------
|
35
3
|
*/
|
36
4
|
|
37
5
|
|
@@ -773,6 +741,24 @@ static VALUE method_geometry_buffer(VALUE self, VALUE distance)
|
|
773
741
|
return result;
|
774
742
|
}
|
775
743
|
|
744
|
+
static VALUE method_geometry_simplify(VALUE self, VALUE tolerance)
|
745
|
+
{
|
746
|
+
VALUE result;
|
747
|
+
RGeo_GeometryData* self_data;
|
748
|
+
const GEOSGeometry* self_geom;
|
749
|
+
VALUE factory;
|
750
|
+
|
751
|
+
result = Qnil;
|
752
|
+
self_data = RGEO_GEOMETRY_DATA_PTR(self);
|
753
|
+
self_geom = self_data->geom;
|
754
|
+
if (self_geom) {
|
755
|
+
factory = self_data->factory;
|
756
|
+
result = rgeo_wrap_geos_geometry(factory, GEOSSimplify_r(self_data->geos_context, self_geom,
|
757
|
+
rb_num2dbl(tolerance)), Qnil);
|
758
|
+
}
|
759
|
+
return result;
|
760
|
+
}
|
761
|
+
|
776
762
|
|
777
763
|
static VALUE method_geometry_convex_hull(VALUE self)
|
778
764
|
{
|
@@ -914,7 +900,7 @@ static VALUE method_geometry_initialize_copy(VALUE self, VALUE orig)
|
|
914
900
|
GEOSSetSRID_r(orig_context, clone_geom, GEOSGetSRID_r(orig_context, geom));
|
915
901
|
self_data->geom = clone_geom;
|
916
902
|
self_data->geos_context = orig_context;
|
917
|
-
self_data->prep = factory_data && (factory_data->flags & RGEO_FACTORYFLAGS_PREPARE_HEURISTIC != 0) ?
|
903
|
+
self_data->prep = factory_data && ((factory_data->flags & RGEO_FACTORYFLAGS_PREPARE_HEURISTIC) != 0) ?
|
918
904
|
(GEOSPreparedGeometry*)1 : NULL;
|
919
905
|
self_data->factory = orig_data->factory;
|
920
906
|
self_data->klasses = orig_data->klasses;
|
@@ -1001,6 +987,7 @@ void rgeo_init_geos_geometry(RGeo_Globals* globals)
|
|
1001
987
|
rb_define_method(geos_geometry_methods, "relate?", method_geometry_relate, 2);
|
1002
988
|
rb_define_method(geos_geometry_methods, "distance", method_geometry_distance, 1);
|
1003
989
|
rb_define_method(geos_geometry_methods, "buffer", method_geometry_buffer, 1);
|
990
|
+
rb_define_method(geos_geometry_methods, "simplify", method_geometry_simplify, 1);
|
1004
991
|
rb_define_method(geos_geometry_methods, "convex_hull", method_geometry_convex_hull, 0);
|
1005
992
|
rb_define_method(geos_geometry_methods, "intersection", method_geometry_intersection, 1);
|
1006
993
|
rb_define_method(geos_geometry_methods, "*", method_geometry_intersection, 1);
|
data/ext/geos_c_impl/geometry.h
CHANGED
@@ -1,37 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
-----------------------------------------------------------------------------
|
3
|
-
|
4
2
|
Geometry base class methods for GEOS wrapper
|
5
|
-
|
6
|
-
-----------------------------------------------------------------------------
|
7
|
-
Copyright 2010-2012 Daniel Azuma
|
8
|
-
|
9
|
-
All rights reserved.
|
10
|
-
|
11
|
-
Redistribution and use in source and binary forms, with or without
|
12
|
-
modification, are permitted provided that the following conditions are met:
|
13
|
-
|
14
|
-
* Redistributions of source code must retain the above copyright notice,
|
15
|
-
this list of conditions and the following disclaimer.
|
16
|
-
* Redistributions in binary form must reproduce the above copyright notice,
|
17
|
-
this list of conditions and the following disclaimer in the documentation
|
18
|
-
and/or other materials provided with the distribution.
|
19
|
-
* Neither the name of the copyright holder, nor the names of any other
|
20
|
-
contributors to this software, may be used to endorse or promote products
|
21
|
-
derived from this software without specific prior written permission.
|
22
|
-
|
23
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
24
|
-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
25
|
-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
26
|
-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
27
|
-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
28
|
-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
29
|
-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
30
|
-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
31
|
-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
32
|
-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
33
|
-
POSSIBILITY OF SUCH DAMAGE.
|
34
|
-
-----------------------------------------------------------------------------
|
35
3
|
*/
|
36
4
|
|
37
5
|
|
@@ -1,37 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
-----------------------------------------------------------------------------
|
3
|
-
|
4
2
|
Geometry collection methods for GEOS wrapper
|
5
|
-
|
6
|
-
-----------------------------------------------------------------------------
|
7
|
-
Copyright 2010-2012 Daniel Azuma
|
8
|
-
|
9
|
-
All rights reserved.
|
10
|
-
|
11
|
-
Redistribution and use in source and binary forms, with or without
|
12
|
-
modification, are permitted provided that the following conditions are met:
|
13
|
-
|
14
|
-
* Redistributions of source code must retain the above copyright notice,
|
15
|
-
this list of conditions and the following disclaimer.
|
16
|
-
* Redistributions in binary form must reproduce the above copyright notice,
|
17
|
-
this list of conditions and the following disclaimer in the documentation
|
18
|
-
and/or other materials provided with the distribution.
|
19
|
-
* Neither the name of the copyright holder, nor the names of any other
|
20
|
-
contributors to this software, may be used to endorse or promote products
|
21
|
-
derived from this software without specific prior written permission.
|
22
|
-
|
23
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
24
|
-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
25
|
-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
26
|
-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
27
|
-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
28
|
-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
29
|
-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
30
|
-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
31
|
-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
32
|
-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
33
|
-
POSSIBILITY OF SUCH DAMAGE.
|
34
|
-
-----------------------------------------------------------------------------
|
35
3
|
*/
|
36
4
|
|
37
5
|
|
@@ -1,37 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
-----------------------------------------------------------------------------
|
3
|
-
|
4
2
|
Geometry collection methods for GEOS wrapper
|
5
|
-
|
6
|
-
-----------------------------------------------------------------------------
|
7
|
-
Copyright 2010-2012 Daniel Azuma
|
8
|
-
|
9
|
-
All rights reserved.
|
10
|
-
|
11
|
-
Redistribution and use in source and binary forms, with or without
|
12
|
-
modification, are permitted provided that the following conditions are met:
|
13
|
-
|
14
|
-
* Redistributions of source code must retain the above copyright notice,
|
15
|
-
this list of conditions and the following disclaimer.
|
16
|
-
* Redistributions in binary form must reproduce the above copyright notice,
|
17
|
-
this list of conditions and the following disclaimer in the documentation
|
18
|
-
and/or other materials provided with the distribution.
|
19
|
-
* Neither the name of the copyright holder, nor the names of any other
|
20
|
-
contributors to this software, may be used to endorse or promote products
|
21
|
-
derived from this software without specific prior written permission.
|
22
|
-
|
23
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
24
|
-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
25
|
-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
26
|
-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
27
|
-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
28
|
-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
29
|
-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
30
|
-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
31
|
-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
32
|
-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
33
|
-
POSSIBILITY OF SUCH DAMAGE.
|
34
|
-
-----------------------------------------------------------------------------
|
35
3
|
*/
|
36
4
|
|
37
5
|
|
@@ -1,37 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
-----------------------------------------------------------------------------
|
3
|
-
|
4
2
|
Line string methods for GEOS wrapper
|
5
|
-
|
6
|
-
-----------------------------------------------------------------------------
|
7
|
-
Copyright 2010-2012 Daniel Azuma
|
8
|
-
|
9
|
-
All rights reserved.
|
10
|
-
|
11
|
-
Redistribution and use in source and binary forms, with or without
|
12
|
-
modification, are permitted provided that the following conditions are met:
|
13
|
-
|
14
|
-
* Redistributions of source code must retain the above copyright notice,
|
15
|
-
this list of conditions and the following disclaimer.
|
16
|
-
* Redistributions in binary form must reproduce the above copyright notice,
|
17
|
-
this list of conditions and the following disclaimer in the documentation
|
18
|
-
and/or other materials provided with the distribution.
|
19
|
-
* Neither the name of the copyright holder, nor the names of any other
|
20
|
-
contributors to this software, may be used to endorse or promote products
|
21
|
-
derived from this software without specific prior written permission.
|
22
|
-
|
23
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
24
|
-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
25
|
-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
26
|
-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
27
|
-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
28
|
-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
29
|
-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
30
|
-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
31
|
-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
32
|
-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
33
|
-
POSSIBILITY OF SUCH DAMAGE.
|
34
|
-
-----------------------------------------------------------------------------
|
35
3
|
*/
|
36
4
|
|
37
5
|
|
@@ -1,37 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
-----------------------------------------------------------------------------
|
3
|
-
|
4
2
|
Line string methods for GEOS wrapper
|
5
|
-
|
6
|
-
-----------------------------------------------------------------------------
|
7
|
-
Copyright 2010-2012 Daniel Azuma
|
8
|
-
|
9
|
-
All rights reserved.
|
10
|
-
|
11
|
-
Redistribution and use in source and binary forms, with or without
|
12
|
-
modification, are permitted provided that the following conditions are met:
|
13
|
-
|
14
|
-
* Redistributions of source code must retain the above copyright notice,
|
15
|
-
this list of conditions and the following disclaimer.
|
16
|
-
* Redistributions in binary form must reproduce the above copyright notice,
|
17
|
-
this list of conditions and the following disclaimer in the documentation
|
18
|
-
and/or other materials provided with the distribution.
|
19
|
-
* Neither the name of the copyright holder, nor the names of any other
|
20
|
-
contributors to this software, may be used to endorse or promote products
|
21
|
-
derived from this software without specific prior written permission.
|
22
|
-
|
23
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
24
|
-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
25
|
-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
26
|
-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
27
|
-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
28
|
-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
29
|
-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
30
|
-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
31
|
-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
32
|
-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
33
|
-
POSSIBILITY OF SUCH DAMAGE.
|
34
|
-
-----------------------------------------------------------------------------
|
35
3
|
*/
|
36
4
|
|
37
5
|
|
data/ext/geos_c_impl/main.c
CHANGED
@@ -1,37 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
-----------------------------------------------------------------------------
|
3
|
-
|
4
2
|
Main initializer for GEOS wrapper
|
5
|
-
|
6
|
-
-----------------------------------------------------------------------------
|
7
|
-
Copyright 2010-2012 Daniel Azuma
|
8
|
-
|
9
|
-
All rights reserved.
|
10
|
-
|
11
|
-
Redistribution and use in source and binary forms, with or without
|
12
|
-
modification, are permitted provided that the following conditions are met:
|
13
|
-
|
14
|
-
* Redistributions of source code must retain the above copyright notice,
|
15
|
-
this list of conditions and the following disclaimer.
|
16
|
-
* Redistributions in binary form must reproduce the above copyright notice,
|
17
|
-
this list of conditions and the following disclaimer in the documentation
|
18
|
-
and/or other materials provided with the distribution.
|
19
|
-
* Neither the name of the copyright holder, nor the names of any other
|
20
|
-
contributors to this software, may be used to endorse or promote products
|
21
|
-
derived from this software without specific prior written permission.
|
22
|
-
|
23
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
24
|
-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
25
|
-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
26
|
-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
27
|
-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
28
|
-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
29
|
-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
30
|
-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
31
|
-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
32
|
-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
33
|
-
POSSIBILITY OF SUCH DAMAGE.
|
34
|
-
-----------------------------------------------------------------------------
|
35
3
|
*/
|
36
4
|
|
37
5
|
|
data/ext/geos_c_impl/point.c
CHANGED
@@ -1,40 +1,7 @@
|
|
1
1
|
/*
|
2
|
-
-----------------------------------------------------------------------------
|
3
|
-
|
4
2
|
Point methods for GEOS wrapper
|
5
|
-
|
6
|
-
-----------------------------------------------------------------------------
|
7
|
-
Copyright 2010-2012 Daniel Azuma
|
8
|
-
|
9
|
-
All rights reserved.
|
10
|
-
|
11
|
-
Redistribution and use in source and binary forms, with or without
|
12
|
-
modification, are permitted provided that the following conditions are met:
|
13
|
-
|
14
|
-
* Redistributions of source code must retain the above copyright notice,
|
15
|
-
this list of conditions and the following disclaimer.
|
16
|
-
* Redistributions in binary form must reproduce the above copyright notice,
|
17
|
-
this list of conditions and the following disclaimer in the documentation
|
18
|
-
and/or other materials provided with the distribution.
|
19
|
-
* Neither the name of the copyright holder, nor the names of any other
|
20
|
-
contributors to this software, may be used to endorse or promote products
|
21
|
-
derived from this software without specific prior written permission.
|
22
|
-
|
23
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
24
|
-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
25
|
-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
26
|
-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
27
|
-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
28
|
-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
29
|
-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
30
|
-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
31
|
-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
32
|
-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
33
|
-
POSSIBILITY OF SUCH DAMAGE.
|
34
|
-
-----------------------------------------------------------------------------
|
35
3
|
*/
|
36
4
|
|
37
|
-
|
38
5
|
#include "preface.h"
|
39
6
|
|
40
7
|
#ifdef RGEO_GEOS_SUPPORTED
|