Ticket #7588: 7588.patch

File 7588.patch, 2.6 KB (added by simon04, 14 years ago)

  • src/org/openstreetmap/josm/data/osm/OsmPrimitive.java 

    diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
index e059d59..f5b838c 100644
    a b abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab  
    601601     * Initialized by checkDirectionTagged()
    602602     */
    603603    static {
    604         // FIXME: incline=\"-*\" search pattern does not work.
    605         String reversedDirectionDefault = "oneway=\"-1\" | incline=down | incline=\"-*\"";
     604        String reversedDirectionDefault = "oneway=\"-1\" | incline=down | incline=\"-.*\"";
    606605
    607606        String directionDefault = "oneway? | incline=* | aerialway=* | "+
    608607                "waterway=stream | waterway=river | waterway=canal | waterway=drain | waterway=rapids | "+
    … … abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab  
    610609                "junction=roundabout";
    611610
    612611        try {
    613             reversedDirectionKeys = SearchCompiler.compile(Main.pref.get("tags.reversed_direction", reversedDirectionDefault), false, false);
     612            reversedDirectionKeys = SearchCompiler.compile(Main.pref.get("tags.reversed_direction", reversedDirectionDefault), false, true);
    614613        } catch (ParseError e) {
    615614            System.err.println("Unable to compile pattern for tags.reversed_direction, trying default pattern: " + e.getMessage());
    616615
    617616            try {
    618                 reversedDirectionKeys = SearchCompiler.compile(reversedDirectionDefault, false, false);
     617                reversedDirectionKeys = SearchCompiler.compile(reversedDirectionDefault, false, true);
    619618            } catch (ParseError e2) {
    620619                throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage());
    621620            }
    622621        }
    623622        try {
    624             directionKeys = SearchCompiler.compile(Main.pref.get("tags.direction", directionDefault), false, false);
     623            directionKeys = SearchCompiler.compile(Main.pref.get("tags.direction", directionDefault), false, true);
    625624        } catch (ParseError e) {
    626625            System.err.println("Unable to compile pattern for tags.direction, trying default pattern: " + e.getMessage());
    627626
    628627            try {
    629                 directionKeys = SearchCompiler.compile(directionDefault, false, false);
     628                directionKeys = SearchCompiler.compile(directionDefault, false, true);
    630629            } catch (ParseError e2) {
    631630                throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage());
    632631            }