proj4rb 4.0.0 → 4.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/ChangeLog +11 -0
  3. data/README.rdoc +22 -40
  4. data/lib/api/api.rb +22 -1
  5. data/lib/api/api_5_0.rb +7 -1
  6. data/lib/api/api_6_0.rb +4 -2
  7. data/lib/api/api_7_0.rb +1 -0
  8. data/lib/api/api_9_4.rb +6 -0
  9. data/lib/api/api_experimental.rb +5 -0
  10. data/lib/proj/area.rb +1 -0
  11. data/lib/proj/axis_info.rb +1 -1
  12. data/lib/proj/context.rb +4 -3
  13. data/lib/proj/conversion.rb +1 -2
  14. data/lib/proj/coordinate_metadata.rb +38 -0
  15. data/lib/proj/coordinate_operation_mixin.rb +9 -9
  16. data/lib/proj/coordinate_system.rb +18 -18
  17. data/lib/proj/crs.rb +83 -75
  18. data/lib/proj/crs_info.rb +15 -15
  19. data/lib/proj/database.rb +3 -3
  20. data/lib/proj/datum.rb +1 -1
  21. data/lib/proj/ellipsoid.rb +3 -3
  22. data/lib/proj/grid.rb +1 -1
  23. data/lib/proj/operation.rb +2 -2
  24. data/lib/proj/operation_factory_context.rb +2 -1
  25. data/lib/proj/parameters.rb +1 -0
  26. data/lib/proj/pj_object.rb +8 -6
  27. data/lib/proj/pj_objects.rb +1 -0
  28. data/lib/proj/prime_meridian.rb +2 -2
  29. data/lib/proj/projection.rb +1742 -698
  30. data/lib/proj/session.rb +2 -1
  31. data/lib/proj/transformation.rb +4 -4
  32. data/lib/proj/unit.rb +1 -1
  33. data/lib/proj.rb +11 -7
  34. data/proj4rb.gemspec +1 -1
  35. data/test/abstract_test.rb +0 -23
  36. data/test/conversion_test.rb +11 -11
  37. data/test/coordinate_system_test.rb +7 -7
  38. data/test/crs_test.rb +25 -15
  39. data/test/database_test.rb +60 -28
  40. data/test/operation_factory_context_test.rb +13 -9
  41. data/test/pj_object_test.rb +38 -30
  42. data/test/projection_test.rb +187 -187
  43. data/test/transformation_test.rb +7 -7
  44. metadata +5 -3
data/test/pj_object_test.rb CHANGED
@@ -19,20 +19,20 @@ class PjObjectTest < AbstractTest
19
19
  def test_equivalent
20
20
  from_epsg = Proj::PjObject.create_from_database("EPSG", "7844", :PJ_CATEGORY_CRS)
21
21
  from_wkt = Proj::PjObject.create_from_wkt(<<~EOS)
22
- GEOGCRS["GDA2020",
23
- DATUM["GDA2020",
24
- ELLIPSOID["GRS_1980",6378137,298.257222101,
25
- LENGTHUNIT["metre",1]]],
26
- PRIMEM["Greenwich",0,
27
- ANGLEUNIT["Degree",0.0174532925199433]],
28
- CS[ellipsoidal,2],
29
- AXIS["geodetic latitude (Lat)",north,
30
- ORDER[1],
31
- ANGLEUNIT["degree",0.0174532925199433]],
32
- AXIS["geodetic longitude (Lon)",east,
33
- ORDER[2],
34
- ANGLEUNIT["degree",0.0174532925199433]]]"
35
- EOS
22
+ GEOGCRS["GDA2020",
23
+ DATUM["GDA2020",
24
+ ELLIPSOID["GRS_1980",6378137,298.257222101,
25
+ LENGTHUNIT["metre",1]]],
26
+ PRIMEM["Greenwich",0,
27
+ ANGLEUNIT["Degree",0.0174532925199433]],
28
+ CS[ellipsoidal,2],
29
+ AXIS["geodetic latitude (Lat)",north,
30
+ ORDER[1],
31
+ ANGLEUNIT["degree",0.0174532925199433]],
32
+ AXIS["geodetic longitude (Lon)",east,
33
+ ORDER[2],
34
+ ANGLEUNIT["degree",0.0174532925199433]]]"
35
+ EOS
36
36
 
37
37
  assert(from_epsg.equivalent_to?(from_wkt, :PJ_COMP_EQUIVALENT))
38
38
  end
@@ -136,7 +136,15 @@ class PjObjectTest < AbstractTest
136
136
  objects = Proj::PjObject.create_from_name("WGS 84", context, approximate_match: true,
137
137
  types: [:PJ_TYPE_GEODETIC_CRS, :PJ_TYPE_PROJECTED_CRS])
138
138
 
139
- expected = proj9? ? 442 : 440
139
+ expected = case
140
+ when Proj::Api::PROJ_VERSION >= '9.3.0'
141
+ 443
142
+ when Proj::Api::PROJ_VERSION >= '9.0.0'
143
+ 442
144
+ else
145
+ 440
146
+ end
147
+
140
148
  assert_equal(expected, objects.size)
141
149
  end
142
150
 
@@ -149,23 +157,23 @@ class PjObjectTest < AbstractTest
149
157
 
150
158
  def test_deprecated_true
151
159
  wkt = <<~EOS
152
- GEOGCRS["SAD69 (deprecated)",
153
- DATUM["South_American_Datum_1969",
154
- ELLIPSOID["GRS 1967",6378160,298.247167427,
155
- LENGTHUNIT["metre",1,
156
- ID["EPSG",9001]]]],
157
- PRIMEM["Greenwich",0,
160
+ GEOGCRS["SAD69 (deprecated)",
161
+ DATUM["South_American_Datum_1969",
162
+ ELLIPSOID["GRS 1967",6378160,298.247167427,
163
+ LENGTHUNIT["metre",1,
164
+ ID["EPSG",9001]]]],
165
+ PRIMEM["Greenwich",0,
166
+ ANGLEUNIT["degree",0.0174532925199433,
167
+ ID["EPSG",9122]]],
168
+ CS[ellipsoidal,2],
169
+ AXIS["latitude",north,
170
+ ORDER[1],
158
171
  ANGLEUNIT["degree",0.0174532925199433,
159
172
  ID["EPSG",9122]]],
160
- CS[ellipsoidal,2],
161
- AXIS["latitude",north,
162
- ORDER[1],
163
- ANGLEUNIT["degree",0.0174532925199433,
164
- ID["EPSG",9122]]],
165
- AXIS["longitude",east,
166
- ORDER[2],
167
- ANGLEUNIT["degree",0.0174532925199433,
168
- ID["EPSG",9122]]]]
173
+ AXIS["longitude",east,
174
+ ORDER[2],
175
+ ANGLEUNIT["degree",0.0174532925199433,
176
+ ID["EPSG",9122]]]]
169
177
  EOS
170
178
 
171
179
  crs = Proj::Crs.create(wkt)