Index: trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 5723) +++ trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 5724) @@ -19,4 +19,5 @@ import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.corrector.ReverseWayNoTagCorrector; import org.openstreetmap.josm.corrector.ReverseWayTagCorrector; import org.openstreetmap.josm.corrector.UserCancelException; @@ -109,6 +110,8 @@ * @param w the way * @return the reverse command and the tag correction commands + * @throws UserCancelException if user cancels a reverse warning dialog */ public static ReverseWayResult reverseWay(Way w) throws UserCancelException { + ReverseWayNoTagCorrector.checkAndConfirmReverseWay(w); Way wnew = new Way(w); List nodesCopy = wnew.getNodes(); Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java (revision 5724) +++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java (revision 5724) @@ -0,0 +1,117 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.corrector; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.util.Arrays; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.Tag; +import org.openstreetmap.josm.data.osm.TagCollection; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; +import org.openstreetmap.josm.gui.DefaultNameFormatter; + +/** + * A ReverseWayNoTagCorrector warns about ways that should not be reversed + * because their semantic meaning cannot be preserved in that case. + * E.g. natural=coastline, natural=cliff, barrier=retaining_wall cannot be changed. + * @see ReverseWayTagCorrector for handling of tags that can be modified (oneway=yes, etc.) + * @since 5724 + */ +public class ReverseWayNoTagCorrector { + + /** + * Tags that imply a semantic meaning from the way direction and cannot be changed. + */ + public static final TagCollection directionalTags = new TagCollection(Arrays.asList(new Tag[]{ + new Tag("natural", "coastline"), + new Tag("natural", "cliff"), + new Tag("barrier", "retaining_wall"), + new Tag("waterway", "stream"), + new Tag("waterway", "river"), + new Tag("waterway", "ditch"), + new Tag("waterway", "drain"), + new Tag("waterway", "canal") + })); + + /** + * Replies the tags that imply a semantic meaning from way direction and cannot be changed. + * @param way The way to look for + * @return tags that imply a semantic meaning from way direction and cannot be changed + */ + public static final TagCollection getDirectionalTags(Way way) { + return directionalTags.intersect(TagCollection.from(way)); + } + + /** + * Tests whether way can be reversed without semantic change. + * Looks for tags like natural=cliff, barrier=retaining_wall. + * @param way The way to check + * @return false if the semantic meaning change if the way is reversed, true otherwise. + */ + public static boolean isReversible(Way way) { + return getDirectionalTags(way).isEmpty(); + } + + protected static String getHTML(TagCollection tags) { + if (tags.size() == 1) { + return tags.iterator().next().toString(); + } else if (tags.size() > 1) { + String s = ""; + return s; + } else { + return ""; + } + } + + protected static boolean confirmReverseWay(Way way, TagCollection tags) { + String msg = trn( + // Singular, if a single tag is impacted + "You are going to reverse the way ''{0}''," + + "
whose semantic meaning of its tag ''{1}'' is defined by its direction.
" + + "Do you really want to change the way direction, thus its semantic meaning?", + // Plural, if several tags are impacted + "You are going to reverse the way ''{0}''," + + "
whose semantic meaning of these tags are defined by its direction:
{1}" + + "Do you really want to change the way direction, thus its semantic meaning?", + tags.size(), + way.getDisplayName(DefaultNameFormatter.getInstance()), + getHTML(tags) + ); + int ret = ConditionalOptionPaneUtil.showOptionDialog( + "reverse_directional_way", + Main.parent, + msg, + tr("Reverse directional way."), + JOptionPane.YES_NO_CANCEL_OPTION, + JOptionPane.WARNING_MESSAGE, + null, + null + ); + switch(ret) { + case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true; + case JOptionPane.YES_OPTION: return true; + default: return false; + } + } + + /** + * Checks the given way can be safely reversed and asks user to confirm the operation if it not the case. + * @param way The way to check + * @throws UserCancelException If the user cancels the operation + */ + public static void checkAndConfirmReverseWay(Way way) throws UserCancelException { + TagCollection tags = getDirectionalTags(way); + if (!tags.isEmpty() && !confirmReverseWay(way, tags)) { + throw new UserCancelException(); + } + } +} Index: trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 5723) +++ trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 5724) @@ -24,5 +24,5 @@ * A TagCollection can be created: *