extend the right normalize! on v0.4 and v0.5

Fixes warning on julia v0.4

Author: visr

src/LibGEOS.jl

@@ -7,7 +7,16 @@ module LibGEOS
     end
 
     using Compat, GeoInterface
-    import Base: normalize!, contains
+    import Base: contains
+
+    # normalize! was added in julia v0.5, for v0.4 extend Compat version
+    if isdefined(Base, :normalize!)
+        import Base: normalize!
+    else
+        import Compat: normalize!
+        export normalize!
+    end
+
 
     export  Point, MultiPoint, LineString, MultiLineString, LinearRing, Polygon, MultiPolygon, GeometryCollection,
             parseWKT, geomFromWKT, geomToWKT,
@@ -19,7 +28,7 @@ module LibGEOS
             disjoint, touches, intersects, crosses, within, contains, overlaps, equals, equalsexact, covers, coveredby,
             prepareGeom, prepcontains, prepcontainsproperly, prepcoveredby, prepcovers, prepcrosses,
             prepdisjoint, prepintersects, prepoverlaps, preptouches, prepwithin,
-            isEmpty, isSimple, isRing, hasZ, isClosed, isValid, normalize!, interiorRings, exteriorRing,
+            isEmpty, isSimple, isRing, hasZ, isClosed, isValid, interiorRings, exteriorRing,
             numPoints, startPoint, endPoint, area, geomLength, distance, hausdorffdistance, nearestPoints
 
     include("geos_c.jl")

test/test_geos_functions.jl

@@ -324,7 +324,7 @@ LibGEOS.destroyCoordSeq(coords_)
 # GEOSNodeTest
 geom1_ = LibGEOS.geomFromWKT("LINESTRING(0 0, 10 10, 10 0, 0 10)")
 geom2_ = LibGEOS.node(geom1_)
-LibGEOS.normalize!(geom2_)
+normalize!(geom2_)
 geom3_ = LibGEOS.geomFromWKT("MULTILINESTRING ((5 5, 10 0, 10 10, 5 5), (0 10, 5 5), (0 0, 5 5))")
 @fact LibGEOS.geomToWKT(geom2_) --> LibGEOS.geomToWKT(geom3_)
 LibGEOS.destroyGeom(geom1_)
@@ -333,7 +333,7 @@ LibGEOS.destroyGeom(geom3_)
 
 geom1_ = LibGEOS.geomFromWKT("MULTILINESTRING((0 0, 2 0, 4 0),(5 0, 3 0, 1 0))")
 geom2_ = LibGEOS.node(geom1_)
-LibGEOS.normalize!(geom2_)
+normalize!(geom2_)
 geom3_ = LibGEOS.geomFromWKT("MULTILINESTRING ((4 0, 5 0), (3 0, 4 0), (2 0, 3 0), (1 0, 2 0), (0 0, 1 0))")
 @fact LibGEOS.geomToWKT(geom2_) --> LibGEOS.geomToWKT(geom3_)
 LibGEOS.destroyGeom(geom1_)
@@ -342,7 +342,7 @@ LibGEOS.destroyGeom(geom3_)
 
 geom1_ = LibGEOS.geomFromWKT("MULTILINESTRING((0 0, 2 0, 4 0),(0 0, 2 0, 4 0))")
 geom2_ = LibGEOS.node(geom1_)
-LibGEOS.normalize!(geom2_)
+normalize!(geom2_)
 geom3_ = LibGEOS.geomFromWKT("MULTILINESTRING ((2 0, 4 0), (0 0, 2 0))")
 @fact LibGEOS.geomToWKT(geom2_) --> LibGEOS.geomToWKT(geom3_)
 LibGEOS.destroyGeom(geom1_)

test/test_geos_operations.jl

@@ -144,15 +144,15 @@ points = nearestPoints(g1, g2)
 
 # GEOSNodeTest
 g1 = node(parseWKT("LINESTRING(0 0, 10 10, 10 0, 0 10)"))
-LibGEOS.normalize!(g1)
+normalize!(g1)
 equivalent_to_wkt(g1, "MULTILINESTRING ((5 5, 10 0, 10 10, 5 5), (0 10, 5 5), (0 0, 5 5))")
 
 g1 = node(parseWKT("MULTILINESTRING((0 0, 2 0, 4 0),(5 0, 3 0, 1 0))"))
-LibGEOS.normalize!(g1)
+normalize!(g1)
 equivalent_to_wkt(g1, "MULTILINESTRING ((4 0, 5 0), (3 0, 4 0), (2 0, 3 0), (1 0, 2 0), (0 0, 1 0))")
 
 g1 = node(parseWKT("MULTILINESTRING((0 0, 2 0, 4 0),(0 0, 2 0, 4 0))"))
-LibGEOS.normalize!(g1)
+normalize!(g1)
 equivalent_to_wkt(g1, "MULTILINESTRING ((2 0, 4 0), (0 0, 2 0))")
 
 # GEOSPointOnSurfaceTest