Merge pull request #38 from twpayne/update-deps

Miscellaneous updates

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
     - run: go build ./...
     - run: go test ./...
@@ -21,8 +21,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
     - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
-    - uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64
+    - uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86
       with:
-        version: v1.59.1
+        version: v1.61.0

.golangci.yml

@@ -1,11 +1,16 @@
+run:
+  go: '1.22'
+
 linters:
   enable:
   - asasalint
   - asciicheck
   - bidichk
   - bodyclose
+  - canonicalheader
   - containedctx
   - contextcheck
+  - copyloopvar
   - decorder
   - dogsled
   - dupl
@@ -17,7 +22,6 @@ linters:
   - errname
   - errorlint
   - exhaustive
-  - exportloopref
   - fatcontext
   - forbidigo
   - forcetypeassert
@@ -47,6 +51,7 @@ linters:
   - inamedparam
   - ineffassign
   - interfacebloat
+  - intrange
   - ireturn
   - loggercheck
   - makezero
@@ -77,6 +82,7 @@ linters:
   - tagalign
   - tagliatelle
   - tenv
+  - testableexamples
   - testifylint
   - testpackage
   - thelper
@@ -90,7 +96,6 @@ linters:
   - whitespace
   - zerologlint
   disable:
-  - canonicalheader
   - cyclop
   - depguard
   - exhaustruct
@@ -102,7 +107,6 @@ linters:
   - maintidx
   - nlreturn
   - paralleltest
-  - testableexamples
   - varnamelen
   - wrapcheck
   - wsl
@@ -115,7 +119,6 @@ linters-settings:
     - prefix(github.com/twpayne/go-kml)
   gofumpt:
     extra-rules: true
-    local-prefixes: github.com/twpayne/go-kml
   goimports:
     local-prefixes: github.com/twpayne/go-kml
   govet:

go.mod

@@ -1,6 +1,6 @@
 module github.com/twpayne/go-kml/v3
 
-go 1.21
+go 1.22
 
 require (
 	github.com/alecthomas/assert/v2 v2.10.0

kmz_test.go

@@ -1,6 +1,10 @@
 package kml_test
 
 import (
+	"archive/zip"
+	"bytes"
+	"fmt"
+	"io"
 	"os"
 
 	"github.com/twpayne/go-kml/v3"
@@ -18,9 +22,32 @@ func ExampleWriteKMZ() {
 		),
 	)
 
-	if err := kml.WriteKMZ(os.Stdout, map[string]any{
+	var buffer bytes.Buffer
+	buffer.Grow(512)
+	if err := kml.WriteKMZ(&buffer, map[string]any{
 		"doc.kml": doc,
 	}); err != nil {
 		panic(err)
 	}
+
+	zipReader, err := zip.NewReader(bytes.NewReader(buffer.Bytes()), int64(buffer.Len()))
+	if err != nil {
+		panic(err)
+	}
+	for _, zipFile := range zipReader.File {
+		fmt.Println(zipFile.Name + ":")
+		file, err := zipFile.Open()
+		if err != nil {
+			panic(err)
+		}
+		if _, err := io.Copy(os.Stdout, file); err != nil { //nolint:gosec
+			panic(err)
+		}
+		file.Close()
+	}
+
+	// Output:
+	// doc.kml:
+	// <?xml version="1.0" encoding="UTF-8"?>
+	// <kml xmlns="http://www.opengis.net/kml/2.2"><Placemark><name>Zürich</name><Point><coordinates>8.541111,47.374444</coordinates></Point></Placemark></kml>
 }

sphere/sphere.go

@@ -46,7 +46,7 @@ func (t T) Offset(origin kml.Coordinate, distance, bearing float64) kml.Coordina
 func (t T) Circle(center kml.Coordinate, radius, maxErr float64) []kml.Coordinate {
 	numVertices := int(math.Ceil(math.Pi / math.Acos((radius-maxErr)/(radius+maxErr))))
 	cs := make([]kml.Coordinate, numVertices+1)
-	for i := 0; i < numVertices; i++ {
+	for i := range numVertices {
 		cs[i] = t.Offset(center, radius, 360*float64(i)/float64(numVertices))
 	}
 	cs[numVertices] = cs[0]