use camelCase

2 files changed, 23 insertions, 23 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/geo/OneDegreeParser.java b/vespajlib/src/main/java/com/yahoo/geo/OneDegreeParser.java
index 2af85ad0b9e..fe0e1224dd7 100644
--- a/vespajlib/src/main/java/com/yahoo/geo/OneDegreeParser.java
+++ b/vespajlib/src/main/java/com/yahoo/geo/OneDegreeParser.java
@@ -78,17 +78,17 @@ class OneDegreeParser {
      * "E10o25.982" and "N63o25.105" → same <br>
      * "N63.418417" and "E10.433033" → same <br>
      * "63N25.105" and "10E25.982" → same <br>
-     * @param assume_n_s Latitude assumed, otherwise longitude
-     * @param lat_or_lon Latitude or longitude
+     * @param assumeNorthSouth Latitude assumed, otherwise longitude
+     * @param toParse Latitude or longitude string to parse
      *
      **/
-    public OneDegreeParser(boolean assume_n_s, String lat_or_lon) throws IllegalArgumentException {
-        this.parseString = lat_or_lon;
+    public OneDegreeParser(boolean assumeNorthSouth, String toParse) throws IllegalArgumentException {
+        this.parseString = toParse;
         this.len = parseString.length();
-        consumeString(assume_n_s);
+        consumeString(assumeNorthSouth);
     }
 
-    private void consumeString(boolean assume_n_s)  throws IllegalArgumentException {
+    private void consumeString(boolean assumeNorthSouth)  throws IllegalArgumentException {
         char ch = getNextChar();
 
         double degrees = 0.0;
@@ -238,7 +238,7 @@ class OneDegreeParser {
             if (ch == 0) {
                 valid = true;
                 if (!dirSet) {
-                    if (assume_n_s) {
+                    if (assumeNorthSouth) {
                         findingLatitude = true;
                     } else {
                         findingLongitude = true;
diff --git a/vespajlib/src/test/java/com/yahoo/geo/OneDegreeParserTestCase.java b/vespajlib/src/test/java/com/yahoo/geo/OneDegreeParserTestCase.java
index b3a25f5ca83..9543739d4cc 100644
--- a/vespajlib/src/test/java/com/yahoo/geo/OneDegreeParserTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/geo/OneDegreeParserTestCase.java
@@ -19,33 +19,33 @@ public class OneDegreeParserTestCase {
 
     private OneDegreeParser parser;
 
-    private void checkLat(boolean ans, String to_parse, double expected) {
-        parser = new OneDegreeParser(ans, to_parse);
+    private void checkLat(boolean assumeLatitude, String toParse, double expected) {
+        parser = new OneDegreeParser(assumeLatitude, toParse);
         assertEquals(expected, parser.latitude, delta);
         assertTrue(parser.foundLatitude);
         assertFalse(parser.foundLongitude);
     }
-    private void checkLon(boolean ans, String to_parse, double expected) {
-        parser = new OneDegreeParser(ans, to_parse);
+    private void checkLon(boolean assumeLatitude, String toParse, double expected) {
+        parser = new OneDegreeParser(assumeLatitude, toParse);
         assertEquals(expected, parser.longitude, delta);
         assertFalse(parser.foundLatitude);
         assertTrue(parser.foundLongitude);
     }
-    private void checkLat(String to_parse, double expected) {
-        checkLat(true, to_parse, expected);
-        checkLat(false, to_parse, expected);
+    private void checkLat(String toParse, double expected) {
+        checkLat(true, toParse, expected);
+        checkLat(false, toParse, expected);
     }
-    private void checkLon(String to_parse, double expected) {
-        checkLon(true, to_parse, expected);
-        checkLon(false, to_parse, expected);
+    private void checkLon(String toParse, double expected) {
+        checkLon(true, toParse, expected);
+        checkLon(false, toParse, expected);
     }
 
-    private void checkZeroLat(boolean ans, String to_parse) {
-        checkLat(ans, to_parse, 0d);
+    private void checkZeroLat(boolean assumeLatitude, String toParse) {
+        checkLat(assumeLatitude, toParse, 0d);
     }
 
-    private void checkZeroLon(boolean ans, String to_parse) {
-        checkLon(ans, to_parse, 0d);
+    private void checkZeroLon(boolean assumeLatitude, String toParse) {
+        checkLon(assumeLatitude, toParse, 0d);
     }
 
     /**
@@ -140,10 +140,10 @@ public class OneDegreeParserTestCase {
         checkLon("W180\u00B00'0", -180d);
     }
 
-    private String parseException(boolean ans, String to_parse) {
+    private String parseException(boolean assumeLatitude, String toParse) {
         String message = "";
         try {
-            parser = new OneDegreeParser(ans, to_parse);
+            parser = new OneDegreeParser(assumeLatitude, toParse);
             assertTrue(false);
         } catch (IllegalArgumentException e) {
             message = e.getMessage();