Merge pull request #71 from mircobe87/issue-69-geostoreBasePath

Fixes #69
geosolutions-it · Aug 27, 2015 · f9a0334 · f9a0334
2 parents ac617f0 + 909ed05
commit f9a0334
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/web/client/api/GeoStoreDAO.js b/web/client/api/GeoStoreDAO.js
@@ -12,14 +12,14 @@ var axios = require('axios');
  */
 var Api = {
     getData: function(id, geoStoreBase) {
-        var url = geoStoreBase || "/rest/geostore/";
+        var url = geoStoreBase || "/mapstore/rest/geostore/";
         url += "data/" + id;
         return axios.get(url).then(function(response) {
             return response.data;
         });
     },
     getResourcesByCategory: function(category, query, params, geoStoreBase) {
-        var url = geoStoreBase || "/rest/geostore/";
+        var url = geoStoreBase || "/mapstore/rest/geostore/";
         var q = query || "*";
         url += "extjs/search/category/" + category + "/*" + q + "*/";
         return axios.get(url, params).then(function(response) {return response.data; });

diff --git a/web/client/api/MapConfigDAO.js b/web/client/api/MapConfigDAO.js
@@ -21,7 +21,7 @@ var Api = {
      * Returns Merged configurations from base url and GeoStore
      */
     getMergedConfig: function(baseConfigURL, mapId, geoStoreBase) {
-        var url = ( geoStoreBase || "/rest/geostore/" ) + "data/" + mapId;
+        var url = ( geoStoreBase || "/mapstore/rest/geostore/" ) + "data/" + mapId;
         if (!mapId) {
             return Api.get(baseConfigURL);
         }

diff --git a/webpack.config.js b/webpack.config.js
@@ -35,7 +35,7 @@ module.exports = {
     },
     devServer: {
         proxy: [{
-            path: new RegExp("/rest/geostore/(.*)"),
+            path: new RegExp("/mapstore/rest/geostore/(.*)"),
             rewrite: rewriteUrl("/geostore/rest/$1"),
             target: "http://mapstore.geo-solutions.it"
         }]