[josm-dev] deleted vs. visible

[Jiri Klement]

Have a look at #4687 (unsolvable conflict with nodes). It's about node
that is not visible on server and has also been removed in josm. That
produce two conflicts (one for deleted, other one for visible).
Resolution of conflicts ends with an exception. I think correct way to
fix this is show only deleted state (so in this case the node will
have no conflict).

On Fri, Mar 5, 2010 at 11:04 PM, Matthias Julius <lists at julius-net.net> wrote:
> I need to brung up this subject again.  I still can not wrap my head
> around why we need to distinguish between deleted and visible state
> for primitives and bother the user with it.  AFAICT, isDeleted()==true
> is equivalent to isVisible()==false && isModified()==true.
>
> I believe there is currently no way to have primitives with either
> isDeleted()==true && isModified()==false or isVisible()==false &&
> isModified()==true.  Therefore, I think the two flags can be
> consolidated.  IMO, it is enough to have the DELETED flag and to
> distinguish between "deleted locally" and "deleted on server" the
> MODIFIED flag should be enough.
>
> This would simplify both merging and conflict handling.
>
> Matthias
>
> _______________________________________________
> josm-dev mailing list
> josm-dev at openstreetmap.org
> http://lists.openstreetmap.org/listinfo/josm-dev
>