rgeo 0.4.0 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/LICENSE.txt +29 -0
- data/ext/geos_c_impl/Makefile_2.2.3 +260 -0
- data/ext/geos_c_impl/coordinates.c +65 -0
- data/ext/geos_c_impl/coordinates.h +2 -0
- data/ext/geos_c_impl/extconf.rb +19 -43
- data/ext/geos_c_impl/geometry.c +24 -0
- data/ext/geos_c_impl/geometry_collection.c +99 -1
- data/ext/geos_c_impl/geos_c_impl_2.2.3.bundle +0 -0
- data/ext/geos_c_impl/line_string.c +38 -0
- data/ext/geos_c_impl/mkmf.log +123 -0
- data/ext/geos_c_impl/point.c +27 -0
- data/ext/geos_c_impl/polygon.c +26 -0
- data/ext/proj4_c_impl/Makefile_2.2.3 +260 -0
- data/ext/proj4_c_impl/extconf.rb +32 -32
- data/ext/proj4_c_impl/mkmf.log +47 -0
- data/ext/proj4_c_impl/proj4_c_impl_2.2.3.bundle +0 -0
- data/lib/rgeo.rb +10 -11
- data/lib/rgeo/cartesian.rb +7 -12
- data/lib/rgeo/cartesian/analysis.rb +13 -26
- data/lib/rgeo/cartesian/bounding_box.rb +45 -114
- data/lib/rgeo/cartesian/calculations.rb +3 -21
- data/lib/rgeo/cartesian/factory.rb +101 -122
- data/lib/rgeo/cartesian/feature_classes.rb +9 -59
- data/lib/rgeo/cartesian/feature_methods.rb +15 -45
- data/lib/rgeo/cartesian/interface.rb +6 -17
- data/lib/rgeo/coord_sys.rb +9 -15
- data/lib/rgeo/coord_sys/cs/entities.rb +84 -330
- data/lib/rgeo/coord_sys/cs/factories.rb +2 -32
- data/lib/rgeo/coord_sys/cs/wkt_parser.rb +52 -80
- data/lib/rgeo/coord_sys/proj4.rb +28 -67
- data/lib/rgeo/coord_sys/proj4_c_impl.bundle +0 -0
- data/lib/rgeo/coord_sys/srs_database/interface.rb +4 -24
- data/lib/rgeo/coord_sys/srs_database/proj4_data.rb +20 -38
- data/lib/rgeo/coord_sys/srs_database/sr_org.rb +6 -22
- data/lib/rgeo/coord_sys/srs_database/url_reader.rb +6 -21
- data/lib/rgeo/error.rb +0 -6
- data/lib/rgeo/feature.rb +18 -23
- data/lib/rgeo/feature/curve.rb +0 -14
- data/lib/rgeo/feature/factory.rb +13 -38
- data/lib/rgeo/feature/factory_generator.rb +4 -16
- data/lib/rgeo/feature/geometry.rb +18 -60
- data/lib/rgeo/feature/geometry_collection.rb +3 -17
- data/lib/rgeo/feature/line.rb +0 -10
- data/lib/rgeo/feature/line_string.rb +1 -13
- data/lib/rgeo/feature/linear_ring.rb +0 -9
- data/lib/rgeo/feature/mixins.rb +11 -36
- data/lib/rgeo/feature/multi_curve.rb +0 -11
- data/lib/rgeo/feature/multi_line_string.rb +0 -9
- data/lib/rgeo/feature/multi_point.rb +0 -9
- data/lib/rgeo/feature/multi_polygon.rb +0 -9
- data/lib/rgeo/feature/multi_surface.rb +0 -12
- data/lib/rgeo/feature/point.rb +0 -13
- data/lib/rgeo/feature/polygon.rb +1 -14
- data/lib/rgeo/feature/surface.rb +0 -12
- data/lib/rgeo/feature/types.rb +19 -61
- data/lib/rgeo/geographic.rb +10 -15
- data/lib/rgeo/geographic/factory.rb +126 -147
- data/lib/rgeo/geographic/interface.rb +67 -81
- data/lib/rgeo/geographic/proj4_projector.rb +13 -37
- data/lib/rgeo/geographic/projected_feature_classes.rb +7 -66
- data/lib/rgeo/geographic/projected_feature_methods.rb +15 -80
- data/lib/rgeo/geographic/projected_window.rb +15 -67
- data/lib/rgeo/geographic/simple_mercator_projector.rb +32 -56
- data/lib/rgeo/geographic/spherical_feature_classes.rb +9 -68
- data/lib/rgeo/geographic/spherical_feature_methods.rb +18 -51
- data/lib/rgeo/geographic/spherical_math.rb +26 -51
- data/lib/rgeo/geos.rb +23 -20
- data/lib/rgeo/geos/capi_factory.rb +125 -131
- data/lib/rgeo/geos/capi_feature_classes.rb +21 -88
- data/lib/rgeo/geos/ffi_factory.rb +90 -143
- data/lib/rgeo/geos/ffi_feature_classes.rb +8 -63
- data/lib/rgeo/geos/ffi_feature_methods.rb +46 -162
- data/lib/rgeo/geos/geos_c_impl.bundle +0 -0
- data/lib/rgeo/geos/interface.rb +4 -23
- data/lib/rgeo/geos/utils.rb +4 -19
- data/lib/rgeo/geos/zm_factory.rb +82 -131
- data/lib/rgeo/geos/zm_feature_classes.rb +8 -63
- data/lib/rgeo/geos/zm_feature_methods.rb +34 -107
- data/lib/rgeo/impl_helper.rb +8 -13
- data/lib/rgeo/impl_helper/basic_geometry_collection_methods.rb +27 -71
- data/lib/rgeo/impl_helper/basic_geometry_methods.rb +10 -28
- data/lib/rgeo/impl_helper/basic_line_string_methods.rb +21 -57
- data/lib/rgeo/impl_helper/basic_point_methods.rb +12 -30
- data/lib/rgeo/impl_helper/basic_polygon_methods.rb +9 -28
- data/lib/rgeo/impl_helper/math.rb +4 -10
- data/lib/rgeo/impl_helper/utils.rb +2 -10
- data/lib/rgeo/version.rb +1 -1
- data/lib/rgeo/wkrep.rb +4 -9
- data/lib/rgeo/wkrep/wkb_generator.rb +22 -46
- data/lib/rgeo/wkrep/wkb_parser.rb +25 -52
- data/lib/rgeo/wkrep/wkt_generator.rb +39 -69
- data/lib/rgeo/wkrep/wkt_parser.rb +52 -89
- data/lib/rgeo/yaml.rb +1 -7
- data/test/common/factory_tests.rb +4 -19
- data/test/common/geometry_collection_tests.rb +6 -39
- data/test/common/line_string_tests.rb +10 -39
- data/test/common/multi_line_string_tests.rb +10 -30
- data/test/common/multi_point_tests.rb +15 -34
- data/test/common/multi_polygon_tests.rb +26 -28
- data/test/common/point_tests.rb +37 -59
- data/test/common/polygon_tests.rb +16 -25
- data/test/coord_sys/tc_ogc_cs.rb +151 -186
- data/test/coord_sys/tc_proj4.rb +35 -60
- data/test/coord_sys/tc_proj4_srs_data.rb +15 -24
- data/test/coord_sys/tc_sr_org.rb +11 -19
- data/test/coord_sys/tc_url_reader.rb +13 -23
- data/test/geos_capi/tc_factory.rb +7 -16
- data/test/geos_capi/tc_geometry_collection.rb +6 -14
- data/test/geos_capi/tc_line_string.rb +7 -15
- data/test/geos_capi/tc_misc.rb +26 -41
- data/test/geos_capi/tc_multi_line_string.rb +6 -14
- data/test/geos_capi/tc_multi_point.rb +7 -15
- data/test/geos_capi/tc_multi_polygon.rb +8 -18
- data/test/geos_capi/tc_parsing_unparsing.rb +11 -21
- data/test/geos_capi/tc_point.rb +12 -26
- data/test/geos_capi/tc_polygon.rb +52 -17
- data/test/geos_capi/tc_zmfactory.rb +7 -18
- data/test/geos_ffi/tc_factory.rb +7 -16
- data/test/geos_ffi/tc_geometry_collection.rb +7 -15
- data/test/geos_ffi/tc_line_string.rb +7 -15
- data/test/geos_ffi/tc_misc.rb +8 -18
- data/test/geos_ffi/tc_multi_line_string.rb +7 -15
- data/test/geos_ffi/tc_multi_point.rb +8 -16
- data/test/geos_ffi/tc_multi_polygon.rb +9 -18
- data/test/geos_ffi/tc_parsing_unparsing.rb +14 -24
- data/test/geos_ffi/tc_point.rb +13 -28
- data/test/geos_ffi/tc_polygon.rb +7 -17
- data/test/geos_ffi/tc_zmfactory.rb +8 -19
- data/test/projected_geographic/tc_factory.rb +7 -15
- data/test/projected_geographic/tc_geometry_collection.rb +7 -15
- data/test/projected_geographic/tc_line_string.rb +7 -15
- data/test/projected_geographic/tc_multi_line_string.rb +7 -16
- data/test/projected_geographic/tc_multi_point.rb +8 -17
- data/test/projected_geographic/tc_multi_polygon.rb +8 -16
- data/test/projected_geographic/tc_point.rb +11 -23
- data/test/projected_geographic/tc_polygon.rb +7 -15
- data/test/simple_cartesian/tc_calculations.rb +6 -22
- data/test/simple_cartesian/tc_factory.rb +7 -16
- data/test/simple_cartesian/tc_geometry_collection.rb +6 -15
- data/test/simple_cartesian/tc_line_string.rb +6 -15
- data/test/simple_cartesian/tc_multi_line_string.rb +6 -15
- data/test/simple_cartesian/tc_multi_point.rb +7 -16
- data/test/simple_cartesian/tc_multi_polygon.rb +7 -16
- data/test/simple_cartesian/tc_point.rb +10 -21
- data/test/simple_cartesian/tc_polygon.rb +6 -15
- data/test/simple_mercator/tc_factory.rb +6 -14
- data/test/simple_mercator/tc_geometry_collection.rb +6 -14
- data/test/simple_mercator/tc_line_string.rb +6 -14
- data/test/simple_mercator/tc_multi_line_string.rb +6 -15
- data/test/simple_mercator/tc_multi_point.rb +7 -16
- data/test/simple_mercator/tc_multi_polygon.rb +7 -15
- data/test/simple_mercator/tc_point.rb +11 -24
- data/test/simple_mercator/tc_polygon.rb +6 -14
- data/test/simple_mercator/tc_window.rb +10 -34
- data/test/spherical_geographic/tc_calculations.rb +5 -32
- data/test/spherical_geographic/tc_factory.rb +6 -15
- data/test/spherical_geographic/tc_geometry_collection.rb +6 -15
- data/test/spherical_geographic/tc_line_string.rb +6 -15
- data/test/spherical_geographic/tc_multi_line_string.rb +6 -15
- data/test/spherical_geographic/tc_multi_point.rb +7 -16
- data/test/spherical_geographic/tc_multi_polygon.rb +7 -16
- data/test/spherical_geographic/tc_point.rb +10 -22
- data/test/spherical_geographic/tc_polygon.rb +6 -15
- data/test/tc_cartesian_analysis.rb +4 -16
- data/test/tc_cartesian_bbox.rb +7 -21
- data/test/tc_mixins.rb +8 -25
- data/test/tc_oneoff.rb +5 -13
- data/test/tc_types.rb +7 -16
- data/test/wkrep/tc_wkb_generator.rb +63 -97
- data/test/wkrep/tc_wkb_parser.rb +63 -100
- data/test/wkrep/tc_wkt_generator.rb +54 -92
- data/test/wkrep/tc_wkt_parser.rb +84 -133
- metadata +39 -9
- data/lib/rgeo/coord_sys/srs_database/active_record_table.rb +0 -166
- data/test/coord_sys/tc_active_record_table.rb +0 -79
data/lib/rgeo/feature/line.rb
CHANGED
@@ -5,10 +5,7 @@
|
|
5
5
|
# -----------------------------------------------------------------------------
|
6
6
|
|
7
7
|
module RGeo
|
8
|
-
|
9
8
|
module Feature
|
10
|
-
|
11
|
-
|
12
9
|
# == SFS 1.1 Description
|
13
10
|
#
|
14
11
|
# A Line is a LineString with exactly 2 Points.
|
@@ -22,15 +19,8 @@ module RGeo
|
|
22
19
|
# class method (or === operator) defined in the Type module.
|
23
20
|
|
24
21
|
module Line
|
25
|
-
|
26
|
-
|
27
22
|
include LineString
|
28
23
|
extend Type
|
29
|
-
|
30
|
-
|
31
24
|
end
|
32
|
-
|
33
|
-
|
34
25
|
end
|
35
|
-
|
36
26
|
end
|
@@ -5,10 +5,7 @@
|
|
5
5
|
# -----------------------------------------------------------------------------
|
6
6
|
|
7
7
|
module RGeo
|
8
|
-
|
9
8
|
module Feature
|
10
|
-
|
11
|
-
|
12
9
|
# == SFS 1.1 Description
|
13
10
|
#
|
14
11
|
# A LineString is a Curve with linear interpolation between Points.
|
@@ -23,11 +20,9 @@ module RGeo
|
|
23
20
|
# class method (or === operator) defined in the Type module.
|
24
21
|
|
25
22
|
module LineString
|
26
|
-
|
27
23
|
include Curve
|
28
24
|
extend Type
|
29
25
|
|
30
|
-
|
31
26
|
# === SFS 1.1 Description
|
32
27
|
#
|
33
28
|
# The number of Points in this LineString.
|
@@ -40,7 +35,6 @@ module RGeo
|
|
40
35
|
raise Error::UnsupportedOperation, "Method LineString#num_points not defined."
|
41
36
|
end
|
42
37
|
|
43
|
-
|
44
38
|
# === SFS 1.1 Description
|
45
39
|
#
|
46
40
|
# Returns the specified Point N in this LineString.
|
@@ -51,22 +45,16 @@ module RGeo
|
|
51
45
|
# if the given N is out of range. N is zero-based.
|
52
46
|
# Does not support negative indexes.
|
53
47
|
|
54
|
-
def point_n(
|
48
|
+
def point_n(_n_)
|
55
49
|
raise Error::UnsupportedOperation, "Method LineString#point_n not defined."
|
56
50
|
end
|
57
51
|
|
58
|
-
|
59
52
|
# Returns the constituent points as an array of objects that
|
60
53
|
# support the Point interface.
|
61
54
|
|
62
55
|
def points
|
63
56
|
raise Error::UnsupportedOperation, "Method LineString#points not defined."
|
64
57
|
end
|
65
|
-
|
66
|
-
|
67
58
|
end
|
68
|
-
|
69
|
-
|
70
59
|
end
|
71
|
-
|
72
60
|
end
|
@@ -5,10 +5,7 @@
|
|
5
5
|
# -----------------------------------------------------------------------------
|
6
6
|
|
7
7
|
module RGeo
|
8
|
-
|
9
8
|
module Feature
|
10
|
-
|
11
|
-
|
12
9
|
# == SFS 1.1 Description
|
13
10
|
#
|
14
11
|
# A LinearRing is a LineString that is both closed and simple.
|
@@ -22,14 +19,8 @@ module RGeo
|
|
22
19
|
# class method (or === operator) defined in the Type module.
|
23
20
|
|
24
21
|
module LinearRing
|
25
|
-
|
26
22
|
include LineString
|
27
23
|
extend Type
|
28
|
-
|
29
|
-
|
30
24
|
end
|
31
|
-
|
32
|
-
|
33
25
|
end
|
34
|
-
|
35
26
|
end
|
data/lib/rgeo/feature/mixins.rb
CHANGED
@@ -5,10 +5,7 @@
|
|
5
5
|
# -----------------------------------------------------------------------------
|
6
6
|
|
7
7
|
module RGeo
|
8
|
-
|
9
8
|
module Feature
|
10
|
-
|
11
|
-
|
12
9
|
# MixinCollection is a mechanism for adding arbitrary methods to
|
13
10
|
# geometry objects.
|
14
11
|
#
|
@@ -38,14 +35,10 @@ module RGeo
|
|
38
35
|
# To add a mixin to all objects, connect it to the Geometry base type.
|
39
36
|
|
40
37
|
class MixinCollection
|
41
|
-
|
42
|
-
|
43
38
|
# An API point controlling a particular type.
|
44
39
|
|
45
40
|
class TypeData
|
46
|
-
|
47
|
-
|
48
|
-
def initialize(collection_, type_) # :nodoc:
|
41
|
+
def initialize(collection_, type_) # :nodoc:
|
49
42
|
@collection = collection_
|
50
43
|
@type = type_
|
51
44
|
@mixins = []
|
@@ -54,64 +47,55 @@ module RGeo
|
|
54
47
|
@rclasses = []
|
55
48
|
end
|
56
49
|
|
57
|
-
|
58
50
|
# The feature type
|
59
51
|
attr_reader :type
|
60
52
|
|
61
53
|
# The MixinCollection owning this data
|
62
54
|
attr_reader :collection
|
63
55
|
|
64
|
-
|
65
56
|
# Add a mixin to be included in implementations of this type.
|
66
57
|
|
67
58
|
def add(module_)
|
68
59
|
@mixins << module_
|
69
|
-
@classes.each{ |k_| k_.class_eval{ include(module_) } }
|
60
|
+
@classes.each { |k_| k_.class_eval { include(module_) } }
|
70
61
|
_radd(module_)
|
71
62
|
end
|
72
63
|
|
73
|
-
|
74
64
|
# A class that implements this type should call this method to
|
75
65
|
# get the appropriate mixins.
|
76
66
|
# If include_ancestry_ is set to true, then mixins connected to
|
77
67
|
# subtypes of this type are also added to the class.
|
78
68
|
|
79
|
-
def include_in_class(klass_, include_ancestry_=false)
|
80
|
-
(include_ancestry_ ? @rmixins : @mixins).each{ |m_| klass_.class_eval{ include(m_) } }
|
69
|
+
def include_in_class(klass_, include_ancestry_ = false)
|
70
|
+
(include_ancestry_ ? @rmixins : @mixins).each { |m_| klass_.class_eval { include(m_) } }
|
81
71
|
(include_ancestry_ ? @rclasses : @classes) << klass_
|
82
72
|
self
|
83
73
|
end
|
84
74
|
|
85
|
-
|
86
75
|
# An object that implements this type should call this method to
|
87
76
|
# get the appropriate mixins.
|
88
77
|
# If include_ancestry_ is set to true, then mixins connected to
|
89
78
|
# subtypes of this type are also added to the object.
|
90
79
|
|
91
|
-
def include_in_object(obj_, include_ancestry_=false)
|
92
|
-
(include_ancestry_ ? @rmixins : @mixins).each{ |m_| obj_.extend(m_) }
|
80
|
+
def include_in_object(obj_, include_ancestry_ = false)
|
81
|
+
(include_ancestry_ ? @rmixins : @mixins).each { |m_| obj_.extend(m_) }
|
93
82
|
self
|
94
83
|
end
|
95
84
|
|
96
|
-
|
97
|
-
def _radd(module_) # :nodoc:
|
85
|
+
def _radd(module_) # :nodoc:
|
98
86
|
@rmixins << module_
|
99
|
-
@rclasses.each{ |k_| k_.class_eval{ include(module_) } }
|
100
|
-
@type.each_immediate_subtype{ |t_| @collection.for_type(t_)._radd(module_) }
|
87
|
+
@rclasses.each { |k_| k_.class_eval { include(module_) } }
|
88
|
+
@type.each_immediate_subtype { |t_| @collection.for_type(t_)._radd(module_) }
|
101
89
|
self
|
102
90
|
end
|
103
|
-
|
104
|
-
|
105
91
|
end
|
106
92
|
|
107
|
-
|
108
93
|
# Create a new empty MixinCollection
|
109
94
|
|
110
95
|
def initialize
|
111
96
|
@types = {}
|
112
97
|
end
|
113
98
|
|
114
|
-
|
115
99
|
# Returns a TypeData for the given type.
|
116
100
|
#
|
117
101
|
# e.g. to add a module for point types, you can call:
|
@@ -121,7 +105,6 @@ module RGeo
|
|
121
105
|
(@types[type_] ||= TypeData.new(self, type_))
|
122
106
|
end
|
123
107
|
|
124
|
-
|
125
108
|
# Add a module connected to the given type.
|
126
109
|
#
|
127
110
|
# Shorthand for:
|
@@ -131,38 +114,30 @@ module RGeo
|
|
131
114
|
for_type(type_).add(module_)
|
132
115
|
end
|
133
116
|
|
134
|
-
|
135
117
|
# A class that implements this type should call this method to
|
136
118
|
# get the appropriate mixins.
|
137
119
|
#
|
138
120
|
# Shorthand for:
|
139
121
|
# for_type(type_).include_in_class(klass_, include_ancestry_)
|
140
122
|
|
141
|
-
def include_in_class(type_, klass_, include_ancestry_=false)
|
123
|
+
def include_in_class(type_, klass_, include_ancestry_ = false)
|
142
124
|
for_type(type_).include_in_class(klass_, include_ancestry_)
|
143
125
|
end
|
144
126
|
|
145
|
-
|
146
127
|
# An object that implements this type should call this method to
|
147
128
|
# get the appropriate mixins.
|
148
129
|
#
|
149
130
|
# Shorthand for:
|
150
131
|
# for_type(type_).include_in_object(obj_, include_ancestry_)
|
151
132
|
|
152
|
-
def include_in_object(type_, obj_, include_ancestry_=false)
|
133
|
+
def include_in_object(type_, obj_, include_ancestry_ = false)
|
153
134
|
for_type(type_).include_in_object(obj_, include_ancestry_)
|
154
135
|
end
|
155
136
|
|
156
|
-
|
157
137
|
# The global MixinCollection. Mixins added to this collection are
|
158
138
|
# added to all geometry objects for all implementations.
|
159
139
|
|
160
140
|
GLOBAL = MixinCollection.new
|
161
|
-
|
162
|
-
|
163
141
|
end
|
164
|
-
|
165
|
-
|
166
142
|
end
|
167
|
-
|
168
143
|
end
|
@@ -5,10 +5,7 @@
|
|
5
5
|
# -----------------------------------------------------------------------------
|
6
6
|
|
7
7
|
module RGeo
|
8
|
-
|
9
8
|
module Feature
|
10
|
-
|
11
|
-
|
12
9
|
# == SFS 1.1 Description
|
13
10
|
#
|
14
11
|
# A MultiCurve is a 1-dimensional GeometryCollection whose elements are
|
@@ -40,11 +37,9 @@ module RGeo
|
|
40
37
|
# class method (or === operator) defined in the Type module.
|
41
38
|
|
42
39
|
module MultiCurve
|
43
|
-
|
44
40
|
include GeometryCollection
|
45
41
|
extend Type
|
46
42
|
|
47
|
-
|
48
43
|
# === SFS 1.1 Description
|
49
44
|
#
|
50
45
|
# The Length of this MultiCurve which is equal to the sum of the
|
@@ -58,7 +53,6 @@ module RGeo
|
|
58
53
|
raise Error::UnsupportedOperation, "Method MultiCurve#length not defined."
|
59
54
|
end
|
60
55
|
|
61
|
-
|
62
56
|
# === SFS 1.1 Description
|
63
57
|
#
|
64
58
|
# Returns true if this MultiCurve is closed [StartPoint() = EndPoint()
|
@@ -72,11 +66,6 @@ module RGeo
|
|
72
66
|
def is_closed?
|
73
67
|
raise Error::UnsupportedOperation, "Method MultiCurve#is_closed? not defined."
|
74
68
|
end
|
75
|
-
|
76
|
-
|
77
69
|
end
|
78
|
-
|
79
|
-
|
80
70
|
end
|
81
|
-
|
82
71
|
end
|
@@ -5,10 +5,7 @@
|
|
5
5
|
# -----------------------------------------------------------------------------
|
6
6
|
|
7
7
|
module RGeo
|
8
|
-
|
9
8
|
module Feature
|
10
|
-
|
11
|
-
|
12
9
|
# == SFS 1.1 Description
|
13
10
|
#
|
14
11
|
# A MultiLineString is a MultiCurve whose elements are LineStrings.
|
@@ -22,14 +19,8 @@ module RGeo
|
|
22
19
|
# class method (or === operator) defined in the Type module.
|
23
20
|
|
24
21
|
module MultiLineString
|
25
|
-
|
26
22
|
include MultiCurve
|
27
23
|
extend Type
|
28
|
-
|
29
|
-
|
30
24
|
end
|
31
|
-
|
32
|
-
|
33
25
|
end
|
34
|
-
|
35
26
|
end
|
@@ -5,10 +5,7 @@
|
|
5
5
|
# -----------------------------------------------------------------------------
|
6
6
|
|
7
7
|
module RGeo
|
8
|
-
|
9
8
|
module Feature
|
10
|
-
|
11
|
-
|
12
9
|
# == SFS 1.1 Description
|
13
10
|
#
|
14
11
|
# A MultiPoint is a 0-dimensional GeometryCollection. The elements of
|
@@ -29,14 +26,8 @@ module RGeo
|
|
29
26
|
# class method (or === operator) defined in the Type module.
|
30
27
|
|
31
28
|
module MultiPoint
|
32
|
-
|
33
29
|
include GeometryCollection
|
34
30
|
extend Type
|
35
|
-
|
36
|
-
|
37
31
|
end
|
38
|
-
|
39
|
-
|
40
32
|
end
|
41
|
-
|
42
33
|
end
|
@@ -5,10 +5,7 @@
|
|
5
5
|
# -----------------------------------------------------------------------------
|
6
6
|
|
7
7
|
module RGeo
|
8
|
-
|
9
8
|
module Feature
|
10
|
-
|
11
|
-
|
12
9
|
# == SFS 1.1 Description
|
13
10
|
#
|
14
11
|
# A MultiPolygon is a MultiSurface whose elements are Polygons.
|
@@ -53,14 +50,8 @@ module RGeo
|
|
53
50
|
# class method (or === operator) defined in the Type module.
|
54
51
|
|
55
52
|
module MultiPolygon
|
56
|
-
|
57
53
|
include MultiSurface
|
58
54
|
extend Type
|
59
|
-
|
60
|
-
|
61
55
|
end
|
62
|
-
|
63
|
-
|
64
56
|
end
|
65
|
-
|
66
57
|
end
|
@@ -5,10 +5,7 @@
|
|
5
5
|
# -----------------------------------------------------------------------------
|
6
6
|
|
7
7
|
module RGeo
|
8
|
-
|
9
8
|
module Feature
|
10
|
-
|
11
|
-
|
12
9
|
# == SFS 1.1 Description
|
13
10
|
#
|
14
11
|
# A MultiSurface is a 2-dimensional GeometryCollection whose elements
|
@@ -31,11 +28,9 @@ module RGeo
|
|
31
28
|
# class method (or === operator) defined in the Type module.
|
32
29
|
|
33
30
|
module MultiSurface
|
34
|
-
|
35
31
|
include GeometryCollection
|
36
32
|
extend Type
|
37
33
|
|
38
|
-
|
39
34
|
# === SFS 1.1 Description
|
40
35
|
#
|
41
36
|
# The area of this MultiSurface, as measured in the spatial reference
|
@@ -49,7 +44,6 @@ module RGeo
|
|
49
44
|
raise Error::UnsupportedOperation, "Method MultiSurface#area not defined."
|
50
45
|
end
|
51
46
|
|
52
|
-
|
53
47
|
# === SFS 1.1 Description
|
54
48
|
#
|
55
49
|
# The mathematical centroid for this MultiSurface as a Point. The
|
@@ -63,7 +57,6 @@ module RGeo
|
|
63
57
|
raise Error::UnsupportedOperation, "Method MultiSurface#centroid not defined."
|
64
58
|
end
|
65
59
|
|
66
|
-
|
67
60
|
# === SFS 1.1 Description
|
68
61
|
#
|
69
62
|
# A Point guaranteed to be on this MultiSurface.
|
@@ -75,11 +68,6 @@ module RGeo
|
|
75
68
|
def point_on_surface
|
76
69
|
raise Error::UnsupportedOperation, "Method MultiSurface#point_on_surface not defined."
|
77
70
|
end
|
78
|
-
|
79
|
-
|
80
71
|
end
|
81
|
-
|
82
|
-
|
83
72
|
end
|
84
|
-
|
85
73
|
end
|
data/lib/rgeo/feature/point.rb
CHANGED
@@ -5,10 +5,7 @@
|
|
5
5
|
# -----------------------------------------------------------------------------
|
6
6
|
|
7
7
|
module RGeo
|
8
|
-
|
9
8
|
module Feature
|
10
|
-
|
11
|
-
|
12
9
|
# == SFS 1.1 Description
|
13
10
|
#
|
14
11
|
# A Point is a 0-dimensional geometric object and represents a single
|
@@ -36,11 +33,9 @@ module RGeo
|
|
36
33
|
# with real coordinates.
|
37
34
|
|
38
35
|
module Point
|
39
|
-
|
40
36
|
include Geometry
|
41
37
|
extend Type
|
42
38
|
|
43
|
-
|
44
39
|
# === SFS 1.1 Description
|
45
40
|
#
|
46
41
|
# The x-coordinate value for this Point.
|
@@ -53,7 +48,6 @@ module RGeo
|
|
53
48
|
raise Error::UnsupportedOperation, "Method Point#x not defined."
|
54
49
|
end
|
55
50
|
|
56
|
-
|
57
51
|
# === SFS 1.1 Description
|
58
52
|
#
|
59
53
|
# The y-coordinate value for this Point.
|
@@ -66,7 +60,6 @@ module RGeo
|
|
66
60
|
raise Error::UnsupportedOperation, "Method Point#y not defined."
|
67
61
|
end
|
68
62
|
|
69
|
-
|
70
63
|
# Returns the z-coordinate for this Point as a floating-point
|
71
64
|
# scalar value.
|
72
65
|
#
|
@@ -77,7 +70,6 @@ module RGeo
|
|
77
70
|
raise Error::UnsupportedOperation, "Method Point#z not defined."
|
78
71
|
end
|
79
72
|
|
80
|
-
|
81
73
|
# Returns the m-coordinate for this Point as a floating-point
|
82
74
|
# scalar value.
|
83
75
|
#
|
@@ -87,11 +79,6 @@ module RGeo
|
|
87
79
|
def m
|
88
80
|
raise Error::UnsupportedOperation, "Method Point#m not defined."
|
89
81
|
end
|
90
|
-
|
91
|
-
|
92
82
|
end
|
93
|
-
|
94
|
-
|
95
83
|
end
|
96
|
-
|
97
84
|
end
|