mirror of
https://github.com/Luzifer/staticmap.git
synced 2024-12-20 12:51:18 +00:00
Lint: Fix linter errors
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
parent
3bb2ce36fe
commit
aea881c15c
3 changed files with 8 additions and 8 deletions
8
main.go
8
main.go
|
@ -67,7 +67,7 @@ func main() {
|
||||||
rateLimit.SetIPLookups([]string{"X-Forwarded-For", "RemoteAddr", "X-Real-IP"})
|
rateLimit.SetIPLookups([]string{"X-Forwarded-For", "RemoteAddr", "X-Real-IP"})
|
||||||
|
|
||||||
r := mux.NewRouter()
|
r := mux.NewRouter()
|
||||||
r.HandleFunc("/status", func(res http.ResponseWriter, r *http.Request) { http.Error(res, "I'm fine", http.StatusOK) })
|
r.HandleFunc("/status", func(res http.ResponseWriter, _ *http.Request) { http.Error(res, "I'm fine", http.StatusOK) })
|
||||||
r.Handle("/map.png", tollbooth.LimitFuncHandler(rateLimit, handleMapRequest)).Methods("GET")
|
r.Handle("/map.png", tollbooth.LimitFuncHandler(rateLimit, handleMapRequest)).Methods("GET")
|
||||||
r.Handle("/map.png", tollbooth.LimitFuncHandler(rateLimit, handlePostMapRequest)).Methods("POST")
|
r.Handle("/map.png", tollbooth.LimitFuncHandler(rateLimit, handlePostMapRequest)).Methods("POST")
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ func main() {
|
||||||
ReadHeaderTimeout: time.Second,
|
ReadHeaderTimeout: time.Second,
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.WithField("version", version).Info("staticmap started")
|
logrus.WithField("version", version).WithField("addr", cfg.Listen).Info("staticmap started")
|
||||||
if err = server.ListenAndServe(); err != nil {
|
if err = server.ListenAndServe(); err != nil {
|
||||||
logrus.WithError(err).Fatal("running HTTP server")
|
logrus.WithError(err).Fatal("running HTTP server")
|
||||||
}
|
}
|
||||||
|
@ -173,7 +173,7 @@ func parseCoordinate(coord string) (s2.LatLng, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
parts := strings.Split(coord, ",")
|
parts := strings.Split(coord, ",")
|
||||||
if len(parts) != 2 { //nolint:gomnd
|
if len(parts) != 2 { //nolint:mnd
|
||||||
return s2.LatLng{}, errors.New("Coordinate not in format lat,lon")
|
return s2.LatLng{}, errors.New("Coordinate not in format lat,lon")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -200,7 +200,7 @@ func parseSize(size string) (x, y int, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
parts := strings.Split(size, "x")
|
parts := strings.Split(size, "x")
|
||||||
if len(parts) != 2 { //nolint:gomnd
|
if len(parts) != 2 { //nolint:mnd
|
||||||
return 0, 0, errors.New("Size not in format 600x300")
|
return 0, 0, errors.New("Size not in format 600x300")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
6
map.go
6
map.go
|
@ -14,7 +14,7 @@ import (
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
//nolint:gomnd // these are the "constant" definitions
|
//nolint:mnd // these are the "constant" definitions
|
||||||
var markerColors = map[string]color.Color{
|
var markerColors = map[string]color.Color{
|
||||||
"black": color.RGBA{R: 145, G: 145, B: 145, A: 0xff},
|
"black": color.RGBA{R: 145, G: 145, B: 145, A: 0xff},
|
||||||
"brown": color.RGBA{R: 178, G: 154, B: 123, A: 0xff},
|
"brown": color.RGBA{R: 178, G: 154, B: 123, A: 0xff},
|
||||||
|
@ -30,7 +30,7 @@ var markerColors = map[string]color.Color{
|
||||||
|
|
||||||
type markerSize float64
|
type markerSize float64
|
||||||
|
|
||||||
//nolint:gomnd // these are the "constant" definitions
|
//nolint:mnd // these are the "constant" definitions
|
||||||
var markerSizes = map[string]markerSize{
|
var markerSizes = map[string]markerSize{
|
||||||
"tiny": 10,
|
"tiny": 10,
|
||||||
"mid": 15,
|
"mid": 15,
|
||||||
|
@ -97,7 +97,7 @@ func generateMap(opts generateMapConfig) (io.Reader, error) {
|
||||||
|
|
||||||
if opts.Markers != nil {
|
if opts.Markers != nil {
|
||||||
for _, m := range opts.Markers {
|
for _, m := range opts.Markers {
|
||||||
ctx.AddMarker(staticMap.NewMarker(m.pos, m.color, float64(m.size)))
|
ctx.AddObject(staticMap.NewMarker(m.pos, m.color, float64(m.size)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -105,7 +105,7 @@ func (p postMapOverlay) toOverlays() ([]*staticMap.TileProvider, error) {
|
||||||
|
|
||||||
result = append(result, &staticMap.TileProvider{
|
result = append(result, &staticMap.TileProvider{
|
||||||
Name: fmt.Sprintf("%x", sha256.Sum256([]byte(pat))),
|
Name: fmt.Sprintf("%x", sha256.Sum256([]byte(pat))),
|
||||||
TileSize: 256, //nolint:gomnd
|
TileSize: 256, //nolint:mnd
|
||||||
URLPattern: pat,
|
URLPattern: pat,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue