[osm2pgsql] 01/05: Imported Upstream version 0.92.1+ds

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit 5e8895b2681e28088c5ef0c42d7c205010962383
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Apr 13 23:51:40 2017 +0200

    Imported Upstream version 0.92.1+ds
---
 CMakeLists.txt   | 2 +-
 output-multi.cpp | 4 ++--
 parse-osmium.cpp | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db48c1e..05696b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(PACKAGE osm2pgsql)
 set(PACKAGE_NAME osm2pgsql)
-set(PACKAGE_VERSION 0.92.0)
+set(PACKAGE_VERSION 0.92.1)
 
 cmake_minimum_required(VERSION 2.8.7)
 
diff --git a/output-multi.cpp b/output-multi.cpp
index c92c752..e8de3bc 100644
--- a/output-multi.cpp
+++ b/output-multi.cpp
@@ -92,7 +92,7 @@ void output_multi_t::enqueue_ways(pending_queue_t &job_queue, osmid_t id, size_t
     }
 
     //make sure to get this one as well and move to the next
-    if(popped == id) {
+    if (popped > id) {
         if (!ways_done_tracker->is_marked(popped) && id_tracker::is_valid(popped)) {
             job_queue.push(pending_job_t(popped, output_id));
             added++;
@@ -143,7 +143,7 @@ void output_multi_t::enqueue_relations(pending_queue_t &job_queue, osmid_t id, s
     }
 
     //make sure to get this one as well and move to the next
-    if(popped == id) {
+    if (popped > id) {
         if(id_tracker::is_valid(popped)) {
             job_queue.push(pending_job_t(popped, output_id));
             added++;
diff --git a/parse-osmium.cpp b/parse-osmium.cpp
index 9581f18..681032e 100644
--- a/parse-osmium.cpp
+++ b/parse-osmium.cpp
@@ -176,6 +176,9 @@ void parse_osmium_t::relation(osmium::Relation& rel)
     if (rel.deleted()) {
         m_data->relation_delete(rel.id());
     } else {
+        if (rel.members().size() > 32767) {
+            return;
+        }
         convert_tags(rel);
         convert_members(rel.members());
         if (m_append) {

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