Align master on c125_annotations branch

README.md

@@ -23,6 +23,25 @@ You can download the WAR file from the latest release [here](https://github.com/
 
 Quick Start
 ------------
+
+There are two quick ways to test out MapStore2. Either using [Docker](https://www.docker.com/) or a local java web container like [Apache Tomcat](http://tomcat.apache.org/)
+
+### Using Docker
+
+Pull the latest image from Docker Hub:
+
+`docker pull geosolutionsit/mapstore2`
+
+`docker run --name mapstore -p8080:8080  geosolutionsit/mapstore2`
+
+Then you can access MapStore2 using the following URL:
+
+[http://localhost:8080/mapstore](http://localhost:8080/mapstore)
+
+Use the default credentials (admin / admin) to login and start creating your maps!
+
+### Using the Web Archive (WAR file)
+
 After downloading the MapStore2 war file, install it in your java web container (e.g. Tomcat), with usual procedures for the container (normally you only need to copy the war file in the webapps subfolder).
 
 If you don't have a java web container you can download Apache Tomcat from [here](https://tomcat.apache.org/download-70.cgi) and install it. You will also need a Java7 [JRE](http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html)

buildConfig.js

@@ -161,6 +161,14 @@ module.exports = (bundles, themeEntries, paths, extractThemesPlugin, prod, publi
                 target: "https://dev.mapstore2.geo-solutions.it/mapstore",
                 secure: false
             },
+            '/pdf': {
+                target: "https://dev.mapstore2.geo-solutions.it/mapstore",
+                secure: false
+            },
+            '/mapstore/pdf': {
+                target: "https://dev.mapstore2.geo-solutions.it",
+                secure: false
+            },
             '/proxy': {
                 target: "https://dev.mapstore2.geo-solutions.it/mapstore",
                 secure: false

docma-config.json

@@ -28,15 +28,15 @@
         "emoji": true
     },
     "app": {
-        "title": "MapStore 2 documentation",
+        "title": "MapStore documentation",
         "base": "/mapstore/docs",
         "entrance": "content:site",
         "routing": { "method": "path", "caseSensitive": true }
     },
     "template": {
         "path": "./docma-template",
         "options": {
-            "title": "MapStore 2",
+            "title": "MapStore",
             "sidebar": true,
             "collapsed": false,
             "outline": "tree",
@@ -75,17 +75,17 @@
                     "href": "index.html",
                     "items": [
                         {
-                            "label": "MapStore 2 Releases",
+                            "label": "MapStore Releases",
                             "href": "https://github.com/geosolutions-it/MapStore2/releases",
                             "target": "_blank"
                         },
                         {
-                            "label": "MapStore 2 tar.gz",
+                            "label": "MapStore tar.gz",
                             "href": "https://github.com/geosolutions-it/MapStore2/tarball/master",
                             "target": "_blank"
                         },
                         {
-                            "label": "MapStore 2 .zip",
+                            "label": "MapStore .zip",
                             "href": "https://github.com/geosolutions-it/MapStore2/zipball/master",
                             "target": "_blank"
                         }
@@ -120,6 +120,8 @@
             "web/client/components/mapcontrols/annotations/Annotations.jsx",
             "web/client/components/mapcontrols/annotations/AnnotationsEditor.jsx",
             "web/client/components/mapcontrols/annotations/AnnotationsConfig.js",
+            "web/client/components/misc/cardgrids/SideCard.jsx",
+            "web/client/components/misc/cardgrids/SideGrid.jsx",
             "web/client/components/misc/enhancers/emptyState.jsx",
             "web/client/components/misc/enhancers/tooltip.jsx",
             "web/client/components/misc/panels/Accordion.jsx",
@@ -130,6 +132,8 @@
             "web/client/components/misc/toolbar/Toolbar.jsx",
             "web/client/components/misc/EmptyView.jsx",
             "web/client/components/misc/ResizableModal.jsx",
+            "web/client/components/misc/Slider.jsx",
+            "web/client/components/TOC/FloatingLegend.jsx",
             "web/client/components/TOC/TOCItemsSettings.jsx",
             "web/client/components/TOC/fragments/settings/FeatureInfo.jsx",
             "web/client/components/TOC/fragments/settings/FeatureInfoEditor.jsx",
@@ -138,6 +142,7 @@
             "web/client/actions/controls.js",
             "web/client/actions/fullscreen.js",
             "web/client/actions/globeswitcher.js",
+            "web/client/actions/floatinglegend.js",
             "web/client/actions/maplayout.js",
             "web/client/actions/maps.js",
             "web/client/actions/maptype.js",
@@ -146,6 +151,7 @@
 
             "web/client/selectors/index.jsdoc",
             "web/client/selectors/featuregrid.js",
+            "web/client/selectors/floatinglegend.js",
             "web/client/selectors/map.js",
             "web/client/selectors/mapinfo.js",
             "web/client/selectors/maplayout.js",
@@ -156,6 +162,7 @@
             "web/client/reducers/controls.js",
             "web/client/reducers/featuregrid.js",
             "web/client/reducers/globeswitcher.js",
+            "web/client/reducers/floatinglegend.js",
             "web/client/reducers/maps.js",
             "web/client/reducers/maptype.js",
             "web/client/reducers/notifications.js",
@@ -197,11 +204,13 @@
                 "web/client/plugins/GlobeViewSwitcher.jsx",
                 "web/client/plugins/GoFull.jsx",
                 "web/client/plugins/Map.jsx",
+                "web/client/plugins/MapSearch.jsx",
                 "web/client/plugins/Measure.jsx",
                 "web/client/plugins/MeasurePanel.jsx",
                 "web/client/plugins/MeasureResults.jsx",
                 "web/client/plugins/FullScreen.jsx",
                 "web/client/plugins/Identify.jsx",
+                "web/client/plugins/FloatingLegend.jsx",
                 "web/client/plugins/Locate.jsx",
                 "web/client/plugins/Login.jsx",
                 "web/client/plugins/MousePosition.jsx",

docs/developer-guide/maps-configuration.md

@@ -8,7 +8,8 @@ maxExtent: {number[]} max bbox of the map expressed [minx, miny, maxx, maxy]
 layers: {object[]} list of layers to be loaded on the map
 
 i.e.
-> ``{ "projection": "EPSG:900913",
+``` javascript
+{ "projection": "EPSG:900913",
     "units": "m",
     "center": {"x": 1000000.000000, "y": 5528000.000000, "crs": "EPSG:900913"},
     "zoom": 15,
@@ -17,18 +18,22 @@ i.e.
         20037508.34, 20037508.34
     ],
     "layers": [{...},{...}]
-}``
+}
+```
 # Layers option
 
 i.e.
-> ``{
+ ``` javascript
+{
     "url": "http..."
     "format": "image/png8"
     "title": "Open Street Map",
     "name": "mapnik",
     "group": "background",
-    "visibility": false
-}``
+    "visibility": false,
+    "hidden": true
+}
+```
 
 ## Layer types
 
@@ -41,6 +46,45 @@ i.e.
 
 ### WMS
 
+#### Elevation layer
+WMS layers can be configured to be used as a source for elevation related functions.
+This requires:
+ * a GeoServer WMS service with the DDS/BIL plugin
+ * A WMS layer configured with BIL 16 bit output in big endian mode and -9999 nodata value
+ * a static layer in the Map plugin configuration (use the additionalLayers configuration option):
+
+**in localConfig.json**
+ ``` javascript
+ {
+     "name": "Map",
+     "cfg": {
+         "additionalLayers": [{
+            "url": "http..."
+            "format": "application/bil16",
+            ...
+            "name": "elevation",
+            "visibility": true,
+            "useForElevation": true
+        }]
+     }
+ }
+ ```
+
+ The layer will be used for:
+  * showing elevation in the MousePosition plugin (requires showElevation: true in the plugin configuration)
+  * as a TerrainProvider if the maptype is Cesium
+
+**in localConfig.json**
+ ``` javascript
+ {
+     "name": "MousePosition",
+     "cfg": {
+         "showElevation": true,
+         ...
+     }
+ }
+ ```
+
 ### Bing
 
 ### Google
@@ -54,14 +98,16 @@ It's enough to add provider property and 'tileprovider' as type property to the
 List of available layer [here](https://github.com/geosolutions-it/MapStore2/blob/master/web/client/utils/ConfigProvider.js)
 
 i.e.
-> ``{
+``` javascript
+{
 "type": "tileprovider",
 "title": "Title",
 "provider": "Stamen.Toner",
 "name": "Name",
 "group": "GroupName",
 "visibility": false
-}``
+}
+```
 
 Options passed in configuration object, if already configured by TileProvider,  will be overridden.
 

package.json

@@ -34,7 +34,6 @@
     "istanbul-instrumenter-loader": "2.0.0",
     "jsdoc": "https://github.com/geosolutions-it/jsdoc/tarball/fix_acorn_jsx",
     "jsdoc-jsx": "0.1.0",
-    "json-loader": "0.5.4",
     "karma": "1.5.0",
     "karma-chrome-launcher": "2.0.0",
     "karma-cli": "1.0.1",
@@ -123,6 +122,7 @@
     "leaflet.locatecontrol": "0.62.0",
     "leaflet.nontiledlayer": "1.0.7",
     "lodash": "4.16.6",
+    "lru-cache": "4.1.2",
     "moment": "2.21.0",
     "node-geo-distance": "1.2.0",
     "object-assign": "4.1.1",
@@ -142,6 +142,7 @@
     "react-container-dimensions": "1.3.2",
     "react-copy-to-clipboard": "5.0.0",
     "react-data-grid": "2.0.59",
+    "react-data-grid-addons": "3.0.11",
     "react-dnd": "2.4.0",
     "react-dnd-html5-backend": "2.4.1",
     "react-dock": "0.2.4",
@@ -182,6 +183,7 @@
     "redux-thunk": "0.1.0",
     "redux-undo": "0.5.0",
     "reselect": "2.5.1",
+    "resize-observer-polyfill": "1.5.0",
     "rxjs": "5.1.1",
     "screenfull": "3.1.0",
     "shpjs": "3.4.2",
@@ -195,6 +197,7 @@
     "url": "0.10.3",
     "uuid": "3.0.1",
     "w3c-schemas": "1.3.1",
+    "wellknown": "0.5.0",
     "wkt-parser": "https://github.com/geosolutions-it/wkt-parser/tarball/mapstore2_fixes",
     "xml2js": "0.4.17"
   },