@abi-software/flatmap-viewer 2.3.0-a.2 → 2.3.0-a.4

package/README.rst

@@ -38,7 +38,7 @@ The map server endpoint is specified as ``MAP_ENDPOINT`` in ``src/main.js``. It
 Package Installation
 ====================
 
-* ``npm install @abi-software/flatmap-viewer@2.3.0-a.2``
+* ``npm install @abi-software/flatmap-viewer@2.3.0-a.4``
 
 Documentation
 -------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmap-viewer",
-  "version": "2.3.0-a.2",
+  "version": "2.3.0-a.4",
   "description": "Flatmap viewer using Maplibre GL",
   "repository": "https://github.com/AnatomicMaps/flatmap-viewer.git",
   "main": "src/main.js",
@@ -18,6 +18,7 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.10.4",
+    "@fortawesome/fontawesome-free": "^6.4.0",
     "@turf/area": "^6.0.1",
     "@turf/bbox": "^6.0.1",
     "@turf/helpers": "^6.1.4",

package/src/annotation.js

@@ -23,7 +23,7 @@ limitations under the License.
 //==============================================================================
 
 // We use Font Awesome icons
-import '../static/css/font-awesome.min.css';
+import '@fortawesome/fontawesome-free/css/all.css';
 import escape from 'html-es6cape';
 import { jsPanel } from 'jspanel4';
 import 'jspanel4/dist/jspanel.css';
@@ -113,17 +113,18 @@ export class Annotator
         }).then((response) => {
             panel.headerlogo.innerHTML = '';
             if (response.ok) {
-                const creator = response.json();
-                if ('error' in creator) {
-                    callback({error: creator.error});
-                } else {
-                    this.__setUser(creator);
-                    this.__authorised = true;
-                    callback(creator);
-                }
+                return response.json();
             } else {
                 callback({error: `${response.status} ${response.statusText}`});
             }
+        }).then((response) => {
+            if ('error' in response) {
+                callback({error: response.error});
+            } else {
+                this.__setUser(response);
+                this.__authorised = true;
+                callback(response);
+            }
         });
         setTimeout((panel) => {
             if (this.user === 'undefined') {
@@ -148,10 +149,12 @@ export class Annotator
         }).then((response) => {
             if (response.ok) {
                 this.__authorised = false;
-                console.log('Annotator logout:', response.json());
+                return response.json();
             } else {
                 console.log('Annotator logout:', `${response.status} ${response.statusText}`);
             }
+        }).then((response) => {
+            console.log('Annotator logout:', response);
         });
         setTimeout(() => {
             if (this.__authorised) {
@@ -293,10 +296,12 @@ export class Annotator
             signal: abortController.signal
         }).then((response) => {
             if (response.ok) {
-                callback(response.json());
+                return response.json();
             } else {
                 callback({error: `${response.status} ${response.statusText}`});
             }
+        }).then((response) => {
+            callback(response);
         });
         return abortController;
     }