Skip to content

Commit b029a0b

Browse files
committed
minor error message text change for config validatoin. #94
1 parent 724b86f commit b029a0b

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

config/config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ func (e ErrInvalidProviderLayerName) Error() string {
3131
return fmt.Sprintf("config: invalid provider layer name (%v)", e.ProviderLayerName)
3232
}
3333

34-
type ErrLayerCollision struct {
34+
type ErrOverlappingLayerZooms struct {
3535
ProviderLayer1 string
3636
ProviderLayer2 string
3737
}
3838

39-
func (e ErrLayerCollision) Error() string {
40-
return fmt.Sprintf("config: layer collision (%v) and (%v)", e.ProviderLayer1, e.ProviderLayer2)
39+
func (e ErrOverlappingLayerZooms) Error() string {
40+
return fmt.Sprintf("config: overlapping zooms for layer (%v) and layer (%v)", e.ProviderLayer1, e.ProviderLayer2)
4141
}
4242

4343
// A Config represents the a Tegola Config file.
@@ -105,7 +105,7 @@ func (c *Config) Validate() error {
105105
if val, ok := layerNames[name]; ok {
106106
// we have a hit. check for zoom range overlap
107107
if val.MinZoom <= l.MaxZoom && l.MinZoom <= val.MaxZoom {
108-
return ErrLayerCollision{
108+
return ErrOverlappingLayerZooms{
109109
ProviderLayer1: val.ProviderLayer,
110110
ProviderLayer2: l.ProviderLayer,
111111
}

config/config_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ func TestValidate(t *testing.T) {
297297
},
298298
},
299299
},
300-
expected: config.ErrLayerCollision{
300+
expected: config.ErrOverlappingLayerZooms{
301301
ProviderLayer1: "provider1.water",
302302
ProviderLayer2: "provider2.water",
303303
},
@@ -363,7 +363,7 @@ func TestValidate(t *testing.T) {
363363
},
364364
},
365365
},
366-
expected: config.ErrLayerCollision{
366+
expected: config.ErrOverlappingLayerZooms{
367367
ProviderLayer1: "provider1.water_0_5",
368368
ProviderLayer2: "provider2.water_5_10",
369369
},

0 commit comments

Comments
 (0)