Skip to content

Commit 4d0b59b

Browse files
visrvisr
committed
run JuliaFormatter
1 parent 2d5671b commit 4d0b59b

File tree

3 files changed

+100
-33
lines changed

3 files changed

+100
-33
lines changed

‎src/geo_interface.jl‎

Lines changed: 90 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,27 @@ function GeoInterface.getgeom(::AbstractGeometryTrait, geom::Polygon, i)
4040
end
4141
GeoInterface.getgeom(::AbstractPointTrait, geom::Polygon, i) = nothing
4242

43-
GeoInterface.ngeom(t::AbstractGeometryTrait, geom::PreparedGeometry) = GeoInterface.ngeom(t, geom.ownedby)
43+
GeoInterface.ngeom(t::AbstractGeometryTrait, geom::PreparedGeometry) =
44+
GeoInterface.ngeom(t, geom.ownedby)
4445
GeoInterface.ngeom(t::AbstractPointTrait, geom::PreparedGeometry) = 0
45-
GeoInterface.getgeom(t::AbstractGeometryTrait, geom::PreparedGeometry, i) = GeoInterface.getgeom(t, geom.ownedby, i)
46+
GeoInterface.getgeom(t::AbstractGeometryTrait, geom::PreparedGeometry, i) =
47+
GeoInterface.getgeom(t, geom.ownedby, i)
4648
GeoInterface.getgeom(t::AbstractPointTrait, geom::PreparedGeometry, i) = 0
4749

4850
GeoInterface.ncoord(::AbstractGeometryTrait, geom::AbstractGeometry) =
4951
isEmpty(geom.ptr) ? 0 : getCoordinateDimension(geom.ptr)
5052
GeoInterface.getcoord(::AbstractGeometryTrait, geom::AbstractGeometry, i) =
5153
getCoordinates(getCoordSeq(geom.ptr), 1)[i]
5254

53-
GeoInterface.ncoord(t::AbstractGeometryTrait, geom::PreparedGeometry) = GeoInterface.ncoord(t, geom.ownedby)
54-
GeoInterface.getcoord(t::AbstractGeometryTrait, geom::PreparedGeometry, i) = GeoInterface.getcoord(t, geom.ownedby, i)
55+
GeoInterface.ncoord(t::AbstractGeometryTrait, geom::PreparedGeometry) =
56+
GeoInterface.ncoord(t, geom.ownedby)
57+
GeoInterface.getcoord(t::AbstractGeometryTrait, geom::PreparedGeometry, i) =
58+
GeoInterface.getcoord(t, geom.ownedby, i)
5559

5660
function GeoInterface.extent(::AbstractGeometryTrait, geom::AbstractGeometry)
5761
# minx, miny, maxx, maxy = getExtent(geom)
5862
env = envelope(geom)
59-
return Extent(X=(getXMin(env), getXMax(env)), Y=(getYMin(env), getYMax(env)))
63+
return Extent(X = (getXMin(env), getXMax(env)), Y = (getYMin(env), getYMax(env)))
6064
end
6165

6266
function Base.convert(::Type{T}, geom::T) where {T<:AbstractGeometry}
@@ -86,32 +90,94 @@ function Base.convert(::Type{MultiPolygon}, type::MultiPolygonTrait, geom)
8690
return MultiPolygon(GeoInterface.coordinates(geom))
8791
end
8892

89-
function Base.convert(
90-
t::Type{<:AbstractGeometry},
91-
type::AbstractGeometryTrait,
92-
geom,
93-
)
93+
function Base.convert(t::Type{<:AbstractGeometry}, type::AbstractGeometryTrait, geom)
9494
error(
9595
"Cannot convert an object of $(typeof(geom)) with the $(typeof(type)) trait to a $t (yet). Please report an issue.",
9696
)
9797
return f(GeoInterface.coordinates(geom))
9898
end
9999

100-
GeoInterface.distance(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = distance(a, b)
101-
GeoInterface.buffer(::AbstractGeometryTrait, geom::AbstractGeometry, distance) = buffer(geom, distance)
100+
GeoInterface.distance(
101+
::AbstractGeometryTrait,
102+
::AbstractGeometryTrait,
103+
a::AbstractGeometry,
104+
b::AbstractGeometry,
105+
) = distance(a, b)
106+
GeoInterface.buffer(::AbstractGeometryTrait, geom::AbstractGeometry, distance) =
107+
buffer(geom, distance)
102108
GeoInterface.convexhull(::AbstractGeometryTrait, geom::AbstractGeometry) = convexhull(geom)
103109

104-
GeoInterface.equals(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = equals(a, b)
105-
GeoInterface.disjoint(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = disjoint(a, b)
106-
GeoInterface.intersects(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = intersects(a, b)
107-
GeoInterface.touches(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = touches(a, b)
108-
GeoInterface.within(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = within(a, b)
109-
GeoInterface.contains(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = contains(a, b)
110-
GeoInterface.overlaps(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = overlaps(a, b)
111-
GeoInterface.crosses(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = crosses(a, b)
110+
GeoInterface.equals(
111+
::AbstractGeometryTrait,
112+
::AbstractGeometryTrait,
113+
a::AbstractGeometry,
114+
b::AbstractGeometry,
115+
) = equals(a, b)
116+
GeoInterface.disjoint(
117+
::AbstractGeometryTrait,
118+
::AbstractGeometryTrait,
119+
a::AbstractGeometry,
120+
b::AbstractGeometry,
121+
) = disjoint(a, b)
122+
GeoInterface.intersects(
123+
::AbstractGeometryTrait,
124+
::AbstractGeometryTrait,
125+
a::AbstractGeometry,
126+
b::AbstractGeometry,
127+
) = intersects(a, b)
128+
GeoInterface.touches(
129+
::AbstractGeometryTrait,
130+
::AbstractGeometryTrait,
131+
a::AbstractGeometry,
132+
b::AbstractGeometry,
133+
) = touches(a, b)
134+
GeoInterface.within(
135+
::AbstractGeometryTrait,
136+
::AbstractGeometryTrait,
137+
a::AbstractGeometry,
138+
b::AbstractGeometry,
139+
) = within(a, b)
140+
GeoInterface.contains(
141+
::AbstractGeometryTrait,
142+
::AbstractGeometryTrait,
143+
a::AbstractGeometry,
144+
b::AbstractGeometry,
145+
) = contains(a, b)
146+
GeoInterface.overlaps(
147+
::AbstractGeometryTrait,
148+
::AbstractGeometryTrait,
149+
a::AbstractGeometry,
150+
b::AbstractGeometry,
151+
) = overlaps(a, b)
152+
GeoInterface.crosses(
153+
::AbstractGeometryTrait,
154+
::AbstractGeometryTrait,
155+
a::AbstractGeometry,
156+
b::AbstractGeometry,
157+
) = crosses(a, b)
112158
# GeoInterface.relate(::AbstractGeometryTrait, ::AbstractGeometryTrait, a, b, relationmatrix) = relate(a, b) # not yet implemented
113159

114-
GeoInterface.symdifference(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = symmetricDifference(a, b)
115-
GeoInterface.difference(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = difference(a, b)
116-
GeoInterface.intersection(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = intersection(a, b)
117-
GeoInterface.union(::AbstractGeometryTrait, ::AbstractGeometryTrait, a::AbstractGeometry, b::AbstractGeometry) = union(a, b)
160+
GeoInterface.symdifference(
161+
::AbstractGeometryTrait,
162+
::AbstractGeometryTrait,
163+
a::AbstractGeometry,
164+
b::AbstractGeometry,
165+
) = symmetricDifference(a, b)
166+
GeoInterface.difference(
167+
::AbstractGeometryTrait,
168+
::AbstractGeometryTrait,
169+
a::AbstractGeometry,
170+
b::AbstractGeometry,
171+
) = difference(a, b)
172+
GeoInterface.intersection(
173+
::AbstractGeometryTrait,
174+
::AbstractGeometryTrait,
175+
a::AbstractGeometry,
176+
b::AbstractGeometry,
177+
) = intersection(a, b)
178+
GeoInterface.union(
179+
::AbstractGeometryTrait,
180+
::AbstractGeometryTrait,
181+
a::AbstractGeometry,
182+
b::AbstractGeometry,
183+
) = union(a, b)

‎test/test_geo_interface.jl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@test GeoInterface.ncoord(pt) == 2
66
@test GeoInterface.getcoord(pt, 1) ≈ 1.0
77
@test GeoInterface.testgeometry(pt)
8-
@test GeoInterface.extent(pt) == Extent(X=(1.0, 1.0), Y=(2.0, 2.0))
8+
@test GeoInterface.extent(pt) == Extent(X = (1.0, 1.0), Y = (2.0, 2.0))
99

1010
pt = LibGEOS.Point(1, 2)
1111
@test GeoInterface.coordinates(pt) ≈ [1, 2] atol = 1e-5
@@ -89,12 +89,12 @@
8989
]]]
9090
@test GeoInterface.geomtrait(multipolygon) == MultiPolygonTrait()
9191
@test GeoInterface.testgeometry(multipolygon)
92-
@test GeoInterface.extent(multipolygon) == Extent(X=(0.0, 10.0), Y=(0.0, 10.0))
92+
@test GeoInterface.extent(multipolygon) == Extent(X = (0.0, 10.0), Y = (0.0, 10.0))
9393

9494
pmultipolygon = LibGEOS.prepareGeom(multipolygon)
9595
@test GeoInterface.geomtrait(pmultipolygon) == MultiPolygonTrait()
9696
@test GeoInterface.testgeometry(pmultipolygon)
97-
@test GeoInterface.extent(pmultipolygon) == Extent(X=(0.0, 10.0), Y=(0.0, 10.0))
97+
@test GeoInterface.extent(pmultipolygon) == Extent(X = (0.0, 10.0), Y = (0.0, 10.0))
9898
LibGEOS.destroyGeom(pmultipolygon)
9999

100100
geomcollection = LibGEOS.readgeom(

‎test/test_geos_operations.jl‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -385,14 +385,15 @@ end
385385
@test buffer(MultiPoint([[1.0, 1.0], [2.0, 2.0], [2.0, 0.0]]), 0.1) isa
386386
LibGEOS.MultiPolygon
387387
@test buffer(MultiPoint([[1.0, 1.0], [2.0, 2.0], [2.0, 0.0]]), 10) isa LibGEOS.Polygon
388-
@test GeoInterface.buffer(MultiPoint([[1.0, 1.0], [2.0, 2.0], [2.0, 0.0]]), 10) isa LibGEOS.Polygon
388+
@test GeoInterface.buffer(MultiPoint([[1.0, 1.0], [2.0, 2.0], [2.0, 0.0]]), 10) isa
389+
LibGEOS.Polygon
389390

390391
# bufferWithStyle
391392
g1 = bufferWithStyle(
392393
readgeom("LINESTRING(0 0,0 1,1 1)"),
393394
0.1,
394-
endCapStyle=LibGEOS.GEOSBUF_CAP_FLAT,
395-
joinStyle=LibGEOS.GEOSBUF_JOIN_BEVEL,
395+
endCapStyle = LibGEOS.GEOSBUF_CAP_FLAT,
396+
joinStyle = LibGEOS.GEOSBUF_JOIN_BEVEL,
396397
)
397398
g2 = readgeom(
398399
"POLYGON((-0.1 0.0,-0.1 1.0,0.0 1.1,1.0 1.1,1.0 0.9,0.1 0.9,0.1 0.0,-0.1 0.0))",
@@ -403,8 +404,8 @@ end
403404
g1 = bufferWithStyle(
404405
readgeom("LINESTRING(0 0,0 1,1 1)"),
405406
0.1,
406-
endCapStyle=LibGEOS.GEOSBUF_CAP_SQUARE,
407-
joinStyle=LibGEOS.GEOSBUF_JOIN_MITRE,
407+
endCapStyle = LibGEOS.GEOSBUF_CAP_SQUARE,
408+
joinStyle = LibGEOS.GEOSBUF_JOIN_MITRE,
408409
)
409410
g2 =
410411
readgeom("POLYGON((-0.1 -0.1,-0.1 1.1,1.1 1.1,1.1 0.9,0.1 0.9,0.1 -0.1,-0.1 -0.1))")
@@ -413,7 +414,7 @@ end
413414
g1 = bufferWithStyle(
414415
readgeom("POLYGON((-1 -1,1 -1,1 1,-1 1,-1 -1))"),
415416
0.2,
416-
joinStyle=LibGEOS.GEOSBUF_JOIN_MITRE,
417+
joinStyle = LibGEOS.GEOSBUF_JOIN_MITRE,
417418
)
418419
g2 = readgeom("POLYGON((-1.2 1.2,1.2 1.2,1.2 -1.2,-1.2 -1.2,-1.2 1.2))")
419420
@test equals(g1, g2)

0 commit comments

Comments
 (0)