Skip to content

Commit 8d121cd

Browse files
mpgerlekmpgerlek
authored
fixed error names (#24)
1 parent d175991 commit 8d121cd

File tree

10 files changed

+54
-55
lines changed

10 files changed

+54
-55
lines changed

‎core/ConvertLPToXY.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (op *ConvertLPToXY) forwardPrepare(lp *CoordLP) (*CoordLP, error) {
9191
sys := op.System
9292

9393
if math.MaxFloat64 == lp.Lam {
94-
return nil, merror.New(merror.ErrCoordinateError)
94+
return nil, merror.New(merror.CoordinateError)
9595
}
9696

9797
/* Check validity of angular input coordinates */
@@ -105,7 +105,7 @@ func (op *ConvertLPToXY) forwardPrepare(lp *CoordLP) (*CoordLP, error) {
105105
t = lp.Phi - support.PiOverTwo
106106
}
107107
if t > epsLat || lp.Lam > 10 || lp.Lam < -10 {
108-
return nil, merror.New(merror.ErrLatOrLonExceededLimit)
108+
return nil, merror.New(merror.LatOrLonExceededLimit)
109109
}
110110

111111
/* Clamp latitude to -90..90 degree range */
@@ -177,7 +177,7 @@ func (op *ConvertLPToXY) inversePrepare(coo *CoordXY) (*CoordXY, error) {
177177
sys := op.System
178178

179179
if coo.X == math.MaxFloat64 {
180-
return nil, merror.New(merror.ErrInvalidXOrY)
180+
return nil, merror.New(merror.InvalidXOrY)
181181
}
182182

183183
/* Handle remaining possible input types */

‎core/Ellipsoid.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func (e *Ellipsoid) doEllps(ps *support.ProjString) error {
197197

198198
/* Then look up the right size and shape parameters from the builtin list */
199199
if name == "" {
200-
return merror.New(merror.ErrInvalidArg)
200+
return merror.New(merror.InvalidArg)
201201
}
202202

203203
ellps, ok := support.EllipsoidsTable[name]
@@ -317,7 +317,7 @@ func (e *Ellipsoid) doShape(ps *support.ProjString) error {
317317
case "rf":
318318
P.Rf = foundValue
319319
if P.Rf == math.MaxFloat64 {
320-
return merror.New(merror.ErrInvalidArg)
320+
return merror.New(merror.InvalidArg)
321321
}
322322
if P.Rf == 0 {
323323
return merror.New(merror.ReverseFlatteningIsZero)
@@ -329,10 +329,10 @@ func (e *Ellipsoid) doShape(ps *support.ProjString) error {
329329
case "f":
330330
P.F = foundValue
331331
if P.F == math.MaxFloat64 {
332-
return merror.New(merror.ErrInvalidArg)
332+
return merror.New(merror.InvalidArg)
333333
}
334334
if P.F == 0 {
335-
return merror.New(merror.ErrInvalidArg)
335+
return merror.New(merror.InvalidArg)
336336
}
337337
P.Rf = 1 / P.F
338338
P.Es = 2*P.F - P.F*P.F
@@ -341,7 +341,7 @@ func (e *Ellipsoid) doShape(ps *support.ProjString) error {
341341
case "es":
342342
P.Es = foundValue
343343
if P.Es == math.MaxFloat64 {
344-
return merror.New(merror.ErrInvalidArg)
344+
return merror.New(merror.InvalidArg)
345345
}
346346
if P.Es == 1 {
347347
return merror.New(merror.EccentricityIsOne)
@@ -351,10 +351,10 @@ func (e *Ellipsoid) doShape(ps *support.ProjString) error {
351351
case "e":
352352
P.E = foundValue
353353
if P.E == math.MaxFloat64 {
354-
return merror.New(merror.ErrInvalidArg)
354+
return merror.New(merror.InvalidArg)
355355
}
356356
if P.E == 0 {
357-
return merror.New(merror.ErrInvalidArg)
357+
return merror.New(merror.InvalidArg)
358358
}
359359
if P.E == 1 {
360360
return merror.New(merror.EccentricityIsOne)
@@ -365,7 +365,7 @@ func (e *Ellipsoid) doShape(ps *support.ProjString) error {
365365
case "b":
366366
P.B = foundValue
367367
if P.B == math.MaxFloat64 {
368-
return merror.New(merror.ErrInvalidArg)
368+
return merror.New(merror.InvalidArg)
369369
}
370370
if P.B == 0 {
371371
return merror.New(merror.EccentricityIsOne)
@@ -377,12 +377,12 @@ func (e *Ellipsoid) doShape(ps *support.ProjString) error {
377377
P.Es = 2*P.F - P.F*P.F
378378

379379
default:
380-
return merror.New(merror.ErrInvalidArg)
380+
return merror.New(merror.InvalidArg)
381381

382382
}
383383

384384
if P.Es < 0 {
385-
return merror.New(merror.ErrEsLessThanZero)
385+
return merror.New(merror.EsLessThanZero)
386386
}
387387

388388
return nil
@@ -448,14 +448,14 @@ func (e *Ellipsoid) doSpherification(ps *support.ProjString) error {
448448
case "R_lat_a", "R_lat_g":
449449
v, ok := ps.GetAsString(key)
450450
if !ok {
451-
return merror.New(merror.ErrInvalidArg)
451+
return merror.New(merror.InvalidArg)
452452
}
453453
t, err := support.DMSToR(v)
454454
if err != nil {
455455
return err
456456
}
457457
if math.Abs(t) > support.PiOverTwo {
458-
return merror.New(merror.ErrRefRadLargerThan90)
458+
return merror.New(merror.RefRadLargerThan90)
459459
}
460460
t = math.Sin(t)
461461
t = 1 - P.Es*t*t
@@ -466,7 +466,7 @@ func (e *Ellipsoid) doSpherification(ps *support.ProjString) error {
466466
}
467467

468468
default:
469-
return merror.New(merror.ErrInvalidArg)
469+
return merror.New(merror.InvalidArg)
470470

471471
}
472472

‎core/System.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ func (sys *System) readUnits(vertical bool) (float64, float64, error) {
359359
if ok {
360360
u, ok := support.UnitsTable[name]
361361
if !ok {
362-
return 0.0, 0.0, merror.New(merror.ErrUnknownUnit)
362+
return 0.0, 0.0, merror.New(merror.UnknownUnit)
363363
}
364364
s = u.ToMetersS
365365
}
@@ -383,7 +383,7 @@ func (sys *System) readUnits(vertical bool) (float64, float64, error) {
383383
return 0.0, 0.0, merror.New(merror.InvalidProjectionSyntax, s)
384384
}
385385
if (factor <= 0.0) || (1.0/factor == 0.0) {
386-
return 0.0, 0.0, merror.New(merror.ErrUnitFactorLessThanZero)
386+
return 0.0, 0.0, merror.New(merror.UnitFactorLessThanZero)
387387
}
388388

389389
if ratio {
@@ -420,7 +420,7 @@ func (sys *System) processMisc() error {
420420
/* when correcting longitudes around it */
421421
/* The test is written this way to error on long_wrap_center "=" NaN */
422422
if !(math.Abs(sys.LongWrapCenter) < 10.0*support.TwoPi) {
423-
return merror.New(merror.ErrLatOrLonExceededLimit)
423+
return merror.New(merror.LatOrLonExceededLimit)
424424
}
425425
}
426426

@@ -483,7 +483,7 @@ func (sys *System) processScaling() error {
483483
sys.K0 = 1.0
484484
}
485485
if sys.K0 <= 0.0 {
486-
return merror.New(merror.ErrKLessThanZero)
486+
return merror.New(merror.KLessThanZero)
487487
}
488488

489489
return nil
@@ -537,13 +537,13 @@ func (sys *System) processAxis() error {
537537
axisLegal := "ewnsud"
538538
axisArg, _ := sys.ProjString.GetAsString("axis")
539539
if len(axisArg) != 3 {
540-
return merror.New(merror.ErrAxis)
540+
return merror.New(merror.Axis)
541541
}
542542

543543
if !strings.ContainsAny(axisArg[0:1], axisLegal) ||
544544
!strings.ContainsAny(axisArg[1:2], axisLegal) ||
545545
!strings.ContainsAny(axisArg[2:3], axisLegal) {
546-
return merror.New(merror.ErrAxis)
546+
return merror.New(merror.Axis)
547547
}
548548

549549
/* TODO: it would be nice to validate we don't have on axis repeated */

‎merror/error_strings.go‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,26 @@ var (
1111
ReverseFlatteningIsZero = "reverse flattening (rf) is zero"
1212
EccentricityIsOne = "eccentricity is one"
1313
ToleranceCondition = "tolerance condition error"
14-
15-
ProjValueMissing = "proj value missing in string"
16-
NoSuchDatum = "no such datum"
17-
NotYetSupported = "not yet supported" // TODO
18-
ErrInvalidArg = "ERR_INVALID_ARG"
19-
ErrEsLessThanZero = "ERR_ES_LESS_THAN_ZERO"
20-
ErrRefRadLargerThan90 = "ERR_REF_RAD_LARGER_THAN_90"
21-
ErrInvalidDMS = "ErrInvalidDMS"
22-
ErrEllipsoidUseRequired = "ERR_ELLIPSOID_USE_REQUIRED"
23-
ErrInvalidUTMZone = "ERR_INVALID_UTM_ZONE"
24-
ErrLatOrLonExceededLimit = "ERR_LAT_OR_LON_EXCEED_LIMIT"
25-
ErrUnknownUnit = "ERR_UNKNOWN_UNIT_ID"
26-
ErrUnitFactorLessThanZero = "ERR_UNIT_FACTOR_LESS_THAN_0"
27-
ErrAxis = "ERR_AXIS"
28-
ErrKLessThanZero = "ERR_K_LESS_THAN_ZERO"
29-
ErrCoordinateError = "ErrCoordinateError"
30-
ErrInvalidXOrY = "ERR_INVALID_X_OR_Y"
31-
ErrConicLatEqual = "ErrConicLatEqual"
32-
ErrAeaSetupFailed = "ErrAeaSetupFailed"
33-
ErrInvMlfn = "ErrInvMlfn"
34-
ErrAeaProjString = "ErrAeaProjString"
35-
ErrLatTSLargerThan90 = "ErrLatTSLargerThan90"
36-
ErrPhi2 = "ErrPhi2"
14+
ProjValueMissing = "proj value missing"
15+
NoSuchDatum = "no such datum"
16+
NotYetSupported = "not yet supported" // TODO
17+
InvalidArg = "invalid argument in proj string"
18+
EsLessThanZero = "ES is less than zero"
19+
RefRadLargerThan90 = "ref rad is greater than 90"
20+
InvalidDMS = "invalid DMS (degrees-minutes-seconds)"
21+
EllipsoidUseRequired = "use of ellipsoid required"
22+
InvalidUTMZone = "invalid UTM zone"
23+
LatOrLonExceededLimit = "lat or lon limit exceeded"
24+
UnknownUnit = "unknown unit"
25+
UnitFactorLessThanZero = "unit factor less than zero"
26+
Axis = "invalid axis configuration"
27+
KLessThanZero = "K is less than zero"
28+
CoordinateError = "invalid coordinates"
29+
InvalidXOrY = "invalid X or Y"
30+
ConicLatEqual = "Conic lat is equal"
31+
AeaSetupFailed = "setup for aea projection failed"
32+
InvMlfn = "invalid mlfn computation"
33+
AeaProjString = "invalid projection string for aea"
34+
LatTSLargerThan90 = "lat ts is greater than 90"
35+
Phi2 = "invalid phi2 computation"
3736
)

‎operations/Aea.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (aea *Aea) localSetup(sys *core.System) error {
111111
PE := P.Ellipsoid
112112

113113
if math.Abs(Q.phi1+Q.phi2) < eps10 {
114-
return merror.New(merror.ErrConicLatEqual)
114+
return merror.New(merror.ConicLatEqual)
115115
}
116116
sinphi = math.Sin(Q.phi1)
117117
Q.n = sinphi
@@ -132,7 +132,7 @@ func (aea *Aea) localSetup(sys *core.System) error {
132132
m2 = support.Msfn(sinphi, cosphi, PE.Es)
133133
ml2 = support.Qsfn(sinphi, PE.E, PE.OneEs)
134134
if ml2 == ml1 {
135-
return merror.New(merror.ErrAeaSetupFailed)
135+
return merror.New(merror.AeaSetupFailed)
136136
}
137137

138138
Q.n = (m1*m1 - m2*m2) / (ml2 - ml1)

‎operations/EtMerc.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func (xxx *EtMerc) localSetup(P *core.System) error {
249249
PE := P.Ellipsoid
250250

251251
if PE.Es <= 0 {
252-
return merror.New(merror.ErrEllipsoidUseRequired)
252+
return merror.New(merror.EllipsoidUseRequired)
253253
}
254254

255255
/* flattening */
@@ -341,10 +341,10 @@ func (xxx *EtMerc) etmercSetup(op *core.System) error {
341341
func (xxx *EtMerc) utmSetup(op *core.System) error {
342342

343343
if op.Ellipsoid.Es == 0.0 {
344-
return merror.New(merror.ErrEllipsoidUseRequired)
344+
return merror.New(merror.EllipsoidUseRequired)
345345
}
346346
if op.Lam0 < -1000.0 || op.Lam0 > 1000.0 {
347-
return merror.New(merror.ErrInvalidUTMZone)
347+
return merror.New(merror.InvalidUTMZone)
348348
}
349349

350350
op.Y0 = 0.0
@@ -358,7 +358,7 @@ func (xxx *EtMerc) utmSetup(op *core.System) error {
358358
if zone > 0 && zone <= 60 {
359359
zone--
360360
} else {
361-
return merror.New(merror.ErrInvalidUTMZone)
361+
return merror.New(merror.InvalidUTMZone)
362362
}
363363
} else { /* nearest central meridian input */
364364
zone = (int)(math.Floor((support.Adjlon(op.Lam0) + support.Pi) * 30. / support.Pi))

‎operations/Merc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func (merc *Merc) mercSetup(sys *core.System) error {
122122
phits = support.DDToR(phits)
123123
phits = math.Abs(phits)
124124
if phits >= support.PiOverTwo {
125-
return merror.New(merror.ErrLatTSLargerThan90)
125+
return merror.New(merror.LatTSLargerThan90)
126126
}
127127
}
128128

‎support/DMS.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func DMSToDD(input string) (float64, error) {
2929

3030
tokens := r.FindStringSubmatch(input)
3131
if tokens == nil {
32-
return 0.0, merror.New(merror.ErrInvalidArg)
32+
return 0.0, merror.New(merror.InvalidArg)
3333
}
3434

3535
sign := tokens[1]

‎support/Mlfn.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ func InvMlfn(arg float64, es float64, en []float64) (float64, error) {
6868
}
6969
}
7070

71-
return phi, merror.New(merror.ErrInvMlfn)
71+
return phi, merror.New(merror.InvMlfn)
7272
}

‎support/Phi2.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func Phi2(ts, e float64) (float64, error) {
2929
break
3030
}
3131
if i <= 0 {
32-
return 0.0, merror.New(merror.ErrPhi2)
32+
return 0.0, merror.New(merror.Phi2)
3333
}
3434
return Phi, nil
3535
}

0 commit comments

Comments
 (0)