Package org.openstreetmap.atlas.mutator.configuration.parsing.mergeforgiveness

Interface MergeForgivenessStrategy

All Superinterfaces:

java.io.Serializable

All Known Implementing Classes:

AlwaysPickLeftStrategy, PickRemoveOverAddStrategy, PrioritizeTagStrategy, TakeLowerNodeIdentifierStrategy

public interface MergeForgivenessStrategy
extends java.io.Serializable

The MergeForgivenessStrategy interface defines a strategy for resolving FeatureChange merge conflicts. Implementing classes must provide a method that decides which FeatureChange to choose in the face of a merge conflict.

Method Summary

Modifier and Type	Method	Description
org.openstreetmap.atlas.geography.atlas.change.FeatureChange	resolve(org.openstreetmap.atlas.geography.atlas.change.FeatureChange left, org.openstreetmap.atlas.geography.atlas.change.FeatureChange right, java.util.Map<java.lang.String,java.io.Serializable> configuration)	Resolve a merge conflict between two FeatureChanges and return a new, valid FeatureChange that represents a merge between the two.

Method Detail

resolve

org.openstreetmap.atlas.geography.atlas.change.FeatureChange resolve(org.openstreetmap.atlas.geography.atlas.change.FeatureChange left,
                                                                     org.openstreetmap.atlas.geography.atlas.change.FeatureChange right,
                                                                     java.util.Map<java.lang.String,java.io.Serializable> configuration)

Resolve a merge conflict between two FeatureChanges and return a new, valid FeatureChange that represents a merge between the two.

Parameters:

left - the left FeatureChange

right - the right FeatureChange

configuration - the configuration for the resolution

Returns:

the resolved FeatureChange