[osm2pgsql] 03/04: Add upstream patch to fix projection info for generic projection.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit fb1c21b99b7fe5afe720b12b6fcac68f0d9fea98
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu May 5 22:06:58 2016 +0200

    Add upstream patch to fix projection info for generic projection.
---
 debian/changelog                                   |  1 +
 ...ix-projection-info-for-generic-projection.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d79738b..317b5f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ osm2pgsql (0.90.0+ds-3) UNRELEASED; urgency=medium
 
   * Bump Standards-Version to 3.9.8, no changes.
   * Drop unused override for spelling error false positive.
+  * Add upstream patch to fix projection info for generic projection.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 05 May 2016 21:56:03 +0200
 
diff --git a/debian/patches/fix-projection-info-for-generic-projection.patch b/debian/patches/fix-projection-info-for-generic-projection.patch
new file mode 100644
index 0000000..a019178
--- /dev/null
+++ b/debian/patches/fix-projection-info-for-generic-projection.patch
@@ -0,0 +1,37 @@
+From 84335a08cfbb404b8eeaaa6167ef316f652e7b40 Mon Sep 17 00:00:00 2001
+From: Sarah Hoffmann <lonvia at denofr.de>
+Origin: https://github.com/openstreetmap/osm2pgsql/commit/84335a08cfbb404b8eeaaa6167ef316f652e7b40
+Bug: https://github.com/openstreetmap/osm2pgsql/issues/571
+Date: Wed, 20 Apr 2016 23:50:04 +0200
+Subject: fix projection info for generic projection
+
+fixes #571
+
+(cherry picked from commit ce2de4935c103f698721352ac423ad3a14c6bd75)
+
+--- a/reprojection.cpp
++++ b/reprojection.cpp
+@@ -75,7 +75,8 @@ class generic_reprojection_t : public re
+ {
+ public:
+     generic_reprojection_t(int srs)
+-    : pj_target(srs), pj_source(PROJ_LATLONG), pj_tile("+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs")
++    : m_target_srs(srs), pj_target(srs), pj_source(PROJ_LATLONG),
++      pj_tile("+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs")
+     {}
+ 
+     osmium::geom::Coordinates reproject(osmium::Location loc) const override
+@@ -94,10 +95,11 @@ public:
+         *lat = c.y;
+     }
+ 
+-    int target_srs() const override { return PROJ_SPHERE_MERC; }
+-    const char *target_desc() const override { return "Spherical Mercator"; }
++    int target_srs() const override { return m_target_srs; }
++    const char *target_desc() const override { return pj_get_def(pj_target.get(), 0); }
+ 
+ private:
++    int m_target_srs;
+     osmium::geom::CRS pj_target;
+     /** The projection of the source data. Always lat/lon (EPSG:4326). */
+     osmium::geom::CRS pj_source;
diff --git a/debian/patches/series b/debian/patches/series
index d9f5725..b12a5b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 pgsql_execPrepared-check-for-null-pointers-when-printing-error-message.patch
+fix-projection-info-for-generic-projection.patch

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