[PATCH] TagConflictResolutionUtil : automatic tag conflict resolution

[Tyndare]

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 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
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.

[Tyndare]

PATCH

[Tyndare]

[PATCH] for plugins

[Don-vip]

This looks great! Some remarks:
1) Are you used to JUnit tests? This would be useful to add unit tests for this new feature.
2) All public/protected methods should have Javadoc
3) Please don't add labels such as keyLoop:
4) You can enable Checkstyle in your IDE to meet code rules (whitespaces, etc.)

[Tyndare]

PATCH (updated)

[Tyndare]

Thanks a lot for your feedback and valuables comments.
Please find attached an updated version which includes the modifications you suggested:

applyAutomaticTagConflictResolution-updated.diff

[Tyndare]

Unit test

[Don-vip]

This looks very nice, I'll give it a try soon :)

[Don-vip]

The patch is awesome. I'm adding ​CanVec too :)

[Don-vip]

Values concerned by this ticket:

[Don-vip]

2010 was a mess, 5 different formats... I'm reworking the regex to match all existing values.

[Don-vip]

In 11606/josm:

fix #14374 - automatic tag conflict resolution of source for French cadastre and Canadian CanVec (patch from Tyndare, modified)

[Don-vip]

In 11607/josm:

see #14374 - remove TigerUtils class, not used anymore

[Klumbumbus]

Someone please also add a short end user documentation about the new features at Help/Concepts/Conflict or Help/Dialog/Conflict

[Don-vip]

In 11614/josm:

see #14374 - sonar - pmd-unit-tests:UseAssertSameInsteadOfAssertTrue - Use assertSame instead of assertTrue