more cyclomatic complexity

Author: mpgerlek

core/Ellipsoid.go

@@ -318,10 +318,10 @@ func (e *Ellipsoid) doShape(ps *support.ProjString) error {
 
 	/* Not giving a shape parameter means selecting a sphere, unless shape */
 	/* has been selected previously via ellps=xxx */
-	if !found && P.Es != 0 {
-		return nil
-	}
-	if !found && P.Es == 0 {
+	if !found {
+		if P.Es != 0 {
+			return nil
+		}
 		P.Es = 0
 		P.F = 0
 		P.B = P.A

core/System.go

@@ -473,16 +473,9 @@ func (sys *System) processMisc() error {
 		sys.T0 = f
 	}
 
-	/* General scaling factor */
-	if sys.ProjString.ContainsKey("k_0") {
-		sys.K0, _ = sys.ProjString.GetAsFloat("k_0")
-	} else if sys.ProjString.ContainsKey("k") {
-		sys.K0, _ = sys.ProjString.GetAsFloat("k")
-	} else {
-		sys.K0 = 1.0
-	}
-	if sys.K0 <= 0.0 {
-		return merror.New(merror.ErrKLessThanZero)
+	err = sys.processScaling()
+	if err != nil {
+		return err
 	}
 
 	err = sys.processUnits()
@@ -500,6 +493,23 @@ func (sys *System) processMisc() error {
 	return nil
 }
 
+func (sys *System) processScaling() error {
+
+	/* General scaling factor */
+	if sys.ProjString.ContainsKey("k_0") {
+		sys.K0, _ = sys.ProjString.GetAsFloat("k_0")
+	} else if sys.ProjString.ContainsKey("k") {
+		sys.K0, _ = sys.ProjString.GetAsFloat("k")
+	} else {
+		sys.K0 = 1.0
+	}
+	if sys.K0 <= 0.0 {
+		return merror.New(merror.ErrKLessThanZero)
+	}
+
+	return nil
+}
+
 func (sys *System) processMeridian() error {
 
 	/* Prime meridian */