From f8a4a0b3ad0fc7a1ef8512f3d46c2da9ca593e9a Mon Sep 17 00:00:00 2001
From: SilentSpike <SilentSpike100+Github@gmail.com>
Date: Fri, 7 Feb 2020 11:26:02 +0000
Subject: [PATCH] Use d3_json Promise directly for Osmose requests

---
 modules/services/osmose.js | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/services/osmose.js b/modules/services/osmose.js
index 2c97852ed..321ef8cf6 100644
--- a/modules/services/osmose.js
+++ b/modules/services/osmose.js
@@ -171,7 +171,7 @@ export default {
       this.replaceItem(issue);
     };
 
-    return jsonPromise(url, cacheDetails).then(() => issue);
+    return d3_json(url).then(cacheDetails).then(() => issue);
   },
 
   loadStrings(locale=currentLocale) {
@@ -239,7 +239,7 @@ export default {
       // Osmose API falls back to English strings where untranslated or if locale doesn't exist
       const url = `${_osmoseUrlRoot}/items/${item}/class/${cl}?langs=${locale}`;
 
-      return jsonPromise(url, cacheData);
+      return d3_json(url).then(cacheData);
     });
 
     return Promise.all(allRequests).then(() => _cache.strings[locale]);
@@ -324,16 +324,3 @@ export default {
     return _cache.closed;
   }
 };
-
-function jsonPromise(url, then) {
-  return new Promise((resolve, reject) => {
-    d3_json(url)
-      .then(data => {
-        then(data);
-        resolve();
-      })
-      .catch(err => {
-        reject(err);
-      });
-  });
-}