OpenOrienteering / mapper

OpenOrienteering Mapper is a software for creating maps for the orienteering sport.
https://www.openorienteering.org/apps/mapper/
GNU General Public License v3.0
399 stars 106 forks source link

diff and merge #741

Open otoomet opened 8 years ago

otoomet commented 8 years ago

Are there any thoughts about creating a diff/merge utility for Mapper? In my practice several people do fieldwork while one is maintaining the map. It would be nice to be able to see and selectively import the individual edits of each contributor. Currently we do it with templates. It mostly works, but if you want to do a minor edit of an object on the template (e.g straighten up a contour line or adjust a boundary), then it is not that easy.

This is probably quite a bit work, and I am not sure how to get it right, but I think it is worth discussing.

dl3sdo commented 8 years ago

Adding unique IDs to objects would allow to easily identify also new or deleted objects. There is already another issue (#???) discussing object tags that show the creation date, date of last change and maybe the person making the change.

otoomet commented 8 years ago

Yea, that would be a big step forward. It would be nice to have a merge interface on top of that, one that shows the differences on the map, and lets you to accept or reject those.

This is not a complete substitute to diff however, I can manually change the content of the objects while leaving the tags unchanged, and fool it in this way.