[Tile-serving] [osm2pgsql] avoid duplicates in job queues for pending ways and relations (#420)

[Sarah Hoffmann]

If the pending tracker of output was ahead of the pending tracker
of middle when merging the two then an id coming from the middle
tracker was unconditionally added even if it was present in the
output tracker and therefore added from there.

Fixes #419
You can view, comment on, or merge this pull request online at:

  https://github.com/openstreetmap/osm2pgsql/pull/420

-- Commit Summary --

  * avoid duplicates in job queues for pending ways and relations

-- File Changes --

    M id-tracker.cpp (2)
    M id-tracker.hpp (1)
    M output-multi.cpp (36)
    M output-pgsql.cpp (40)

-- Patch Links --

https://github.com/openstreetmap/osm2pgsql/pull/420.patch
https://github.com/openstreetmap/osm2pgsql/pull/420.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/osm2pgsql/pull/420
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/tile-serving/attachments/20150731/c3d6c46f/attachment.html>