Merge pull request #279 from fschmenger/replace_fetch_by_axios

Replace fetch by axios

src/factory/Layer.js

@@ -17,6 +17,7 @@ import { bbox as bboxStrategy } from 'ol/loadingstrategy';
 import { OlStyleFactory } from './OlStyle'
 import { applyTransform } from 'ol/extent';
 import { getTransform } from 'ol/proj';
+import axios from 'axios';
 
 /**
  * Factory, which creates OpenLayers layer instances according to a given config
@@ -181,12 +182,18 @@ export const LayerFactory = {
         }
 
         // load data from WFS, parse and add to vector source
-        fetch(wfsRequest).then((response) => {
-          return response.text();
-        }).then((responseText) => {
-          const feats = vectorSource.getFormat().readFeatures(responseText);
-          vectorSource.addFeatures(feats);
-        });
+        const request = {
+          method: 'GET',
+          url: wfsRequest
+        };
+        axios(request)
+          .then(response => {
+            const feats = vectorSource.getFormat().readFeatures(response.data);
+            vectorSource.addFeatures(feats);
+          })
+          .catch(() => {
+            vectorSource.removeLoadedExtent(extent);
+          });
       },
       strategy: lConf.loadOnlyVisible !== false ? bboxStrategy : undefined
     });

src/main.js

@@ -13,6 +13,7 @@ import LocaleUtil from './util/Locale';
 import ObjectUtil from './util/Object';
 import ColorThemeUtil from './util/ColorTheme'
 import 'vuetify/dist/vuetify.min.css';
+import axios from 'axios';
 
 Vue.use(Vuetify);
 Vue.use(PortalVue);
@@ -190,11 +191,13 @@ const createApp = function (appConfig) {
 
 // Look in the static dir for an app-specific config file.
 const configFile = 'static/app-conf' + appCtxFile + '.json';
-fetch(configFile)
-  .then(function (response) {
-    return response.json().then(function (appConfig) {
-      createApp(appConfig);
-    })
-  }).catch(function () {
-    console.error('Cannot load config file: ' + configFile)
+const request = {
+  method: 'GET',
+  url: configFile
+};
+axios(request)
+  .then(response => {
+    createApp(response.data);
+  }).catch(function (error) {
+    console.error(`Cannot load config file ${configFile}, ${error}`)
   });