Merge pull request #66 from allyoucanmap/project-scripts-update

#65: Update MapStore client with Map Swipe and Locate plugins
GeoNode · Nov 11, 2020 · 25f5b94 · 25f5b94
2 parents a1313d8 + bd21a98
commit 25f5b94
Show file tree

Hide file tree

Showing 111 changed files with 8,086 additions and 4,163 deletions.
diff --git a/geonode_mapstore_client/client/.eslintignore b/geonode_mapstore_client/client/.eslintignore
diff --git a/geonode_mapstore_client/client/.eslintrc b/geonode_mapstore_client/client/.eslintrc
diff --git a/geonode_mapstore_client/client/.gitignore b/geonode_mapstore_client/client/.gitignore
@@ -4,3 +4,4 @@ web/
 dist/
 module/
 coverage/
+package-lock.json
diff --git a/geonode_mapstore_client/client/.npmignore b/geonode_mapstore_client/client/.npmignore
@@ -0,0 +1,2 @@
+MapStore2
+module/
diff --git a/geonode_mapstore_client/client/js/api.js b/geonode_mapstore_client/client/js/api.js
@@ -7,19 +7,20 @@
  */
 require('react-widgets/dist/css/react-widgets.css');
 const assign = require("object-assign");
-const ConfigUtils = require('../MapStore2/web/client/utils/ConfigUtils');
-const LocaleUtils = require('../MapStore2/web/client/utils/LocaleUtils');
-const LayersUtils = require('../MapStore2/web/client/utils/LayersUtils');
+const ConfigUtils = require('@mapstore/framework/utils/ConfigUtils');
+const LocaleUtils = require('@mapstore/framework/utils/LocaleUtils');
+const LayersUtils = require('@mapstore/framework/utils/LayersUtils');
 LayersUtils.setRegGeoserverRule(/\/[\w- ]*geoserver[\w- ]*\/|\/[\w- ]*gs[\w- ]*\//);
 const {keyBy, values} = require('lodash');
+
+require('react-select/dist/react-select.css');
 /**
  * Add custom (overriding) translations with:
  *
  * ConfigUtils.setConfigProp('translationsPath', ['./MapStore2/web/client/translations', './translations']);
  */
-ConfigUtils.setConfigProp('translationsPath', ['../MapStore2/web/client', './'] );
 ConfigUtils.setConfigProp('themePrefix', 'msgapi');
-const Persistence = require("../MapStore2/web/client/api/persistence");
+const Persistence = require("@mapstore/framework/api/persistence");
 Persistence.addApi("geonode", require("./api/geonode"));
 Persistence.setApi("geonode");
 
@@ -50,21 +51,23 @@ Persistence.setApi("geonode");
 
 const getScriptPath = function() {
     const scriptEl = document.getElementById('ms2-api');
-    return scriptEl && scriptEl.src && scriptEl.src.substring(0, scriptEl.src.lastIndexOf('/')) || 'https://dev.mapstore2.geo-solutions.it/mapstore/dist';
+    return scriptEl && scriptEl.src && scriptEl.src.substring(0, scriptEl.src.lastIndexOf('/')) || '';
 };
 
+const translationsPath = __GEONODE_PROJECT_CONFIG__.translationsPath || getScriptPath() + '/../ms-translations';
+
 // Set X-CSRFToken in axios;
-const axios = require('../MapStore2/web/client/libs/ajax');
+const axios = require('@mapstore/framework/libs/ajax');
 axios.defaults.xsrfHeaderName = "X-CSRFToken";
 axios.defaults.xsrfCookieName = "csrftoken";
 
 const createMapStore2Api = function(plugins) {
-    const MapStore2 = require('../MapStore2/web/client/jsapi/MapStore2').withPlugins(plugins, {
+    const MapStore2 = require('@mapstore/framework/jsapi/MapStore2').withPlugins(plugins, {
         theme: {
             path: getScriptPath() + '/themes'
         },
         noLocalConfig: true,
-        translations: getScriptPath() + '/../MapStore2/web/client'
+        translations: translationsPath
     });
     // window.MapStore2 = MapStore2;
     return assign({}, MapStore2, { create: function(container, opts) {

diff --git a/geonode_mapstore_client/client/js/api/geonode.js b/geonode_mapstore_client/client/js/api/geonode.js
@@ -7,8 +7,8 @@
  */
 
 const Rx = require('rxjs');
-const axios = require('../../MapStore2/web/client/libs/ajax');
-const ConfigUtils = require("../../MapStore2/web/client/utils/ConfigUtils");
+const axios = require('@mapstore/framework/libs/ajax');
+const ConfigUtils = require("@mapstore/framework/utils/ConfigUtils");
 
 
 const createAttributesFromMetadata = ({ name, description }) => {

diff --git a/geonode_mapstore_client/client/js/components/leaflet/ArcGisMapServer.js b/geonode_mapstore_client/client/js/components/leaflet/ArcGisMapServer.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-const Layers = require('../../../MapStore2/web/client/utils/leaflet/Layers');
+const Layers = require('@mapstore/framework/utils/leaflet/Layers');
 var L = require('leaflet');
 
 Layers.registerType('arcgis', (options) => {

diff --git a/geonode_mapstore_client/client/js/components/openlayers/ArcGisMapServer.js b/geonode_mapstore_client/client/js/components/openlayers/ArcGisMapServer.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import Layers from '../../../MapStore2/web/client/utils/openlayers/Layers';
+import Layers from '@mapstore/framework/utils/openlayers/Layers';
 
 import TileLayer from 'ol/layer/Tile';
 import TileArcGISRest from 'ol/source/TileArcGISRest';
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ web/ @@
     dist/
     module/
     coverage/
+    package-lock.json