OpenGeofiction
When I started remodeling my capital city, I isolated some components (the embassies, for example) and saved them as separate osm files so I could put them back once I found a spot for them in the ‘new’ city.
However, since the replacements are the same version number as the originals that were deleted, JOSM pitches a fit about data-set synchronization when I upload; the message “your version is version 1, server has version 2”. Conflict resolution is slow because I can’t get JOSM to download all the desynced data at once (I get a read timed out error if I try to synchronize the entire data-set, which I sometimes get on normal data downloads from the server), so I have to sync each each conflict individually.
Is there a faster way around this issue? I have more things I plan on restoring in this manner and would like the process to go a bit quicker. :)
-Reece
Discussion
Comment from Ūdilugbulgidħū on 10 April 2016 at 16:25
One way round this may be to copy the features you want to upload and paste them into a new layer. Then upload this layer. It won’t work if there are multi-polygon relations, but simple buildings should just be given a new version number when copied.
Comment from Reece202 on 10 April 2016 at 18:18
For the record, after trying the above method and getting more conflicts, I downloaded a macro recorder and had it automate resolving the conflicts individually. Anything more complicated than un-deleting a node caused the macro to click fruitlessly on greyed-out buttons, but I could stop the loop and resolve complicated conflicts manually. However, automating 500+ resolutions made the remaining >100 not as bad.
Comment from Luciano on 10 April 2016 at 23:57
As Udi said, the solution to this problem (which I struggled with for a long time, too) is in the use of new layers. You copy-paste your data to a new layer, close the old layer, and upload the new. JOSM/OGF then “think” they’re seeing new data. Don’t get confused, though - this can lead to duplicates, too - so you have to be careful.
It has taken me a long time to get comfortable with it, but I now see that maintaining multiple layers for all my map work is the best way. For each area, I lately have several “do not upload” layers, one for sketching or archiving things, one for contours, etc. Slowly, I’m migrating a lot of my “construction” work offline, so that the OGF data is less cluttered - the Ardisphere is still full of “junk” ways, “constructor” lines that I have used to plan, place and scale things. In contrast, nowadays I do NOT maintain offline .osm files of data that exists online. This is precisely because of the versioning problem mentioned. For work in a area, I always newly download from OGF. So think of it this way: the .osm files I keep on my computer are flagged “do not upload,” while the already-uploaded OGF work is never stored in duplicate on my computer.