fix #8986 - Data loading/bbox index counting optimization (patch by shinigami) + code cleanup in Quad* classes

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6171 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror