RubyGems - rgeo - Versions diffs - 0.3.20 → 0.4.0 - Mend

rgeo 0.3.20 → 0.4.0

Files changed (179) hide show

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

data/test/coord_sys/tc_sr_org.rb CHANGED

@@ -3,36 +3,6 @@
 # Tests for OGC CS classes
 #
 # -----------------------------------------------------------------------------
-# 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,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * 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
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
 require 'test/unit'
 require 'rgeo'
@@ -54,9 +24,9 @@ module RGeo
         end
-        def test_epsg_3785
+        def test_epsg_3857
           db_ = ::RGeo::CoordSys::SRSDatabase::SrOrg.new('epsg')
-          entry_ = db_.get(3785)
+          entry_ = db_.get(3857)
           assert_equal('+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs', entry_.proj4.original_str)
           assert_kind_of(::RGeo::CoordSys::CS::ProjectedCoordinateSystem, entry_.coord_sys)
           assert_equal('Popular Visualisation CRS / Mercator', entry_.name)

data/test/coord_sys/tc_url_reader.rb CHANGED

@@ -3,36 +3,6 @@
 # Tests for OGC CS classes
 #
 # -----------------------------------------------------------------------------
-# 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,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * 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
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
 require 'test/unit'
 require 'rgeo'
@@ -60,17 +30,17 @@ module RGeo
         end
-        def test_sr_org_epsg_3785_ogcwkt
+        def test_sr_org_epsg_3857_ogcwkt
           db_ = ::RGeo::CoordSys::SRSDatabase::UrlReader.new
-          entry_ = db_.get('http://spatialreference.org/ref/epsg/3785/ogcwkt/')
+          entry_ = db_.get('http://spatialreference.org/ref/epsg/3857/ogcwkt/')
           assert_kind_of(::RGeo::CoordSys::CS::ProjectedCoordinateSystem, entry_.coord_sys)
           assert_equal('Popular Visualisation CRS / Mercator', entry_.name)
         end
-        def test_sr_org_epsg_3785_proj4
+        def test_sr_org_epsg_3857_proj4
           db_ = ::RGeo::CoordSys::SRSDatabase::UrlReader.new
-          entry_ = db_.get('http://spatialreference.org/ref/epsg/3785/proj4/')
+          entry_ = db_.get('http://spatialreference.org/ref/epsg/3857/proj4/')
           assert_equal('+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs', entry_.proj4.original_str)
         end

data/test/geos_capi/tc_factory.rb CHANGED

@@ -3,36 +3,6 @@
 # Tests for the GEOS factory
 #
 # -----------------------------------------------------------------------------
-# 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,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * 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
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
 require 'test/unit'
 require 'rgeo'

data/test/geos_capi/tc_geometry_collection.rb CHANGED

@@ -3,36 +3,6 @@
 # Tests for the GEOS geometry collection implementation
 #
 # -----------------------------------------------------------------------------
-# 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,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * 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
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
 require 'test/unit'
 require 'rgeo'

data/test/geos_capi/tc_line_string.rb CHANGED

@@ -3,36 +3,6 @@
 # Tests for the GEOS line string implementation
 #
 # -----------------------------------------------------------------------------
-# 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,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * 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
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
 require 'test/unit'
 require 'rgeo'

data/test/geos_capi/tc_misc.rb CHANGED

@@ -3,36 +3,6 @@
 # Tests for miscellaneous GEOS stuff
 #
 # -----------------------------------------------------------------------------
-# 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,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * 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
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
 require 'test/unit'
 require 'rgeo'
@@ -50,6 +20,42 @@ module RGeo
         end
+        def test_marshal_dump_with_geos
+          @factory = ::RGeo::Geos.factory(
+            :srid => 4326,
+            :wkt_generator => :geos,
+            :wkb_generator => :geos,
+            :wkt_parser => :geos,
+            :wkb_parser => :geos
+          )
+          dump = nil
+          assert_nothing_raised { dump = @factory.marshal_dump }
+          assert_equal({}, dump['wktg'])
+          assert_equal({}, dump['wkbg'])
+          assert_equal({}, dump['wktp'])
+          assert_equal({}, dump['wkbp'])
+        end
+        def test_encode_with_geos
+          @factory = ::RGeo::Geos.factory(
+            :srid => 4326,
+            :wkt_generator => :geos,
+            :wkb_generator => :geos,
+            :wkt_parser => :geos,
+            :wkb_parser => :geos
+          )
+          coder = Psych::Coder.new('test')
+          assert_nothing_raised { @factory.encode_with(coder) }
+          assert_equal({}, coder['wkt_generator'])
+          assert_equal({}, coder['wkb_generator'])
+          assert_equal({}, coder['wkt_parser'])
+          assert_equal({}, coder['wkb_parser'])
+        end
         def test_uninitialized
           geom_ = ::RGeo::Geos::CAPIGeometryImpl.new
           assert_equal(false, geom_.initialized?)
@@ -110,7 +116,7 @@ module RGeo
         def test_geos_version
-          assert_match(/^\d+\.\d+(\.\d+)?$/, ::RGeo::Geos.version_string)
+          assert_match(/^\d+\.\d+(\.\d+)?$/, ::RGeo::Geos.version)
         end

data/test/geos_capi/tc_multi_line_string.rb CHANGED

@@ -3,36 +3,6 @@
 # Tests for the GEOS multi line string implementation
 #
 # -----------------------------------------------------------------------------
-# 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,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * 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
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
 require 'test/unit'
 require 'rgeo'

data/test/geos_capi/tc_multi_point.rb CHANGED

@@ -3,36 +3,6 @@
 # Tests for the GEOS multi point implementation
 #
 # -----------------------------------------------------------------------------
-# 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,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * 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
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
 require 'test/unit'
 require 'rgeo'

data/test/geos_capi/tc_multi_polygon.rb CHANGED

@@ -3,36 +3,6 @@
 # Tests for the GEOS multi polygon implementation
 #
 # -----------------------------------------------------------------------------
-# 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,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * 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
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
 require 'test/unit'
 require 'rgeo'

data/test/geos_capi/tc_parsing_unparsing.rb CHANGED

@@ -3,36 +3,6 @@
 # Tests for the GEOS point implementation
 #
 # -----------------------------------------------------------------------------
-# 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,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * 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
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
 require 'test/unit'
 require 'rgeo'