Skip to content

Commit 7027670

Browse files
offtherailzofftherailz
committed
Merge branch 'master' of github.com:geosolutions-it/MapStore2 into C039_geostory
2 parents 11c6d57 + 0908662 commit 7027670

223 files changed

Lines changed: 8178 additions & 3258 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/buildConfig.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ module.exports = (bundles, themeEntries, paths, extractThemesPlugin, prod, publi
6868
}
6969
}),
7070
new NormalModuleReplacementPlugin(/leaflet$/, path.join(paths.framework, "libs", "leaflet")),
71-
new NormalModuleReplacementPlugin(/openlayers$/, path.join(paths.framework, "libs", "openlayers")),
7271
new NormalModuleReplacementPlugin(/proj4$/, path.join(paths.framework, "libs", "proj4")),
7372
new NoEmitOnErrorsPlugin(),
7473
extractThemesPlugin

‎build/docma-config.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@
192192
"web/client/utils/LocaleUtils.js",
193193
"web/client/utils/PluginsUtils.js",
194194
"web/client/utils/PrintUtils.js",
195+
"web/client/utils/openlayers/DrawSupportUtils.js",
195196
"web/client/utils/ogc/Filter/FilterBuilder.js",
196197
"web/client/utils/ogc/WFS/RequestBuilder.js",
197198
"web/client/utils/ogc/WFST/RequestBuilder.js",

‎docs/developer-guide/map-query-parameters.md‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ To dispatch additional actions when the map viewer is started, the **actions** q
1919
"initialActionsWhiteList": ["ZOOM_TO_EXTENT", "ADD_LAYER", ...]
2020
```
2121

22-
The value of this paramater is a JSON string containing an array with an object per action. The structure of the object consist of a property type and a bunch of other properties depending on the action.
22+
The value of this parameter is a JSON string containing an array with an object per action. The structure of the object consist of a property type and a bunch of other properties depending on the action.
2323

2424
### Available actions
2525
Only the following actions can be used in the **actions** json string.
@@ -74,3 +74,23 @@ The MapStore invocation URL above executes the following operations:
7474
- Execution of a map zoom to the provided extent
7575

7676
For more details check out the [searchLayerWithFilter](https://mapstore2.geo-solutions.it/mapstore/docs/#actions.search.exports.searchLayerWithFilter) in the framework documentation
77+
78+
79+
#### Add Layers
80+
81+
This action allows to add layers directly to the map by taking them from the Catalogs
82+
83+
Requirements:
84+
85+
- The number of layers should match the number of sources
86+
- The source name must match a catalog service name present in the map
87+
88+
Example:
89+
```
90+
{
91+
"type": "CATALOG:ADD_LAYERS_FROM_CATALOGS",
92+
"layers": ["workspace1:layer1", "workspace2:layer2"],
93+
"sources": ["catalog1", "catalog2"]
94+
}
95+
?actions=[{"type":"CATALOG:ADD_LAYERS_FROM_CATALOGS","layers":["layer1", "layer2"],"sources":["catalog1", "catalog2"]}]
96+
```

‎docs/developer-guide/mapstore-projects.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# MapStore Projects
2-
MapStore projects can be created using the [Project Creation Script](project-creation-script).
2+
MapStore projects can be created using the [Project Creation Script](../project-creation-script).
33

44
A MapStore project is a custom WebGis application that uses MapStore as a framework.
55

‎docs/user-guide/attributes-table.md‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,52 @@ In *Edit mode*, you can delete existing features following these steps:
113113

114114
<img src="../img/delete-line-shape.gif" />
115115

116+
Quick Filtering
117+
-------------------
118+
119+
The [MapStore](https://mapstore2.geo-solutions.it/mapstore/#/) Attribute Table allows you to quickly filter the table records(features) by using the
120+
filter field located at the top of each table column.
121+
122+
<p><img src="../img/attribute-table-quick-filter.jpg" style="max-width:620px;"/></p>
123+
124+
To use the attribute table quick filters, just type in anything in the filter fields located at the top of each column
125+
126+
For example to filter **Arizona State** type in **arizona** in the filter field located on **state_name** column
127+
<p><img src="../img/attribute-table-quick-filter-1.jpg" style="max-width:620px;"/></p>
128+
129+
!!! note
130+
We have got **one** item and since the map is by default synchronized with the **attribute table**, only the **Arizona** state is visible.
131+
132+
133+
### Operator based filtering
134+
Quick filters allow you to filter records in the Attribute Table by using comparison operators (the operators must precede the filter text): operator can be used for all data type including float and date types.
135+
136+
<p><img src="../img/attribute-table-quick-filter-2.jpg" style="max-width:620px;"/></p>
137+
138+
So far the operators allowed are as follows
139+
140+
* **!== or != or <>** Not equal
141+
* **<=** Less than or equal
142+
* **>=** Greater than or equal
143+
* **<** Less than
144+
* **>** Greater than
145+
* **=== or == or =** Equal, this is the internal default one if the operator isn't specified.
146+
147+
Examples;
148+
149+
* States with **persons >= 4,000,000**
150+
<p><img src="../img/attribute-table-quick-filter-3.jpg" style="max-width:620px;"/></p>
151+
152+
* States with male population **Male < 2000,0000**
153+
<p><img src="../img/attribute-table-quick-filter-4.jpg" style="max-width:620px;"/></p>
154+
155+
!!! note
156+
Please note the comparison operator preceding the filter text in both examples.
157+
116158
Advanced Filtering
117159
------------------
118160

119-
[MapStore](https://mapstore2.geo-solutions.it/mapstore/#/) allows you to filter and select the data by attribute or by region and to perform cross filtering between two present layers in the map.
161+
In addition to quick filters, [MapStore](https://mapstore2.geo-solutions.it/mapstore/#/) attribute table allows you to perform advance filtering and select the data by attribute or by region and to perform cross filtering between two present layers in the map.
120162

121163
* **Click** on the *Advanced Search* icon <img src="../img/filter-icon.jpg" style="max-width:25px;" />.
122164

‎docs/user-guide/img/add-as-annotation.jpg‎

1.32 KB
Loading

‎docs/user-guide/img/annotation-prefill.jpg‎

99 KB
Loading

‎docs/user-guide/img/attribute-table-quick-filter-1.jpg‎

74.5 KB
Loading

‎docs/user-guide/img/attribute-table-quick-filter-2.jpg‎

111 KB
Loading

‎docs/user-guide/img/attribute-table-quick-filter-3.jpg‎

122 KB
Loading

0 commit comments

Comments
 (0)