diff options
author | wiedi <wiedi@pkgsrc.org> | 2015-08-28 21:38:32 +0000 |
---|---|---|
committer | wiedi <wiedi@pkgsrc.org> | 2015-08-28 21:38:32 +0000 |
commit | 765c878dcd1cf87844382ee60518a021d7ed0539 (patch) | |
tree | 0516f0ee925eca9ae99d05f33a51740602d437be /geography | |
parent | 54108438e2cce9ab247f28dd91dc0b0d94a0b62d (diff) | |
download | pkgsrc-765c878dcd1cf87844382ee60518a021d7ed0539.tar.gz |
Update geography/osm2pgsql to 0.88.1
Release 0.88.1
This maintainance release fixes duplicates in the job
queues for pending ways and relations, minor compiler
errors, and updates memory usage documentation.
The duplicates in job queues (#419) only impacted
multithreaded updates and was not observed in most
cases.
Release 0.88.0, a new stable branch
If upgrading and using a database created with 0.86.0 or earlier,
the schema migrations in docs/migrations.md are required.
Major changes since 0.86.0
- Osm2pgsql is now C++ and requires the Boost libraries
- A new backend has been added, the “multi” backend. This allows
multiple tables which can each contain different types of features.
More documentation is available at docs/multi.md
- In-database pending way tracking has been replaced with in-memory
tracking, offering significant performance gains.
- Rendering tables are ordered by GeoHash when created, resulting in
significant performance improvements.
- z_logic has been improved, taking into account more recent work
across multiple styles.
- The node storage has been improved, and out of order nodes and
nodes at 0,0 should now always be handled correctly
- A new test suite with unit tests
- Many bug-fixes
Changes since 0.87.3 include
- C++ cleanups
- default.style cleanups to improve ease of modification
- Remove the lockfree queue pending implementation and default
to what was --without-lockfree, which uses less RAM
- RAM node storage cleanups
- Better node storage test coverage
Diffstat (limited to 'geography')
-rw-r--r-- | geography/osm2pgsql/Makefile | 4 | ||||
-rw-r--r-- | geography/osm2pgsql/distinfo | 9 | ||||
-rw-r--r-- | geography/osm2pgsql/patches/patch-node-persistent-cache.cpp | 35 |
3 files changed, 6 insertions, 42 deletions
diff --git a/geography/osm2pgsql/Makefile b/geography/osm2pgsql/Makefile index f367bf6f178..51deceef4eb 100644 --- a/geography/osm2pgsql/Makefile +++ b/geography/osm2pgsql/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2015/06/10 01:48:49 wiedi Exp $ +# $NetBSD: Makefile,v 1.2 2015/08/28 21:38:32 wiedi Exp $ -DISTNAME= osm2pgsql-0.87.3 +DISTNAME= osm2pgsql-0.88.1 CATEGORIES= geography MASTER_SITES= ${MASTER_SITE_GITHUB:=openstreetmap/} GITHUB_TAG= ${PKGVERSION_NOREV} diff --git a/geography/osm2pgsql/distinfo b/geography/osm2pgsql/distinfo index 5b3e2868fbb..f936069e4f0 100644 --- a/geography/osm2pgsql/distinfo +++ b/geography/osm2pgsql/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.1 2015/06/10 01:48:49 wiedi Exp $ +$NetBSD: distinfo,v 1.2 2015/08/28 21:38:32 wiedi Exp $ -SHA1 (osm2pgsql-0.87.3.tar.gz) = 977f1c6591a7603240dafd31ca67a18f01537ab8 -RMD160 (osm2pgsql-0.87.3.tar.gz) = bacfb31b95611cd9c02e005bbc50749f1ac1905b -Size (osm2pgsql-0.87.3.tar.gz) = 2141464 bytes +SHA1 (osm2pgsql-0.88.1.tar.gz) = 8dcdb563de23a641c94855b50bf020c799b6a869 +RMD160 (osm2pgsql-0.88.1.tar.gz) = 8d8ce268e00a015112ec3385dd93b7160032da83 +Size (osm2pgsql-0.88.1.tar.gz) = 2140606 bytes SHA1 (patch-middle-pgsql.cpp) = 71146a00bdfd486ae0b7ed74566270b4671175b7 -SHA1 (patch-node-persistent-cache.cpp) = db641099525c275af06f86377d30b7f67d1e273a diff --git a/geography/osm2pgsql/patches/patch-node-persistent-cache.cpp b/geography/osm2pgsql/patches/patch-node-persistent-cache.cpp deleted file mode 100644 index 488c734ba3a..00000000000 --- a/geography/osm2pgsql/patches/patch-node-persistent-cache.cpp +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-node-persistent-cache.cpp,v 1.1 2015/06/10 01:48:49 wiedi Exp $ - -Use std namespace to find isnan - ---- node-persistent-cache.cpp.orig 2015-04-30 04:15:07.000000000 +0000 -+++ node-persistent-cache.cpp -@@ -450,7 +450,7 @@ int node_persistent_cache::set_append(os - block_id = load_block(block_offset); - - #ifdef FIXED_POINT -- if (isnan(lat) && isnan(lon)) -+ if (std::isnan(lat) && std::isnan(lon)) - { - readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lat = - INT_MIN; -@@ -512,8 +512,8 @@ int node_persistent_cache::get(struct os - return 0; - } - #else -- if ((isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lat)) && -- (isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lon))) -+ if ((std::isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lat)) && -+ (std::isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lon))) - { - return 1; - } -@@ -547,7 +547,7 @@ int node_persistent_cache::get_list(node - - size_t wrtidx = 0; - for (size_t i = 0; i < nds.size(); i++) { -- if (isnan(out[i].lat) && isnan(out[i].lon)) { -+ if (std::isnan(out[i].lat) && std::isnan(out[i].lon)) { - if (get(&(out[wrtidx]), nds[i]) == 0) - wrtidx++; - } else { |