my
and their
.
@param my my way (i.e. the way in the local dataset)
@param their their way (i.e. the way in the server dataset)
@param mergedMap The map of merged primitives if the conflict results from merging two layers
@exception IllegalArgumentException thrown, if my is null
@exception IllegalArgumentException thrown, if their is null
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|