id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
14374	[PATCH]  TagConflictResolutionUtil : automatic tag conflict resolution	Tyndare	Don-vip	"Hi,

I'm trying to see how to update buildings data in France that has been imported from the ""cadastre"".
We have the authorization to import data from the French cadastre if the ""source"" tag mention the year.
This lead to tag conflicts whenever we try to merge or update building geometry, as the year of newly imported data is different.

I think this particular conflict should be resolved automatically, by choosing the source tag with the most recent year.

I looked at the class [https://josm.openstreetmap.de/browser/josm/trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java TagConflictResolutionUtil.java]
and there was already an automatic resolution implemented for ""tiger:*"" tags in the US.

I imagine TIGER or French cadastre are not the only conflict cases that could be automated so I tried to make something a little generic.

I defined two kinds of automatic resolution preference:
* automatic-tag-conflict-resolution.**combine**: where the values are automatically combined with a separator, like it was done for Tiger.
* automatic-tag-conflict-resolution.**choice**: where the best value from a group is automatically selected.

I'm not used to JOSM code, so don't hesitate to tell me if my code is not structured correctly.

It's not visible in the patch but I also deleted the file
[https://josm.openstreetmap.de/browser/josm/trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java TigerUtils.java]
which is no longer necessary.


If this patch is accepted I may try to make also a preference editor dialogue to allow users to add new entries.

Regards,

Tyndare.


"	enhancement	closed	major	17.02	Core		fixed	tag conflict resolution tiger cadastre france canada import