Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#9396 Review annotations UI and system #9397

Merged
merged 25 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
19bd756
#9396 Review annotations UI and system
allyoucanmap Sep 6, 2023
4ed3436
add missing translations
allyoucanmap Sep 6, 2023
ecd998a
restore ol measurement support
allyoucanmap Sep 7, 2023
f3aa3a9
restore cesium style parser
allyoucanmap Sep 7, 2023
4eb09d1
remove freehand condition from ol drawing/modify interactions
allyoucanmap Sep 7, 2023
eda1d6c
Merge branch 'master' of https://github.com/geosolutions-it/MapStore2…
allyoucanmap Sep 7, 2023
579e58f
set use spatial index to false for ol vector layers
allyoucanmap Sep 8, 2023
0d3e212
improve alignement of default marker icon
allyoucanmap Sep 8, 2023
126b826
allow bearing polyline annotations
allyoucanmap Sep 8, 2023
bef0fc6
Merge branch 'master' of https://github.com/geosolutions-it/MapStore2…
allyoucanmap Sep 8, 2023
b17e6a1
add settings inside the annotation layer panel
allyoucanmap Sep 8, 2023
30da897
fix height coordinates computation of annotation between 2D/3D
allyoucanmap Sep 11, 2023
89ab83b
Add jsdoc for annotations files
allyoucanmap Sep 11, 2023
fd1741f
add migration guidelines
allyoucanmap Sep 11, 2023
00fdd86
Update docs/developer-guide/mapstore-migration-guide.md
allyoucanmap Sep 12, 2023
54f4f4d
Update build/docma-config.json
allyoucanmap Sep 12, 2023
a9c021b
Update web/client/translations/data.it-IT.json
allyoucanmap Sep 12, 2023
d7367d8
Update web/client/translations/data.it-IT.json
allyoucanmap Sep 12, 2023
3f71591
Update web/client/plugins/Annotations/index.js
allyoucanmap Sep 12, 2023
7dcc142
Merge branch 'master' of https://github.com/geosolutions-it/MapStore2…
allyoucanmap Sep 12, 2023
2555e8c
fix markdown lint errors
allyoucanmap Sep 12, 2023
252652f
add intersected features to map mouse move event
allyoucanmap Sep 12, 2023
3c62dd1
fix marker visibility on annotation vector layers
allyoucanmap Sep 12, 2023
18ade1f
fix geometry height parsing in ol modify interaction
allyoucanmap Sep 12, 2023
63b9cf6
fix deafult circle style for annotations
allyoucanmap Sep 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/docma-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
"plugins": [
"web/client/plugins/index.jsdoc",
"web/client/plugins/AddGroup.jsx",
"web/client/plugins/Annotations.jsx",
"web/client/plugins/Annotations/index.js",
"web/client/plugins/AutoMapUpdate.jsx",
"web/client/plugins/BackgroundSelector.jsx",
"web/client/plugins/BurgerMenu.jsx",
Expand Down
29 changes: 0 additions & 29 deletions docs/developer-guide/local-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,35 +241,6 @@ CSW service

<br>

#### Annotations Editor configuration

Annotations editor can be configured by setting it's defaultState. It looks like this:

```javascript
"defaultState": {
...
"annotations": {
"config": {
"geometryEditorOptions": {
"measureOptions": {
"displayUom": "nm"
}
},
"multiGeometry": true,
"validationErrors": {},
"defaultPointType": "symbol"
},
"format": "aeronautical",
"defaultTextAnnotation": "New"
},
```

- **format** - decimal or aeronautical degree for coordinates
- **defaultTextAnnotation** - default text value for text annotations
- **config.geometryEditorOptions** - properties to be passed to CoordinatesEditor of GeometryEditor. For more information refer to the documentation of CoordinatesEditor component
- **config.multiGeometry** - if set to true allows to add more then one geometry to annotations
- **config.defaultPointType** - default point type of marker geometry type. Can be 'marker' or 'symbol'

### projectionDefs configuration

Custom CRS can be configured here, at root level of localConfig.json file. For example:
Expand Down
15 changes: 15 additions & 0 deletions docs/developer-guide/mapstore-migration-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,21 @@ This is a list of things to check if you want to update from a previous version
- Optionally check also accessory files like `.eslinrc`, if you want to keep aligned with lint standards.
- Follow the instructions below, in order, from your version to the one you want to update to.

## Migration from 2023.02.xx to 2024.01.00

### Annotations plugin refactor

The Annotation plugin has been updated to be supported also in 3D maps. This update introduced some changes:

- All the configurations related to the "Annotations" plugin has been removed from `localConfig.json` `defaultState` entry and moved to the `cfg` property of the plugin
- The annotations reducers is not needed anymore inside the default reducers of the app

Please update by:

- Removing `annotations` entry from your `localConfig.json` `defaultState`
- If you customized the app, you can remove the `annotations` reducer from default reducers.
- If some customizations were applied to the Annotations plugin in `defaultState`, apply these changes to the plugin configuration, following the documentation of the plugin.

## Migration from 2023.01.xx to 2023.02.00

### About plugin cfg changes
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
"@mapbox/togeojson": "0.16.0",
"@mapstore/patcher": "https://github.com/geosolutions-it/Patcher/tarball/master",
"@turf/along": "6.5.0",
"@turf/area": "6.5.0",
"@turf/bbox": "4.1.0",
"@turf/bbox-polygon": "5.1.5",
"@turf/boolean-clockwise": "6.5.0",
Expand Down
Loading