Class PickRemoveOverAddStrategy

    • Method Summary

      All Methods Instance Methods Concrete Methods 
      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.
      • Methods inherited from class java.lang.Object

        clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    • Constructor Detail

      • PickRemoveOverAddStrategy

        public PickRemoveOverAddStrategy()
    • Method Detail

      • resolve

        public 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)
        Description copied from interface: MergeForgivenessStrategy
        Resolve a merge conflict between two FeatureChanges and return a new, valid FeatureChange that represents a merge between the two.
        Specified by:
        resolve in interface MergeForgivenessStrategy
        Parameters:
        left - the left FeatureChange
        right - the right FeatureChange
        configuration - the configuration for the resolution
        Returns:
        the resolved FeatureChange