Clean up logic in tryParseAsGeo. (#3672)

hypermodeinc · Jul 23, 2019 · 98d3f02 · 98d3f02
1 parent b324ed8
commit 98d3f02
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/chunker/json/parse.go b/chunker/json/parse.go
@@ -211,16 +211,17 @@ func handleGeoType(val map[string]interface{}, nq *api.NQuad) (bool, error) {
 func tryParseAsGeo(b []byte, nq *api.NQuad) (bool, error) {
 	var g geom.T
 	err := geojson.Unmarshal(b, &g)
-	if err == nil {
-		geo, err := types.ObjectValue(types.GeoID, g)
-		if err != nil {
-			return false, errors.Errorf("Couldn't convert value: %s to geo type", string(b))
-		}
+	if err != nil {
+		return false, nil
+	}
 
-		nq.ObjectValue = geo
-		return true, nil
+	geo, err := types.ObjectValue(types.GeoID, g)
+	if err != nil {
+		return false, errors.Errorf("Couldn't convert value: %s to geo type", string(b))
 	}
-	return false, nil
+
+	nq.ObjectValue = geo
+	return true, nil
 }
 
 // TODO - Abstract these parameters to a struct.