[osmosis] 08/14: Add patch from upstream master branch: 0001-Fix-remaining-64-bit-id-tracking-problems.patch

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository osmosis.

commit 4a376fc200bd4bda81fce4494302ecf83102a3b8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Apr 10 20:20:05 2014 +0200

    Add patch from upstream master branch: 0001-Fix-remaining-64-bit-id-tracking-problems.patch
---
 ...Fix-remaining-64-bit-id-tracking-problems.patch | 76 ++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/debian/patches/0001-Fix-remaining-64-bit-id-tracking-problems.patch b/debian/patches/0001-Fix-remaining-64-bit-id-tracking-problems.patch
new file mode 100644
index 0000000..c8307aa
--- /dev/null
+++ b/debian/patches/0001-Fix-remaining-64-bit-id-tracking-problems.patch
@@ -0,0 +1,76 @@
+From 50d1ec7a49fa13332d6e9c9123f8b7d05f306c5d Mon Sep 17 00:00:00 2001
+From: Brett Henderson <brett at bretth.com>
+Date: Sat, 20 Jul 2013 10:23:58 +1000
+Subject: Fix remaining 64-bit id tracking problems
+Origin: https://github.com/openstreetmap/osmosis/commit/50d1ec7a49fa13332d6e9c9123f8b7d05f306c5d
+
+The BitSetIdTracker was still being used in a number of places.  All
+instances have now been replaced by the 64-bit capable DynamicIdTracker.
+
+--- a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/report/v0_6/IntegrityReporter.java
++++ b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/report/v0_6/IntegrityReporter.java
+@@ -23,7 +23,7 @@ import org.openstreetmap.osmosis.core.do
+ import org.openstreetmap.osmosis.core.domain.v0_6.RelationMember;
+ import org.openstreetmap.osmosis.core.domain.v0_6.Way;
+ import org.openstreetmap.osmosis.core.domain.v0_6.WayNode;
+-import org.openstreetmap.osmosis.core.filter.common.BitSetIdTracker;
++import org.openstreetmap.osmosis.core.filter.common.DynamicIdTracker;
+ import org.openstreetmap.osmosis.core.filter.common.IdTracker;
+ import org.openstreetmap.osmosis.core.task.v0_6.Sink;
+ 
+@@ -55,8 +55,8 @@ public class IntegrityReporter implement
+ 		this.file = file;
+ 		
+ 		initialized = false;
+-		nodeBitSet = new BitSetIdTracker();
+-		wayBitSet = new BitSetIdTracker();
++		nodeBitSet = new DynamicIdTracker();
++		wayBitSet = new DynamicIdTracker();
+ 	}
+ 	
+ 	
+--- a/osmosis-dataset/src/main/java/org/openstreetmap/osmosis/dataset/v0_6/impl/BoundingBoxContext.java
++++ b/osmosis-dataset/src/main/java/org/openstreetmap/osmosis/dataset/v0_6/impl/BoundingBoxContext.java
+@@ -4,7 +4,7 @@ package org.openstreetmap.osmosis.datase
+ import java.awt.geom.Rectangle2D;
+ import java.util.Comparator;
+ 
+-import org.openstreetmap.osmosis.core.filter.common.BitSetIdTracker;
++import org.openstreetmap.osmosis.core.filter.common.DynamicIdTracker;
+ import org.openstreetmap.osmosis.core.filter.common.IdTracker;
+ import org.openstreetmap.osmosis.core.store.UnsignedIntegerComparator;
+ import org.openstreetmap.osmosis.core.util.TileCalculator;
+@@ -117,9 +117,9 @@ public class BoundingBoxContext {
+ 		minimumTile = tmpMinimumTile;
+ 		
+ 		// Create the id trackers.
+-		nodeIdTracker = new BitSetIdTracker();
+-		wayIdTracker = new BitSetIdTracker();
+-		relationIdTracker = new BitSetIdTracker();
+-		externalNodeIdTracker = new BitSetIdTracker();
++		nodeIdTracker = new DynamicIdTracker();
++		wayIdTracker = new DynamicIdTracker();
++		relationIdTracker = new DynamicIdTracker();
++		externalNodeIdTracker = new DynamicIdTracker();
+ 	}
+ }
+--- a/osmosis-dataset/src/main/java/org/openstreetmap/osmosis/dataset/v0_6/impl/DatasetStoreReader.java
++++ b/osmosis-dataset/src/main/java/org/openstreetmap/osmosis/dataset/v0_6/impl/DatasetStoreReader.java
+@@ -22,7 +22,7 @@ import org.openstreetmap.osmosis.core.do
+ import org.openstreetmap.osmosis.core.domain.v0_6.Relation;
+ import org.openstreetmap.osmosis.core.domain.v0_6.Way;
+ import org.openstreetmap.osmosis.core.domain.v0_6.WayNode;
+-import org.openstreetmap.osmosis.core.filter.common.BitSetIdTracker;
++import org.openstreetmap.osmosis.core.filter.common.DynamicIdTracker;
+ import org.openstreetmap.osmosis.core.filter.common.IdTracker;
+ import org.openstreetmap.osmosis.core.lifecycle.ReleasableIterator;
+ import org.openstreetmap.osmosis.core.store.EmptyIterator;
+@@ -287,7 +287,7 @@ public class DatasetStoreReader implemen
+ 		ReleasableIterator<Long> nodeIdsForTileset;
+ 		IdTracker idTracker;
+ 		
+-		idTracker = new BitSetIdTracker();
++		idTracker = new DynamicIdTracker();
+ 		
+ 		// Search through all nodes in the tile range and add them to a
+ 		// temporary id tracker. This temporary id tracker allows all node ids

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git