iterface{} -> any and go.mod back down to 1.18

bound.go

@@ -8,6 +8,7 @@ var emptyBound = Bound{Min: Point{1, 1}, Max: Point{-1, -1}}
 
 // A Bound represents a closed box or rectangle.
 // To create a bound with two points you can do something like:
+//
 //	orb.MultiPoint{p1, p2}.Bound()
 type Bound struct {
 	Min, Max Point

clip/smartclip/smart.go

@@ -338,11 +338,11 @@ func smartWrap(box orb.Bound, input []orb.LineString, o orb.Orientation) orb.Mul
 
 const notOnSide = 0xFF
 
-//    4
-//   +-+
-// 1 | | 3
-//   +-+
-//    2
+// :    4
+// :   +-+
+// : 1 | | 3
+// :   +-+
+// :    2
 func pointSide(b orb.Bound, p orb.Point) uint8 {
 	if p[1] == b.Max[1] {
 		return 4

encoding/ewkb/scanner.go

@@ -28,7 +28,7 @@ var (
 //	}
 type GeometryScanner struct {
 	sridInPrefix bool
-	g            interface{}
+	g            any
 	SRID         int
 	Geometry     orb.Geometry
 	Valid        bool // Valid is true if the geometry is not NULL
@@ -56,7 +56,7 @@ type GeometryScanner struct {
 //	} else {
 //	  // NULL value
 //	}
-func Scanner(g interface{}) *GeometryScanner {
+func Scanner(g any) *GeometryScanner {
 	return &GeometryScanner{g: g}
 }
 
@@ -75,20 +75,20 @@ func Scanner(g interface{}) *GeometryScanner {
 //		Scan(&srid, wkb.Scanner(&p))
 //
 // https://dev.mysql.com/doc/refman/5.7/en/gis-data-formats.html
-func ScannerPrefixSRID(g interface{}) *GeometryScanner {
+func ScannerPrefixSRID(g any) *GeometryScanner {
 	return &GeometryScanner{sridInPrefix: true, g: g}
 }
 
 // Scan will scan the input []byte data into a geometry.
 // This could be into the orb geometry type pointer or, if nil,
 // the scanner.Geometry attribute.
-func (s *GeometryScanner) Scan(d interface{}) error {
+func (s *GeometryScanner) Scan(d any) error {
 	s.Geometry = nil
 	s.Valid = false
 
 	var (
 		srid int
-		data interface{}
+		data any
 	)
 
 	data = d

encoding/ewkb/scanner_test.go

@@ -329,7 +329,7 @@ func TestScanPoint_errors(t *testing.T) {
 	// error conditions
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -496,7 +496,7 @@ func TestScanMultiPoint(t *testing.T) {
 func TestScanMultiPoint_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -590,7 +590,7 @@ func TestScanLineString(t *testing.T) {
 func TestScanLineString_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -684,7 +684,7 @@ func TestScanMultiLineString(t *testing.T) {
 func TestScanMultiLineString_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -772,7 +772,7 @@ func TestScanRing(t *testing.T) {
 func TestScanRing_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -866,7 +866,7 @@ func TestScanPolygon(t *testing.T) {
 func TestScanPolygon_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -966,7 +966,7 @@ func TestScanMultiPolygon(t *testing.T) {
 func TestScanMultiPolygon_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -1054,7 +1054,7 @@ func TestScanCollection(t *testing.T) {
 func TestScanCollection_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -1148,7 +1148,7 @@ func TestScanBound(t *testing.T) {
 func TestScanBound_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{

encoding/internal/wkbcommon/scan.go

@@ -34,7 +34,7 @@ var (
 // Scan will scan the input []byte data into a geometry.
 // This could be into the orb geometry type pointer or, if nil,
 // the scanner.Geometry attribute.
-func Scan(g, d interface{}) (orb.Geometry, int, bool, error) {
+func Scan(g, d any) (orb.Geometry, int, bool, error) {
 	if d == nil {
 		return nil, 0, false, nil
 	}

encoding/mvt/geometry.go

@@ -137,15 +137,15 @@ type keyValueEncoder struct {
 	keyMap map[string]uint32
 
 	Values   []*vectortile.Tile_Value
-	valueMap map[interface{}]uint32
+	valueMap map[any]uint32
 
 	keySortBuffer []string
 }
 
 func newKeyValueEncoder() *keyValueEncoder {
 	return &keyValueEncoder{
 		keyMap:   make(map[string]uint32),
-		valueMap: make(map[interface{}]uint32),
+		valueMap: make(map[any]uint32),
 	}
 }
 
@@ -161,7 +161,7 @@ func (kve *keyValueEncoder) Key(s string) uint32 {
 	return i
 }
 
-func (kve *keyValueEncoder) Value(v interface{}) (uint32, error) {
+func (kve *keyValueEncoder) Value(v any) (uint32, error) {
 	// If a type is not comparable we can't figure out uniqueness in the hash,
 	// we also can't encode it into a vectortile.Tile_Value.
 	// So we encoded it as a json string, which is what other encoders
@@ -191,7 +191,7 @@ func (kve *keyValueEncoder) Value(v interface{}) (uint32, error) {
 	return i, nil
 }
 
-func encodeValue(v interface{}) (*vectortile.Tile_Value, error) {
+func encodeValue(v any) (*vectortile.Tile_Value, error) {
 	tv := &vectortile.Tile_Value{}
 	switch t := v.(type) {
 	case string:
@@ -242,7 +242,7 @@ func encodeValue(v interface{}) (*vectortile.Tile_Value, error) {
 	return tv, nil
 }
 
-func decodeValue(v *vectortile.Tile_Value) interface{} {
+func decodeValue(v *vectortile.Tile_Value) any {
 	if v == nil {
 		return nil
 	}

encoding/mvt/geometry_test.go

@@ -208,8 +208,8 @@ func (s stringer) String() string {
 func TestEncodeValue(t *testing.T) {
 	cases := []struct {
 		name   string
-		input  interface{}
-		output interface{}
+		input  any
+		output any
 	}{
 		{
 			name:   "string",
@@ -303,7 +303,7 @@ func TestEncodeValue(t *testing.T) {
 	}
 
 	// error if a weird type, but typical json decode result
-	input := map[string]interface{}{
+	input := map[string]any{
 		"a": 1,
 		"b": 2,
 	}

encoding/mvt/marshal.go

@@ -96,7 +96,7 @@ func addFeature(layer *vectortile.Tile_Layer, kve *keyValueEncoder, f *geojson.F
 	return addSingleGeometryFeature(layer, kve, f.Geometry, f.Properties, f.ID)
 }
 
-func addSingleGeometryFeature(layer *vectortile.Tile_Layer, kve *keyValueEncoder, g orb.Geometry, p geojson.Properties, id interface{}) error {
+func addSingleGeometryFeature(layer *vectortile.Tile_Layer, kve *keyValueEncoder, g orb.Geometry, p geojson.Properties, id any) error {
 	geomType, encodedGeometry, err := encodeGeometry(g)
 	if err != nil {
 		return err
@@ -141,7 +141,7 @@ func encodeProperties(kve *keyValueEncoder, properties geojson.Properties) ([]ui
 	return tags, nil
 }
 
-func convertID(id interface{}) *uint64 {
+func convertID(id any) *uint64 {
 	if id == nil {
 		return nil
 	}

encoding/mvt/marshal_test.go

@@ -284,11 +284,11 @@ func compareProperties(t testing.TB, result, expected geojson.Properties) {
 	t.Helper()
 
 	// properties
-	fr := map[string]interface{}(result)
-	fe := map[string]interface{}(expected)
+	fr := map[string]any(result)
+	fe := map[string]any(expected)
 
 	for k, v := range fe {
-		if _, ok := v.([]interface{}); ok {
+		if _, ok := v.([]any); ok {
 			// arrays are not included
 			delete(fr, k)
 			delete(fe, k)
@@ -414,7 +414,7 @@ func loadGeoJSON(t testing.TB, tile maptile.Tile) map[string]*geojson.FeatureCol
 func TestMarshal_ID(t *testing.T) {
 	cases := []struct {
 		name string
-		id   interface{}
+		id   any
 		val  float64
 	}{
 		{

encoding/mvt/unmarshal.go

@@ -45,7 +45,7 @@ func Unmarshal(data []byte) (Layers, error) {
 // decoder is here to reuse objects to save allocations/memory.
 type decoder struct {
 	keys     []string
-	values   []interface{}
+	values   []any
 	features [][]byte
 
 	valMsg *protoscan.Message
@@ -429,7 +429,7 @@ func (gd *geomDecoder) done() bool {
 	return !gd.iter.HasNext()
 }
 
-func decodeValueMsg(msg *protoscan.Message) (interface{}, error) {
+func decodeValueMsg(msg *protoscan.Message) (any, error) {
 	for msg.Next() {
 		switch msg.FieldNumber() {
 		case 1:

encoding/wkb/scanner.go

@@ -25,7 +25,7 @@ var (
 //	  // NULL value
 //	}
 type GeometryScanner struct {
-	g        interface{}
+	g        any
 	Geometry orb.Geometry
 	Valid    bool // Valid is true if the geometry is not NULL
 }
@@ -59,14 +59,14 @@ type GeometryScanner struct {
 // first 4 bytes and try again. This works for most use cases.
 //
 // For supported behavior see `ewkb.ScannerPrefixSRID`
-func Scanner(g interface{}) *GeometryScanner {
+func Scanner(g any) *GeometryScanner {
 	return &GeometryScanner{g: g}
 }
 
 // Scan will scan the input []byte data into a geometry.
 // This could be into the orb geometry type pointer or, if nil,
 // the scanner.Geometry attribute.
-func (s *GeometryScanner) Scan(d interface{}) error {
+func (s *GeometryScanner) Scan(d any) error {
 	if d == nil {
 		return nil
 	}

encoding/wkb/scanner_test.go

@@ -191,7 +191,7 @@ func TestScanPoint_errors(t *testing.T) {
 	// error conditions
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -293,7 +293,7 @@ func TestScanMultiPoint(t *testing.T) {
 func TestScanMultiPoint_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -385,7 +385,7 @@ func TestScanLineString(t *testing.T) {
 func TestScanLineString_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -482,7 +482,7 @@ func TestScanMultiLineString(t *testing.T) {
 func TestScanMultiLineString_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -564,7 +564,7 @@ func TestScanRing(t *testing.T) {
 func TestScanRing_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -656,7 +656,7 @@ func TestScanPolygon(t *testing.T) {
 func TestScanPolygon_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -753,7 +753,7 @@ func TestScanMultiPolygon(t *testing.T) {
 func TestScanMultiPolygon_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -835,7 +835,7 @@ func TestScanCollection(t *testing.T) {
 func TestScanCollection_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{
@@ -957,7 +957,7 @@ func TestScanBound(t *testing.T) {
 func TestScanBound_errors(t *testing.T) {
 	cases := []struct {
 		name string
-		data interface{}
+		data any
 		err  error
 	}{
 		{

encoding/wkt/benchmarks_test.go

@@ -102,7 +102,7 @@ func BenchmarkUnmarshalMultiPolygon(b *testing.B) {
 	}
 }
 
-func loadJSON(tb testing.TB, filename string, obj interface{}) {
+func loadJSON(tb testing.TB, filename string, obj any) {
 	data, err := os.ReadFile(filename)
 	if err != nil {
 		tb.Fatalf("failed to load mvt file: %v", err)