Skip to content

Commit d4bbd7e

Browse files
visrvisr
committed
rerun generator.jl
only effect it has is to format some files
1 parent 8ea1e52 commit d4bbd7e

File tree

3 files changed

+63
-23
lines changed

3 files changed

+63
-23
lines changed

‎gen/Manifest.toml‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.7.3"
3+
julia_version = "1.8.0"
44
manifest_format = "2.0"
5+
project_hash = "c207a7c5032a4b9a7a881d57cf2ab43f0327ec83"
56

67
[[deps.ArgTools]]
78
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
9+
version = "1.1.1"
810

911
[[deps.Artifacts]]
1012
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
@@ -25,15 +27,15 @@ version = "3.3.6"
2527

2628
[[deps.Clang]]
2729
deps = ["CEnum", "Clang_jll", "Downloads", "Pkg", "TOML"]
28-
git-tree-sha1 = "b6998b85ea2abbc8a02ca1ccca9438338ed5f8e5"
30+
git-tree-sha1 = "0b40886a23b65c23e6c2a4169e14f2743327a2b2"
2931
uuid = "40e3b903-d033-50b4-a0cc-940c62c95e31"
30-
version = "0.15.8"
32+
version = "0.16.1"
3133

3234
[[deps.Clang_jll]]
3335
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll", "libLLVM_jll"]
34-
git-tree-sha1 = "8cf7e67e264dedc5d321ec87e78525e958aea057"
36+
git-tree-sha1 = "0dfffba1b32bb3e30cb0372bfe666a5ddffe37fb"
3537
uuid = "0ee61d77-7f21-5576-8119-9fcc46b10100"
36-
version = "12.0.1+3"
38+
version = "13.0.1+3"
3739

3840
[[deps.CommonMark]]
3941
deps = ["Crayons", "JSON", "URIs"]
@@ -43,13 +45,14 @@ version = "0.8.6"
4345

4446
[[deps.Compat]]
4547
deps = ["Dates", "LinearAlgebra", "UUIDs"]
46-
git-tree-sha1 = "924cdca592bc16f14d2f7006754a621735280b74"
48+
git-tree-sha1 = "5856d3031cdb1f3b2b6340dfdc66b6d9a149a374"
4749
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
48-
version = "4.1.0"
50+
version = "4.2.0"
4951

5052
[[deps.CompilerSupportLibraries_jll]]
5153
deps = ["Artifacts", "Libdl"]
5254
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
55+
version = "0.5.2+0"
5356

5457
[[deps.Crayons]]
5558
git-tree-sha1 = "249fe38abf76d48563e2f4556bebd215aa317e15"
@@ -69,6 +72,7 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
6972
[[deps.Downloads]]
7073
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
7174
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
75+
version = "1.6.0"
7276

7377
[[deps.FileWatching]]
7478
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
@@ -97,17 +101,19 @@ version = "0.21.3"
97101

98102
[[deps.JuliaFormatter]]
99103
deps = ["CSTParser", "CommonMark", "DataStructures", "Pkg", "Tokenize"]
100-
git-tree-sha1 = "6f13ba89febc5c12f882902e1f5dcd11a8913fa5"
104+
git-tree-sha1 = "bc360182bf55b82cf15efb1cbc1b3607d05e1648"
101105
uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
102-
version = "1.0.7"
106+
version = "1.0.9"
103107

104108
[[deps.LibCURL]]
105109
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
106110
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
111+
version = "0.6.3"
107112

108113
[[deps.LibCURL_jll]]
109114
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
110115
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
116+
version = "7.84.0+0"
111117

112118
[[deps.LibGit2]]
113119
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
@@ -116,6 +122,7 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
116122
[[deps.LibSSH2_jll]]
117123
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
118124
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
125+
version = "1.10.2+0"
119126

120127
[[deps.Libdl]]
121128
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
@@ -140,19 +147,23 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
140147
[[deps.MbedTLS_jll]]
141148
deps = ["Artifacts", "Libdl"]
142149
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
150+
version = "2.28.0+0"
143151

144152
[[deps.Mmap]]
145153
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
146154

147155
[[deps.MozillaCACerts_jll]]
148156
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
157+
version = "2022.2.1"
149158

150159
[[deps.NetworkOptions]]
151160
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
161+
version = "1.2.0"
152162

153163
[[deps.OpenBLAS_jll]]
154164
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
155165
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
166+
version = "0.3.20+0"
156167

157168
[[deps.OrderedCollections]]
158169
git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
@@ -161,13 +172,14 @@ version = "1.4.1"
161172

162173
[[deps.Parsers]]
163174
deps = ["Dates"]
164-
git-tree-sha1 = "0044b23da09b5608b4ecacb4e5e6c6332f833a7e"
175+
git-tree-sha1 = "3d5bf43e3e8b412656404ed9466f1dcbf7c50269"
165176
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
166-
version = "2.3.2"
177+
version = "2.4.0"
167178

168179
[[deps.Pkg]]
169180
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
170181
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
182+
version = "1.8.0"
171183

172184
[[deps.Preferences]]
173185
deps = ["TOML"]
@@ -189,6 +201,7 @@ uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
189201

190202
[[deps.SHA]]
191203
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
204+
version = "0.7.0"
192205

193206
[[deps.Serialization]]
194207
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
@@ -199,10 +212,12 @@ uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
199212
[[deps.TOML]]
200213
deps = ["Dates"]
201214
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
215+
version = "1.0.0"
202216

203217
[[deps.Tar]]
204218
deps = ["ArgTools", "SHA"]
205219
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
220+
version = "1.10.0"
206221

207222
[[deps.Tokenize]]
208223
git-tree-sha1 = "2b3af135d85d7e70b863540160208fa612e736b9"
@@ -224,19 +239,24 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
224239
[[deps.Zlib_jll]]
225240
deps = ["Libdl"]
226241
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
242+
version = "1.2.12+3"
227243

228244
[[deps.libLLVM_jll]]
229245
deps = ["Artifacts", "Libdl"]
230246
uuid = "8f36deef-c2a5-5394-99ed-8e07531fb29a"
247+
version = "13.0.1+3"
231248

232249
[[deps.libblastrampoline_jll]]
233250
deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
234251
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
252+
version = "5.1.1+0"
235253

236254
[[deps.nghttp2_jll]]
237255
deps = ["Artifacts", "Libdl"]
238256
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
257+
version = "1.48.0+0"
239258

240259
[[deps.p7zip_jll]]
241260
deps = ["Artifacts", "Libdl"]
242261
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
262+
version = "17.4.0+0"

‎src/geos_functions.jl‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ end
7777
# Set ordinate values in a Coordinate Sequence (Return 0 on exception)
7878
function setX!(ptr::GEOSCoordSeq, i::Integer, value::Real, context::GEOSContext = _context)
7979
if !(0 < i <= getSize(ptr, context))
80-
error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
80+
error(
81+
"LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))",
82+
)
8183
end
8284
result = GEOSCoordSeq_setX_r(context.ptr, ptr, i - 1, value)
8385
if result == 0
@@ -88,7 +90,9 @@ end
8890

8991
function setY!(ptr::GEOSCoordSeq, i::Integer, value::Real, context::GEOSContext = _context)
9092
if !(0 < i <= getSize(ptr, context))
91-
error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
93+
error(
94+
"LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))",
95+
)
9296
end
9397
result = GEOSCoordSeq_setY_r(context.ptr, ptr, i - 1, value)
9498
if result == 0
@@ -99,7 +103,9 @@ end
99103

100104
function setZ!(ptr::GEOSCoordSeq, i::Integer, value::Real, context::GEOSContext = _context)
101105
if !(0 < i <= getSize(ptr, context))
102-
error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
106+
error(
107+
"LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))",
108+
)
103109
end
104110
result = GEOSCoordSeq_setZ_r(context.ptr, ptr, i - 1, value)
105111
if result == 0
@@ -138,7 +144,9 @@ function setCoordSeq!(
138144
ndim = length(coords)
139145
@assert ndim >= 2
140146
if !(0 < i <= getSize(ptr, context))
141-
error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
147+
error(
148+
"LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))",
149+
)
142150
end
143151
setX!(ptr, i, coords[1], context)
144152
setY!(ptr, i, coords[2], context)
@@ -201,7 +209,9 @@ end
201209

202210
function getX(ptr::GEOSCoordSeq, i::Integer, context::GEOSContext = _context)
203211
if !(0 < i <= getSize(ptr, context))
204-
error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
212+
error(
213+
"LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))",
214+
)
205215
end
206216
out = Ref{Float64}()
207217
result = GEOSCoordSeq_getX_r(context.ptr, ptr, i - 1, out)
@@ -224,7 +234,9 @@ end
224234

225235
function getY(ptr::GEOSCoordSeq, i::Integer, context::GEOSContext = _context)
226236
if !(0 < i <= getSize(ptr, context))
227-
error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
237+
error(
238+
"LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))",
239+
)
228240
end
229241
out = Ref{Float64}()
230242
result = GEOSCoordSeq_getY_r(context.ptr, ptr, i - 1, out)
@@ -247,7 +259,9 @@ end
247259

248260
function getZ(ptr::GEOSCoordSeq, i::Integer, context::GEOSContext = _context)
249261
if !(0 < i <= getSize(ptr, context))
250-
error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
262+
error(
263+
"LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))",
264+
)
251265
end
252266
out = Ref{Float64}()
253267
result = GEOSCoordSeq_getZ_r(context.ptr, ptr, i - 1, out)
@@ -270,7 +284,9 @@ end
270284

271285
function getCoordinates(ptr::GEOSCoordSeq, i::Integer, context::GEOSContext = _context)
272286
if !(0 < i <= getSize(ptr, context))
273-
error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
287+
error(
288+
"LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))",
289+
)
274290
end
275291
ndim = getDimensions(ptr, context)
276292
coord = Array{Float64}(undef, ndim)
@@ -1127,7 +1143,9 @@ end
11271143
# Returned object is a pointer to internal storage: it must NOT be destroyed directly.
11281144
function interiorRing(ptr::GEOSGeom, n::Integer, context::GEOSContext = _context)
11291145
if !(0 < n <= numInteriorRings(ptr, context))
1130-
error("LibGEOS: n=$n is out of bounds for Polygon with $(numInteriorRings(ptr, context)) interior ring(s)")
1146+
error(
1147+
"LibGEOS: n=$n is out of bounds for Polygon with $(numInteriorRings(ptr, context)) interior ring(s)",
1148+
)
11311149
end
11321150
result = GEOSGetInteriorRingN_r(context.ptr, ptr, n - 1)
11331151
if result == C_NULL
@@ -1265,7 +1283,9 @@ end
12651283
# Call only on LINESTRING, and must be freed by caller (Returns NULL on exception)
12661284
function getPoint(ptr::GEOSGeom, n::Integer, context::GEOSContext = _context)
12671285
if !(0 < n <= numPoints(ptr, context))
1268-
error("LibGEOS: n=$n is out of bounds for LineString with numPoints=$(numPoints(ptr, context))")
1286+
error(
1287+
"LibGEOS: n=$n is out of bounds for LineString with numPoints=$(numPoints(ptr, context))",
1288+
)
12691289
end
12701290
result = GEOSGeomGetPointN_r(context.ptr, ptr, n - 1)
12711291
if result == C_NULL

‎test/test_geos_operations.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,10 @@ end
354354
"POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10),(20 30, 35 35, 30 20, 20 30))",
355355
)
356356
@test LibGEOS.getCoordinates(LibGEOS.getCoordSeq(exteriorRing(poly).ptr)) ==
357-
Vector{Float64}[[35, 10], [45, 45], [15, 40], [10, 20], [35, 10]]
357+
Vector{Float64}[[35, 10], [45, 45], [15, 40], [10, 20], [35, 10]]
358358
@test length(interiorRings(poly)) == 1
359359
@test LibGEOS.getCoordinates(LibGEOS.getCoordSeq(interiorRing(poly, 1).ptr)) ==
360-
Vector{Float64}[[20, 30], [35, 35], [30, 20], [20, 30]]
360+
Vector{Float64}[[20, 30], [35, 35], [30, 20], [20, 30]]
361361
@test_throws ErrorException interiorRing(poly, 0)
362362
@test_throws ErrorException interiorRing(poly, 2)
363363
end

0 commit comments

Comments
 (0)