[Git][debian-gis-team/spatialindex][upstream] New upstream version 2.0.0~b1
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Tue May 28 18:09:48 BST 2024
Bas Couwenberg pushed to branch upstream at Debian GIS Project / spatialindex
Commits:
3176b466 by Bas Couwenberg at 2024-05-28T18:41:14+02:00
New upstream version 2.0.0~b1
- - - - -
19 changed files:
- HOWTORELEASE.txt
- README.rst
- docs/source/conf.py
- docs/source/download.rst
- docs/source/introduction.rst
- include/spatialindex/Version.h
- src/storagemanager/DiskStorageManager.cc
- src/storagemanager/DiskStorageManager.h
- + test/cleanup-test-output.sh
- test/geometry/test1/run
- test/index-tests.sh
- test/mvrtree/test1/run
- test/mvrtree/test2/run
- test/rtree/test1/run
- test/rtree/test2/run
- test/rtree/test3/run
- test/rtree/test4/run
- test/tprtree/test1/run
- test/tprtree/test2/run
Changes:
=====================================
HOWTORELEASE.txt
=====================================
@@ -28,8 +28,8 @@ Release Process
- Update SO versions
* https://github.com/libspatialindex/libspatialindex/pull/44#issuecomment-57088783
-2) Update README to include any relevant info about the release that
- might have changed.
+2) Update docs/source/* and README.rst with latest version number, including any relevant info
+ about the release that might have changed.
3) Update ChangeLog with git2cl
=====================================
README.rst
=====================================
@@ -5,10 +5,10 @@
*****************************************************************************
-:Author: Marios Hadjieleftheriou
-:Contact: mhadji at gmail.com
-:Revision: 1.9.3
-:Date: 10/23/2019
+:Author: Marios Hadjieleftheriou <mhadji at gmail.com>
+:Contact: Developer mailing list https://groups.io/g/libspatialindex/
+:Revision: 2.0
+:Date: 2024-05-17
See http://libspatialindex.org for full documentation.
=====================================
docs/source/conf.py
=====================================
@@ -43,16 +43,16 @@ master_doc = 'index'
# General information about the project.
project = u'libspatialindex'
-copyright = u'2019, Marios Hadjieleftheriou'
+copyright = u'2024, Marios Hadjieleftheriou and contributors'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-version = '1.9.3'
+version = '2.0.0'
# The full version, including alpha/beta/rc tags.
-release = '1.9.3'
+release = '2.0.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
=====================================
docs/source/download.rst
=====================================
@@ -5,13 +5,13 @@ Download
Current Release (MIT)
------------------------------------------------------------------------------
-* **2018-10-23**
+* **2024-06-03**
- - `spatialindex-src-1.9.3.tar.gz <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.gz>`__
- `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.gz.md5>`__
+ - `spatialindex-src-2.0.0.tar.gz <https://github.com/libspatialindex/libspatialindex/releases/download/2.0.0/spatialindex-src-2.0.0.tar.gz>`__
+ `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/2.0.0/spatialindex-src-2.0.0.tar.gz.md5>`__
- - `spatialindex-src-1.9.3.tar.bz2 <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2>`__
- `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2.md5>`__
+ - `spatialindex-src-2.0.0.tar.bz2 <https://github.com/libspatialindex/libspatialindex/releases/download/2.0.0/spatialindex-src-2.0.0.tar.bz2>`__
+ `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/2.0.0/spatialindex-src-2.0.0.tar.bz2.md5>`__
Binaries
..............................................................................
@@ -21,7 +21,7 @@ for OSX, Linux, and Windows. After installing Conda or Miniconda, install the li
::
- conda install -c conda-forge libspatialindex=1.9.3
+ conda install -c conda-forge libspatialindex=2.0.0
Additionally, packaging systems such as Debian, RedHat, Homebrew, MacPorts, and many others
contain binaries for libspatialindex.
@@ -30,20 +30,28 @@ contain binaries for libspatialindex.
Past Release (MIT)
------------------------------------------------------------------------------
-* **2018-10-22**
+* **2019-10-23**
- - `spatialindex-src-1.9.2.tar.gz <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.2/spatialindex-src-1.9.2.tar.gz>`__
- `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.2/spatialindex-src-1.9.2.tar.gz.md5>`__
+ - `spatialindex-src-1.9.3.tar.gz <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.gz>`__
+ `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.gz.md5>`__
- - `spatialindex-src-1.9.2.tar.bz2 <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.2/spatialindex-src-1.9.2.tar.bz2>`__
- `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.2/spatialindex-src-1.9.2.tar.bz2.md5>`__
+ - `spatialindex-src-1.9.3.tar.bz2 <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2>`__
+ `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2.md5>`__
+
+* **2019-10-22**
+
+ - `spatialindex-src-1.9.3.tar.gz <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.gz>`__
+ `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.gz.md5>`__
+
+ - `spatialindex-src-1.9.3.tar.bz2 <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2>`__
+ `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2.md5>`__
-* **2018-10-19**
+* **2019-10-19**
- spatialindex-src-1.9.1.tar.gz -- broken. See GitHub tag if needed.
-* **2018-02-08**
+* **2019-02-08**
- `spatialindex-src-1.9.0.tar.gz <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.0/spatialindex-src-1.9.0.tar.gz>`__
`(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.0/spatialindex-src-1.9.0.tar.gz.md5>`__
@@ -67,32 +75,3 @@ Past Release (MIT)
- `spatialindex-src-1.8.0-src.tar.bz2 <http://download.osgeo.org/libspatialindex/spatialindex-src-1.8.0.tar.bz2>`__
`(md5) <http://download.osgeo.org/libspatialindex/spatialindex-src-1.8.0.tar.bz2.md5>`__
-
-Windows Builds
-..............................................................................
-
-Windows builds are provided for convenience. The full matrix might not be
-complete, and you will have to compile yourself using your favorite compiler
-configuration and cmake if something is missing.
-
-- `libspatialindex-1.8.0-win-msvc-2008-x64-x32.zip <http://download.osgeo.org/libspatialindex/libspatialindex-1.8.0-win-msvc-2008-x64-x32.zip>`__
- `(md5) <http://download.osgeo.org/libspatialindex/libspatialindex-1.8.0-win-msvc-2008-x64-x32.zip.md5>`__
-
-- `libspatialindex-1.8.0-win-msvc-2010-x64-x32.zip <http://download.osgeo.org/libspatialindex/libspatialindex-1.8.0-win-msvc-2010-x64-x32.zip>`__
- `(md5) <http://download.osgeo.org/libspatialindex/libspatialindex-1.8.0-win-msvc-2010-x64-x32.zip.md5>`__
-
-
-Past Release(s) (LGPL)
-------------------------------------------------------------------------------
-
-* **2011-12-12**
-
- - `spatialindex-src-1.7.1-src.tar.gz <http://download.osgeo.org/libspatialindex/spatialindex-src-1.7.1.tar.gz>`__
- `(md5) <http://download.osgeo.org/libspatialindex/spatialindex-src-1.7.1.tar.gz.md5>`__
-
- - `spatialindex-src-1.7.1-src.tar.bz2 <http://download.osgeo.org/libspatialindex/spatialindex-src-1.7.1.tar.bz2>`__
- `(md5) <http://download.osgeo.org/libspatialindex/spatialindex-src-1.7.1.tar.bz2.md5>`__
-
-
- - `Release Notes <http://lists.gispython.org/pipermail/spatialindex/2011-December/000288.html>`__
-
=====================================
docs/source/introduction.rst
=====================================
@@ -1,20 +1,18 @@
.. _introduction:
-:Author: Marios Hadjieleftheriou
-:Contact: mhadji at gmail.com
-:Revision: 1.9.3
-:Date: 10/23/2019
+:Author: Marios Hadjieleftheriou <mhadji at gmail.com>
+:Contact: Developer mailing list https://groups.io/g/libspatialindex/
+:Revision: 2.0.0
+:Date: 2024-05-28
-The entire website is available as a single PDF at https://libspatialindex.org/libspatialindex.pdf
+The entire website is available as a single PDF at http://libspatialindex.org/_/downloads/en/latest/pdf/
------------------------------------------------------------------------------
Introduction
------------------------------------------------------------------------------
-
-
Library Goals
------------------------------------------------------------------------------
=====================================
include/spatialindex/Version.h
=====================================
@@ -28,9 +28,9 @@
#pragma once
#ifndef SIDX_VERSION_MAJOR
-#define SIDX_VERSION_MAJOR 1
-#define SIDX_VERSION_MINOR 9
-#define SIDX_VERSION_REV 3
+#define SIDX_VERSION_MAJOR 2
+#define SIDX_VERSION_MINOR 0
+#define SIDX_VERSION_REV 0
#define SIDX_VERSION_BUILD 0
#endif
@@ -39,10 +39,10 @@
#endif
#ifndef SIDX_RELEASE_DATE
-#define SIDX_RELEASE_DATE 20191023
+#define SIDX_RELEASE_DATE 20240517
#endif
#ifndef SIDX_RELEASE_NAME
-#define SIDX_RELEASE_NAME "1.9.3"
+#define SIDX_RELEASE_NAME "2.0.0"
#endif
=====================================
src/storagemanager/DiskStorageManager.cc
=====================================
@@ -168,16 +168,14 @@ DiskStorageManager::DiskStorageManager(Tools::PropertySet& ps) : m_pageSize(0),
bFileExists = CheckFilesExists(ps);
// check if file can be read/written.
- if (bFileExists && !bOverwrite)
+ if (bFileExists == true && bOverwrite == false)
{
- // Exists and not overwrite: open read-only, and no flush needed
- m_flushNeeded = false;
- std::ios_base::openmode mode = std::ios::in | std::ios::binary;
+ std::ios_base::openmode mode = std::ios::in | std::ios::out | std::ios::binary;
m_indexFile.open(sIndexFile.c_str(), mode);
m_dataFile.open(sDataFile.c_str(), mode);
if (m_indexFile.fail() || m_dataFile.fail())
- throw Tools::IllegalArgumentException("SpatialIndex::DiskStorageManager: Index/Data file cannot be read.");
+ throw Tools::IllegalArgumentException("SpatialIndex::DiskStorageManager: Index/Data file cannot be read/written.");
}
else
{
@@ -286,8 +284,7 @@ DiskStorageManager::DiskStorageManager(Tools::PropertySet& ps) : m_pageSize(0),
DiskStorageManager::~DiskStorageManager()
{
- if (m_flushNeeded)
- flush();
+ flush();
m_indexFile.close();
m_dataFile.close();
if (m_buffer != nullptr) delete[] m_buffer;
=====================================
src/storagemanager/DiskStorageManager.h
=====================================
@@ -5,7 +5,7 @@
* Copyright (c) 2002, Marios Hadjieleftheriou
*
* All rights reserved.
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
@@ -57,7 +57,6 @@ namespace SpatialIndex
id_type m_nextPage;
std::set<id_type> m_emptyPages;
std::map<id_type, Entry*> m_pageIndex;
- bool m_flushNeeded = true;
uint8_t* m_buffer;
}; // DiskStorageManager
=====================================
test/cleanup-test-output.sh
=====================================
@@ -0,0 +1,4 @@
+#! /bin/bash
+
+rm *.dat *.idx || true
+rm data queries res mix || true
=====================================
test/geometry/test1/run
=====================================
@@ -1,8 +1,11 @@
#! /bin/bash
+set -e
+
echo Testing Intersection
if test-geometry-Intersection ; then
echo "Intersection Test Passed"
else
echo "Intersection Test Failed"
+ exit 1
fi
=====================================
test/index-tests.sh
=====================================
@@ -4,30 +4,24 @@ set -e
echo "path: " $PATH
printenv
-pushd geometry/test1
-./run
-popd
-pushd rtree/test1
-./run
-popd
-pushd rtree/test2
-./run
-popd
-pushd rtree/test3
-./run
-popd
-pushd rtree/test4
-./run
-popd
-pushd tprtree/test1
-./run
-popd
-pushd tprtree/test2
-./run
-popd
-pushd mvrtree/test1
-./run
-popd
-pushd mvrtree/test2
-./run
-popd
+TEST_ROOT=`pwd`
+
+execute_test () {
+ dir="$1"
+ pushd "$dir"
+ echo "Executing test ------------------ $1 -----------------------------"
+ ./run
+ echo "Executed test ------------------ $1 -----------------------------"
+ $TEST_ROOT/cleanup-test-output.sh
+ popd
+}
+
+execute_test "geometry/test1"
+execute_test "rtree/test1"
+execute_test "rtree/test2"
+execute_test "rtree/test3"
+execute_test "rtree/test4"
+execute_test "tprtree/test1"
+execute_test "tprtree/test2"
+execute_test "mvrtree/test1"
+execute_test "mvrtree/test2"
\ No newline at end of file
=====================================
test/mvrtree/test1/run
=====================================
@@ -1,4 +1,7 @@
#! /bin/bash
+
+set -e
+
echo Generating dataset
test-mvrtree-Generator 1000 > d
awk '{if ($2 != 2) print $0}' < d > data
@@ -18,11 +21,13 @@ test-mvrtree-Exhaustive .t intersection > res2
echo Comparing results
sort -n res > a
sort -n res2 > b
-if diff a b
-then
-echo "Same results with exhaustive search. Everything seems fine."
-echo Results: `wc -l a`
-rm -rf a b res res2 .t tree.*
+
+set +e
+if diff a b; then
+ echo "Same results with exhaustive search. Everything seems fine."
+ echo Results: `wc -l a`
+ rm -rf a b res res2 .t tree.*
else
-echo "PROBLEM! We got different results from exhaustive search!"
+ echo "PROBLEM! We got different results from exhaustive search!"
+ exit 1
fi
=====================================
test/mvrtree/test2/run
=====================================
@@ -1,5 +1,7 @@
#! /bin/bash
+set -e
+
echo Generating dataset
test-mvrtree-Generator 1000 > mix
@@ -12,11 +14,13 @@ test-mvrtree-Exhaustive mix intersection > res2
echo Comparing results
sort -n res > a
sort -n res2 > b
-if diff a b
-then
-echo "Same results with exhaustive search. Everything seems fine."
-echo Results: `wc -l a`
-rm -rf a b res res2 tree.*
+
+set +e
+if diff a b; then
+ echo "Same results with exhaustive search. Everything seems fine."
+ echo Results: `wc -l a`
+ rm -rf a b res res2 tree.*
else
-echo "PROBLEM! We got different results from exhaustive search!"
+ echo "PROBLEM! We got different results from exhaustive search!"
+ exit 1
fi
=====================================
test/rtree/test1/run
=====================================
@@ -1,5 +1,7 @@
#! /bin/bash
+set -e
+
echo Generating dataset
test-rtree-Generator 10000 100 > d
awk '{if ($1 != 2) print $0}' < d > data
@@ -19,11 +21,13 @@ test-rtree-Exhaustive .t 10NN > res2
echo Comparing results
sort -n res > a
sort -n res2 > b
-if diff a b
-then
-echo "Same results with exhaustive search. Everything seems fine."
-echo Results: `wc -l a`
-rm -rf a b res res2 .t tree.*
+
+set +e
+if diff a b; then
+ echo "Same results with exhaustive search. Everything seems fine."
+ echo Results: `wc -l a`
+ rm -rf a b res res2 .t tree.*
else
-echo "PROBLEM! We got different results from exhaustive search!"
+ echo "PROBLEM! We got different results from exhaustive search!"
+ exit 1
fi
=====================================
test/rtree/test2/run
=====================================
@@ -1,5 +1,7 @@
#! /bin/bash
+set -e
+
echo Generating dataset
test-rtree-Generator 10000 100 > mix
@@ -12,12 +14,14 @@ test-rtree-Exhaustive mix intersection > res2
echo Comparing results
sort -n res > a
sort -n res2 > b
-if diff a b
-then
-echo "Same results with exhaustive search. Everything seems fine."
-echo Results: `wc -l a`
-rm -rf a b res res2 tree.*
+
+set +e
+if diff a b; then
+ echo "Same results with exhaustive search. Everything seems fine."
+ echo Results: `wc -l a`
+ rm -rf a b res res2 tree.*
else
-echo "PROBLEM! We got different results from exhaustive search!"
+ echo "PROBLEM! We got different results from exhaustive search!"
+ exit 1
fi
=====================================
test/rtree/test3/run
=====================================
@@ -1,5 +1,6 @@
#! /bin/bash
+set -e
#echo Generating 10 million entries. This might take a while
#echo Generating dataset
@@ -21,9 +22,13 @@ test-rtree-Exhaustive .t intersection > res2
echo Comparing results
sort -n res > a
sort -n res2 > b
-if diff a b
-then echo "Same results with exhaustive search. Everything seems fine."
-else echo "PROBLEM! We got different results from exhaustive search!"
+
+set +e
+if diff a b; then
+ echo "Same results with exhaustive search. Everything seems fine."
+ echo Results: `wc -l a`
+ rm -rf a b res res2 .t tree.*
+else
+ echo "PROBLEM! We got different results from exhaustive search!"
+ exit 1
fi
-echo Results: `wc -l a`
-rm -rf a b res res2 .t tree.*
=====================================
test/rtree/test4/run
=====================================
@@ -1,5 +1,7 @@
#! /bin/bash
+set -e
+
echo Generating dataset
test-rtree-Generator 10000 0 > d
awk '{if ($1 == 1) print $0}' < d > data
@@ -19,11 +21,13 @@ test-rtree-Exhaustive .t selfjoin > res2
echo Comparing results
sort -n res > a
sort -n res2 > b
-if diff a b
-then
-echo "Same results with exhaustive search. Everything seems fine."
-echo Results: `wc -l a`
-rm -rf a b res res2 .t tree.*
+
+set +e
+if diff a b; then
+ echo "Same results with exhaustive search. Everything seems fine."
+ echo Results: `wc -l a`
+ rm -rf a b res res2 .t tree.*
else
-echo "PROBLEM! We got different results from exhaustive search!"
+ echo "PROBLEM! We got different results from exhaustive search!"
+ exit 1
fi
=====================================
test/tprtree/test1/run
=====================================
@@ -1,5 +1,7 @@
#! /bin/bash
+set -e
+
echo Generating dataset
test-tprtree-Generator -ds 1000 -sl 100 > d
awk '{if ($2 != 2) print $0}' < d > data
@@ -19,11 +21,13 @@ test-tprtree-Exhaustive .t > res2
echo Comparing results
sort -n res > a
sort -n res2 > b
-if diff a b
-then
-echo "Same results with exhaustive search. Everything seems fine."
-echo Results: `wc -l a`
-rm -rf a b res res2 .t tree.*
+
+set +e
+if diff a b; then
+ echo "Same results with exhaustive search. Everything seems fine."
+ echo Results: `wc -l a`
+ rm -rf a b res res2 .t tree.*
else
-echo "PROBLEM! We got different results from exhaustive search!"
+ echo "PROBLEM! We got different results from exhaustive search!"
+ exit 1
fi
=====================================
test/tprtree/test2/run
=====================================
@@ -1,5 +1,7 @@
#! /bin/bash
+set -e
+
echo Generating dataset
test-tprtree-Generator -ds 1000 -sl 100 > mix
@@ -7,17 +9,18 @@ echo Creating new TPR-Tree and Querying
test-tprtree-TPRTreeLoad mix tree 10 > res
echo Running exhaustive search
-test-tpr-tree-Exhaustive mix > res2
+test-tprtree-Exhaustive mix > res2
echo Comparing results
sort -n res > a
sort -n res2 > b
-if diff a b
-then
-echo "Same results with exhaustive search. Everything seems fine."
-echo Results: `wc -l a`
-rm -rf a b res res2 tree.*
+
+set +e
+if diff a b; then
+ echo "Same results with exhaustive search. Everything seems fine."
+ echo Results: `wc -l a`
+ rm -rf a b res res2 tree.*
else
-echo "PROBLEM! We got different results from exhaustive search!"
+ echo "PROBLEM! We got different results from exhaustive search!"
+ exit 1
fi
-
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialindex/-/commit/3176b466ab20d562d8cd9d1b286793f8a14ad122
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialindex/-/commit/3176b466ab20d562d8cd9d1b286793f8a14ad122
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240528/80c1360d/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list