Merge pull request #85 from google/drinckes-patch-4

drinckes · web-flow · commit c434a9c406c7 · 2017-08-04T09:34:41.000+02:00
JS code length validation
diff --git a/js/closure/openlocationcode.js b/js/closure/openlocationcode.js
@@ -264,7 +264,7 @@ function encode(latitude, longitude, opt_length) {
     opt_length = PAIR_CODE_LENGTH;
   }
   if (opt_length < 2 ||
-      (opt_length < SEPARATOR_POSITION && opt_length % 2 == 1)) {
+      (opt_length < PAIR_CODE_LENGTH && opt_length % 2 == 1)) {
     throw 'IllegalArgumentException: Invalid Open Location Code length';
   }
   // Ensure that latitude and longitude are valid.
diff --git a/js/src/openlocationcode.js b/js/src/openlocationcode.js
@@ -286,7 +286,7 @@
       throw ('ValueError: Parameters are not numbers');
     }
     if (codeLength < 2 ||
-        (codeLength < SEPARATOR_POSITION_ && codeLength % 2 == 1)) {
+        (codeLength < PAIR_CODE_LENGTH_ && codeLength % 2 == 1)) {
       throw 'IllegalArgumentException: Invalid Open Location Code length';
     }
     // Ensure that latitude and longitude are valid.
diff --git a/js/src/openlocationcode.min.js b/js/src/openlocationcode.min.js

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ function encode(latitude, longitude, opt_length) {`
`264`	`264`	`opt_length = PAIR_CODE_LENGTH;`
`265`	`265`	`}`
`266`	`266`	`if (opt_length < 2 \|\|`
`267`		`- (opt_length < SEPARATOR_POSITION && opt_length % 2 == 1)) {`
	`267`	`+ (opt_length < PAIR_CODE_LENGTH && opt_length % 2 == 1)) {`
`268`	`268`	`throw 'IllegalArgumentException: Invalid Open Location Code length';`
`269`	`269`	`}`
`270`	`270`	`// Ensure that latitude and longitude are valid.`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@`
`286`	`286`	`throw ('ValueError: Parameters are not numbers');`
`287`	`287`	`}`
`288`	`288`	`if (codeLength < 2 \|\|`
`289`		`- (codeLength < SEPARATOR_POSITION_ && codeLength % 2 == 1)) {`
	`289`	`+ (codeLength < PAIR_CODE_LENGTH_ && codeLength % 2 == 1)) {`
`290`	`290`	`throw 'IllegalArgumentException: Invalid Open Location Code length';`
`291`	`291`	`}`
`292`	`292`	`// Ensure that latitude and longitude are valid.`