Changeset 2890 in josm for trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

Timestamp:

24.01.2010 17:55:56 (2 years ago)

Author:

bastiK

Message:

Reverse Arrows for 'oneway=-1' and similar (see #2387).
More efficient calculation of arrow geometry.
Test file for Arrow direction added.

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (9 diffs)

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

@@ -108 +108 @@
     private static final int FLAG_HAS_DIRECTIONS = 1 << 5;
     private static final int FLAG_TAGGED = 1 << 6;
+    private static final int FLAG_DIRECTION_REVERSED = 1 << 7;
 
     /**
@@ -532 +533 @@
 
     private static volatile Match directionKeys = null;
+    private static volatile Match reversedDirectionKeys = null;
 
     /**
@@ -538 +540 @@
      * Initialized by checkDirectionTagged()
      */
-    public static void initDirectionKeys() {
-        if(directionKeys == null) {
-
-            // Legacy support - convert list of keys to search pattern
-            if (Main.pref.isCollection("tags.direction", false)) {
-                System.out.println("Collection of keys in tags.direction is no longer supported, value will converted to search pattern");
-                Collection<String> keys = Main.pref.getCollection("tags.direction", null);
-                StringBuilder builder = new StringBuilder();
-                for (String key:keys) {
-                    builder.append(key);
-                    builder.append("=* | ");
-                }
-                builder.delete(builder.length() - 3, builder.length());
-                Main.pref.put("tags.direction", builder.toString());
-            }
-
-            String defaultValue = "oneway? | incline=* | incline_steep=* | aerialway=* | waterway=stream | waterway=river | waterway=canal | waterway=drain | \"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" ";
+    static {
+        // Legacy support - convert list of keys to search pattern
+        if (Main.pref.isCollection("tags.direction", false)) {
+            System.out.println("Collection of keys in tags.direction is no longer supported, value will converted to search pattern");
+            Collection<String> keys = Main.pref.getCollection("tags.direction", null);
+            StringBuilder builder = new StringBuilder();
+            for (String key:keys) {
+                builder.append(key);
+                builder.append("=* | ");
+            }
+            builder.delete(builder.length() - 3, builder.length());
+            Main.pref.put("tags.direction", builder.toString());
+        }
+
+        String reversedDirectionDefault = "oneway=\"-1\" | incline=down | incline=\"-*\"";
+        String directionDefault = "oneway? | incline=* | aerialway=* | waterway=stream | waterway=river | waterway=canal | waterway=drain | waterway=rapids | \"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" ";
+
+        try {
+            reversedDirectionKeys = SearchCompiler.compile(Main.pref.get("tags.reversed_direction", reversedDirectionDefault), false, false);
+        } catch (ParseError e) {
+            System.err.println("Unable to compile pattern for tags.reversed_direction, trying default pattern: " + e.getMessage());
+
             try {
-                directionKeys = SearchCompiler.compile(Main.pref.get("tags.direction", defaultValue), false, false);
-            } catch (ParseError e) {
-                System.err.println("Unable to compile pattern for tags.direction, trying default pattern: " + e.getMessage());
-
-                try {
-                    directionKeys = SearchCompiler.compile(defaultValue, false, false);
-                } catch (ParseError e2) {
-                    throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage());
-                }
+                reversedDirectionKeys = SearchCompiler.compile(reversedDirectionDefault, false, false);
+            } catch (ParseError e2) {
+                throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage());
+            }
+        }
+        try {
+            directionKeys = SearchCompiler.compile(Main.pref.get("tags.direction", directionDefault), false, false);
+        } catch (ParseError e) {
+            System.err.println("Unable to compile pattern for tags.direction, trying default pattern: " + e.getMessage());
+
+            try {
+                directionKeys = SearchCompiler.compile(directionDefault, false, false);
+            } catch (ParseError e2) {
+                throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage());
             }
         }
@@ -576 +588 @@
      * direction dependent.
      */
+    @Deprecated
     public static Collection<String> getDirectionKeys() {
         return Main.pref.getCollection("tags.direction",
@@ -863 +876 @@
     private void keysChangedImpl(Map<String, String> originalKeys) {
         clearCached();
-        updateHasDirectionKeys();
+        updateDirectionFlags();
         updateTagged();
         if (dataSet != null) {
@@ -1126 +1139 @@
     }
 
-    private void updateHasDirectionKeys() {
-        initDirectionKeys();
+    private void updateDirectionFlags() {
+        boolean hasDirections = false;
+        boolean directionReversed = false;
+        if (reversedDirectionKeys.match(this)) {
+            hasDirections = true;
+            directionReversed = true;
+        }
         if (directionKeys.match(this)) {
+            hasDirections = true;
+        }
+
+        if (directionReversed) {
+            flags |= FLAG_DIRECTION_REVERSED;
+        } else {
+            flags &= ~FLAG_DIRECTION_REVERSED;
+        }
+        if (hasDirections) {
             flags |= FLAG_HAS_DIRECTIONS;
         } else {
@@ -1142 +1169 @@
     }
 
+    public boolean reversedDirection() {
+        return (flags & FLAG_DIRECTION_REVERSED) != 0;
+    }
     /**
      * Replies the name of this primitive. The default implementation replies the value
@@ -1222 +1252 @@
 
     protected String getFlagsAsString() {
-
         StringBuilder builder = new StringBuilder();
 
@@ -1240 +1269 @@
             builder.append("f");
         }
-
-        if (isDeleted()) {
+        if (isDisabled()) {
             builder.append("d");
         }
-
+        if (isTagged()) {
+            builder.append("T");
+        }
+        if (hasDirectionKeys()) {
+            if (reversedDirection()) {
+                builder.append("<");
+            } else {
+                builder.append(">");
+            }
+        }
         return builder.toString();
     }