Better handling of conflicting tags when merging and editing ways and nodes
authorRichard Fairhurst <richard@systemeD.net>
Thu, 16 Jun 2011 18:55:37 +0000 (19:55 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Thu, 16 Jun 2011 18:55:37 +0000 (19:55 +0100)
commit547250c98fb4fac4ceaaac526e3b3481487c49d5
tree447c12e8b20a97d8c44c46be27496f5a18db21e1
parent04251dd2da1995cf5cb913e6369d1449f386fedd
Better handling of conflicting tags when merging and editing ways and nodes
embedded/warning.png [new file with mode: 0644]
net/systemeD/controls/DataGridWarningField.as [new file with mode: 0644]
net/systemeD/controls/PromptingTextInputWarning.as [new file with mode: 0644]
net/systemeD/halcyon/connection/Entity.as
net/systemeD/halcyon/connection/actions/MergeNodesAction.as
net/systemeD/halcyon/connection/actions/MergeWaysAction.as
net/systemeD/potlatch2/TagGrid.mxml
net/systemeD/potlatch2/controller/SelectedMultiple.as
net/systemeD/potlatch2/controller/SelectedWayNode.as
net/systemeD/potlatch2/mapfeatures/editors/FreeTextEditor.mxml