From cbd5cf6393586c8a2eeb0017cc0d546b2de31632 Mon Sep 17 00:00:00 2001
From: Ramy Aboul Naga <ramy.naga@gmail.com>
Date: Mon, 28 Jan 2019 11:14:55 +0100
Subject: [PATCH] Use type switch in favor of fmt.Sprint

---
 baked_in.go       | 40 ++++++++++++++++++++++++++++++++++++++--
 validator_test.go | 10 +++++++++-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/baked_in.go b/baked_in.go
index 0b7a545..74dc35e 100644
--- a/baked_in.go
+++ b/baked_in.go
@@ -304,12 +304,48 @@ func isSSN(fl FieldLevel) bool {
 
 // IsLongitude is the validation function for validating if the field's value is a valid longitude coordinate.
 func isLongitude(fl FieldLevel) bool {
-	return longitudeRegex.MatchString(fmt.Sprint(fl.Field().Interface()))
+	field := fl.Field()
+
+	var v string
+	switch field.Kind() {
+	case reflect.String:
+		v = field.String()
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		v = strconv.FormatInt(field.Int(), 10)
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		v = strconv.FormatUint(field.Uint(), 10)
+	case reflect.Float32:
+		v = strconv.FormatFloat(field.Float(), 'f', -1, 32)
+	case reflect.Float64:
+		v = strconv.FormatFloat(field.Float(), 'f', -1, 64)
+	default:
+		panic(fmt.Sprintf("Bad field type %T", field.Interface()))
+	}
+
+	return longitudeRegex.MatchString(v)
 }
 
 // IsLatitude is the validation function for validating if the field's value is a valid latitude coordinate.
 func isLatitude(fl FieldLevel) bool {
-	return latitudeRegex.MatchString(fmt.Sprint(fl.Field().Interface()))
+	field := fl.Field()
+
+	var v string
+	switch field.Kind() {
+	case reflect.String:
+		v = field.String()
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		v = strconv.FormatInt(field.Int(), 10)
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		v = strconv.FormatUint(field.Uint(), 10)
+	case reflect.Float32:
+		v = strconv.FormatFloat(field.Float(), 'f', -1, 32)
+	case reflect.Float64:
+		v = strconv.FormatFloat(field.Float(), 'f', -1, 64)
+	default:
+		panic(fmt.Sprintf("Bad field type %T", field.Interface()))
+	}
+
+	return latitudeRegex.MatchString(v)
 }
 
 // IsDataURI is the validation function for validating if the field's value is a valid data URI.
diff --git a/validator_test.go b/validator_test.go
index 98cacba..c082536 100644
--- a/validator_test.go
+++ b/validator_test.go
@@ -3344,6 +3344,8 @@ func TestLongitudeValidation(t *testing.T) {
 		{"+73.234", true},
 		{"+382.3811", false},
 		{"23.11111111", true},
+		{uint(180), true},
+		{float32(-180.0), true},
 		{-180, true},
 		{180.1, false},
 	}
@@ -3369,6 +3371,8 @@ func TestLongitudeValidation(t *testing.T) {
 			}
 		}
 	}
+
+	PanicMatches(t, func() { validate.Var(true, "longitude") }, "Bad field type bool")
 }
 
 func TestLatitudeValidation(t *testing.T) {
@@ -3382,8 +3386,10 @@ func TestLatitudeValidation(t *testing.T) {
 		{"47.1231231", true},
 		{"+99.9", false},
 		{"108", false},
+		{uint(90), true},
+		{float32(-90.0), true},
 		{-90, true},
-		{90, true},
+		{90.1, false},
 	}
 
 	validate := New()
@@ -3407,6 +3413,8 @@ func TestLatitudeValidation(t *testing.T) {
 			}
 		}
 	}
+
+	PanicMatches(t, func() { validate.Var(true, "latitude") }, "Bad field type bool")
 }
 
 func TestDataURIValidation(t *testing.T) {