Changeset 19216 in osm for applications/editors/josm

Timestamp:

2009-12-27T17:44:48+01:00 (15 years ago)

Author:

tordanik

Message:

added type parameter for relation members to GraphView's DataSource

Location:

applications/editors/josm/plugins/graphview

Files:

• src/org/openstreetmap/josm/plugins/graphview/core/access/RulesetAccessEvaluator.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/graphview/core/data/DataSource.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/graphview/core/data/DataSourceObserver.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/graphview/core/property/RoadIncline.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/graphview/core/property/RoadMaxspeed.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/graphview/core/property/RoadPropertyType.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/graphview/core/property/RoadSurface.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/graphview/core/property/RoadTracktype.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/graphview/core/property/RoadValueLimit.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/graphview/core/transition/GenericTransitionStructure.java (modified) (7 diffs)
• src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMTransitionStructure.java (modified) (3 diffs)
• test/org/openstreetmap/josm/plugins/graphview/core/FullGraphCreationTest.java (modified) (1 diff)
• test/org/openstreetmap/josm/plugins/graphview/core/TestDataSource.java (modified) (5 diffs)

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/RulesetAccessEvaluator.java

@@ -16 +16 @@
  * AccessEvaluator based on a single AccessRuleset
  */
-public class RulesetAccessEvaluator<N, W, R> implements AccessEvaluator<N, W> {
+public class RulesetAccessEvaluator<N, W, R, M> implements AccessEvaluator<N, W> {
 
-        private final DataSource<N, W, R> dataSource;
+        private final DataSource<N, W, R, M> dataSource;
         private final AccessRuleset ruleset;
         private final AccessParameters parameters;
@@ -28 +28 @@
          *                    and situation to evaluate access for; != null
          */
-        public RulesetAccessEvaluator(DataSource<N, W, R> dataSource, AccessRuleset ruleset, AccessParameters parameters) {
+        public RulesetAccessEvaluator(DataSource<N, W, R, M> dataSource, AccessRuleset ruleset, AccessParameters parameters) {
                 assert dataSource != null && ruleset != null && parameters != null;
 

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/data/DataSource.java

@@ -8 +8 @@
  * @param <R>  relation type
  */
-public interface DataSource<N, W, R> {
-
-        public static interface RelationMember {
-                /** returns the member's role. != null */
-                public String getRole();
-                /** returns the member itself. Must be instance of N, W or R, != null */
-                public Object getMember();
-        }
-
+public interface DataSource<N, W, R, M> {
+        
         /** returns all nodes */
         public Iterable<N> getNodes();
@@ -36 +29 @@
 
         /** returns a relation's members */
-        public Iterable<RelationMember> getMembers(R relation);
+        public Iterable<M> getMembers(R relation);
 
         /** returns a node's tags */
@@ -47 +40 @@
         public TagGroup getTagsR(R relation);
 
+        /** returns a relation member's role */
+        public String getRole(M member);
+
+        /** returns a relation member's member object */
+        public Object getMember(M member);
+        
+        /** returns whether a relation member is a node */
+        public boolean isNMember(M member);
+        
+        /** returns whether a relation member is a way */
+        public boolean isWMember(M member);
+        
+        /** returns whether a relation member is a relation */
+        public boolean isRMember(M member);
+        
         /**
          * adds an observer.

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/data/DataSourceObserver.java

@@ -12 +12 @@
          * @param dataSource  observed data source that has changed; != null
          */
-        public void update(DataSource<?, ?, ?> dataSource);
+        public void update(DataSource<?, ?, ?, ?> dataSource);
 
 }

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/property/RoadIncline.java

@@ -8 +8 @@
 public class RoadIncline implements RoadPropertyType<Float> {
 
-        public <N, W, R> Float evaluateN(N node, AccessParameters accessParameters,
-                        DataSource<N,W,R> dataSource) {
+        public <N, W, R, M> Float evaluateN(N node, AccessParameters accessParameters,
+                        DataSource<N,W,R,M> dataSource) {
                 return null;
         };
 
-        public <N, W, R> Float evaluateW(W way, boolean forward, AccessParameters accessParameters,
-                        DataSource<N,W,R> dataSource) {
+        public <N, W, R, M> Float evaluateW(W way, boolean forward, AccessParameters accessParameters,
+                        DataSource<N,W,R,M> dataSource) {
                 assert way != null && accessParameters != null && dataSource != null;
 

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/property/RoadMaxspeed.java

@@ -8 +8 @@
 public class RoadMaxspeed implements RoadPropertyType<Float> {
 
-        private DataSource<?, ?, ?> lastDataSource;
+        private DataSource<?, ?, ?, ?> lastDataSource;
 
         /**
@@ -14 +14 @@
          * since last call to {@link #evaluate(Object, boolean, AccessParameters, DataSource)}
          */
-        private <N, W, R> void initializeIfNecessary(DataSource<N, W, R> dataSource) {
+        private <N, W, R, M> void initializeIfNecessary(DataSource<N, W, R, M> dataSource) {
 
                 if (dataSource != lastDataSource) {
@@ -30 +30 @@
         }
 
-        public <N, W, R> Float evaluateN(N node, AccessParameters accessParameters,
-                        DataSource<N, W, R> dataSource) {
+        public <N, W, R, M> Float evaluateN(N node, AccessParameters accessParameters,
+                        DataSource<N, W, R, M> dataSource) {
                 assert node != null && accessParameters != null && dataSource != null;
 
@@ -39 +39 @@
         }
 
-        public <N, W, R> Float evaluateW(W way, boolean forward, AccessParameters accessParameters,
-                        DataSource<N, W, R> dataSource) {
+        public <N, W, R, M> Float evaluateW(W way, boolean forward, AccessParameters accessParameters,
+                        DataSource<N, W, R, M> dataSource) {
                 assert way != null && accessParameters != null && dataSource != null;
 

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/property/RoadPropertyType.java

@@ -26 +26 @@
          *                          null if property cannot be determined / does not apply
          */
-        public <N, W, R> V evaluateW(W way, boolean forward,
-                        AccessParameters accessParameters, DataSource<N, W, R> dataSource);
+        public <N, W, R, M> V evaluateW(W way, boolean forward,
+                        AccessParameters accessParameters, DataSource<N, W, R, M> dataSource);
 
         /**
@@ -39 +39 @@
          *                          null if property cannot be determined / does not apply
          */
-        public <N, W, R> V evaluateN(N node,
-                        AccessParameters accessParameters, DataSource<N, W, R> dataSource);
+        public <N, W, R, M> V evaluateN(N node,
+                        AccessParameters accessParameters, DataSource<N, W, R, M> dataSource);
 
         /**

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/property/RoadSurface.java

@@ -9 +9 @@
 public class RoadSurface implements RoadPropertyType<String> {
 
-        public <N, W, R> String evaluateN(N node, AccessParameters accessParameters,
-                        DataSource<N,W,R> dataSource) {
+        public <N, W, R, M> String evaluateN(N node, AccessParameters accessParameters,
+                        DataSource<N,W,R,M> dataSource) {
                 return null;
         };
 
-        public <N, W, R> String evaluateW(W way, boolean forward, AccessParameters accessParameters,
-                        DataSource<N,W,R> dataSource) {
+        public <N, W, R, M> String evaluateW(W way, boolean forward, AccessParameters accessParameters,
+                        DataSource<N,W,R,M> dataSource) {
                 assert way != null && accessParameters != null && dataSource != null;
 

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/property/RoadTracktype.java

@@ -7 +7 @@
 public class RoadTracktype implements RoadPropertyType<Integer> {
 
-        public <N, W, R> Integer evaluateN(N node, AccessParameters accessParameters,
-                        DataSource<N,W,R> dataSource) {
+        public <N, W, R, M> Integer evaluateN(N node, AccessParameters accessParameters,
+                        DataSource<N,W,R,M> dataSource) {
                 return null;
         };
 
-        public <N, W, R> Integer evaluateW(W way, boolean forward, AccessParameters accessParameters,
-                        DataSource<N,W,R> dataSource) {
+        public <N, W, R, M> Integer evaluateW(W way, boolean forward, AccessParameters accessParameters,
+                        DataSource<N,W,R,M> dataSource) {
                 assert way != null && accessParameters != null && dataSource != null;
 

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/property/RoadValueLimit.java

@@ -34 +34 @@
         }
 
-        public <N, W, R> Float evaluateW(W way, boolean forward,
-                        AccessParameters accessParameters, DataSource<N, W, R> dataSource) {
+        public <N, W, R, M> Float evaluateW(W way, boolean forward,
+                        AccessParameters accessParameters, DataSource<N, W, R, M> dataSource) {
                 assert way != null && accessParameters != null && dataSource != null;
                 return evaluateTags(dataSource.getTagsW(way));
         }
 
-        public <N, W, R> Float evaluateN(N node,
-                        AccessParameters accessParameters, DataSource<N, W, R> dataSource) {
+        public <N, W, R, M> Float evaluateN(N node,
+                        AccessParameters accessParameters, DataSource<N, W, R, M> dataSource) {
                 assert node != null && accessParameters != null && dataSource != null;
                 return evaluateTags(dataSource.getTagsN(node));

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/transition/GenericTransitionStructure.java

@@ -28 +28 @@
  * @param <R>  relation type
  */
-public class GenericTransitionStructure<N, W, R> implements TransitionStructure, DataSourceObserver {
+public class GenericTransitionStructure<N, W, R, M> implements TransitionStructure, DataSourceObserver {
 
         private static final Collection<Segment> EMPTY_SEGMENT_LIST =
@@ -148 +148 @@
         }
 
-        private final Class<N> nodeClass;
-        private final Class<W> wayClass;
-        private final Class<R> relationClass;
-
         private final Set<TransitionStructureObserver> observers = new HashSet<TransitionStructureObserver>();
 
         private final Collection<RoadPropertyType<?>> properties;
 
-        private final DataSource<N, W, R> dataSource;
+        private final DataSource<N, W, R, M> dataSource;
 
         private AccessParameters accessParameters;
@@ -168 +164 @@
 
         public GenericTransitionStructure(
-                        Class<N> nodeClass, Class<W> wayClass, Class<R> relationClass,
                         AccessParameters accessParameters, AccessRuleset ruleset,
-                        DataSource<N, W, R> dataSource,
+                        DataSource<N, W, R, M> dataSource,
                         Collection<RoadPropertyType<?>> properties) {
 
-                assert nodeClass != null && wayClass != null && relationClass != null;
                 assert accessParameters != null && ruleset != null;
                 assert dataSource != null;
                 assert properties != null;
-
-                this.nodeClass = nodeClass;
-                this.wayClass = wayClass;
-                this.relationClass = relationClass;
 
                 this.dataSource = dataSource;
@@ -211 +201 @@
                         assert dataSource != null;
 
-                        accessEvaluator = new RulesetAccessEvaluator<N, W, R>(
+                        accessEvaluator = new RulesetAccessEvaluator<N, W, R, M>(
                                         dataSource,
                                         this.ruleset,
@@ -411 +401 @@
                         Map<W, List<Segment>> waySegmentMap) {
 
-                assert relationClass.isInstance(relation);
-
                 /* collect information about the relation */
 
@@ -420 +408 @@
                 Collection<W> toWays = new LinkedList<W>();
 
-                for (DataSource.RelationMember member : dataSource.getMembers(relation)) {
-
-                        if ("from".equals(member.getRole())) {
-                                if (fromWay != null || !wayClass.isInstance(member.getMember())) {
+                for (M member : dataSource.getMembers(relation)) {
+
+                        if ("from".equals(dataSource.getRole(member))) {
+                                if (fromWay != null || !dataSource.isWMember(member)) {
                                         //broken restriction
                                         return EMPTY_RESTRICTION_COLLECTION;
                                 } else {
-                                        fromWay = (W)member.getMember();
-                                }
-                        } else if ("to".equals(member.getRole())) {
-                                if (!wayClass.isInstance(member.getMember())) {
+                                        fromWay = (W)dataSource.getMember(member);
+                                }
+                        } else if ("to".equals(dataSource.getRole(member))) {
+                                if (!dataSource.isWMember(member)) {
                                         //broken restriction
                                         return EMPTY_RESTRICTION_COLLECTION;
                                 } else {
-                                        toWays.add((W)member.getMember());
-                                }
-                        } else if ("via".equals(member.getRole())) {
-                                if (wayClass.isInstance(member.getMember())) {
-                                        viaWays.add((W)member.getMember());
-                                } else if (nodeClass.isInstance(member.getMember())) {
-                                        viaNodes.add((N)member.getMember());
+                                        toWays.add((W)dataSource.getMember(member));
+                                }
+                        } else if ("via".equals(dataSource.getRole(member))) {
+                                if (dataSource.isWMember(member)) {
+                                        viaWays.add((W)dataSource.getMember(member));
+                                } else if (dataSource.isNMember(member)) {
+                                        viaNodes.add((N)dataSource.getMember(member));
                                 }
                         }
@@ -683 +671 @@
         }
 
-        public void update(DataSource<?, ?, ?> dataSource) {
+        public void update(DataSource<?, ?, ?, ?> dataSource) {
                 assert this.dataSource == dataSource;
                 updateData();

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.graphview.plugin.data;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -14 +12 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.plugins.graphview.core.data.DataSource;
@@ -25 +24 @@
  */
 
-public class JOSMDataSource implements DataSource<Node, Way, Relation> {
+public class JOSMDataSource implements DataSource<Node, Way, Relation, RelationMember> {
 
         public double getLat(Node node) {
@@ -36 +35 @@
 
         public Iterable<RelationMember> getMembers(Relation relation) {
-                List<RelationMember> members = new ArrayList<RelationMember>(relation.getMembersCount());
-                for (org.openstreetmap.josm.data.osm.RelationMember member : relation.getMembers()) {
-                        if (!member.getMember().isDeleted() && !member.getMember().isIncomplete()) {
-                                members.add(new RelationMemberImpl(member));
-                        }
-                }
-                return members;
+                return relation.getMembers();
         }
 
@@ -80 +73 @@
                 }
         }
+        
+        public Object getMember(RelationMember member) {
+                return member.getMember();
+        }
+        
+        public String getRole(RelationMember member) {
+                return member.getRole();
+        }
+        
+        public boolean isNMember(RelationMember member) {
+                return member.getMember() instanceof Node;
+        }
+        
+        public boolean isWMember(RelationMember member) {
+                return member.getMember() instanceof Way;
+        }
+        
+        public boolean isRMember(RelationMember member) {
+                return member.getMember() instanceof Relation;
+        }
+        
 
         private static final TagGroup EMPTY_TAG_GROUP;
@@ -175 +189 @@
         }
 
-        public static class RelationMemberImpl implements RelationMember {
+        static class RelationMemberImpl {
                 private final String role;
                 private final Object member;

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMTransitionStructure.java

@@ -5 +5 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.plugins.graphview.core.access.AccessParameters;
@@ -14 +15 @@
  * transition structure that retrieves data from a {@link JOSMDataSource}
  */
-public class JOSMTransitionStructure extends GenericTransitionStructure<Node, Way, Relation> {
+public class JOSMTransitionStructure extends GenericTransitionStructure<Node, Way, Relation, RelationMember> {
 
         private static final JOSMDataSource DATA_SOURCE = new JOSMDataSource();
@@ -21 +22 @@
                         Collection<RoadPropertyType<?>> properties) {
 
-                super(Node.class, Way.class, Relation.class,
-                                accessParameters, ruleset,
+                super(accessParameters, ruleset,
                                 DATA_SOURCE,
                                 properties);

applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/FullGraphCreationTest.java

@@ -165 +165 @@
                 properties.add(new RoadWidth());
 
-                return new GenericTransitionStructure<TestNode, TestWay, TestRelation>(
-                                TestNode.class, TestWay.class, TestRelation.class,
+                return new GenericTransitionStructure<TestNode, TestWay, TestRelation, TestRelationMember>(
                                 ACCESS_PARAMS, TEST_RULESET, dataSource, properties);
         }

applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/TestDataSource.java

@@ -12 +12 @@
 import org.openstreetmap.josm.plugins.graphview.core.data.TagGroup;
 
-public class TestDataSource implements DataSource<TestDataSource.TestNode, TestDataSource.TestWay, TestDataSource.TestRelation> {
+public class TestDataSource implements DataSource<TestDataSource.TestNode, TestDataSource.TestWay, TestDataSource.TestRelation, TestDataSource.TestRelationMember> {
 
         public static class TestPrimitive {
@@ -43 +43 @@
 
         public static class TestRelation extends TestPrimitive {
-                public final Collection<RelationMember> members = new LinkedList<RelationMember>();
+                public final Collection<TestRelationMember> members = new LinkedList<TestRelationMember>();
                 @Override
                 public String toString() {
@@ -50 +50 @@
         }
 
-        public static class TestRelationMember implements RelationMember {
+        public static class TestRelationMember {
                 public final String role;
                 public final TestPrimitive member;
@@ -82 +82 @@
         }
 
-        public Iterable<RelationMember> getMembers(TestRelation relation) {
+        public Iterable<TestRelationMember> getMembers(TestRelation relation) {
                 return relation.members;
         }
@@ -113 +113 @@
                 return new MapBasedTagGroup(relation.tags);
         }
+        
+        public Object getMember(TestRelationMember member) {
+                return member.getMember();
+        }
+        
+        public String getRole(TestRelationMember member) {
+                return member.getRole();
+        }
+        
+        public boolean isNMember(TestRelationMember member) {
+                return member.getMember() instanceof TestNode;
+        }
+        
+        public boolean isWMember(TestRelationMember member) {
+                return member.getMember() instanceof TestWay;
+        }
+        
+        public boolean isRMember(TestRelationMember member) {
+                return member.getMember() instanceof TestRelation;
+        }
 
         public void addObserver(DataSourceObserver observer) {