Use Math.pow instead of ** (#342)

* enable comments for js

* correct the comment file path

* remove exponent operators

* update version, refresh minified library

Author: drinckes

.gitignore

@@ -5,11 +5,18 @@
 /bazel-*
 # Ignore outputs generated during Bazel bootstrapping.
 /output/
-# Ignore Compiled files
+# Ignore compiled files
 **/target/
 # Ignore intelliJ auto generated dir
 **/.idea/
-#Ignore iml extensions files
+# Ignore iml extensions files
 **/*.iml
-#ignore visusl studio auto generated dir
-**/.vscode/
+# Ignore visual studio auto generated dir
+**/.vscode/
+# Ignore JS NPM modules
+/js/node_modules/
+/js/package-lock.json
+# Ignore dynamically generated test JSON files.
+/js/test/*json
+# Ignore Rust lockfile.
+/rust/Cargo.lock

.travis.yml

@@ -82,7 +82,7 @@ matrix:
       env: OLC_PATH=js
       script:
         - cd js
-        - sh test/run_tests.sh
+        - bash checks.sh
 
     # Python implementation. Lives in python/, tested with bazel.
     - language: python

js/checks.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+# Run lint checks on files in the Javascript directory.
+# When running within TravisCI, post comments back to the pull request.
+# Also converts the test CSV files to JSON ready for the tests to execute.
+# Note: must run within the JS directory.
+if [ `basename "$PWD"` != "js" ]; then
+  echo "$0: must be run from within the js directory!"
+  exit 1
+fi
+
+# Require that the NPM install and CSV conversion commands succeed.
+set -e
+
+# Install all the dependencies.
+npm install
+
+# Convert the CSV test files to JSON and put them in the test directory for serving.
+go run ../test_data/csv_to_json.go --csv ../test_data/decoding.csv >test/decoding.json
+go run ../test_data/csv_to_json.go --csv ../test_data/encoding.csv >test/encoding.json
+go run ../test_data/csv_to_json.go --csv ../test_data/shortCodeTests.csv >test/shortCodeTests.json
+go run ../test_data/csv_to_json.go --csv ../test_data/validityTests.csv >test/validityTests.json
+
+set +e
+
+# Run the tests
+npm test
+# Save the return value for the end.
+RETURN=$?
+
+# Run eslint based on local installs as well as in PATH.
+# eslint errors will cause a build failure.
+ESLINT=eslint
+$ESLINT --version >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+  ESLINT=./node_modules/.bin/eslint
+fi
+
+$ESLINT --version >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+  echo "\e[1;31mCannot find eslint, check your installation\e[0m"
+else
+  # Run eslint on the source file.
+  FILE=src/openlocationcode.js
+  LINT=`$ESLINT $FILE`
+  if [ $? -ne 0 ]; then
+    echo -e "\e[1;31mFile has formatting errors:\e[0m"
+    echo "$LINT"
+    RETURN=1
+    if [ -v TRAVIS ]; then
+      # On TravisCI, send a comment with the diff to the pull request.
+      go run ../travis-utils/github_comments.go \
+          --comment '**File has `eslint` errors that must be fixed**:'"<br><pre>$LINT</pre>" \
+          --file "js/$FILE" \
+          --pr "$TRAVIS_PULL_REQUEST" \
+          --commit "$TRAVIS_PULL_REQUEST_SHA"
+    fi
+  fi
+fi
+exit $RETURN

js/package.json

@@ -1,7 +1,7 @@
 {
   "name": "open-location-code",
   "description": "Library to convert between lat/lng and OLC codes",
-  "version": "20181203.0.0",
+  "version": "20190515.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/google/open-location-code.git"

js/src/openlocationcode.js

@@ -117,10 +117,11 @@
   var PAIR_CODE_LENGTH_ = 10;
 
   // First place value of the pairs (if the last pair value is 1).
-  var PAIR_FIRST_PLACE_VALUE_ = ENCODING_BASE_**(PAIR_CODE_LENGTH_ / 2 - 1);
+  var PAIR_FIRST_PLACE_VALUE_ = Math.pow(
+      ENCODING_BASE_, (PAIR_CODE_LENGTH_ / 2 - 1));
 
   // Inverse of the precision of the pair section of the code.
-  var PAIR_PRECISION_ = ENCODING_BASE_**3;
+  var PAIR_PRECISION_ = Math.pow(ENCODING_BASE_, 3);
 
   // The resolution values in degrees for each position in the lat/lng pair
   // encoding. These give the place value of each position, and therefore the
@@ -137,20 +138,22 @@
   var GRID_ROWS_ = 5;
 
   // First place value of the latitude grid (if the last place is 1).
-  var GRID_LAT_FIRST_PLACE_VALUE_ = GRID_ROWS_**(GRID_CODE_LENGTH_ - 1);
+  var GRID_LAT_FIRST_PLACE_VALUE_ = Math.pow(
+      GRID_ROWS_, (GRID_CODE_LENGTH_ - 1));
 
   // First place value of the longitude grid (if the last place is 1).
-  var GRID_LNG_FIRST_PLACE_VALUE_ = GRID_COLUMNS_**(GRID_CODE_LENGTH_ - 1);
+  var GRID_LNG_FIRST_PLACE_VALUE_ = Math.pow(
+      GRID_COLUMNS_, (GRID_CODE_LENGTH_ - 1));
 
   // Multiply latitude by this much to make it a multiple of the finest
   // precision.
   var FINAL_LAT_PRECISION_ = PAIR_PRECISION_ *
-      GRID_ROWS_**(MAX_DIGIT_COUNT_ - PAIR_CODE_LENGTH_);
+      Math.pow(GRID_ROWS_, (MAX_DIGIT_COUNT_ - PAIR_CODE_LENGTH_));
 
   // Multiply longitude by this much to make it a multiple of the finest
   // precision.
   var FINAL_LNG_PRECISION_ = PAIR_PRECISION_ *
-      GRID_COLUMNS_**(MAX_DIGIT_COUNT_ - PAIR_CODE_LENGTH_);
+      Math.pow(GRID_COLUMNS_, (MAX_DIGIT_COUNT_ - PAIR_CODE_LENGTH_));
 
   // Minimum length of a code that can be shortened.
   var MIN_TRIMMABLE_CODE_LEN_ = 6;
@@ -353,8 +356,8 @@
         lngVal = Math.floor(lngVal / GRID_COLUMNS_);
       }
     } else {
-      latVal = Math.floor(latVal / GRID_ROWS_**GRID_CODE_LENGTH_);
-      lngVal = Math.floor(lngVal / GRID_COLUMNS_**GRID_CODE_LENGTH_);
+      latVal = Math.floor(latVal / Math.pow(GRID_ROWS_, GRID_CODE_LENGTH_));
+      lngVal = Math.floor(lngVal / Math.pow(GRID_COLUMNS_, GRID_CODE_LENGTH_));
     }
     // Compute the pair section of the code.
     for (var i = 0; i < PAIR_CODE_LENGTH_ / 2; i++) {