- Bump to 1.4.0a1

GeoNode · Jul 24, 2019 · ee75923 · ee75923
1 parent c34f7cb
commit ee75923
Show file tree

Hide file tree

Showing 47 changed files with 8,274 additions and 2,065 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Change Log
 
+## [1.3.1](https://github.com/geosolutions-it/geonode-mapstore-client/releases/tag/v1.3.1) (2019-06-18)
+
+### Main features
+
+- Install `pip install django-geonode-mapstore-client==1.3.1` instructions [Here](https://pypi.org/project/django-geonode-mapstore-client/)
+- Release of GeoNode MapStore client v1.1
+- Based on [Django MapStore Adapter 1.0.3](https://github.com/geosolutions-it/django-mapstore-adapter/releases/tag/1.0.3)
+
+[GeoNode MapStore Client](https://github.com/geosolutions-it/geonode-mapstore-client/issues?q=is%3Aissue+milestone%3A%221.3.1%22) the list of issues solved.
+
+[MapStore2](https://github.com/geosolutions-it/MapStore2/issues?utf8=%E2%9C%93&q=+is%3Aissue+milestone%3A2019.01.01) the list of MapStore2 issues solved.
+
+## [1.3.0](https://github.com/geosolutions-it/geonode-mapstore-client/releases/tag/v1.3) (2019-06-18)
+
+### Main features
+
+- Install `pip install django-geonode-mapstore-client==1.3` instructions [Here](https://pypi.org/project/django-geonode-mapstore-client/)
+- Release of GeoNode MapStore client v1.1
+- Based on [Django MapStore Adapter 1.0.3](https://github.com/geosolutions-it/django-mapstore-adapter/releases/tag/1.0.3)
+
+[GeoNode MapStore Client](https://github.com/geosolutions-it/geonode-mapstore-client/issues?q=is%3Aissue+milestone%3A%221.2%22) the list of issues solved.
+
+[MapStore2](https://github.com/geosolutions-it/MapStore2/issues?utf8=%E2%9C%93&q=+is%3Aissue+milestone%3A2019.01.01) the list of MapStore2 issues solved.
+
 ## [1.1](https://github.com/geosolutions-it/geonode-mapstore-client/tree/v1.1) (2019-06-14)
 
  - **[MapStore2 Tag](https://github.com/geosolutions-it/MapStore2/releases/tag/v2019.01.01)**

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.1
+1.4.0a1
diff --git a/geonode_mapstore_client/client/MapStore2 b/geonode_mapstore_client/client/MapStore2
diff --git a/geonode_mapstore_client/client/js/epics/index.js b/geonode_mapstore_client/client/js/epics/index.js
@@ -26,7 +26,7 @@ const {SIZE_CHANGE, CLOSE_FEATURE_GRID, OPEN_FEATURE_GRID} = require('../../MapS
 const {CLOSE_IDENTIFY, ERROR_FEATURE_INFO, TOGGLE_MAPINFO_STATE, LOAD_FEATURE_INFO, EXCEPTIONS_FEATURE_INFO} = require('../../MapStore2/web/client/actions/mapInfo');
 const {SHOW_SETTINGS, HIDE_SETTINGS} = require('../../MapStore2/web/client/actions/layers');
 const {PURGE_MAPINFO_RESULTS} = require('../../MapStore2/web/client/actions/mapInfo');
-const {mapInfoRequestsSelector} = require('../../MapStore2/web/client/selectors/mapinfo');
+const {mapInfoRequestsSelector} = require('../../MapStore2/web/client/selectors/mapInfo');
 
 const {isFeatureGridOpen, getDockSize} = require('../../MapStore2/web/client/selectors/featuregrid');
 const {head, get} = require('lodash');

diff --git a/geonode_mapstore_client/client/package.json b/geonode_mapstore_client/client/package.json
@@ -85,7 +85,9 @@
     "webpack-bundle-size-analyzer": "2.0.2",
     "webpack-dev-server": "2.4.1",
     "webpack-parallel-uglify-plugin": "0.4.0",
-    "axios-mock-adapter": "1.16.0"
+    "axios-mock-adapter": "1.16.0",
+    "dynamic-public-path-webpack-plugin": "1.0.4",
+    "readline-promise": "1.0.4"
   },
   "dependencies": {
     "@carnesen/redux-add-action-listener-enhancer": "0.0.1",
@@ -97,7 +99,7 @@
     "@turf/polygon-to-linestring": "4.1.0",
     "ag-grid": "3.3.3",
     "ag-grid-react": "3.3.1",
-    "axios": "0.11.1",
+    "axios": "0.18.0",
     "b64-to-blob": "1.2.19",
     "babel-polyfill": "6.8.0",
     "babel-standalone": "6.7.7",
@@ -157,8 +159,8 @@
     "react-copy-to-clipboard": "5.0.0",
     "react-data-grid": "5.0.4",
     "react-data-grid-addons": "5.0.4",
-    "react-dnd": "2.4.0",
-    "react-dnd-html5-backend": "2.4.1",
+    "react-dnd": "2.6.0",
+    "react-dnd-html5-backend": "2.6.0",
     "react-dock": "0.2.4",
     "react-dom": "15.6.2",
     "react-draggable": "2.2.6",
@@ -217,6 +219,11 @@
     "xml2js": "0.4.17",
     "cache": "^2.1.0",
     "clean": "^4.0.2",
-    "lru-cache": "4.1.2"
+    "lru-cache": "4.1.2",
+    "@mapbox/geojsonhint": "2.0.1",
+    "@turf/center": "5.1.5",
+    "@turf/bbox-polygon": "5.1.5",
+    "@turf/boolean-overlap": "5.1.5",
+    "@turf/boolean-contains": "5.1.5"
   }
 }
diff --git a/geonode_mapstore_client/client/prod-webpack.config.js b/geonode_mapstore_client/client/prod-webpack.config.js
@@ -4,9 +4,9 @@ const themeEntries = {
     "themes/default": path.join(__dirname, "themes", "default", "theme.less"),
     "themes/preview": path.join(__dirname, "themes", "preview", "theme.less")
 };
-const extractThemesPlugin = require('./MapStore2/themes.js').extractThemesPlugin;
+const extractThemesPlugin = require('./MapStore2/build/themes.js').extractThemesPlugin;
 
-module.exports = require('./MapStore2/buildConfig')(
+module.exports = require('./MapStore2/build/buildConfig')(
     {
         'ms2-geonode-api': path.join(__dirname, "js", "api")
     },

diff --git a/geonode_mapstore_client/client/themes/default/theme.less b/geonode_mapstore_client/client/themes/default/theme.less
@@ -6,4 +6,4 @@
 @import "@{ms2-path}/ms2-theme.less";
 @import "@{ms2-path}/variables.less";
 @import "variables.less";
-@import "./less/geonode.less";
+@import "./less/geonode.less";
diff --git a/geonode_mapstore_client/client/themes/preview/theme.less b/geonode_mapstore_client/client/themes/preview/theme.less
@@ -4,6 +4,21 @@
 @import "@{ms2-path}/icons.less";
 @import "@{ms2-path}/bootstrap-theme.less";
 
+.no-border {
+    border: none !important;
+    border-top: none !important;
+}
+
+.no-border:active,
+.no-border:active:focus,
+.no-border:focus,
+.no-border:hover {
+    box-shadow: none;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    outline: none;
+}
+
 .fill:-webkit-full-screen
 {
     @import (multiple) "@{ms2-path}/ms2-theme.less";
@@ -19,4 +34,4 @@
 
 @import "@{ms2-path}/variables.less";
 @import "../default/variables.less";
-@import "./less/geonode.less";
+@import "./less/geonode.less";
diff --git a/geonode_mapstore_client/client/webpack.config.js b/geonode_mapstore_client/client/webpack.config.js
@@ -5,9 +5,9 @@ const themeEntries = {
     "themes/default": path.join(__dirname, "themes", "default", "theme.less"),
     "themes/preview": path.join(__dirname, "themes", "preview", "theme.less")
 };
-const extractThemesPlugin = require('./MapStore2/themes.js').extractThemesPlugin;
+const extractThemesPlugin = require('./MapStore2/build/themes.js').extractThemesPlugin;
 
-module.exports = assign({}, require('./MapStore2/buildConfig')(
+module.exports = assign({}, require('./MapStore2/build/buildConfig')(
     {
         'ms2-geonode-api': path.join(__dirname, "js", "api")
     },