[osmosis] 02/07: Merge tag 'upstream/0.46'
Bas Couwenberg
sebastic at debian.org
Tue Sep 26 14:59:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osmosis.
commit cf6c46da66fe192cc7bc53bd449dd4b7595cde82
Merge: 300c47e b02fa61
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Sep 26 16:44:39 2017 +0200
Merge tag 'upstream/0.46'
Upstream version 0.46
.gitignore | 1 +
.travis.yml | 5 +
README | 50 -
README.md | 78 +
build-support/docker/build.sh | 13 +
build-support/docker/build/Dockerfile | 17 +
build-support/docker/build/build.sh | 9 +
{db-server => build-support/docker/db}/.gitignore | 0
build-support/docker/db/Dockerfile | 17 +
build-support/docker/db/build.sh | 11 +
.../docker/db}/docker-start.sh | 3 -
{db-server => build-support/docker/db}/readme.txt | 2 +-
build-support/docker/db/script | 1 +
build-support/docker/docker-compose.yml | 13 +
build-support/docker/env.sh | 4 +
build-support/docker/run.sh | 23 +
build.gradle | 6 +-
db-server/Dockerfile | 14 -
db-server/build.sh | 6 -
db-server/script | 1 -
docker.sh | 12 +
gradle.properties | 22 +-
gradle/wrapper/gradle-wrapper.jar | Bin 52266 -> 54708 bytes
gradle/wrapper/gradle-wrapper.properties | 3 +-
gradlew | 78 +-
gradlew.bat | 14 +-
.../osmosis/apidb/common/BaseTableReader.java | 4 +-
.../osmosis/apidb/common/DatabaseContext.java | 98 +-
.../osmosis/apidb/common/DatabaseContext2.java | 127 +-
.../osmosis/apidb/common/IdentityValueLoader.java | 4 +-
.../apidb/common/MysqlIdentityValueLoader.java | 44 +-
.../apidb/common/MysqlIdentityValueLoader2.java | 2 +-
.../common/PostgresqlIdentityValueLoader.java | 68 +-
.../common/PostgresqlIdentityValueLoader2.java | 2 +-
.../osmosis/apidb/v0_6/ApidbChangeReader.java | 42 +-
.../osmosis/apidb/v0_6/ApidbChangeWriter.java | 4 +-
.../osmosis/apidb/v0_6/ApidbCurrentReader.java | 19 +-
.../osmosis/apidb/v0_6/ApidbFileReplicator.java | 7 +-
.../osmosis/apidb/v0_6/ApidbReader.java | 24 +-
.../osmosis/apidb/v0_6/ApidbTruncator.java | 9 +-
.../osmosis/apidb/v0_6/ApidbVersionConstants.java | 16 +-
.../osmosis/apidb/v0_6/ApidbWriter.java | 153 +-
.../osmosis/apidb/v0_6/impl/AllEntityDao.java | 32 +-
.../osmosis/apidb/v0_6/impl/ChangeReader.java | 4 +-
.../osmosis/apidb/v0_6/impl/ChangeWriter.java | 120 +-
.../osmosis/apidb/v0_6/impl/ChangesetManager.java | 37 +-
.../osmosis/apidb/v0_6/impl/DeltaToDiffReader.java | 4 +-
.../apidb/v0_6/impl/EntityContainerReader.java | 4 +-
.../osmosis/apidb/v0_6/impl/EntityDao.java | 6 +-
.../apidb/v0_6/impl/EntityHistoryListReader.java | 4 +-
.../apidb/v0_6/impl/EntityHistoryReader.java | 4 +-
.../apidb/v0_6/impl/EntitySnapshotReader.java | 4 +-
.../apidb/v0_6/impl/FeatureHistoryPopulator.java | 4 +-
.../osmosis/apidb/v0_6/impl/RelationDao.java | 2 +-
.../osmosis/apidb/v0_6/impl/Replicator.java | 10 +-
.../apidb/v0_6/impl/SchemaVersionValidator.java | 37 +-
.../osmosis/apidb/v0_6/impl/UserManager.java | 54 +-
.../osmosis/apidb/v0_6/impl/WayDao.java | 2 +-
.../apidb/v0_6/impl/ChangesetManagerTest.java | 49 +-
.../v0_6/impl/MockReplicationDestination.java | 2 +-
.../data/template/v0_6/apidb-authfile.txt | 2 +-
.../areafilter/common/PolygonFileReader.java | 68 +-
.../osmosis/areafilter/v0_6/AreaFilter.java | 58 +-
.../osmosis/areafilter/v0_6/AreaFilterTest.java | 12 +-
.../areafilter/v0_6/BoundingBoxFilterTest.java | 2 +-
.../osmosis/areafilter/v0_6/PolygonFilterTest.java | 2 +-
osmosis-core/build.gradle | 2 -
.../org/openstreetmap/osmosis/core/LogLevels.java | 30 +-
.../openstreetmap/osmosis/core/TaskRegistrar.java | 18 +-
.../osmosis/core/bound/v0_6/BoundComputer.java | 20 +-
.../osmosis/core/bound/v0_6/BoundSetter.java | 4 +-
.../osmosis/core/buffer/v0_6/ChangeBuffer.java | 6 +-
.../osmosis/core/buffer/v0_6/EntityBuffer.java | 6 +-
.../osmosis/core/cli/CommandLineParser.java | 8 +-
.../container/v0_6/BoundContainerIterator.java | 4 +-
.../core/container/v0_6/NodeContainerIterator.java | 4 +-
.../container/v0_6/RelationContainerIterator.java | 4 +-
.../core/container/v0_6/WayContainerIterator.java | 4 +-
.../database/AuthenticationPropertiesLoader.java | 27 +-
.../osmosis/core/database/DatabaseConstants.java | 15 +-
.../osmosis/core/database/FeaturePopulator.java | 4 +-
.../database/ReleasableStatementContainer.java | 6 +-
.../core/filter/common/BitSetIdTracker.java | 2 +-
.../core/filter/common/DynamicIdTracker.java | 2 +-
.../osmosis/core/filter/common/ListIdTracker.java | 2 +-
.../osmosis/core/lifecycle/Closeable.java | 24 +
.../osmosis/core/lifecycle/Completable.java | 2 +-
.../core/lifecycle/CompletableContainer.java | 6 +-
.../osmosis/core/lifecycle/Releasable.java | 25 -
.../core/lifecycle/ReleasableContainer.java | 14 +-
.../osmosis/core/lifecycle/ReleasableIterator.java | 2 +-
.../osmosis/core/misc/v0_6/EmptyChangeReader.java | 2 +-
.../osmosis/core/misc/v0_6/EmptyReader.java | 2 +-
.../osmosis/core/misc/v0_6/NullChangeWriter.java | 2 +-
.../osmosis/core/misc/v0_6/NullWriter.java | 2 +-
.../core/progress/v0_6/ChangeProgressLogger.java | 4 +-
.../core/progress/v0_6/EntityProgressLogger.java | 4 +-
.../osmosis/core/report/v0_6/EntityReporter.java | 32 +-
.../core/report/v0_6/IntegrityReporter.java | 2 +-
.../osmosis/core/sort/common/FileBasedSort.java | 12 +-
.../osmosis/core/sort/common/MergingIterator.java | 8 +-
.../osmosis/core/sort/v0_6/ChangeSorter.java | 16 +-
.../osmosis/core/sort/v0_6/ChangeTagSorter.java | 4 +-
.../osmosis/core/sort/v0_6/EntitySorter.java | 57 +-
.../sort/v0_6/SortedDeltaChangePipeValidator.java | 4 +-
.../v0_6/SortedDuplicateEntityPipeValidator.java | 4 +-
.../core/sort/v0_6/SortedEntityPipeValidator.java | 4 +-
.../v0_6/SortedHistoryChangePipeValidator.java | 4 +-
.../osmosis/core/sort/v0_6/TagSorter.java | 4 +-
.../store/BufferedRandomAccessFileInputStream.java | 2 +-
.../osmosis/core/store/ChunkedObjectStore.java | 8 +-
.../osmosis/core/store/DataPostbox.java | 4 +-
.../core/store/DataPostboxLoadInjector.java | 2 +-
.../osmosis/core/store/EmptyIterator.java | 2 +-
.../osmosis/core/store/IndexStore.java | 29 +-
.../osmosis/core/store/IndexStoreReader.java | 10 +-
.../osmosis/core/store/IndexedObjectStore.java | 8 +-
.../core/store/IndexedObjectStoreReader.java | 10 +-
.../osmosis/core/store/MultipleSourceIterator.java | 6 +-
.../osmosis/core/store/ObjectStreamIterator.java | 2 +-
.../osmosis/core/store/PeekableIterator.java | 4 +-
.../osmosis/core/store/PersistentIterator.java | 10 +-
.../core/store/RandomAccessObjectStore.java | 2 +-
.../core/store/RandomAccessObjectStoreReader.java | 6 +-
.../core/store/ReleasableAdaptorForIterator.java | 2 +-
.../osmosis/core/store/SegmentedObjectStore.java | 2 +-
.../osmosis/core/store/SimpleObjectStore.java | 2 +-
.../osmosis/core/store/StoreReleasingIterator.java | 12 +-
.../core/store/StoreableConstructorCache.java | 2 +-
.../osmosis/core/store/UpcastIterator.java | 4 +-
.../osmosis/core/task/v0_6/DatasetSink.java | 4 +-
.../osmosis/core/tee/v0_6/ChangeTee.java | 10 +-
.../osmosis/core/tee/v0_6/EntityTee.java | 10 +-
.../osmosis/core/util/FileBasedLock.java | 6 +-
.../osmosis/core/util/PropertiesPersister.java | 40 +-
.../osmosis/core/util/ResourceFileManager.java | 55 +-
.../osmosis/core/bound/v0_6/BoundComputerTest.java | 8 +-
.../osmosis/core/bound/v0_6/BoundSetterTest.java | 8 +-
.../osmosis/core/cli/CommandLineParserTest.java | 30 +-
.../core/sort/common/FileBasedSortTest.java | 13 +-
.../osmosis/testutil/v0_6/SinkEntityInspector.java | 2 +-
.../dataset/v0_6/DatasetBoundingBoxFilter.java | 15 +-
.../osmosis/dataset/v0_6/DumpDataset.java | 13 +-
.../osmosis/dataset/v0_6/ReadDataset.java | 4 +-
.../osmosis/dataset/v0_6/WriteDataset.java | 6 +-
.../osmosis/dataset/v0_6/impl/DatasetStore.java | 17 +-
.../dataset/v0_6/impl/DatasetStoreFileManager.java | 4 +-
.../dataset/v0_6/impl/DatasetStoreReader.java | 51 +-
.../dataset/v0_6/impl/NodeStorageContainer.java | 8 +-
.../impl/PermanentFileDatasetStoreFileManager.java | 2 +-
.../v0_6/impl/RelationStorageContainer.java | 8 +-
.../v0_6/impl/RelationalIndexValueIdIterator.java | 2 +-
.../v0_6/impl/TempFileDatasetStoreFileManager.java | 2 +-
.../v0_6/impl/TileIndexValueIdIterator.java | 2 +-
.../dataset/v0_6/impl/WayStorageContainer.java | 8 +-
.../dataset/v0_6/impl/WayTileAreaIndex.java | 15 +-
.../dataset/v0_6/impl/WayTileAreaIndexReader.java | 10 +-
.../osmosis/dataset/v0_6/CustomDbTest.java | 4 +-
.../extract/apidb/common/Configuration.java | 19 +-
.../extract/apidb/v0_6/DatabaseTimeLoader.java | 31 +-
.../extract/apidb/v0_6/OsmosisExtractApiDb.java | 2 +-
.../data/template/v0_6/apidb-authfile.txt | 2 +-
.../org/openstreetmap/osmosis/hstore/PGHStore.java | 18 +-
.../osmosis/osmbinary/Fileformat.java | 1358 +-
.../openstreetmap/osmosis/osmbinary/Osmformat.java | 12786 ++++++++++---------
.../osmosis/osmbinary/test/BuildTestFile.java | 2 +-
.../src/main/protobuf/fileformat.proto | 2 +
.../src/main/protobuf/osmformat.proto | 2 +
.../java/crosby/binary/osmosis/OsmosisReader.java | 2 +-
.../crosby/binary/osmosis/OsmosisSerializer.java | 4 +-
.../openstreetmap/osmosis/pbf2/v0_6/PbfReader.java | 54 +-
.../osmosis/pbf2/v0_6/impl/PbfStreamSplitter.java | 6 +-
osmosis-pgsimple/build.gradle | 3 -
.../osmosis/pgsimple/common/BaseDao.java | 8 +-
.../osmosis/pgsimple/common/BaseTableReader.java | 2 +-
.../common/CompactPersistentNodeLocationStore.java | 6 +-
.../osmosis/pgsimple/common/CopyFileWriter.java | 25 +-
.../osmosis/pgsimple/common/DatabaseContext.java | 60 +-
.../pgsimple/common/InMemoryNodeLocationStore.java | 2 +-
.../osmosis/pgsimple/common/NodeLocationStore.java | 4 +-
.../common/PersistentNodeLocationStore.java | 2 +-
.../pgsimple/v0_6/PostgreSqlChangeWriter.java | 4 +-
.../pgsimple/v0_6/PostgreSqlCopyWriter.java | 18 +-
.../pgsimple/v0_6/PostgreSqlDatasetReader.java | 2 +-
.../pgsimple/v0_6/PostgreSqlDumpWriter.java | 4 +-
.../osmosis/pgsimple/v0_6/PostgreSqlTruncator.java | 2 +-
.../osmosis/pgsimple/v0_6/PostgreSqlWriter.java | 8 +-
.../osmosis/pgsimple/v0_6/impl/ActionDataType.java | 11 +-
.../osmosis/pgsimple/v0_6/impl/ChangeWriter.java | 6 +-
.../pgsimple/v0_6/impl/ChangesetAction.java | 11 +-
.../pgsimple/v0_6/impl/CopyFilesetBuilder.java | 6 +-
.../pgsimple/v0_6/impl/CopyFilesetLoader.java | 32 +-
.../osmosis/pgsimple/v0_6/impl/EntityDao.java | 70 +-
.../osmosis/pgsimple/v0_6/impl/EntityReader.java | 6 +-
.../v0_6/impl/PostgreSqlDatasetContext.java | 6 +-
.../osmosis/pgsimple/v0_6/impl/RelationReader.java | 6 +-
.../pgsimple/v0_6/impl/TempCopyFileset.java | 6 +-
.../pgsimple/v0_6/impl/WayGeometryBuilder.java | 8 +-
.../osmosis/pgsimple/v0_6/impl/WayReader.java | 6 +-
.../osmosis/pgsimple/v0_6/DatasetDriver.java | 9 +-
.../osmosis/pgsimple/v0_6/PostgreSqlTest.java | 28 +-
.../pgsimple/v0_6/impl/NodeLocationStoreTest.java | 2 +-
.../data/template/v0_6/pgsql-authfile.txt | 2 +-
.../common/CompactPersistentNodeLocationStore.java | 6 +-
.../osmosis/pgsnapshot/common/CopyFileWriter.java | 25 +-
.../pgsnapshot/common/DataSourceManager.java | 6 +-
.../osmosis/pgsnapshot/common/DatabaseContext.java | 141 +-
.../common/InMemoryNodeLocationStore.java | 2 +-
.../pgsnapshot/common/NodeLocationStore.java | 4 +-
.../common/PersistentNodeLocationStore.java | 2 +-
.../pgsnapshot/v0_6/PostgreSqlChangeWriter.java | 4 +-
.../pgsnapshot/v0_6/PostgreSqlCopyWriter.java | 16 +-
.../pgsnapshot/v0_6/PostgreSqlDatasetReader.java | 2 +-
.../pgsnapshot/v0_6/PostgreSqlDumpWriter.java | 4 +-
.../pgsnapshot/v0_6/PostgreSqlTruncator.java | 2 +-
.../pgsnapshot/v0_6/impl/ActionDataType.java | 11 +-
.../pgsnapshot/v0_6/impl/ChangesetAction.java | 11 +-
.../pgsnapshot/v0_6/impl/CopyFilesetBuilder.java | 6 +-
.../pgsnapshot/v0_6/impl/CopyFilesetLoader.java | 7 +-
.../osmosis/pgsnapshot/v0_6/impl/EntityDao.java | 11 +-
.../osmosis/pgsnapshot/v0_6/impl/EntityReader.java | 4 +-
.../pgsnapshot/v0_6/impl/FeaturePopulatorImpl.java | 4 +-
.../v0_6/impl/PostgreSqlDatasetContext.java | 4 +-
.../osmosis/pgsnapshot/v0_6/impl/RelationDao.java | 2 +-
.../pgsnapshot/v0_6/impl/TempCopyFileset.java | 6 +-
.../pgsnapshot/v0_6/impl/WayGeometryBuilder.java | 8 +-
.../osmosis/pgsnapshot/v0_6/DatasetDriver.java | 9 +-
.../osmosis/pgsnapshot/v0_6/PostgreSqlTest.java | 34 +-
.../v0_6/impl/NodeLocationStoreTest.java | 2 +-
.../data/template/v0_6/pgsql-authfile.txt | 2 +-
.../template/v0_6/pgsql_with_schema-authfile.txt | 2 +-
.../v0_6/ReplicationDataClient.java | 4 +-
.../v0_6/ReplicationSequenceServer.java | 4 +-
.../v0_6/impl/ChunkedDataReceiver.java | 6 +-
.../v0_6/impl/ReplicationDataClientHandler.java | 6 +-
.../v0_6/impl/ReplicationDataServerHandler.java | 10 +-
.../v0_6/MockReplicationDestination.java | 2 +-
.../v0_6/MockReplicationSource.java | 2 +-
.../v0_6/ReplicationSequenceServerTest.java | 2 +-
.../replication/common/ServerStateReader.java | 29 +-
.../replication/common/TimestampTracker.java | 52 +-
.../v0_6/BaseReplicationDownloader.java | 59 +-
.../replication/v0_6/IntervalDownloader.java | 83 +-
.../v0_6/IntervalDownloaderInitializer.java | 2 +-
.../replication/v0_6/ReplicationDownloader.java | 4 +-
.../v0_6/ReplicationDownloaderInitializer.java | 2 +-
.../replication/v0_6/ReplicationFileMerger.java | 8 +-
.../v0_6/ReplicationFileMergerInitializer.java | 2 +-
.../replication/v0_6/ReplicationLagReader.java | 2 +-
.../replication/v0_6/ReplicationStateWriter.java | 4 +-
.../v0_6/ReplicationToChangeWriter.java | 6 +-
.../replication/v0_6/ReplicationWriter.java | 8 +-
.../osmosis/set/v0_6/BoundRemovedAction.java | 15 +-
.../osmosis/set/v0_6/ChangeAppender.java | 2 +-
.../osmosis/set/v0_6/ChangeApplier.java | 2 +-
.../osmosis/set/v0_6/ChangeDeriver.java | 2 +-
.../osmosis/set/v0_6/ChangeMerger.java | 2 +-
.../osmosis/set/v0_6/ChangeSimplifier.java | 4 +-
.../set/v0_6/ChangeToFullHistoryConvertor.java | 4 +-
.../osmosis/set/v0_6/EntityMerger.java | 2 +-
.../osmosis/set/v0_6/FlattenFilter.java | 4 +-
.../set/v0_6/impl/ChangeSimplifierImpl.java | 4 +-
.../set/v0_6/impl/DataPostboxChangeSink.java | 4 +-
.../osmosis/set/v0_6/impl/DataPostboxSink.java | 4 +-
.../osmosis/set/v0_6/ChangeAppenderTest.java | 2 +-
.../osmosis/set/v0_6/ChangeApplierTest.java | 2 +-
.../osmosis/set/v0_6/ChangeDeriverTest.java | 2 +-
.../osmosis/set/v0_6/ChangeSimplifierTest.java | 6 +-
.../osmosis/set/v0_6/EntityMergerTest.java | 22 +-
.../osmosis/set/v0_6/FlattenFilterTest.java | 6 +-
.../osmosis/set/v0_6/MergeBoundTest.java | 4 +-
.../osmosis/tagfilter/v0_6/NodeKeyFilter.java | 4 +-
.../osmosis/tagfilter/v0_6/NodeKeyValueFilter.java | 4 +-
.../osmosis/tagfilter/v0_6/TagFilter.java | 4 +-
.../osmosis/tagfilter/v0_6/TagRemover.java | 4 +-
.../osmosis/tagfilter/v0_6/UsedNodeFilter.java | 16 +-
.../osmosis/tagfilter/v0_6/UsedWayFilter.java | 16 +-
.../osmosis/tagfilter/v0_6/WayKeyFilter.java | 4 +-
.../osmosis/tagfilter/v0_6/WayKeyValueFilter.java | 4 +-
.../tagfilter/v0_6/NodeKeyValueFilterTest.java | 2 +-
.../osmosis/tagfilter/v0_6/TagFilterTest.java | 6 +-
.../osmosis/tagfilter/v0_6/TagRemoverTest.java | 4 +-
.../tagfilter/v0_6/WayKeyValueFilterTest.java | 2 +-
.../osmosis/tagtransform/impl/TransformHelper.java | 4 +-
.../osmosis/testutil/v0_6/SinkChangeInspector.java | 2 +-
.../osmosis/testutil/v0_6/SinkEntityInspector.java | 2 +-
.../osmosis/xml/common/BaseXmlWriter.java | 2 +-
.../osmosis/xml/v0_6/FastXmlReader.java | 2 +-
.../osmosis/xml/v0_6/XmlChangeReader.java | 2 +-
.../osmosis/xml/v0_6/XmlChangeUploader.java | 2 +-
.../osmosis/xml/v0_6/XmlDownloader.java | 2 +-
.../openstreetmap/osmosis/xml/v0_6/XmlReader.java | 2 +-
.../v0_6/impl/ChangeSourceElementProcessor.java | 6 +-
.../osmosis/xml/v0_6/impl/OsmWriter.java | 2 +-
.../osmosis/xml/common/ElementWriterTest.java | 2 +-
.../osmosis/xml/v0_6/XmlReaderWriterTest.java | 4 +-
.../osmosis/xml/v0_6/impl/NodeWriterTest.java | 4 +-
.../osmosis/xml/v0_6/impl/OsmHandlerTest.java | 18 +-
.../osmosis/xml/v0_6/impl/RelationWriterTest.java | 6 +-
.../osmosis/xml/v0_6/impl/WayWriterTest.java | 6 +-
package/changes.txt | 17 +-
settings.gradle | 1 -
302 files changed, 8594 insertions(+), 9385 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git
More information about the Pkg-grass-devel
mailing list