Re: [OSM-talk] Offline editing during downtime

2009-04-17 Thread Ævar Arnfjörð Bjarmason
On Fri, Apr 17, 2009 at 12:26 PM, Russ Nelson  wrote:
> I should have all the .osm files that I need for my mapping party (not
> cancelled because I was giving a talk that couldn't be rescheduled for
> later).  But hopefully in case I've forgotten anything I'll still have
> read-only access.

Does any editor support offline editing of 0.5 data that can be
uploaded to the 0.6 server once it's live? I think (but I may be
wrong) JOSM at least doesn't allow you to upload a 0.5 .osm file to a
0.6 server.

Or is there some conversion tool that can be used to upload data
edited during the outage?

___
talk mailing list
talk@openstreetmap.org
http://lists.openstreetmap.org/listinfo/talk


Re: [OSM-talk] Offline editing during downtime

2009-04-17 Thread Russ Nelson

On Apr 17, 2009, at 12:16 PM, Ævar Arnfjörð Bjarmason wrote:

> Or is there some conversion tool that can be used to upload data
> edited during the outage?

If there isn't, there will be.

--
Russ Nelson - http://community.cloudmade.com/blog - 
http://wiki.openstreetmap.org/wiki/User:RussNelson
r...@cloudmade.com - Twitter: Russ_OSM - 
http://openstreetmap.org/user/RussNelson


___
talk mailing list
talk@openstreetmap.org
http://lists.openstreetmap.org/listinfo/talk


Re: [OSM-talk] Offline editing during downtime

2009-04-17 Thread Iván Sánchez Ortega
El Viernes, 17 de Abril de 2009, Ævar Arnfjörð Bjarmason escribió:
> Does any editor support offline editing of 0.5 data that can be
> uploaded to the 0.6 server once it's live? I think (but I may be
> wrong) JOSM at least doesn't allow you to upload a 0.5 .osm file to a
> 0.6 server.

AFAIK, the .osm files that JOSM is able to save to disk are pretty much the 
same for 0.5 and 0.6. Your best shot is to save a 0.5 .osm file, open it up 
with JOSM on monday, and try to upload it. The api version auto-detect 
feature of the latest JOSM releases *should* handle this issue gracefully.

If that fails, open the .osm file with a text editor, and change the first 
line to read "0.6" instead of "0.5".

-- 
--
Iván Sánchez Ortega 

No hable a menos que usted pueda mejorar el silencio.


signature.asc
Description: This is a digitally signed message part.
___
talk mailing list
talk@openstreetmap.org
http://lists.openstreetmap.org/listinfo/talk


Re: [OSM-talk] Offline editing during downtime

2009-04-17 Thread MP
I don't think that is so easy. To avoid conflicts, when replacing
node/way/relation that is on server with newer version, server sends
internal ID/revision number of the way and you have to pass this back
(so two people won't overwrite the same way with their version and
"last upload wins" - in 0.6, first one upload, second one gets a
conflict and will have to resolve it first before being able to
upload)

You will have to add these revision numbers to all objects for upload
to work, changing 0.5. to 0.6 won't do it ...

Martin

> AFAIK, the .osm files that JOSM is able to save to disk are pretty much the
>  same for 0.5 and 0.6. Your best shot is to save a 0.5 .osm file, open it up
>  with JOSM on monday, and try to upload it. The api version auto-detect
>  feature of the latest JOSM releases *should* handle this issue gracefully.
>
>  If that fails, open the .osm file with a text editor, and change the first
>  line to read "0.6" instead of "0.5".

___
talk mailing list
talk@openstreetmap.org
http://lists.openstreetmap.org/listinfo/talk


Re: [OSM-talk] Offline editing during downtime

2009-04-17 Thread Frederik Ramm
Hi,

MP wrote:
> I don't think that is so easy. To avoid conflicts, when replacing
> node/way/relation that is on server with newer version, server sends
> internal ID/revision number of the way and you have to pass this back

Martin is right. The only way to upload pre-0.6 changes to the 0.6 
server would be

* download object from 0.6
* check if it is the same object that has been modified
* if yes, upload existing (modified) object with version number just 
retrieved from 0.6

I don't think any editor currently supports this, and neither am I aware 
of a script that does it.

Bye
Frederik

-- 
Frederik Ramm  ##  eMail frede...@remote.org  ##  N49°00'09" E008°23'33"

___
talk mailing list
talk@openstreetmap.org
http://lists.openstreetmap.org/listinfo/talk


Re: [OSM-talk] Offline editing during downtime

2009-04-17 Thread Iván Sánchez Ortega
El Viernes, 17 de Abril de 2009, Frederik Ramm escribió:
> Hi,
>
> MP wrote:
> > I don't think that is so easy. To avoid conflicts, when replacing
> > node/way/relation that is on server with newer version, server sends
> > internal ID/revision number of the way and you have to pass this back
>
> Martin is right.

Hhhmm. What about just setting the revision # to zero on all things coming 
from a 0.5 file? It could be done with a regexp or something.


-- 
--
Iván Sánchez Ortega 

Don't read any sky-writing for the next two weeks.


signature.asc
Description: This is a digitally signed message part.
___
talk mailing list
talk@openstreetmap.org
http://lists.openstreetmap.org/listinfo/talk


Re: [OSM-talk] Offline editing during downtime

2009-04-17 Thread Russ Nelson

On Apr 17, 2009, at 1:46 PM, Iván Sánchez Ortega wrote:

> El Viernes, 17 de Abril de 2009, Frederik Ramm escribió:
>> Hi,
>>
>> MP wrote:
>>> I don't think that is so easy. To avoid conflicts, when replacing
>>> node/way/relation that is on server with newer version, server sends
>>> internal ID/revision number of the way and you have to pass this  
>>> back
>>
>> Martin is right.
>
> Hhhmm. What about just setting the revision # to zero on all things  
> coming
> from a 0.5 file? It could be done with a regexp or something.

Yes, Martin is right.

Cannot parse valid node from xml string 
 
 
 
 
   . Version is required when updating


BUT if you change all "<(node|way|relation) " to "<$1 version='1' "  
and change the version number, it seems to work:

http://mysql.dev.openstreetmap.org/browse/changeset/340

Will go off to lunch and write python program on return, because all  
programs must be written in Python, or REwritten in Python if  
necessary.  We are the Borguido, we will assimilate you.

--
Russ Nelson - http://community.cloudmade.com/blog - 
http://wiki.openstreetmap.org/wiki/User:RussNelson
r...@cloudmade.com - Twitter: Russ_OSM - 
http://openstreetmap.org/user/RussNelson


___
talk mailing list
talk@openstreetmap.org
http://lists.openstreetmap.org/listinfo/talk


Re: [OSM-talk] Offline editing during downtime

2009-04-17 Thread Frederik Ramm
Hi,

Iván Sánchez Ortega wrote:
> Hhhmm. What about just setting the revision # to zero on all things coming 
> from a 0.5 file? It could be done with a regexp or something.

The server would not accept an upload with version=0. You would have to 
download the object in question first to find out what version number 
you have to set.

Bye
Frederik

-- 
Frederik Ramm  ##  eMail frede...@remote.org  ##  N49°00'09" E008°23'33"

___
talk mailing list
talk@openstreetmap.org
http://lists.openstreetmap.org/listinfo/talk


Re: [OSM-talk] Offline editing during downtime

2009-04-20 Thread Joe Richards


> [snip]
> Yes, Martin is right.
>
> Cannot parse valid node from xml string  action="modify" timestamp="2007-11-30T04:11:44Z" user="kresp0"  
> visible="true" changeset="339" lat="51.5006728" lon="-0.1244324">
> 
> 
> 
> 
>   . Version is required when updating
>
>
> BUT if you change all "<(node|way|relation) " to "<$1 version='1' "  
> and change the version number, it seems to work:
>
> http://mysql.dev.openstreetmap.org/browse/changeset/340
>
> Will go off to lunch and write python program on return, because all  
> programs must be written in Python, or REwritten in Python if  
> necessary.  We are the Borguido, we will assimilate you.

I too have an .osm file floating around for upload from 0.5, whereabouts can I 
get a copy of your Python script from to test it against it (and 0.6)?


  


___
talk mailing list
talk@openstreetmap.org
http://lists.openstreetmap.org/listinfo/talk


Re: [OSM-talk] Offline editing during downtime

2009-04-20 Thread Russ Nelson


On Apr 20, 2009, at 10:39 AM, Joe Richards wrote:


I too have an .osm file floating around for upload from 0.5,  
whereabouts can I get a copy of your Python script from to test it  
against it (and 0.6)?


Turns every 0.5 into a 0.6-compatible file.  BUT NOTE that it presumes  
that nobody else has edited ANYTHING in the file, so you are very well  
advised to upload your 0.5 files ASAP, otherwise you'll get conflicts  
that you need to resolve.



#!/usr/bin/python

import sys

def fivetosix(fn):
inf = open(fn)
outf = open(fn.replace('.osm', '-6.osm'), "w")
for line in inf:
line = line.replace("

--
Russ Nelson - http://community.cloudmade.com/blog - 
http://wiki.openstreetmap.org/wiki/User:RussNelson
r...@cloudmade.com - Twitter: Russ_OSM - 
http://openstreetmap.org/user/RussNelson

___
talk mailing list
talk@openstreetmap.org
http://lists.openstreetmap.org/listinfo/talk