Skip to content

Commit 49e5a32

Browse files
Format .jl files (#350)
Co-authored-by: yeesian <[email protected]>
1 parent 0de86cc commit 49e5a32

File tree

10 files changed

+74
-150
lines changed

10 files changed

+74
-150
lines changed

src/dataset.jl

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -615,8 +615,7 @@ height(dataset::AbstractDataset)::Integer = GDAL.gdalgetrasterysize(dataset)
615615
616616
Fetch the number of raster bands on this dataset.
617617
"""
618-
nraster(dataset::AbstractDataset)::Integer =
619-
GDAL.gdalgetrastercount(dataset)
618+
nraster(dataset::AbstractDataset)::Integer = GDAL.gdalgetrastercount(dataset)
620619

621620
"""
622621
nlayer(dataset::AbstractDataset)
@@ -802,12 +801,7 @@ function unsafe_executesql(
802801
spatialfilter::Geometry = Geometry(C_NULL),
803802
)::FeatureLayer
804803
return FeatureLayer(
805-
GDAL.gdaldatasetexecutesql(
806-
dataset,
807-
query,
808-
spatialfilter,
809-
dialect,
810-
),
804+
GDAL.gdaldatasetexecutesql(dataset, query, spatialfilter, dialect),
811805
)
812806
end
813807

@@ -919,8 +913,7 @@ It should be suitable for use with the OGRSpatialReference class. When a
919913
projection definition is not available an empty (but not `NULL`) string is
920914
returned.
921915
"""
922-
getproj(dataset::AbstractDataset)::String =
923-
GDAL.gdalgetprojectionref(dataset)
916+
getproj(dataset::AbstractDataset)::String = GDAL.gdalgetprojectionref(dataset)
924917

925918
"""
926919
setproj!(dataset::AbstractDataset, projstring::AbstractString)

src/ogr/feature.jl

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ Fetch number of fields on this feature.
8282
8383
This will always be the same as the field count for the OGRFeatureDefn.
8484
"""
85-
nfield(feature::AbstractFeature)::Integer =
86-
GDAL.ogr_f_getfieldcount(feature)
85+
nfield(feature::AbstractFeature)::Integer = GDAL.ogr_f_getfieldcount(feature)
8786

8887
"""
8988
keys(feature::AbstractFeature)
@@ -730,8 +729,7 @@ Fetch number of geometry fields on this feature.
730729
731730
This will always be the same as the geometry field count for OGRFeatureDefn.
732731
"""
733-
ngeom(feature::AbstractFeature)::Integer =
734-
GDAL.ogr_f_getgeomfieldcount(feature)
732+
ngeom(feature::AbstractFeature)::Integer = GDAL.ogr_f_getgeomfieldcount(feature)
735733

736734
"""
737735
getgeomdefn(feature::AbstractFeature, i::Integer)
@@ -919,12 +917,7 @@ function setfrom!(
919917
indices::Vector{Cint},
920918
forgiving::Bool = false,
921919
)::AbstractFeature
922-
result = GDAL.ogr_f_setfromwithmap(
923-
feature1,
924-
feature2,
925-
forgiving,
926-
indices,
927-
)
920+
result = GDAL.ogr_f_setfromwithmap(feature1, feature2, forgiving, indices)
928921
@ogrerr result "OGRErr $result: Failed to set feature with map"
929922
return feature1
930923
end

src/ogr/featurelayer.jl

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,7 @@ function createlayer(;
3434
options = StringList(C_NULL),
3535
)::IFeatureLayer
3636
return IFeatureLayer(
37-
GDAL.gdaldatasetcreatelayer(
38-
dataset,
39-
name,
40-
spatialref,
41-
geom,
42-
options,
43-
),
37+
GDAL.gdaldatasetcreatelayer(dataset, name, spatialref, geom, options),
4438
ownedby = dataset,
4539
spatialref = spatialref,
4640
)
@@ -54,13 +48,7 @@ function unsafe_createlayer(;
5448
options = StringList(C_NULL),
5549
)::FeatureLayer
5650
return FeatureLayer(
57-
GDAL.gdaldatasetcreatelayer(
58-
dataset,
59-
name,
60-
spatialref,
61-
geom,
62-
options,
63-
),
51+
GDAL.gdaldatasetcreatelayer(dataset, name, spatialref, geom, options),
6452
ownedby = dataset,
6553
spatialref = spatialref,
6654
)
@@ -1042,8 +1030,7 @@ Increment layer reference count.
10421030
### Returns
10431031
The reference count after incrementing.
10441032
"""
1045-
reference(layer::AbstractFeatureLayer)::Integer =
1046-
GDAL.ogr_l_reference(layer)
1033+
reference(layer::AbstractFeatureLayer)::Integer = GDAL.ogr_l_reference(layer)
10471034

10481035
"""
10491036
dereference(layer::AbstractFeatureLayer)
@@ -1061,8 +1048,7 @@ dereference(layer::AbstractFeatureLayer)::Integer =
10611048
10621049
The current reference count for the layer object itself.
10631050
"""
1064-
nreference(layer::AbstractFeatureLayer)::Integer =
1065-
GDAL.ogr_l_getrefcount(layer)
1051+
nreference(layer::AbstractFeatureLayer)::Integer = GDAL.ogr_l_getrefcount(layer)
10661052

10671053
# """
10681054
# Flush pending changes to disk.

src/ogr/fielddefn.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,7 @@ Get default field value
262262
* https://gdal.org/development/rfc/rfc53_ogr_notnull_default.html
263263
"""
264264
function getdefault(fielddefn::AbstractFieldDefn)::Union{String,Nothing}
265-
result =
266-
@gdal(OGR_Fld_GetDefault::Cstring, fielddefn::GDAL.OGRFieldDefnH)
265+
result = @gdal(OGR_Fld_GetDefault::Cstring, fielddefn::GDAL.OGRFieldDefnH)
267266
return if result == C_NULL
268267
nothing
269268
else

src/ogr/geometry.jl

Lines changed: 49 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,7 @@ function unsafe_forceto(
211211
targettype::OGRwkbGeometryType,
212212
options = StringList(C_NULL),
213213
)::Geometry
214-
return Geometry(
215-
GDAL.ogr_g_forceto(unsafe_clone(geom), targettype, options),
216-
)
214+
return Geometry(GDAL.ogr_g_forceto(unsafe_clone(geom), targettype, options))
217215
end
218216

219217
"""
@@ -1644,13 +1642,8 @@ function polygonfromedges(
16441642
autoclose::Bool = false,
16451643
)::IGeometry
16461644
perr = Ref{GDAL.OGRErr}()
1647-
result = GDAL.ogrbuildpolygonfromedges(
1648-
lines,
1649-
besteffort,
1650-
autoclose,
1651-
tol,
1652-
perr,
1653-
)
1645+
result =
1646+
GDAL.ogrbuildpolygonfromedges(lines, besteffort, autoclose, tol, perr)
16541647
@ogrerr perr[] "Failed to build polygon from edges."
16551648
return IGeometry(result)
16561649
end
@@ -1662,13 +1655,8 @@ function unsafe_polygonfromedges(
16621655
autoclose::Bool = false,
16631656
)::Geometry
16641657
perr = Ref{GDAL.OGRErr}()
1665-
result = GDAL.ogrbuildpolygonfromedges(
1666-
lines,
1667-
besteffort,
1668-
autoclose,
1669-
tol,
1670-
perr,
1671-
)
1658+
result =
1659+
GDAL.ogrbuildpolygonfromedges(lines, besteffort, autoclose, tol, perr)
16721660
@ogrerr perr[] "Failed to build polygon from edges."
16731661
return Geometry(result)
16741662
end
@@ -1730,62 +1718,62 @@ for (geom, wkbgeom) in (
17301718
end
17311719

17321720
let V = Vector{<:Real}
1733-
for (args, typedargs, typesuffix) in (
1721+
for (args, typedargs, typesuffix) in (
17341722
((:xs, :ys), (:(xs::$V), :(ys::$V)), ""), # geomargs2d
17351723
((:xs, :ys, :zs), (:(xs::$V), :(ys::$V), :(zs::$V)), "25D"), # geomargs3d
17361724
)
1737-
T = Symbol("wkbLineString" * typesuffix)
1738-
@eval function createlinearring($(typedargs...))
1739-
return createlinestring(Val{wkbLinearRing}()) do geom
1740-
for pt in zip($(args...))
1741-
addpoint!(geom, pt...)
1742-
end
1743-
# rewrap LinearRing as the corrent LineString/LineString25D
1744-
IGeometry{$T}(GDAL.ogr_g_clone(geom))
1745-
end
1746-
end
1747-
@eval function unsafe_createlinearring($(typedargs...))
1748-
return createlinestring(Val{wkbLinearRing}()) do geom
1749-
for pt in zip($(args...))
1750-
addpoint!(geom, pt...)
1751-
end
1752-
# rewrap LinearRing as the corrent LineString/LineString25D
1753-
Geometry{$T}(GDAL.ogr_g_clone(geom))
1754-
end
1755-
end
1756-
for f in (:create, :unsafe_create)
1757-
f1 = Symbol("$(f)linestring")
17581725
T = Symbol("wkbLineString" * typesuffix)
1759-
@eval function $f1($(typedargs...))
1760-
geom = $f1(Val{$T}())
1761-
for pt in zip($(args...))
1762-
addpoint!(geom, pt...)
1726+
@eval function createlinearring($(typedargs...))
1727+
return createlinestring(Val{wkbLinearRing}()) do geom
1728+
for pt in zip($(args...))
1729+
addpoint!(geom, pt...)
1730+
end
1731+
# rewrap LinearRing as the corrent LineString/LineString25D
1732+
return IGeometry{$T}(GDAL.ogr_g_clone(geom))
17631733
end
1764-
return geom
17651734
end
1766-
f1 = Symbol("$(f)polygon")
1767-
T = Symbol("wkbPolygon" * typesuffix)
1768-
@eval function $f1($(typedargs...))
1769-
geom = $f1(Val{$T}())
1770-
subgeom = unsafe_createlinearring($(args...))
1771-
result = GDAL.ogr_g_addgeometrydirectly(geom, subgeom)
1772-
@ogrerr result "Failed to add linearring."
1773-
return geom
1735+
@eval function unsafe_createlinearring($(typedargs...))
1736+
return createlinestring(Val{wkbLinearRing}()) do geom
1737+
for pt in zip($(args...))
1738+
addpoint!(geom, pt...)
1739+
end
1740+
# rewrap LinearRing as the corrent LineString/LineString25D
1741+
return Geometry{$T}(GDAL.ogr_g_clone(geom))
1742+
end
17741743
end
1775-
f1 = Symbol("$(f)multipoint")
1776-
T = Symbol("wkbMultiPoint" * typesuffix)
1777-
@eval function $f1($(typedargs...))
1778-
geom = $f1(Val{$T}())
1779-
for pt in zip($(args...))
1780-
subgeom = unsafe_createpoint(pt)
1744+
for f in (:create, :unsafe_create)
1745+
f1 = Symbol("$(f)linestring")
1746+
T = Symbol("wkbLineString" * typesuffix)
1747+
@eval function $f1($(typedargs...))
1748+
geom = $f1(Val{$T}())
1749+
for pt in zip($(args...))
1750+
addpoint!(geom, pt...)
1751+
end
1752+
return geom
1753+
end
1754+
f1 = Symbol("$(f)polygon")
1755+
T = Symbol("wkbPolygon" * typesuffix)
1756+
@eval function $f1($(typedargs...))
1757+
geom = $f1(Val{$T}())
1758+
subgeom = unsafe_createlinearring($(args...))
17811759
result = GDAL.ogr_g_addgeometrydirectly(geom, subgeom)
1782-
@ogrerr result "Failed to add point."
1760+
@ogrerr result "Failed to add linearring."
1761+
return geom
1762+
end
1763+
f1 = Symbol("$(f)multipoint")
1764+
T = Symbol("wkbMultiPoint" * typesuffix)
1765+
@eval function $f1($(typedargs...))
1766+
geom = $f1(Val{$T}())
1767+
for pt in zip($(args...))
1768+
subgeom = unsafe_createpoint(pt)
1769+
result = GDAL.ogr_g_addgeometrydirectly(geom, subgeom)
1770+
@ogrerr result "Failed to add point."
1771+
end
1772+
return geom
17831773
end
1784-
return geom
17851774
end
17861775
end
17871776
end
1788-
end
17891777

17901778
for f in (:create, :unsafe_create)
17911779
f1 = Symbol("$(f)point")

src/ogr/styletable.jl

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -341,14 +341,7 @@ function toRGBA(
341341
blue = Ref{Int32}(0)
342342
alpha = Ref{Int32}(0)
343343
result = Bool(
344-
GDAL.ogr_st_getrgbfromstring(
345-
styletool,
346-
color,
347-
red,
348-
green,
349-
blue,
350-
alpha,
351-
),
344+
GDAL.ogr_st_getrgbfromstring(styletool, color, red, green, blue, alpha),
352345
)
353346
result || error("Error in getting RGBA from Styletool")
354347
return (red[], green[], blue[], alpha[])

src/raster/rasterattributetable.jl

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,8 @@ function attributeio!(
211211
nrows::Integer,
212212
data::Vector{Float64},
213213
)::Vector{Float64}
214-
result = GDAL.gdalratvaluesioasdouble(
215-
rat,
216-
access,
217-
col,
218-
startrow,
219-
nrows,
220-
data,
221-
)
214+
result =
215+
GDAL.gdalratvaluesioasdouble(rat, access, col, startrow, nrows, data)
222216
@cplerr result "Failed to $access at column $col starting at $startrow"
223217
return data
224218
end
@@ -231,14 +225,8 @@ function attributeio!(
231225
nrows::Integer,
232226
data::Vector{Cint},
233227
)::Vector{Cint}
234-
result = GDAL.gdalratvaluesioasinteger(
235-
rat,
236-
access,
237-
col,
238-
startrow,
239-
nrows,
240-
data,
241-
)
228+
result =
229+
GDAL.gdalratvaluesioasinteger(rat, access, col, startrow, nrows, data)
242230
@cplerr result "Failed to $access at column $col starting at $startrow"
243231
return data
244232
end
@@ -251,14 +239,8 @@ function attributeio!(
251239
nrows::Integer,
252240
data::Vector{T},
253241
)::Vector{T} where {T<:AbstractString}
254-
result = GDAL.gdalratvaluesioasstring(
255-
rat,
256-
access,
257-
col,
258-
startrow,
259-
nrows,
260-
data,
261-
)
242+
result =
243+
GDAL.gdalratvaluesioasstring(rat, access, col, startrow, nrows, data)
262244
@cplerr result "Failed to $access at column $col starting at $startrow"
263245
return data
264246
end

src/raster/rasterband.jl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ width(band::AbstractRasterBand)::Integer = GDAL.gdalgetrasterbandxsize(band)
5656
5757
Fetch the height in pixels of this band.
5858
"""
59-
height(band::AbstractRasterBand)::Integer =
60-
GDAL.gdalgetrasterbandysize(band)
59+
height(band::AbstractRasterBand)::Integer = GDAL.gdalgetrasterbandysize(band)
6160

6261
"""
6362
accessflag(band::AbstractRasterBand)
@@ -95,8 +94,7 @@ getdataset(band::AbstractRasterBand)::Dataset =
9594
Return a name for the units of this raster's values. For instance, it might be
9695
"m" for an elevation model in meters, or "ft" for feet.
9796
"""
98-
getunittype(band::AbstractRasterBand)::String =
99-
GDAL.gdalgetrasterunittype(band)
97+
getunittype(band::AbstractRasterBand)::String = GDAL.gdalgetrasterunittype(band)
10098

10199
"""
102100
setunittype!(band::AbstractRasterBand, unitstring::AbstractString)
@@ -157,8 +155,7 @@ and starting from -100.
157155
158156
For file formats that don't know this intrinsically a value of one is returned.
159157
"""
160-
getscale(band::AbstractRasterBand)::Real =
161-
GDAL.gdalgetrasterscale(band, C_NULL)
158+
getscale(band::AbstractRasterBand)::Real = GDAL.gdalgetrasterscale(band, C_NULL)
162159

163160
"""
164161
setscale!(band::AbstractRasterBand, ratio::Real)
@@ -305,8 +302,7 @@ end
305302
306303
Return the number of overview layers available, zero if none.
307304
"""
308-
noverview(band::AbstractRasterBand)::Integer =
309-
GDAL.gdalgetoverviewcount(band)
305+
noverview(band::AbstractRasterBand)::Integer = GDAL.gdalgetoverviewcount(band)
310306

311307
"""
312308
getoverview(band::IRasterBand, i::Integer)

0 commit comments

Comments
 (0)