Skip to content

Commit

Permalink
rename GMLOption to GMLExportOption
Browse files Browse the repository at this point in the history
  • Loading branch information
yohancabion committed May 20, 2022
1 parent dd3f85f commit f93a7e9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func ErrLogger(fn ErrorHandler) interface {
GeometryWKBOption
GeometryWKTOption
GetGeoTransformOption
GMLOption
GMLExportOption
HistogramOption
IntersectsOption
MetadataOption
Expand Down Expand Up @@ -248,7 +248,7 @@ func (ec errorCallback) setGeometryWKTOpt(o *geometryWKTOpts) {
func (ec errorCallback) setGetGeoTransformOpt(o *getGeoTransformOpts) {
o.errorHandler = ec.fn
}
func (ec errorCallback) setGMLOpt(o *gmlOpts) {
func (ec errorCallback) setGMLExportOpt(o *gmlExportOpts) {
o.errorHandler = ec.fn
}
func (ec errorCallback) setHistogramOpt(o *histogramOpts) {
Expand Down
6 changes: 3 additions & 3 deletions godal.go
Original file line number Diff line number Diff line change
Expand Up @@ -3031,10 +3031,10 @@ func (g *Geometry) GeoJSON(opts ...GeoJSONOption) (string, error) {
//
// Example of conversion options :
// g.GML(CreationOption("FORMAT=GML3","GML3_LONGSRS=YES"))
func (g *Geometry) GML(opts ...GMLOption) (string, error) {
gmlo := &gmlOpts{}
func (g *Geometry) GML(opts ...GMLExportOption) (string, error) {
gmlo := &gmlExportOpts{}
for _, o := range opts {
o.setGMLOpt(gmlo)
o.setGMLExportOpt(gmlo)
}
switches := make([]string, len(gmlo.creation))
for i, copt := range gmlo.creation {
Expand Down
12 changes: 6 additions & 6 deletions options.go
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ func CreationOption(opts ...string) interface {
DatasetWarpOption
DatasetTranslateOption
DatasetVectorTranslateOption
GMLOption
GMLExportOption
RasterizeOption
} {
return creationOpt{opts}
Expand All @@ -863,7 +863,7 @@ func (co creationOpt) setDatasetTranslateOpt(dc *dsTranslateOpts) {
func (co creationOpt) setDatasetVectorTranslateOpt(dc *dsVectorTranslateOpts) {
dc.creation = append(dc.creation, co.creation...)
}
func (co creationOpt) setGMLOpt(gmlo *gmlOpts) {
func (co creationOpt) setGMLExportOpt(gmlo *gmlExportOpts) {
gmlo.creation = append(gmlo.creation, co.creation...)
}
func (co creationOpt) setRasterizeOpt(o *rasterizeOpts) {
Expand Down Expand Up @@ -1261,18 +1261,18 @@ type GeoJSONOption interface {
setGeojsonOpt(gjo *geojsonOpts)
}

type gmlOpts struct {
type gmlExportOpts struct {
creation []string
errorHandler ErrorHandler
}

// GMLOption is an option passed to Geometry.GML()
// GMLExportOption is an option passed to Geometry.GML()
//
// Available options are:
// - CreationOption
// - ErrLogger
type GMLOption interface {
setGMLOpt(o *gmlOpts)
type GMLExportOption interface {
setGMLExportOpt(o *gmlExportOpts)
}

type significantDigits int
Expand Down

0 comments on commit f93a7e9

Please sign in to comment.