lint

Author: mpgerlek

Proj.go

@@ -22,8 +22,8 @@ type Projector struct {
 
 // New creates a Projector object for the given soure and destination systems.
 func New(sourceEPSG, destEPSG int) (*Projector, error) {
-	pair := pair{sourceEPSG, destEPSG}
-	str, ok := knownProjections[pair]
+	codes := pair{sourceEPSG, destEPSG}
+	str, ok := knownProjections[codes]
 	if !ok {
 		return nil, fmt.Errorf("epsg code pair is not a supported projection")
 	}
@@ -43,7 +43,7 @@ func New(sourceEPSG, destEPSG int) (*Projector, error) {
 	}
 
 	proj := &Projector{
-		pair:       pair,
+		pair:       codes,
 		projString: ps,
 		system:     sys,
 		operation:  opx,

core/Ellipsoid.go

@@ -87,11 +87,7 @@ func (e *Ellipsoid) initialize(op *System) error {
 		if err != nil {
 			return err
 		}
-		err = e.doCalcParams(e.A, 0)
-		if err != nil {
-			return err
-		}
-		return nil
+		return e.doCalcParams(e.A, 0)
 	}
 
 	/* If an ellps argument is specified, start by using that */
@@ -119,21 +115,7 @@ func (e *Ellipsoid) initialize(op *System) error {
 	}
 
 	/* And finally, we may turn it into a sphere */
-	err = e.doSpherification(op.ProjString)
-	if err != nil {
-		return err
-	}
-
-	//proj_log_debug (P, "pj_ellipsoid - final: a=%.3f f=1/%7.3f, errno=%d",
-	//                  P->a,  P->f!=0? 1/P->f: 0,  proj_errno (P));
-	//proj_log_debug (P, "pj_ellipsoid - final: %s %s %s %s",
-	//                  P->def_size?           P->def_size: empty,
-	//                P->def_shape?          P->def_shape: empty,
-	//              P->def_spherification? P->def_spherification: empty,
-	//            P->def_ellps?          P->def_ellps: empty            );
-
-	/* success */
-	return nil
+	return e.doSpherification(op.ProjString)
 }
 
 func (e *Ellipsoid) doCalcParams(a float64, es float64) error {
@@ -241,12 +223,7 @@ func (e *Ellipsoid) doEllps(ps *support.ProjString) error {
 		return err
 	}
 
-	err = e.doShape(newPS)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return e.doShape(newPS)
 }
 
 func (e *Ellipsoid) doSize(ps *support.ProjString) error {
@@ -500,10 +477,5 @@ func (e *Ellipsoid) doSpherification(ps *support.ProjString) error {
 	P.Rf = math.MaxFloat64
 	P.B = P.A
 
-	err := e.doCalcParams(P.A, 0)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return e.doCalcParams(P.A, 0)
 }

core/System.go

@@ -221,21 +221,7 @@ func (sys *System) initialize() error {
 		sys.DatumType = DatumTypeWGS84
 	}
 
-	err = sys.processMisc()
-	if err != nil {
-		return err
-	}
-
-	/*
-		// do setup work specific to this operation
-		// (locate_constructor)
-		err = op.Info.setup(op)
-		if err != nil {
-			return err
-		}
-	*/
-
-	return nil
+	return sys.processMisc()
 }
 
 func (sys *System) processDatum() error {
@@ -483,14 +469,7 @@ func (sys *System) processMisc() error {
 		return err
 	}
 
-	err = sys.processMeridian()
-	if err != nil {
-		return err
-	}
-
-	// TODO: geod_init(PIN->geod, PIN->a,  (1 - sqrt (1 - PIN->es)));
-
-	return nil
+	return sys.processMeridian()
 }
 
 func (sys *System) processScaling() error {

core/System_test.go

@@ -24,10 +24,10 @@ func TestSystem(t *testing.T) {
 func TestProjStringValidation(t *testing.T) {
 	assert := assert.New(t)
 
-	ps, err := support.NewProjString("")
+	_, err := support.NewProjString("")
 	assert.NoError(err)
 
-	ps, err = support.NewProjString("  +proj=P99 +k1=a   +k2=b    \t  ")
+	ps, err := support.NewProjString("  +proj=P99 +k1=a   +k2=b    \t  ")
 	assert.NoError(err)
 	assert.Equal(3, ps.Len())
 

gie/Command.go

@@ -19,7 +19,6 @@ type testcase struct {
 	inv    bool
 	accept coord
 	expect coord
-	trips  int
 }
 
 // Command holds a set of tests as we build them up

gie/Parser.go

@@ -51,9 +51,10 @@ func NewParser(fname string) (*Parser, error) {
 			continue
 		}
 
-		if p.lines[0] != "" && (p.lines[0][0:1] >= "A" && p.lines[0][0:1] >= "Z") {
-			//fmt.Printf("[%s:%d] JUNK: %s\n", p.fname, p.lineNum, p.lines[0])
-		}
+		//if p.lines[0] != "" && (p.lines[0][0:1] >= "A" && p.lines[0][0:1] >= "Z") {
+		//fmt.Printf("[%s:%d] JUNK: %s\n", p.fname, p.lineNum, p.lines[0])
+		//}
+
 		p.pop()
 	}
 
@@ -297,7 +298,7 @@ func readLines(fname string) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer file.Close()
+	defer func() { _ = file.Close() }()
 
 	var lines []string
 	scanner := bufio.NewScanner(file)

mlog/Log.go

@@ -28,15 +28,15 @@ func init() {
 func Debugf(format string, v ...interface{}) {
 	if DebugEnabled {
 		s := fmt.Sprintf(format, v...)
-		debugLogger.Output(2, s)
+		_ = debugLogger.Output(2, s)
 	}
 }
 
 // Printf writes a regular log message to stderr
 func Printf(format string, v ...interface{}) {
 	if InfoEnabled {
 		s := fmt.Sprintf(format, v...)
-		infoLogger.Output(2, s)
+		_ = infoLogger.Output(2, s)
 	}
 }
 
@@ -49,14 +49,14 @@ func Printv(v interface{}) {
 			panic(err)
 		}
 		s := string(b)
-		infoLogger.Output(2, s)
+		_ = infoLogger.Output(2, s)
 	}
 }
 
 // Error writes an error message to stderr
 func Error(err error) {
 	if ErrorEnabled {
 		s := err.Error()
-		errorLogger.Output(2, s)
+		_ = errorLogger.Output(2, s)
 	}
 }

operations/Airy.go

@@ -50,7 +50,9 @@ func (airy *Airy) Forward(lp *core.CoordLP) (*core.CoordXY, error) {
 
 	sinlam = math.Sin(lp.Lam)
 	coslam = math.Cos(lp.Lam)
+
 	switch Q.mode {
+
 	case modeEquit, modeObliq:
 		sinphi = math.Sin(lp.Phi)
 		cosphi = math.Cos(lp.Phi)
@@ -74,7 +76,7 @@ func (airy *Airy) Forward(lp *core.CoordLP) (*core.CoordXY, error) {
 		} else {
 			xy.Y = Krho * sinphi
 		}
-		break
+
 	case modeSPole, modeNPole:
 		lp.Phi = math.Abs(Q.phalfpi - lp.Phi)
 		if !Q.nocut && (lp.Phi-eps10) > support.PiOverTwo {
@@ -94,6 +96,7 @@ func (airy *Airy) Forward(lp *core.CoordLP) (*core.CoordXY, error) {
 			xy.Y = 0.
 		}
 	}
+
 	return xy, nil
 }
 

operations/common.go

@@ -11,7 +11,6 @@ const (
 
 const tol7 = 1.e-7
 const tol10 = 1.0e-10
-const tol14 = 1.0e-14
 
 const eps7 = 1.0e-7
 const eps10 = 1.e-10

support/ProjString_test.go

@@ -65,10 +65,10 @@ func TestPairListGets(t *testing.T) {
 	pl.Add(p3)
 	pl.Add(p4)
 
-	vs, ok := pl.GetAsString("k99")
+	_, ok := pl.GetAsString("k99")
 	assert.False(ok)
 
-	vs, ok = pl.GetAsString("k2")
+	vs, ok := pl.GetAsString("k2")
 	assert.True(ok)
 	assert.Equal("2.2", vs)
 
@@ -95,13 +95,13 @@ func TestPairListGets(t *testing.T) {
 func TestPairListParsing(t *testing.T) {
 	assert := assert.New(t)
 
-	pl, err := support.NewProjString("")
+	_, err := support.NewProjString("")
 	assert.NoError(err)
 
 	_, err = support.NewProjString("k1=v1=v2")
 	assert.Error(err)
 
-	pl, err = support.NewProjString("  +proj=v1 +k2=v2 k3=v3 \t\t k4= k5")
+	pl, err := support.NewProjString("  +proj=v1 +k2=v2 k3=v3 \t\t k4= k5")
 	assert.NoError(err)
 	assert.Equal(4, pl.Len())