Clean access restriction usage.

src/main/org/insa/graph/RoadInformation.java

@@ -1,11 +1,83 @@
 package org.insa.graph;
 
+import java.util.Map;
+
 /**
  * Class containing information for road that may be shared by multiple arcs.
  * 
  */
 public class RoadInformation {
 
+    /**
+     * Access mode.
+     */
+    public enum AccessMode {
+        FOOT, BICYCLE, SMALL_MOTORCYCLE, MOTORCYCLE, MOTORCAR, BUS
+    }
+
+    /**
+     * Class containing access restriction information.
+     *
+     */
+    public static class AccessRestriction {
+
+        // Private road
+        private boolean is_private = false;
+
+        // Public transport restricted.
+        private boolean is_publicTransport = false;
+
+        // Map Enum -> Allowed.
+        private Map<AccessMode, Boolean> allowedModes;
+
+        /**
+         * Construct a new AccessInformation with unknown information: Not private, not
+         * public transport and all modes are allowed.
+         */
+        public AccessRestriction() {
+
+        }
+
+        /**
+         * @param isPrivate
+         * @param isPublicTransport
+         * @param allowedModes
+         */
+        public AccessRestriction(boolean isPrivate, boolean isPublicTransport,
+                Map<AccessMode, Boolean> allowedModes) {
+            this.is_private = isPrivate;
+            this.is_publicTransport = isPublicTransport;
+            this.allowedModes = allowedModes;
+        }
+
+        /**
+         * @return true if this is a private road.
+         */
+        public boolean isPrivate() {
+            return is_private;
+        }
+
+        /**
+         * @return true if this road is reserved for public transport.
+         */
+        public boolean isPublicTransport() {
+            return is_publicTransport;
+        }
+
+        /**
+         * @param mode
+         * 
+         * @return true if this road is allowed for the specified mode.
+         */
+        public boolean isAllowedFor(AccessMode mode) {
+            if (this.allowedModes == null) {
+                return true;
+            }
+            return this.allowedModes.getOrDefault(mode, false);
+        }
+
+    }
+
     /**
      * Road type.
      */
@@ -28,35 +100,11 @@ public class RoadInformation {
         COASTLINE
     }
 
-    /**
-     * Access mode.
-     */
-    public enum AccessMode {
-        FOOT, BICYCLE, SMALL_MOTORCYCLE, MOTORCYCLE, MOTORCAR, BUS
-    }
-
-    // Some masks...
-    @SuppressWarnings("unused")
-    private static final int MASK_UNKNOWN = 0x01;
-    private static final int MASK_PRIVATE = 0x02;
-    @SuppressWarnings("unused")
-    private static final int MASK_AGRICULTURAL = 0x04;
-    @SuppressWarnings("unused")
-    private static final int MASK_SERVICE = 0x08;
-    private static final int MASK_PUBLIC_TRANSPORT = 0x10;
-
-    private static final int MASK_FOOT = 0x01 << 8;
-    private static final int MASK_BICYCLE = 0x02 << 8;
-    private static final int MASK_MOTORCYCLE = 0x0C << 8;
-    private static final int MASK_SMALL_MOTORCYCLE = 0x08 << 8;
-    private static final int MASK_MOTORCAR = 0x10 << 8;
-    private static final int MASK_BUS = 0x20 << 8;
-
     // Type of the road (see above).
     private final RoadType type;
 
     // Access information
-    private final int access;
+    private final AccessRestriction access;
 
     // One way road?
     private final boolean oneway;
@@ -67,8 +115,8 @@ public class RoadInformation {
     // Name of the road.
     private final String name;
 
-    public RoadInformation(RoadType roadType, int access, boolean isOneWay, int maxSpeed,
-            String name) {
+    public RoadInformation(RoadType roadType, AccessRestriction access, boolean isOneWay,
+            int maxSpeed, String name) {
         this.type = roadType;
         this.access = access;
         this.oneway = isOneWay;
@@ -81,48 +129,8 @@ public class RoadInformation {
     /**
      * @return true if this is a private road.
      */
-    public boolean isPrivate() {
-        return (this.access & MASK_PRIVATE) != 0;
-    }
-
-    /**
-     * @return true if this road is reserved for public transport.
-     */
-    public boolean isPublicTransport() {
-        return (this.access & MASK_PUBLIC_TRANSPORT) != 0;
-    }
-
-    /**
-     * @param mode
-     * 
-     * @return true if this road is allowed for the specified mode.
-     */
-    public boolean isAllowedFor(AccessMode mode) {
-        if ((this.access & MASK_UNKNOWN) != 0) {
-            return true;
-        }
-        int maskedAccess = 0;
-        switch (mode) {
-        case FOOT:
-            maskedAccess = access & MASK_FOOT;
-            break;
-        case BICYCLE:
-            maskedAccess = access & MASK_BICYCLE;
-            break;
-        case SMALL_MOTORCYCLE:
-            maskedAccess = access & MASK_SMALL_MOTORCYCLE;
-            break;
-        case MOTORCYCLE:
-            maskedAccess = access & MASK_MOTORCYCLE;
-            break;
-        case MOTORCAR:
-            maskedAccess = access & MASK_MOTORCAR;
-            break;
-        case BUS:
-            maskedAccess = access & MASK_BUS;
-            break;
-        }
-        return maskedAccess != 0;
+    public AccessRestriction getAccessRestrictions() {
+        return this.access;
     }
 
     /**