Changes between Version 5 and Version 6 of Ru:Help/Concepts/Conflict


Ignore:
Timestamp:
2017-11-12T10:39:23+01:00 (10 days ago)
Author:
ak099
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Ru:Help/Concepts/Conflict

    v5 v6  
    1 [[TranslatedPages(revision=18)]]
    2 [[TOC(inline)]]
     1[[TranslatedPages(revision=18,outdated=Перевод неполный)]]
     2[[PageOutline(1-10,,Содержание)]]
     3
    34= Конфликт =
    45
    5 JOSM locally manages copies of [wiki:/Help/Concepts/Object OSM objects]. It [wiki:/Help/Action/Open loads them from a file] or [wiki:/Help/Action/Download downloads them from the OSM server] and keeps them in memory. If you modify objects or add objects to your map, you are working on copies. The reference objects are still kept on the server from where other users can retrieve them and where other mappers can send their updates to.
     6JOSM работает с локальными копиями [wiki:/Ru:Help/Concepts/Object объектов OSM]. Он [wiki:/Ru:Help/Action/Open открывает их из файла] или [wiki:/Ru:Help/Action/Download скачивает с сервера OSM] и хранит в памяти. Если вы измените объекты или добавите объекты на карту, то работа ведётся с копиями. Исходные объекты продолжают храниться на сервере, откуда их могут затребовать другие пользователи, и куда другие пользователи могут отправлять свои обновления данных.
    67
    7 This means that you don't ''own'' the objects you are currently working with, you still ''share'' them with others. If you exchange your local objects with the server your version may clash with the version somebody else sent in as update. JOSM does its best to hide these clashes from you, but sometimes it can't resolve the differences between two [wiki:/Help/Concepts/Object versions] automatically. In this cases it creates a '''conflict'''.
     8Это означает, что вы не ''владеете'' объектами, с которыми в данный момент работаете, а ''совместно используете'' их с другими людьми. При отправке ваших локальных объектов на сервер может оказаться, что ваша версия противоречит той версии, которую отправил кто-то ещё. JOSM делает всё возможное, чтобы скрыть от вас эти противоречия, но иногда он не может самостоятельно автоматически уладить различия между двумя [wiki:/Ru:Help/Concepts/Object версиями]. В таком случае возникает '''конфликт'''.
    89
    9 A '''conflict''' is a difference between two versions of an object which JOSM can't resolve automatically.
     10'''Конфликт''' — это различие между двумя версиями объекта, которое JOSM не может разрешить автоматически.
    1011
    11 Each data layer maintains a list of unresolved conflicts in the [wiki:/Help/Dialog/ConflictList Conflict List Dialog]. In this dialog you can launch a [wiki:/Help/Dialog/Conflict dialog for resolving a conflict].
     12Для каждого слоя данных поддерживается список неулаженных конфликтов в диалоговой панели [wiki:/Ru:Help/Dialog/ConflictList Конфликт]. В этой же панели можно открыть [wiki:/Ru:Help/Dialog/Conflict диалоговое окно для улаживания конфликта].
    1213
    13 '''Resolving a conflict''' means that you have to decide for every difference between the two object versions whether you want to keep the version from the first or the second object, a process which is sometimes also called '''merging'''.
     14'''Уладить конфликт''' — значит решить для каждого различия между двумя версиями объекта, какую из версий нужно оставить — первую или вторую. Этот процесс иногда называют также '''слиянием'''.
    1415
    15 == Конфликты при скачивании/обновлении == #WarningAboutDetectedConflicts
    16 If you download objects from the OSM server into an existing layer, the objects from the server might "collide" with objects already present in the layer. Often, JOSM can handle these collisions automatically but sometimes this isn't possible. Here's an example:
     16== Конфликты при скачивании или обновлении == #WarningAboutDetectedConflicts
     17Если вы скачиваете объекты с сервера OSM в текущий слой, то объекты с сервера могут "конфликтовать" с объектами, уже присутствующими в слое. Зачастую JOSM может автоматически уладить такие коллизии, но иногда это оказывается невозможным. Вот пример:
    1718
    18  1. You've downloaded a node with id 1 from the server whose [http://wiki.openstreetmap.org/wiki/Key:name name] tag is set to `"My name"`.
    19  2. You edit the node and change its name to `"Or is it this name?"`. In the meantime another user downloaded the node too, changed its name to `"That's the name"`, and uploads it.
    20  3. You select the menu [[Image(wiki:Help/Action/UpdateData:updatedata.png)]]''File->[wiki:/Help/Action/UpdateData Update data]''. The version of the node retrieved from the server will have a tag [http://wiki.openstreetmap.org/wiki/Key:name name] set to `"That's the name"` which collides with `"Or is it this name?"`, the name you've been setting.
     191. Вы скачали с сервера точку с id:1, для которой тегу [osmwiki:Key:name name] присвоено значение `"My name"`.
     201. Вы отредактировали точку, изменив её имя на `"Or is it this name?"`. В то же время другой пользователь тоже скачал эту точку, изменил её имя на `"That's the name"` и отправил на сервер.
     211. Вы выбрали в меню ''Файл -> [[Image(source:trunk/images/updatedata.png,middle)]] [wiki:/Help/Action/UpdateData Update data]''. The version of the node retrieved from the server will have a tag [osmwiki:Key:name name] set to `"That's the name"` which collides with `"Or is it this name?"`, the name you've been setting.
    2122
    22 JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:[[br]]
    23 [[Image(wiki:Help/Concepts/Conflict:conflict-update-data.png)]]
     23JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
     24
     25[[Image(conflict-update-data.png)]]
    2426
    2527== Conflict when uploading ==
    26 If you upload objects to the OSM server, they might "collide" there with updates provided by other mappers. Sometimes, JOSM can handle these collisions automatically. If, for instance, you try to delete an already deleted object, JOSM will sillently skip deleting and won't bother you with an error message. In most cases, though, JOSM can't deal with them automatically. Here's an example:
     28If you upload objects to the OSM server, they might "collide" there with updates provided by other mappers. Sometimes, JOSM can handle these collisions automatically. If, for instance, you try to delete an already deleted object, JOSM will silently skip deleting and won't bother you with an error message. In most cases, though, JOSM can't deal with them automatically. Here's an example:
    2729
    28   1. You've downloaded a node with id 1 from the server whose [http://wiki.openstreetmap.org/wiki/Key:name name] tag is set to `"My name"`.
    29   2. Another mapper downloads the node with id 1 too, assigns it the name `"That's the name"`, and uploads it.
    30   3. You change the name to `"Or is it this name?"` and upload to the server.
    31   4. On the server, your upload collides with the upload from the other mapper.
     301. You've downloaded a node with id:1 from the server whose [osmwiki:Key:name name] tag is set to `"My name"`.
     311. Another mapper downloads the node with id:1 too, assigns it the name `"That's the name"`, and uploads it.
     321. You change the name to `"Or is it this name?"` and upload to the server.
     331. On the server, your upload collides with the upload from the other mapper.
    3234
    3335JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
    34 [[BR]]
    35 [[Image(wiki:Help/Concepts/Conflict:conflict-upload-data.png)]]
    36 [[BR]]
    3736
     37[[Image(conflict-upload-data.png)]]
    3838
    3939== Conflicts when merging ==
     
    4747Resolving conflicts is important. For instance, you can't upload your updates to the OSM server unless the list of unresolved conflicts is empty.
    4848
    49 == Смотрите также ==
     49== Technical background ==
     50For each change set that affects an object, the server assigns an increasing version number to that object. (This is shown in the history e.g. [osmwww:browse/way/1222/history way 1222].) JOSM remembers the version of the downloaded objects and reports it back to the server on upload. If the server has a higher version number (due to a change by another mapper), it rejects the uploaded change. In this situation JOSM creates a conflict. The version that is called "my" in conflict resolution dialog is the old, downloaded version, but with your local modifications applied. The version that is called "their" is the most current version on the server that is then automatically downloaded from the server.
    5051
    51  * [wiki:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer
    52  * [wiki:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict
     52== See also ==
     53* [wiki:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer
     54* [wiki:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict
    5355
    54 
    55 [[BR]]
     56----
     57Back to [wiki:Help Main Help]