Skip to content

Commit 8d682a2

Browse files
committed
reverse accidental removal of code to force XY axis ordering
1 parent 6f1427d commit 8d682a2

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

lib/geoscript.rb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
end
1111
end
1212

13+
java_import org.geotools.factory.Hints
14+
15+
unless java.lang.System.get_property('org.geotools.referencing.forceXY') == 'true'
16+
java.lang.System.set_property 'org.geotools.referencing.forceXY', 'true'
17+
end
18+
19+
Hints.put_system_default Hints::FORCE_LONGITUDE_FIRST_AXIS_ORDER, java.lang.Boolean.new(true)
20+
1321
require 'geoscript/version'
1422
require 'geoscript/util'
1523
require 'geoscript/io'

lib/geoscript/projection.rb

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,9 @@ def transform(obj, dest)
5959
geometry_transform = GeometryCoordinateSequenceTransformer.new
6060
geometry_transform.math_transform = transform
6161
new_geom = geometry_transform.transform obj
62-
# not entirely comfortable with this
63-
case new_geom.class.to_s
64-
when 'Java::ComVividsolutionsJtsGeom::Point'
65-
GeoScript::Geom::Point.new new_geom
66-
when 'Java::ComVividsolutionsJtsGeom::Polygon'
67-
GeoScript::Geom::Polygon.new new_geom
68-
when 'Java::ComVividsolutionsJtsGeom::MultiPoint'
69-
GeoScript::Geom::MultiPoint.create new_geom
70-
when 'Java::ComVividsolutionsJtsGeom::MultiPolygon'
71-
GeoScript::Geom::MultiPolygon.create new_geom
72-
when 'Java::ComVividsolutionsJtsGeom::LineString'
73-
GeoScript::Geom::LineString.create new_geom
74-
when 'Java::ComVividsolutionsJtsGeom::MultiLineString'
75-
GeoScript::Geom::MultiLineString.create new_geom
76-
when 'Java::ComVividsolutionsJtsGeom::LinearRing'
77-
GeoScript::Geom::LinearRing.create new_geom
78-
end
62+
geom_type = new_geom.class.to_s.split('::').last
63+
klass = ['GeoScript', 'Geom', geom_type].inject(Module) {|acc, val| acc.const_get(val)}
64+
klass.new(new_geom)
7965
end
8066
end
8167

0 commit comments

Comments
 (0)