Opened 16 years ago
Closed 16 years ago
#3779 closed defect (fixed)
Unnecessary conflicts for locally edited data upon redownload from OSM
Reported by: | Ldp | Owned by: | Ldp |
---|---|---|---|
Priority: | normal | Milestone: | |
Component: | Core | Version: | latest |
Keywords: | Cc: |
Description
I'm using 2320 SVN.
1) Load some data from OSM, which includes a (multipolyon) relation.
2) Edit one of the member ways of that relation, by merging one of the end nodes with another node which isn't in a way that is a member of the relation. In this case, that node is also the end node of one of the other member ways as well.
3) Download members for that relation.
4) "There were 2 conflicts during import."
The 2 conflicts are for the 2 ways that were involved in the edit.
Another one:
1) Same as above.
2) Edit one of the member ways, by merging the end node back onto the 2nd node from the end.
3) Download members for that relation.
4) "There were 1 conflicts during import."
The conflict is for the way that lost 1 node due to the merge.
Attachments (0)
Change History (4)
comment:1 by , 16 years ago
comment:2 by , 16 years ago
Summary: | Editing member ways then downloading relation members gives conflicts → Unnecessary conflicts for locally edited data upon redownload from OSM |
---|
I also get conflicts when I've edited relation member ways of a relation and then download another area from OSM where this relation also is.
The only answer I ever give to JOSM in this case is basically "my locally edited version is the right one". Ever. That takes some clicks through different tabs in the conflict resolution dialog, and is detracting from useful editing.
In my opinion it should only indicate conflicts when the data on the server is more recent than the version I based my edits on. If the version on the server is the same as I have already downloaded, don't throw conflicts.
comment:3 by , 16 years ago
Owner: | changed from | to
---|---|
Status: | new → needinfo |
Still existing? Should be fixed inbetween.
comment:4 by , 16 years ago
Resolution: | → fixed |
---|---|
Status: | needinfo → closed |
It seems it indeed got fixed inbetween, but I didn't run the full suite of tests yet. From what I tested/saw, it's currently fine (enough) in latest/SVN.
The extra bit I forgot is:
It didn't use to throw a conflict at me before. Local edits should take precedence when fetching relation members.