diff options
Diffstat (limited to 'docs/en')
| -rw-r--r-- | docs/en/administration.rst | 13 | ||||
| -rw-r--r-- | docs/en/import_export.rst | 5 | ||||
| -rw-r--r-- | docs/en/static/chimere_admin_import_CSV.png | bin | 12579 -> 16957 bytes | |||
| -rw-r--r-- | docs/en/static/chimere_admin_import_KML.png | bin | 14953 -> 19520 bytes | |||
| -rw-r--r-- | docs/en/static/chimere_admin_import_OSM.png | bin | 113738 -> 127457 bytes | |||
| -rw-r--r-- | docs/en/static/chimere_admin_import_georss.png | bin | 10260 -> 14414 bytes | |||
| -rw-r--r-- | docs/en/static/chimere_admin_import_shapefile.png | bin | 13807 -> 18301 bytes |
7 files changed, 14 insertions, 4 deletions
diff --git a/docs/en/administration.rst b/docs/en/administration.rst index 8b7e581..73e1dbe 100644 --- a/docs/en/administration.rst +++ b/docs/en/administration.rst @@ -179,17 +179,22 @@ If an item is not relevant the **Delete** button enables to remove it. .. _managing-modified: -Managing end user amendment ---------------------------- +Managing end user amendment/imported item modified locally +---------------------------------------------------------- Amendment can be proposed on the main site by end-users. -In Chimère an amendment is a new item with the status *Modified* and with a link -to the reference item modified. +In Chimère an amendment is a new item with the status **Modified** and with a +link to the reference item modified. + +You can also have imported items which have been modified both locally and on +the external source. The new version from the external source has the status +**Imported** and have a link to the reference item. .. Note:: If you are logged as an administrator and make changes on the map with the end user form they will be directly validated. + A special form has been developed to facilitate the processing of these modified items. diff --git a/docs/en/import_export.rst b/docs/en/import_export.rst index 73a95af..79a13bb 100644 --- a/docs/en/import_export.rst +++ b/docs/en/import_export.rst @@ -44,6 +44,11 @@ Common fields with items localisation you should put here the `SRID <https://en.wikipedia.org/wiki/SRID>`_ associated to the coordinate system of your source. +- **Overload existing data**: by default when data is updated on the source and + has been changed in your Chimère instance a new item is created and has to + be reconciled with the `amendment form <managing-modified>`. If you don't want + to use this form and then overwrite with the data from the external source, + check this option. - **Origin**: if not null this field will be associated to each item imported in order to easily identify where the item came from. For OSM import the source is automatically added. diff --git a/docs/en/static/chimere_admin_import_CSV.png b/docs/en/static/chimere_admin_import_CSV.png Binary files differindex e67a37b..20e53c9 100644 --- a/docs/en/static/chimere_admin_import_CSV.png +++ b/docs/en/static/chimere_admin_import_CSV.png diff --git a/docs/en/static/chimere_admin_import_KML.png b/docs/en/static/chimere_admin_import_KML.png Binary files differindex b48d69a..ad35302 100644 --- a/docs/en/static/chimere_admin_import_KML.png +++ b/docs/en/static/chimere_admin_import_KML.png diff --git a/docs/en/static/chimere_admin_import_OSM.png b/docs/en/static/chimere_admin_import_OSM.png Binary files differindex a599348..03b3632 100644 --- a/docs/en/static/chimere_admin_import_OSM.png +++ b/docs/en/static/chimere_admin_import_OSM.png diff --git a/docs/en/static/chimere_admin_import_georss.png b/docs/en/static/chimere_admin_import_georss.png Binary files differindex 5278652..6c95693 100644 --- a/docs/en/static/chimere_admin_import_georss.png +++ b/docs/en/static/chimere_admin_import_georss.png diff --git a/docs/en/static/chimere_admin_import_shapefile.png b/docs/en/static/chimere_admin_import_shapefile.png Binary files differindex ce612be..0f5bdcf 100644 --- a/docs/en/static/chimere_admin_import_shapefile.png +++ b/docs/en/static/chimere_admin_import_shapefile.png |
