[josm-dev] Problem with large changeset

[Alan Mintz]

At 2010-07-04 23:21, =?ISO-8859-15?Q?Dirk_St=F6cker?= wrote:
>On Sun, 4 Jul 2010, Alan Mintz wrote:
>
>>How can I tell it to simply accept my local version in bulk?
>
>Why do you want? I gave you multiple ways to proceed. It looks like all 
>your changes have been uploaded, so why do you want to bother with 
>conflict resolution at all? This is only necessary when the upload was partial.

Because it's telling me there are conflicts, though I think this may be a 
bug due to rounding.

One of the nodes involved is id 54530540. When I bring up the conflict 
resolution dialog for this node, it says

33.8099363, -117.4006172 My version coordinates
33.8099363, -117.4006170 Their version coordinates

http://www.openstreetmap.org/browse/node/54530540 says the longitude is ...6172

The OSM file says -117.40061723423347 (which rounds to ...6172)
The XML is   <node id='54530540' action='modify' 
timestamp='2009-12-31T22:49:06Z' uid='147510' user='woodpeck_fixbot' 
visible='true' version='2' changeset='3504242' lat='33.80993633282254' 
lon='-117.40061723423347' />

If I bring up the history dialog for this node, it says that v2 was edited 
in changeset 3504242, agreeing with the OSM file, but that it's coordinates 
were 33.80988, -117.40063. It says that v3 was edited in changeset 5131096 
(the one in question) and the coordinates are 33.809994 -117.40062 (which 
is the rounded version of those above). This dialog should really show more 
decimal places.

So, it seems that in this case, my local OSM file has the correct 
coordinates of the node for v3, but the wrong timestamp, uid, user, 
version, and changeset. It seems that, when retrieving the node for 
conflict resolution, the longitude (but not latitude) is getting rounded to 
6 decimal places (instead of 7), which then fails the comparison with the 
local value. I don't know if this is the sole cause of its appearance in 
the conflict list, or if this is because the local version number was not 
updated with the new one after the upload.

If I retrieve all of these nodes and then compare the coordinates with my 
local file, I should be able to confirm that they were correctly uploaded. 
I'll look at the ways after that.

--
Alan Mintz <Alan_Mintz+OSM at Earthlink.net>