Skip to content

Commit

Permalink
Align master on c125_annotations branch (#2923)
Browse files Browse the repository at this point in the history
* Fix #2602 loader spinner on file import

* Fixes #2741: set openlayers single tile wms layers default ratio to 1 (#2742)

* Fixed #2626 fixed leaflet measure tool (#2730)

* Fixed #2626 fixed leaflet measure tool

* added some comments to document changes

* improved implementation

* added more tests

* Fix #2746 leaflet drawing of linestring (#2747)

* fix leaflet override

* fixed with retrocompatibility

* Fixed binding of overridden functions

* Croatian language translation (#2755)

* Fixes #2748: leaflet draw issues (#2752)

* Fixes #2748: leaflet draw issues

* Additional fix for measures

* Removed bootstrap overlay trigger (#2734)

* Fix #2661 First implementation of map widget (#2721)

* Fixes #2021: limit list of srs saved in layers from catalog to the ones supported by the current mapstore2 instance (#2756)

* Update README.md

Add instructions to test MapStore2 using Docker containers

* Fixes #2760: integrated printing service (#2761)

* Added missing files for printing (#2762)

* Removed duplicated and mismatching in version libraries from geostore and mapfish-print (#2763)

* Fixes #2631: usage of mapping libraries (#2739)

* Fixes #2631: usage of mapping libraries

* Fixed switching to 3d mode

* Improved sidecard/sidegrid styles and structures (#2764)

* Quick fix to embedded map style (#2766)

* Fix #2754 Add map widget layer's editing (#2767)

* Croatian language translation - update (#2776)

* Fix #2778 Embedded doesn't work  (#2779)

* Added embedded mode in standard app

* Removed map layout reducers/epics

* Fixed leaflet-draw inclusion in share api template (#2782)

* Connect to #2662 Geodashboard single connection support (#2780)

* Improved widgets dependencies system

* Support for single map connection

* removed test for old map sync switches

* Add support for map sync (#2783)

* Fix #2775 Styles misalignment in BorderLayout component (#2785)

* Multiple map connection support (#2791)

* Fixes #1506 OpenLayers and Leaflet vector different default styles  (#2771)

* Fix #2662. Add widget connections and colors (#2793)

* Improved suggestion when the user can not create a widget (#2795)

* Charts builder improvements (#2796)

* Fixed color style in pdf print (#2792)

* Fixed color style in pdf print

* Tinycolor version

* Fix #2798 search clickable (#2800)

* fix #2798 make clickable search in home

* remove unneeded configuration

* update spinner style dinamically and fix example icon

* Add back buttons to dashboard and map widgets (#2801)

* Add empty state to featuregrid widget (#2802)

* Fix #2787 Panels hide the feature info marker (#2788)

* Merge pull request #1 from geosolutions-it/master (#2805)

* translation data.zh-ZH

* Modify spelling mistakes

* Fixed #2809. Moved utility function in the proper place (#2810)

* Fixed layout of counter widget (#2804)

* Add empty map to map selector (#2813)

* Fix #2794 Force update of map widget position on save (#2814)

* Fix #2807 and add a tool to create chart from feature grid (#2808)

* Fix #2807 and add a tool to create chart from feature grid

* add a flag for disabling chart creation from feature grid

* fix feature grid toolbar test

* update flag used to show char in feature grid

* Exclude google background from widgets (#2817)

* Fix #2812 parseInitialState function  (#2818)

* fix #2812 update parsing of initialState in localConfig.json

* update parsing method

* add documentation and test

* update documentation

* add default in toChangesMap and add a test for empty arrays

* Fix #2790 improved wizard messages (#2819)

* Fixes #2815: elevation support in MousePosition, through elevation layers (#2816)

* fix #2807 back interaction from widget to feature grid (#2821)

* Fix #2803 add popover overlay to the sync tool in feature grid (#2829)

* Fix #2696 map rotation style for openlayers (#2820)

* fix #2696 aligned style of map rotation tool for ol

* disable map rotation on openlayers

* fix require of maplayout selector (#2834)

* Fix #2798 change configuration and make search icon clickable and configurable (#2831)

* Fix #2825. Improved messages in case of no attributes layer (#2833)

* Fixes #2827 Add featured maps plugin (#2828)

* #2827 Minor fixes (#2836)

* Fix #2660 implemented first version of save functionalities for dashboard (#2832)

* Fix #2773. First rules-editor implementation (#2845)

* Fixes #2824: enable elevation layer only for cesium or when mouseposition is enabled (#2841)

* fix #2803 synch popover defaults (#2847)

* fix #2825 interactions between featuregrid anche chart wizard (#2846)

* Removed github link from navbar (#2839)

* fix #2852 dev build fails (#2853)

* Fix #2610 clipped long descriptions of catalog cards (#2830)

* Fix #2664 Implemented browsing functionality for dashboards (#2854)

* First  version of GeoDashboard browsing

  - Has a first abstraction of resources browser. can be reused in maps
 - Still to implement delete and effective link to dashboard

* WIP for dashboard browsing

Still missing:
 - i18n and tests
 - link to the contents
 - titles of tabs  with parenthesis
 - tests
 - fix issues with geostore

* Finalized code for dashboard browser

 - Missing translations and tests

* Add sample category for dashboards

* Fixed groups retrival by admin user

* add some tests

* Add unit tests

* Add i18n

* Fixed confirm dialog test

* Improved empty view style

* Fixed test's context not restored properly

* add tests for geostore observables

* Fix #2825. Fixed error message for layers with no attributes (#2855)

* Fix #2563: Fixed unnecessary details request on Map open (#2849)

* Update data.it-IT

* Fixes #2700  Toolbar icon for 3D map (#2850)

* Minor fixes to localized strings (#2869)

* Changed create map/dashboard buttons (#2871)

* Fix #2843 and Fix #2659. Fixed resize issues on dashboard and map widgets (#2868)

* Added GeoFence admin icon (#2873)

* Fix #2856 Legend action plugin (#2857)

* Added details editor styles filters and  attributes (#2867)

* Fix #2876 Cross layer filter doesn't work if layer has localized title (#2877)

* Changed MapStore 2 strings  to Mapstore (#2882)

- All translation files, html
 - Readme.md Doc pages, pom.xml and package.json still have MapStore 2

* Connected to #2885. Temporary disabled video from detail sheet (#2886)

* Fix #2842. Add legend widget (#2884)

* Fix #2859 Escape special XML chars for title and description (#2887)

* fix #2888 switch to correct 2d mode (#2889)

* Added area editor (#2891)

* Fix #2892. Remove authkey from dashboard layers (#2894)

* Fixed home button position (#2895)

* Fix #2862. Add geofence icon to the manager menu (#2899)

* Fix #2663. Add edit and view mode to the dashboard (#2901)

* Fix #2903. Add support to hide spatial and cross layer filter (#2904)

* fix #2696 map rotation disables correctly (#2905)

* fix #2861 layer metadata layout (#2863)

* fix #2864 properties row viewer (#2865)

* Fix #2898 TOC moves down if Measure tool and print are opened (#2900)

* fix #2711 remove arc layer when toggling length measure tool (#2902)

* RuleEditor Layers filter always enabled (#2907)

* Showing spatial filter selection area when FeatureGrid is open (#2906)

* Moved icons for firefox/ie support (#2912)

* Modify SaveLayer in order to take the custom origin of a wms layer (#2917)

* Modify SaveLayer in order to take the custom origin of a wms layer in account (tilegrid config)

* update maputils tests
  • Loading branch information
MV88 authored and mbarto committed May 18, 2018
1 parent 3b111be commit 1f43df9
Show file tree
Hide file tree
Showing 583 changed files with 28,921 additions and 3,002 deletions.
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
74 changes: 0 additions & 74 deletions TableWidget.jsx

This file was deleted.

8 changes: 8 additions & 0 deletions buildConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 14 additions & 5 deletions docma-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
60 changes: 53 additions & 7 deletions docs/developer-guide/maps-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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.

Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down
Loading

0 comments on commit 1f43df9

Please sign in to comment.