Changeset 19532 in osm for applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/PathBuilder.java

Timestamp:

2010-01-15T21:42:20+01:00 (15 years ago)

Author:

jttt

Message:

Cache route information when dataset didn't changed

File:

• applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/PathBuilder.java (modified) (3 diffs)

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/PathBuilder.java

@@ -14 +14 @@
 public class PathBuilder {
 
-        private Map<Way, BitSet> wayRoutes = new HashMap<Way, BitSet>(); 
+        private Map<Way, BitSet> wayRoutes = new HashMap<Way, BitSet>();
+        private Collection<ConvertedWay> convertedWays;
 
         public void addWay(Way way, RouteDefinition route) {
@@ -30 +31 @@
 
         public Collection<ConvertedWay> getConvertedWays() {
-                Map<WayEnd, ConvertedWay> ways = new HashMap<WayEnd, ConvertedWay>();
+                if (convertedWays == null) {
+                        Map<WayEnd, ConvertedWay> ways = new HashMap<WayEnd, ConvertedWay>();
 
-                for (Entry<Way, BitSet> wayEntry:wayRoutes.entrySet()) {
-                        ConvertedWay way = new ConvertedWay(wayEntry.getValue(), wayEntry.getKey());
+                        for (Entry<Way, BitSet> wayEntry:wayRoutes.entrySet()) {
+                                ConvertedWay way = new ConvertedWay(wayEntry.getValue(), wayEntry.getKey());
 
-                        ConvertedWay wayBefore = ways.get(way.getStart());
-                        ConvertedWay wayAfter = ways.get(way.getStop());
+                                ConvertedWay wayBefore = ways.get(way.getStart());
+                                ConvertedWay wayAfter = ways.get(way.getStop());
 
-                        if (wayBefore != null) {
-                                removeWay(ways, wayBefore);
-                                way.connect(wayBefore);
-                        } 
+                                if (wayBefore != null) {
+                                        removeWay(ways, wayBefore);
+                                        way.connect(wayBefore);
+                                }
 
-                        if (wayAfter != null) {
-                                removeWay(ways, wayAfter);
-                                way.connect(wayAfter);
+                                if (wayAfter != null) {
+                                        removeWay(ways, wayAfter);
+                                        way.connect(wayAfter);
+                                }
+
+                                ways.put(way.getStart(), way);
+                                ways.put(way.getStop(), way);
                         }
 
-                        ways.put(way.getStart(), way);
-                        ways.put(way.getStop(), way);
+                        Set<ConvertedWay> uniqueWays = new HashSet<ConvertedWay>();
+                        uniqueWays.addAll(ways.values());
+                        convertedWays = uniqueWays;
                 }
-
-                Set<ConvertedWay> uniqueWays = new HashSet<ConvertedWay>();
-                uniqueWays.addAll(ways.values());
-                return uniqueWays;
+                return convertedWays;
         }
 
@@ -63 +67 @@
 
         public void clear() {
+                convertedWays = null;
                 wayRoutes.clear();
         }