|
4 | 4 | "bytes" |
5 | 5 | "errors" |
6 | 6 | "fmt" |
7 | | - "math" |
8 | 7 | "strconv" |
9 | 8 | "strings" |
10 | 9 | "time" |
@@ -87,19 +86,19 @@ func parseRectArea(ltyp string, vs []string) (nvs []string, |
87 | 86 | return |
88 | 87 | } |
89 | 88 | var minLat, minLon, maxLat, maxLon float64 |
90 | | - if minLat, err = strconv.ParseFloat(sminLat, 64); err != nil || math.IsInf(minLat, 0) || math.IsNaN(minLat) { |
| 89 | + if minLat, err = strconv.ParseFloat(sminLat, 64); err != nil { |
91 | 90 | err = errInvalidArgument(sminLat) |
92 | 91 | return |
93 | 92 | } |
94 | | - if minLon, err = strconv.ParseFloat(sminLon, 64); err != nil || math.IsInf(minLon, 0) || math.IsNaN(minLon) { |
| 93 | + if minLon, err = strconv.ParseFloat(sminLon, 64); err != nil { |
95 | 94 | err = errInvalidArgument(sminLon) |
96 | 95 | return |
97 | 96 | } |
98 | | - if maxLat, err = strconv.ParseFloat(smaxlat, 64); err != nil || math.IsInf(maxLat, 0) || math.IsNaN(maxLat) { |
| 97 | + if maxLat, err = strconv.ParseFloat(smaxlat, 64); err != nil { |
99 | 98 | err = errInvalidArgument(smaxlat) |
100 | 99 | return |
101 | 100 | } |
102 | | - if maxLon, err = strconv.ParseFloat(smaxlon, 64); err != nil || math.IsInf(maxLon, 0) || math.IsNaN(maxLon) { |
| 101 | + if maxLon, err = strconv.ParseFloat(smaxlon, 64); err != nil { |
103 | 102 | err = errInvalidArgument(smaxlon) |
104 | 103 | return |
105 | 104 | } |
@@ -246,11 +245,11 @@ func (s *Server) cmdSearchArgs( |
246 | 245 | return |
247 | 246 | } |
248 | 247 | var lat, lon, meters float64 |
249 | | - if lat, err = strconv.ParseFloat(slat, 64); err != nil || math.IsInf(lat, 0) || math.IsNaN(lat) { |
| 248 | + if lat, err = strconv.ParseFloat(slat, 64); err != nil { |
250 | 249 | err = errInvalidArgument(slat) |
251 | 250 | return |
252 | 251 | } |
253 | | - if lon, err = strconv.ParseFloat(slon, 64); err != nil || math.IsInf(lon, 0) || math.IsNaN(lon) { |
| 252 | + if lon, err = strconv.ParseFloat(slon, 64); err != nil { |
254 | 253 | err = errInvalidArgument(slon) |
255 | 254 | return |
256 | 255 | } |
@@ -286,11 +285,11 @@ func (s *Server) cmdSearchArgs( |
286 | 285 | return |
287 | 286 | } |
288 | 287 | var lat, lon, meters float64 |
289 | | - if lat, err = strconv.ParseFloat(slat, 64); err != nil || math.IsInf(lat, 0) || math.IsNaN(lat) { |
| 288 | + if lat, err = strconv.ParseFloat(slat, 64); err != nil { |
290 | 289 | err = errInvalidArgument(slat) |
291 | 290 | return |
292 | 291 | } |
293 | | - if lon, err = strconv.ParseFloat(slon, 64); err != nil || math.IsInf(lon, 0) || math.IsNaN(lon) { |
| 292 | + if lon, err = strconv.ParseFloat(slon, 64); err != nil { |
294 | 293 | err = errInvalidArgument(slon) |
295 | 294 | return |
296 | 295 | } |
@@ -345,11 +344,11 @@ func (s *Server) cmdSearchArgs( |
345 | 344 | return |
346 | 345 | } |
347 | 346 | var lat, lon, meters, b1, b2 float64 |
348 | | - if lat, err = strconv.ParseFloat(slat, 64); err != nil || math.IsInf(lat, 0) || math.IsNaN(lat) { |
| 347 | + if lat, err = strconv.ParseFloat(slat, 64); err != nil { |
349 | 348 | err = errInvalidArgument(slat) |
350 | 349 | return |
351 | 350 | } |
352 | | - if lon, err = strconv.ParseFloat(slon, 64); err != nil || math.IsInf(lon, 0) || math.IsNaN(lon) { |
| 351 | + if lon, err = strconv.ParseFloat(slon, 64); err != nil { |
353 | 352 | err = errInvalidArgument(slon) |
354 | 353 | return |
355 | 354 | } |
|
0 commit comments