upgrade golangci-lint and fix errors

paulmach · paulmach · commit 26f197738ee3 · 2026-03-25T09:47:46.000-07:00
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -11,14 +11,14 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           check-latest: true
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v9.2.0
         with:
-          version: v1.50
+          version: v2.11.4
diff --git a/clip/clip.go b/clip/clip.go
@@ -91,10 +91,7 @@ func ring(box orb.Bound, in orb.Ring) orb.Ring {
 	f := in[0]
 	l := in[len(in)-1]
 
-	initClosed := false
-	if f == l {
-		initClosed = true
-	}
+	initClosed := f == l
 
 	for edge := 1; edge <= 8; edge <<= 1 {
 		out = out[:0]
@@ -150,9 +147,11 @@ func ring(box orb.Bound, in orb.Ring) orb.Ring {
 }
 
 // bitCode returns the point position relative to the bbox:
-//         left  mid  right
-//    top  1001  1000  1010
-//    mid  0001  0000  0010
+//
+//	     left  mid  right
+//	top  1001  1000  1010
+//	mid  0001  0000  0010
+//
 // bottom  0101  0100  0110
 func bitCode(b orb.Bound, p orb.Point) int {
 	code := 0
diff --git a/encoding/ewkb/ewkb_test.go b/encoding/ewkb/ewkb_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"encoding/hex"
-	"io/ioutil"
+	"io"
 	"testing"
 
 	"github.com/paulmach/orb"
@@ -37,7 +37,7 @@ func MustDecodeHex(s string) []byte {
 
 func BenchmarkEncode_Point(b *testing.B) {
 	g := orb.Point{1, 2}
-	e := NewEncoder(ioutil.Discard)
+	e := NewEncoder(io.Discard)
 
 	b.ReportAllocs()
 	b.ResetTimer()
@@ -54,7 +54,7 @@ func BenchmarkEncode_LineString(b *testing.B) {
 		{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5},
 		{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5},
 	}
-	e := NewEncoder(ioutil.Discard)
+	e := NewEncoder(io.Discard)
 
 	b.ReportAllocs()
 	b.ResetTimer()
diff --git a/encoding/internal/wkbcommon/wkb.go b/encoding/internal/wkbcommon/wkb.go
@@ -284,11 +284,12 @@ func readByteOrderType(r io.Reader, buf []byte) (byteOrder, uint32, int, error)
 	}
 
 	var order byteOrder
-	if buf[0] == 0 {
+	switch buf[0] {
+	case 0:
 		order = bigEndian
-	} else if buf[0] == 1 {
+	case 1:
 		order = littleEndian
-	} else {
+	default:
 		return 0, 0, 0, ErrNotWKB
 	}
 
diff --git a/encoding/mvt/marshal_test.go b/encoding/mvt/marshal_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"math"
+	"os"
 	"reflect"
 	"testing"
 
@@ -388,7 +388,7 @@ func comparePoints(t testing.TB, e, r []orb.Point, xEpsilon, yEpsilon float64) {
 }
 
 func loadMVT(t testing.TB, tile maptile.Tile) []byte {
-	data, err := ioutil.ReadFile(fmt.Sprintf("testdata/%d-%d-%d.mvt", tile.Z, tile.X, tile.Y))
+	data, err := os.ReadFile(fmt.Sprintf("testdata/%d-%d-%d.mvt", tile.Z, tile.X, tile.Y))
 	if err != nil {
 		t.Fatalf("failed to load mvt file: %v", err)
 	}
@@ -397,7 +397,7 @@ func loadMVT(t testing.TB, tile maptile.Tile) []byte {
 }
 
 func loadGeoJSON(t testing.TB, tile maptile.Tile) map[string]*geojson.FeatureCollection {
-	data, err := ioutil.ReadFile(fmt.Sprintf("testdata/%d-%d-%d.json", tile.Z, tile.X, tile.Y))
+	data, err := os.ReadFile(fmt.Sprintf("testdata/%d-%d-%d.json", tile.Z, tile.X, tile.Y))
 	if err != nil {
 		t.Fatalf("failed to load mvt file: %v", err)
 	}
diff --git a/encoding/mvt/unmarshal.go b/encoding/mvt/unmarshal.go
@@ -5,7 +5,7 @@ import (
 	"compress/gzip"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 
 	"github.com/paulmach/orb"
 	"github.com/paulmach/orb/encoding/mvt/vectortile"
@@ -23,7 +23,7 @@ func UnmarshalGzipped(data []byte) (Layers, error) {
 		return nil, fmt.Errorf("failed to create gzreader: %v", err)
 	}
 
-	decoded, err := ioutil.ReadAll(gzreader)
+	decoded, err := io.ReadAll(gzreader)
 	if err != nil {
 		return nil, fmt.Errorf("failed to unzip: %v", err)
 	}
diff --git a/encoding/wkb/wkb_test.go b/encoding/wkb/wkb_test.go
@@ -3,7 +3,7 @@ package wkb
 import (
 	"bytes"
 	"encoding/binary"
-	"io/ioutil"
+	"io"
 	"testing"
 
 	"github.com/paulmach/orb"
@@ -27,7 +27,7 @@ func TestMustMarshal(t *testing.T) {
 
 func BenchmarkEncode_Point(b *testing.B) {
 	g := orb.Point{1, 2}
-	e := NewEncoder(ioutil.Discard)
+	e := NewEncoder(io.Discard)
 
 	b.ReportAllocs()
 	b.ResetTimer()
@@ -44,7 +44,7 @@ func BenchmarkEncode_LineString(b *testing.B) {
 		{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5},
 		{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5},
 	}
-	e := NewEncoder(ioutil.Discard)
+	e := NewEncoder(io.Discard)
 
 	b.ReportAllocs()
 	b.ResetTimer()
diff --git a/encoding/wkt/benchmarks_test.go b/encoding/wkt/benchmarks_test.go
@@ -2,7 +2,7 @@ package wkt
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/paulmach/orb"
@@ -103,7 +103,7 @@ func BenchmarkUnmarshalMultiPolygon(b *testing.B) {
 }
 
 func loadJSON(tb testing.TB, filename string, obj interface{}) {
-	data, err := ioutil.ReadFile(filename)
+	data, err := os.ReadFile(filename)
 	if err != nil {
 		tb.Fatalf("failed to load mvt file: %v", err)
 	}
diff --git a/geo/area.go b/geo/area.go
@@ -56,19 +56,20 @@ func ringArea(r orb.Ring) float64 {
 
 	area := 0.0
 	for i := 0; i < l; i++ {
-		if i == l-3 { // i = N-3
+		switch i {
+		case l - 3: // i = N-3
 			lo = l - 3
 			mi = l - 2
 			hi = 0
-		} else if i == l-2 { // i = N-2
+		case l - 2: // i = N-2
 			lo = l - 2
 			mi = 0
 			hi = 0
-		} else if i == l-1 { // i = N-1
+		case l - 1: // i = N-1
 			lo = 0
 			mi = 0
 			hi = 1
-		} else { // i = 0 to N-3
+		default: // i = 0 to N-3
 			lo = i
 			mi = i + 1
 			hi = i + 2
diff --git a/geojson/feature_test.go b/geojson/feature_test.go
@@ -3,7 +3,7 @@ package geojson
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"reflect"
 	"strings"
 	"testing"
@@ -424,7 +424,7 @@ func TestFeature_MarshalBSON_extraMembers(t *testing.T) {
 // }
 
 func BenchmarkFeatureMarshalJSON(b *testing.B) {
-	data, err := ioutil.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")
+	data, err := os.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")
 	if err != nil {
 		b.Fatalf("could not open file: %v", err)
 	}
@@ -446,7 +446,7 @@ func BenchmarkFeatureMarshalJSON(b *testing.B) {
 }
 
 func BenchmarkFeatureUnmarshalJSON(b *testing.B) {
-	data, err := ioutil.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")
+	data, err := os.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")
 	if err != nil {
 		b.Fatalf("could not open file: %v", err)
 	}
@@ -463,7 +463,7 @@ func BenchmarkFeatureUnmarshalJSON(b *testing.B) {
 }
 
 func BenchmarkFeatureMarshalBSON(b *testing.B) {
-	data, err := ioutil.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")
+	data, err := os.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")
 	if err != nil {
 		b.Fatalf("could not open file: %v", err)
 	}
@@ -485,7 +485,7 @@ func BenchmarkFeatureMarshalBSON(b *testing.B) {
 }
 
 func BenchmarkFeatureUnmarshalBSON(b *testing.B) {
-	data, err := ioutil.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")
+	data, err := os.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")
 	if err != nil {
 		b.Fatalf("could not open file: %v", err)
 	}
diff --git a/maptile/tile.go b/maptile/tile.go
@@ -228,9 +228,12 @@ func (t Tile) Children() Tiles {
 
 // ChildrenInZoomRange returns all the children tiles of tile from ranges [zoomStart, zoomEnd], both ends inclusive.
 func ChildrenInZoomRange(tile Tile, zoomStart, zoomEnd Zoom) Tiles {
+	//nolint:staticcheck // clearer this way
 	if !(zoomStart <= zoomEnd) {
 		panic("zoomStart must be <= zoomEnd")
 	}
+
+	//nolint:staticcheck // clearer this way
 	if !(tile.Z <= zoomStart) {
 		panic("tile.Z is must be <= zoomStart")
 	}
diff --git a/maptile/tilecover/cover_test.go b/maptile/tilecover/cover_test.go
@@ -2,8 +2,8 @@ package tilecover
 
 import (
 	"encoding/json"
-	"io/ioutil"
 	"math"
+	"os"
 	"sort"
 	"strings"
 	"testing"
@@ -92,7 +92,7 @@ func TestTestdata(t *testing.T) {
 
 			// ts := Geometry(f.Geometry, tc.max)
 			// blob, _ := json.MarshalIndent(MergeUp(ts, tc.min).ToFeatureCollection(), "", "  ")
-			// ioutil.WriteFile("./testdata/"+tc.name+"_out.geojson", blob, 0644)
+			// os.WriteFile("./testdata/"+tc.name+"_out.geojson", blob, 0644)
 
 			expected := loadFeatureCollection(t, "./testdata/"+tc.name+"_out.geojson")
 
@@ -108,7 +108,7 @@ func TestTestdata(t *testing.T) {
 }
 
 func TestCountries(t *testing.T) {
-	files, err := ioutil.ReadDir("./testdata/world")
+	files, err := os.ReadDir("./testdata/world")
 	if err != nil {
 		t.Errorf("could not read directory: %v", err)
 	}
@@ -182,7 +182,7 @@ func sortFC(fc *geojson.FeatureCollection) {
 
 func loadFeature(t testing.TB, path string) *geojson.Feature {
 	t.Helper()
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		t.Fatalf("unable to read file: %v", err)
 	}
@@ -210,7 +210,7 @@ func loadFeature(t testing.TB, path string) *geojson.Feature {
 
 func loadFeatureCollection(t testing.TB, path string) *geojson.FeatureCollection {
 	t.Helper()
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		t.Fatalf("unable to read file: %v", err)
 	}
@@ -250,7 +250,7 @@ func output(t testing.TB, name string, r *geojson.FeatureCollection) {
 		t.Fatalf("error marshalling json: %v", err)
 	}
 
-	err = ioutil.WriteFile("failure_"+name+".geojson", data, 0644)
+	err = os.WriteFile("failure_"+name+".geojson", data, 0644)
 	if err != nil {
 		t.Fatalf("write file failure: %v", err)
 	}
diff --git a/planar/contains.go b/planar/contains.go
@@ -66,7 +66,8 @@ func rayIntersect(p, s, e orb.Point) (intersects, on bool) {
 		s, e = e, s
 	}
 
-	if p[0] == s[0] {
+	switch p[0] {
+	case s[0]:
 		if p[1] == s[1] {
 			// p == start
 			return false, true
@@ -84,7 +85,7 @@ func rayIntersect(p, s, e orb.Point) (intersects, on bool) {
 
 		// Move the y coordinate to deal with degenerate case
 		p[0] = math.Nextafter(p[0], math.Inf(1))
-	} else if p[0] == e[0] {
+	case e[0]:
 		if p[1] == e[1] {
 			// matching the end point
 			return false, true
diff --git a/simplify/benchmarks_test.go b/simplify/benchmarks_test.go
@@ -164,7 +164,11 @@ func benchmarkData() orb.LineString {
 	if err != nil {
 		panic(err)
 	}
-	defer f.Close()
+	defer func() {
+		if err := f.Close(); err != nil {
+			panic(err)
+		}
+	}()
 
 	var points []float64
 	err = json.NewDecoder(f).Decode(&points)

Original file line number	Diff line number	Diff line change
`@@ -284,11 +284,12 @@ func readByteOrderType(r io.Reader, buf []byte) (byteOrder, uint32, int, error)`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`var order byteOrder`
`287`		`- if buf[0] == 0 {`
	`287`	`+ switch buf[0] {`
	`288`	`+ case 0:`
`288`	`289`	`order = bigEndian`
`289`		`- } else if buf[0] == 1 {`
	`290`	`+ case 1:`
`290`	`291`	`order = littleEndian`
`291`		`- } else {`
	`292`	`+ default:`
`292`	`293`	`return 0, 0, 0, ErrNotWKB`
`293`	`294`	`}`
`294`	`295`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"encoding/json"`
`6`	`6`	`"fmt"`
`7`		`- "io/ioutil"`
`8`	`7`	`"math"`
	`8`	`+ "os"`
`9`	`9`	`"reflect"`
`10`	`10`	`"testing"`
`11`	`11`
`@@ -388,7 +388,7 @@ func comparePoints(t testing.TB, e, r []orb.Point, xEpsilon, yEpsilon float64) {`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`func loadMVT(t testing.TB, tile maptile.Tile) []byte {`
`391`		`- data, err := ioutil.ReadFile(fmt.Sprintf("testdata/%d-%d-%d.mvt", tile.Z, tile.X, tile.Y))`
	`391`	`+ data, err := os.ReadFile(fmt.Sprintf("testdata/%d-%d-%d.mvt", tile.Z, tile.X, tile.Y))`
`392`	`392`	`if err != nil {`
`393`	`393`	`t.Fatalf("failed to load mvt file: %v", err)`
`394`	`394`	`}`
`@@ -397,7 +397,7 @@ func loadMVT(t testing.TB, tile maptile.Tile) []byte {`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`func loadGeoJSON(t testing.TB, tile maptile.Tile) map[string]*geojson.FeatureCollection {`
`400`		`- data, err := ioutil.ReadFile(fmt.Sprintf("testdata/%d-%d-%d.json", tile.Z, tile.X, tile.Y))`
	`400`	`+ data, err := os.ReadFile(fmt.Sprintf("testdata/%d-%d-%d.json", tile.Z, tile.X, tile.Y))`
`401`	`401`	`if err != nil {`
`402`	`402`	`t.Fatalf("failed to load mvt file: %v", err)`
`403`	`403`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package wkt`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`		`- "io/ioutil"`
	`5`	`+ "os"`
`6`	`6`	`"testing"`
`7`	`7`
`8`	`8`	`"github.com/paulmach/orb"`
`@@ -103,7 +103,7 @@ func BenchmarkUnmarshalMultiPolygon(b *testing.B) {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`func loadJSON(tb testing.TB, filename string, obj interface{}) {`
`106`		`- data, err := ioutil.ReadFile(filename)`
	`106`	`+ data, err := os.ReadFile(filename)`
`107`	`107`	`if err != nil {`
`108`	`108`	`tb.Fatalf("failed to load mvt file: %v", err)`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package geojson`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"encoding/json"`
`6`		`- "io/ioutil"`
	`6`	`+ "os"`
`7`	`7`	`"reflect"`
`8`	`8`	`"strings"`
`9`	`9`	`"testing"`
`@@ -424,7 +424,7 @@ func TestFeature_MarshalBSON_extraMembers(t *testing.T) {`
`424`	`424`	`// }`
`425`	`425`
`426`	`426`	`func BenchmarkFeatureMarshalJSON(b *testing.B) {`
`427`		`- data, err := ioutil.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")`
	`427`	`+ data, err := os.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")`
`428`	`428`	`if err != nil {`
`429`	`429`	`b.Fatalf("could not open file: %v", err)`
`430`	`430`	`}`
`@@ -446,7 +446,7 @@ func BenchmarkFeatureMarshalJSON(b *testing.B) {`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`func BenchmarkFeatureUnmarshalJSON(b *testing.B) {`
`449`		`- data, err := ioutil.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")`
	`449`	`+ data, err := os.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")`
`450`	`450`	`if err != nil {`
`451`	`451`	`b.Fatalf("could not open file: %v", err)`
`452`	`452`	`}`
`@@ -463,7 +463,7 @@ func BenchmarkFeatureUnmarshalJSON(b *testing.B) {`
`463`	`463`	`}`
`464`	`464`
`465`	`465`	`func BenchmarkFeatureMarshalBSON(b *testing.B) {`
`466`		`- data, err := ioutil.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")`
	`466`	`+ data, err := os.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")`
`467`	`467`	`if err != nil {`
`468`	`468`	`b.Fatalf("could not open file: %v", err)`
`469`	`469`	`}`
`@@ -485,7 +485,7 @@ func BenchmarkFeatureMarshalBSON(b *testing.B) {`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`func BenchmarkFeatureUnmarshalBSON(b *testing.B) {`
`488`		`- data, err := ioutil.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")`
	`488`	`+ data, err := os.ReadFile("../encoding/mvt/testdata/16-17896-24449.json")`
`489`	`489`	`if err != nil {`
`490`	`490`	`b.Fatalf("could not open file: %v", err)`
`491`	`491`	`}`