fiftyone.geolocation 4.4.42 → 4.4.44

package/ci/options.json

@@ -1,28 +1,4 @@
 [
-  {
-    "Name": "Ubuntu_Node_16",
-    "Image": "ubuntu-20.04",
-    "Language": "node",
-    "LanguageVersion": "16.20.0",
-    "RunPerformance": true,
-    "PackageRequirement": true
-  },
-  {
-    "Name": "Windows_Node_16",
-    "Image": "windows-latest",
-    "Language": "node",
-    "LanguageVersion": "16.20.0",
-    "RunPerformance": true,
-    "PackageRequirement": true
-  },
-  {
-    "Name": "macOS_Node_16",
-    "Image": "macos-latest",
-    "Language": "node",
-    "LanguageVersion": "16.20.0",
-    "RunPerformance": true,
-    "PackageRequirement": true
-  },
   {
     "Name": "Ubuntu_Node_18",
     "Image": "ubuntu-20.04",

package/examples/combiningServices.js

@@ -55,7 +55,9 @@ let localResourceKey;
 try {
   localResourceKey = resourceKey;
 } catch (e) {
-  if (e instanceof ReferenceError) {}
+  if (e instanceof ReferenceError) {
+    console.log(e);
+  }
 }
 // You need to create a resource key at https://configure.51degrees.com and
 // paste it into the code, replacing !!YOUR_RESOURCE_KEY!!.

package/examples/configureFromFile.js

@@ -63,7 +63,6 @@ const configFile = fs.readFileSync((process.env.directory || __dirname) +
 const config = JSON.parse(configFile);
 let resourceKeySet = true;
 let resourceKeySetFromFile = true;
-
 // Check if a resource key has been set in the config file.
 if (config.PipelineOptions.Elements[0].elementParameters.resourceKey
   .startsWith('!!')) {
@@ -73,7 +72,9 @@ if (config.PipelineOptions.Elements[0].elementParameters.resourceKey
   try {
     myResourceKey = resourceKey;
   } catch (e) {
-    if (e instanceof ReferenceError) {}
+    if (e instanceof ReferenceError) {
+      console.log(e);
+    }
   }
 
   // If not, check the resource key environment variable.

package/examples/examples.test.js

@@ -1,23 +1,23 @@
-/* *********************************************************************
- * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
- * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
- * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
- *
- * This Original Work is licensed under the European Union Public Licence
- * (EUPL) v.1.2 and is subject to its terms as set out below.
- *
- * If a copy of the EUPL was not distributed with this file, You can obtain
- * one at https://opensource.org/licenses/EUPL-1.2.
- *
- * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
- * amended by the European Commission) shall be deemed incompatible for
- * the purposes of the Work and the provisions of the compatibility
- * clause in Article 5 of the EUPL shall not apply.
- *
- * If using the Work as, or as part of, a network application, by
- * including the attribution notice(s) required under Article 5 of the EUPL
- * in the end user terms of the application under an appropriate heading,
- * such notice(s) shall fulfill the requirements of that article.
+/* *********************************************************************
+ * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
+ * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
+ *
+ * This Original Work is licensed under the European Union Public Licence
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
+ *
+ * If a copy of the EUPL was not distributed with this file, You can obtain
+ * one at https://opensource.org/licenses/EUPL-1.2.
+ *
+ * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
+ * amended by the European Commission) shall be deemed incompatible for
+ * the purposes of the Work and the provisions of the compatibility
+ * clause in Article 5 of the EUPL shall not apply.
+ *
+ * If using the Work as, or as part of, a network application, by
+ * including the attribution notice(s) required under Article 5 of the EUPL
+ * in the end user terms of the application under an appropriate heading,
+ * such notice(s) shall fulfill the requirements of that article.
  * ********************************************************************* */
 
 const fs = require('fs');
@@ -64,17 +64,19 @@ if (isAsync) {
   test('cloud getting started', async (done) => {
     setTimeout(done, 1000);
 
-    testExample({ file: (__dirname) + '/gettingStarted.js' });
+    testExample({ file: path.resolve(__dirname, 'gettingStarted.js') });
   });
+
   test('combining services', async (done) => {
     setTimeout(done, 1000);
 
-    testExample({ file: (__dirname) + '/combiningServices.js' });
+    testExample({ file: path.resolve(__dirname, 'combiningServices.js') });
   });
+
   test('configure from file', async (done) => {
     setTimeout(done, 1000);
 
-    testExample({ file: (__dirname) + '/configureFromFile.js' });
+    testExample({ file: path.resolve(__dirname, 'configureFromFile.js') });
   });
 } else {
   // Skip if async is not available (e.g node 6)

package/examples/gettingStarted.js

@@ -104,7 +104,9 @@ let localResourceKey;
 try {
   localResourceKey = resourceKey;
 } catch (e) {
-  if (e instanceof ReferenceError) {}
+  if (e instanceof ReferenceError) {
+    console.log(e);
+  }
 }
 // You need to create a resource key at https://configure.51degrees.com and
 // paste it into the code, replacing !!YOUR_RESOURCE_KEY!!.

package/examples/webIntegration.js

@@ -1,23 +1,23 @@
-/* *********************************************************************
- * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
- * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
- * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
- *
- * This Original Work is licensed under the European Union Public Licence
- * (EUPL) v.1.2 and is subject to its terms as set out below.
- *
- * If a copy of the EUPL was not distributed with this file, You can obtain
- * one at https://opensource.org/licenses/EUPL-1.2.
- *
- * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
- * amended by the European Commission) shall be deemed incompatible for
- * the purposes of the Work and the provisions of the compatibility
- * clause in Article 5 of the EUPL shall not apply.
- *
- * If using the Work as, or as part of, a network application, by
- * including the attribution notice(s) required under Article 5 of the EUPL
- * in the end user terms of the application under an appropriate heading,
- * such notice(s) shall fulfill the requirements of that article.
+/* *********************************************************************
+ * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
+ * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
+ *
+ * This Original Work is licensed under the European Union Public Licence
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
+ *
+ * If a copy of the EUPL was not distributed with this file, You can obtain
+ * one at https://opensource.org/licenses/EUPL-1.2.
+ *
+ * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
+ * amended by the European Commission) shall be deemed incompatible for
+ * the purposes of the Work and the provisions of the compatibility
+ * clause in Article 5 of the EUPL shall not apply.
+ *
+ * If using the Work as, or as part of, a network application, by
+ * including the attribution notice(s) required under Article 5 of the EUPL
+ * in the end user terms of the application under an appropriate heading,
+ * such notice(s) shall fulfill the requirements of that article.
  * ********************************************************************* */
 
 /**
@@ -100,16 +100,20 @@ if (myResourceKey.substring(0, 2) === '!!') {
     </p>
     <dl>
         <dt><strong>Country</strong></dt>
-        <dv>` + (data && data.country && data.country.hasValue ? data.country.value
+        <dv>` + (data && data.country && data.country.hasValue
+            ? data.country.value
             : ('Unknown (' + (data && data.country ? data.country.noValueMessage : 'no data') + ')')) + `</dv>
         <dt><strong>State</strong></dt>
-        <dv>` + (data && data.state && data.state.hasValue ? data.state.value
+        <dv>` + (data && data.state && data.state.hasValue
+            ? data.state.value
             : ('Unknown (' + (data && data.state ? data.state.noValueMessage : 'no data') + ')')) + `</dv>          
         <dt><strong>County</strong></dt>
-        <dv>` + (data && data.county && data.county.hasValue ? data.county.value
+        <dv>` + (data && data.county && data.county.hasValue
+            ? data.county.value
             : ('Unknown (' + (data && data.county ? data.county.noValueMessage : 'no data') + ')')) + `</dv>
         <dt><strong>Town/City</strong></dt>
-        <dv>` + (data && data.town && data.town.hasValue ? data.town.value
+        <dv>` + (data && data.town && data.town.hasValue
+            ? data.town.value
             : ('Unknown (' + (data && data.town ? data.town.noValueMessage : 'no data') + ')')) + `</dv>
     </dl>
     <p>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fiftyone.geolocation",
-  "version": "4.4.42",
+  "version": "4.4.44",
   "description": "Perform reverse geocoding using longitude and latitude to populate postal addresses",
   "keywords": [
     "51Degrees",
@@ -29,11 +29,13 @@
   "devDependencies": {
     "@types/node": "^15.14.9",
     "eslint": "8.57.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.28.1",
+    "eslint-config-standard": "^17.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jsdoc": "^38.1.6",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-standard": "^4.1.0",
+    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-jest": "^23.13.2",
+    "eslint-plugin-n": "^15.0.0",
     "jest": "^27.5.1",
     "jest-expect-message": "^1.1.3",
     "jest-junit": "^9.0.0"

package/tests/geoLocationCloud.test.js

@@ -1,27 +1,28 @@
-/* *********************************************************************
- * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
- * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
- * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
- *
- * This Original Work is licensed under the European Union Public Licence
- * (EUPL) v.1.2 and is subject to its terms as set out below.
- *
- * If a copy of the EUPL was not distributed with this file, You can obtain
- * one at https://opensource.org/licenses/EUPL-1.2.
- *
- * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
- * amended by the European Commission) shall be deemed incompatible for
- * the purposes of the Work and the provisions of the compatibility
- * clause in Article 5 of the EUPL shall not apply.
- *
- * If using the Work as, or as part of, a network application, by
- * including the attribution notice(s) required under Article 5 of the EUPL
- * in the end user terms of the application under an appropriate heading,
- * such notice(s) shall fulfill the requirements of that article.
+/* *********************************************************************
+ * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
+ * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
+ *
+ * This Original Work is licensed under the European Union Public Licence
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
+ *
+ * If a copy of the EUPL was not distributed with this file, You can obtain
+ * one at https://opensource.org/licenses/EUPL-1.2.
+ *
+ * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
+ * amended by the European Commission) shall be deemed incompatible for
+ * the purposes of the Work and the provisions of the compatibility
+ * clause in Article 5 of the EUPL shall not apply.
+ *
+ * If using the Work as, or as part of, a network application, by
+ * including the attribution notice(s) required under Article 5 of the EUPL
+ * in the end user terms of the application under an appropriate heading,
+ * such notice(s) shall fulfill the requirements of that article.
  * ********************************************************************* */
 
-const GeoLocation = require(__dirname +
-    '/..');
+const path = require('path');
+
+const GeoLocation = require(path.resolve(__dirname, '..'));
 const myResourceKey = process.env.RESOURCE_KEY || '!!YOUR_RESOURCE_KEY!!';
 
 const TestLat = '51.4578261';