Changeset 2573 in josm for trunk/src/org/openstreetmap/josm/corrector

Timestamp:

2009-12-04T18:34:31+01:00 (15 years ago)

Author:

stoecker

Message:

applied #4068 - patch by mjulius - fix combine way and way reversing

File:

• trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -69 +69 @@
     };
 
+    public static boolean isReversible(Way way) {
+        ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
+        primitives.add(way);
+        primitives.addAll(way.getNodes());
+
+        for  (OsmPrimitive primitive : primitives) {
+            for (String key : primitive.keySet()) {
+                if (key.equals("oneway")) return false;
+                for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
+                    if (!key.equals(prefixSuffixSwitcher.apply(key))) return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public static List<Way> irreversibleWays(List<Way> ways) {
+        List<Way> newWays = new ArrayList<Way>(ways);
+        for (Way way : ways) {
+            if (isReversible(way)) {
+                newWays.remove(way);
+            }
+        }
+        return newWays;
+    }
+
     @Override
     public Collection<Command> execute(Way oldway, Way way) throws UserCancelException {
         Map<OsmPrimitive, List<TagCorrection>> tagCorrectionsMap =
-                new HashMap<OsmPrimitive, List<TagCorrection>>();
+            new HashMap<OsmPrimitive, List<TagCorrection>>();
 
         ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
@@ -87 +114 @@
 
                 if (key.equals("oneway")) {
-                    if (value.equals("-1")) {
+                    if (OsmUtils.isReversed(value)) {
                         newValue = OsmUtils.trueval;
                     } else {
                         Boolean boolValue = OsmUtils.getOsmBoolean(value);
                         if (boolValue != null && boolValue.booleanValue()) {
-                            newValue = "-1";
+                            newValue = OsmUtils.reverseval;
                         }
                     }
@@ -112 +139 @@
 
         Map<OsmPrimitive, List<RoleCorrection>> roleCorrectionMap =
-                new HashMap<OsmPrimitive, List<RoleCorrection>>();
+            new HashMap<OsmPrimitive, List<RoleCorrection>>();
         roleCorrectionMap.put(way, new ArrayList<RoleCorrection>());