Skip to content

Commit

Permalink
#3622: some fixes to involved documentations (#4018)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobia Di Pisa authored Jul 29, 2019
1 parent 251c917 commit 94592d2
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
12 changes: 9 additions & 3 deletions docs/user-guide/annotations.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,22 @@ In order to add a new annotation:
* **Click** on the map to define the polygon vertices.

<img src="../img/polygon_annotation_drawing.gif" />


You can also insert new vertices, or edit existing ones, through the coordinates editor using `Decimal` or `Aeronautical` formats.


<img src="../img/coordinates_format_switcher.png" style="max-width:600px;" />


New vertices can be also added using the <img src="../img/++.jpg" style="max-width:30px;" /> button and typing the `latitude` and `longitude` values (see the picture below).


<img src="../img/add_vertex_button.png" style="max-width:450px;" />


Invalid vertices are notified with a red exclamation point icon.


<img src="../img/invalid_vertex.png" style="max-width:600px;" />

Expand All @@ -59,7 +65,7 @@ The annotations layer will be added to the TOC and the annotation will be visibl
Styling Annotations
-------------------

Based on which type of annotation was chosen, [MapStore](https://mapstore2.geo-solutions.it/mapstore/#/) allows you to customize the annotation style through a powerful editor. It is accessible from the <img src="../img/annotation-draw.jpg" style="max-width:30px;" /> button of the annotation toolbar.
Based on which type of annotation was chosen, [MapStore](https://mapstore2.geo-solutions.it/mapstore/#/) allows you to customize the annotation style through a powerful editor. It is accessible from the <img src="../img/annotation-draw.jpg" style="max-width:30px;" /> button of the annotation toolbar. During the style editing a preview placed on top of the styler form shows a preview of the edited style.

<img src="../img/annotations_toolbar.png" style="max-width:500px;"/>

Expand All @@ -75,7 +81,7 @@ MapStore provides two types of *Marker* annotations, so you have to choose what

Choose the `Shape`, `Color` and `Icon` that best fit your needs.

* *Symbol* types can have different `Shape` and `Size`, a `Fill color` with a customizable `Opacity` level (%), a `Stroke` of different types (continuous, dashed, etc) and customizable `Color`, `Opacity` and `Width`.
* *Symbol* types can have different `Shape` and `Size`, a `Fill color` with a customizable `Opacity` level (%), a `Stroke` of different types (continuous, dashed, etc) and customizable `Color`, `Opacity` and `Width`. Only few symbols are provided by default in MapStore but a custom list of symbols can be configured.

<img src="../img/symbol_style_editor.png" style="max-width:600px;"/>

Expand All @@ -99,7 +105,7 @@ See the example below to better understand these options.

*Text* annotations are a bit different from the geometric ones. They display a formatted text on a given point of the map.
The style editor lets you customize the text `Font` (`Family`, `Size`, `Style`, `Weight`) and the `Alignment` (`left`, `center` or `right`).
It also treat the text as a geometric entity, so you can choose a `Fill color` and its `Opacity`, the `Stroke` type, its `Color`, `Opacity` and `Width`. Take a look at the following example.
You can also choose the text `Fill color` and its `Opacity`, the `Stroke` type, its `Color`, `Opacity` and `Width`. Take a look at the following example.

<img src="../img/text_annotation_editor.png" style="max-width:500px;"/>

Expand Down
4 changes: 2 additions & 2 deletions docs/user-guide/catalog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

The Catalog Service for the Web (CSW) is an OGC Standard to publish and search geospatial data and related metadata on the internet. It describes geospatial services such as Web Map Service (WMS) and Web Map Tile Service (WMTS).

In [MapStore](https://mapstore2.geo-solutions.it/mapstore/#/) the Catalog offers demo services that allow you to extract the data and add them to the map from GeoServer or to create connections to other Geoportal services.
In [MapStore](https://mapstore2.geo-solutions.it/mapstore/#/) the Catalog offers demo services that allow you to extract the data and add them to the map from GeoServer or to create connections to other geospatial services (supported services are WMS, WMTS and CSW).

Adding Layers from Demo Services
--------------------------------

CSW, WMS and WMTS Demo Services are available by default allowing you to import layers from GeoServer and to add them to your map.
CSW, WMS and WMTS Demo Services are available by default allowing you to import layers from the GeoSolutions GeoServer and to add them to your map.

Starting from a new map or an already existing map:

Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/filtering-layers.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
******************

When using vector layers it might be useful to work with a subset of features.
About that, [MapStore](https://mapstore2.geo-solutions.it/mapstore/#/) let you set up a **Layer Filter** that acts directly on a layer coming from GeoServer and filter its content upfront.
About that, [MapStore](https://mapstore2.geo-solutions.it/mapstore/#/) let you set up a **Layer Filter** that acts directly on a layer with WFS available and filter its content upfront.
The map will immediately update when a filter is created and all other tools will take it into consideration when used. More over, the filter is saved into the map context so if you save it the filter will apply when you open the map next time.

Creating a new Layer Filter
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/toc.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,6 @@ After adding a layer, several options can be accessed from the TOC allowing you
The remaining tools will be faced in detail in separate sections:

* <img src="../img/properties.jpg" style="width:30px;"/> [Layer Settings](layer-settings.md): allows you to manage the layers in groups, to set the display mode and the style of the layers, and to set the format of the feature info.
* <img src="../img/filter-layer.png" style="max-width:30px;"/> [Filter Layer](filtering-layers.md): acts directly on a layer coming from GeoServer and filter its content upfront.
* <img src="../img/filter-layer.png" style="max-width:30px;"/> [Filter Layer](filtering-layers.md): acts directly on a layer and filter its content upfront (this works only on layers with WFS available).
* <img src="../img/attributes-table.jpg" /> [Attribute Table](attributes-table.md): allows you to visualize, query, edit and analyze tabular data related to the layer.
* <img src="../img/widgets.jpg" /> [Widgets](widgets.md): allows you to create charts, texts, tables widgets and add them to the map.

0 comments on commit 94592d2

Please sign in to comment.