Compare commits

...

2 Commits

Author SHA1 Message Date
07712aa08c fix timeext under 32bit compilation 2022-10-29 15:11:08 +02:00
f5243503db Add GeoDistance 2022-10-27 18:57:24 +02:00
2 changed files with 13 additions and 3 deletions

View File

@@ -9,3 +9,13 @@ func DegToRad(deg float64) float64 {
func RadToDeg(rad float64) float64 {
return rad / (math.Pi * 180.0)
}
func GeoDistance(lon1 float64, lat1 float64, lon2 float64, lat2 float64) float64 {
var d1 = DegToRad(lat1)
var num1 = DegToRad(lon1)
var d2 = DegToRad(lat2)
var num2 = DegToRad(lon2) - num1
var d3 = math.Pow(math.Sin((d2-d1)/2.0), 2.0) + math.Cos(d1)*math.Cos(d2)*math.Pow(math.Sin(num2/2.0), 2.0)
return 6376500.0 * (2.0 * math.Atan2(math.Sqrt(d3), math.Sqrt(1.0-d3)))
}

View File

@@ -84,7 +84,7 @@ func IsDatePartEqual(a time.Time, b time.Time, tz *time.Location) bool {
func WithTimePart(base time.Time, hour, minute, second int) time.Time {
datepart := TimeToDatePart(base, base.Location())
delta := time.Duration(hour*int(time.Hour) + minute*int(time.Minute) + second*int(time.Second))
delta := time.Duration(int64(hour)*int64(time.Hour) + int64(minute)*int64(time.Minute) + int64(second)*int64(time.Second))
return datepart.Add(delta)
}
@@ -94,7 +94,7 @@ func WithTimePart(base time.Time, hour, minute, second int) time.Time {
func CombineDateAndTime(d time.Time, t time.Time) time.Time {
datepart := TimeToDatePart(d, d.Location())
delta := time.Duration(t.Hour()*int(time.Hour) + t.Minute()*int(time.Minute) + t.Second()*int(time.Second) + t.Nanosecond()*int(time.Nanosecond))
delta := time.Duration(int64(t.Hour())*int64(time.Hour) + int64(t.Minute())*int64(time.Minute) + int64(t.Second())*int64(time.Second) + int64(t.Nanosecond())*int64(time.Nanosecond))
return datepart.Add(delta)
}
@@ -108,7 +108,7 @@ func IsSunday(t time.Time, tz *time.Location) bool {
}
func DurationFromTime(hours int, minutes int, seconds int) time.Duration {
return time.Duration(hours*int(time.Hour) + minutes*int(time.Minute) + seconds*int(time.Second))
return time.Duration(int64(hours)*int64(time.Hour) + int64(minutes)*int64(time.Minute) + int64(seconds)*int64(time.Second))
}
func Min(a time.Time, b time.Time) time.Time {