You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by bc...@apache.org on 2022/12/06 23:44:13 UTC
[incubator-baremaps] branch 498-simplify-landcover-layers updated (0f9d7c18 -> f81a2c2e)
This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a change to branch 498-simplify-landcover-layers
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
omit 0f9d7c18 Merge branch '498-simplify-landcover-layers' of github.com:apache/incubator-baremaps into 498-simplify-landcover-layers
omit 3e9482d4 Disable parallel execution
omit 67325596 Fix IDE run config
omit 98208119 Fix IDE run config
omit c64b9d88 Fix concurrent bug and improve error logging
omit 35371b57 Parallelize the workflow
omit a81bd47c Apply convensions in SQL files
omit e0d36d89 Simplify natural and landuse layers
add e44cc7cc Use .asf.yaml to manage GitHub settings (#533)
add df1c6593 Enable github pages
add c02a6e9c Support single IPv4 address to clean up code (#528)
add 06b0feaf Remove docs directory, fix links and modify .asf.yaml (#540)
add 970e36f2 Order IP to location by size of IP range (#543)
add b253f825 Create a new index that includes both ip_start and ip_end (#545)
add cd80dfc8 Leverage Java 17 features (#547)
add d8d06d88 Simplify natural and landuse layers
add 1a3c3f33 Apply convensions in SQL files
add 027adf47 Parallelize the workflow
add 0de24918 Fix concurrent bug and improve error logging
add e46fb032 Fix IDE run config
add 666754fb Disable parallel execution
add 0f30bfc4 Fix IDE run config
add f81a2c2e Finalize the sql scripts and create config file
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0f9d7c18)
\
N -- N -- N refs/heads/498-simplify-landcover-layers (f81a2c2e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 38 +
.gitignore | 2 +-
README.md | 2 +-
.../benchmarks/OpenStreetMapBenchmark.java | 27 +-
.../OpenStreetMapGeometriesBenchmark.java | 37 +-
.../{SaveBlockConsumer.java => BlockImporter.java} | 41 +-
...SaveChangeConsumer.java => ChangeImporter.java} | 75 +-
.../org/apache/baremaps/database/DiffService.java | 88 +-
.../apache/baremaps/database/ImportService.java | 43 +-
.../apache/baremaps/database/UpdateService.java | 56 +-
.../database/collection/PostgresReferenceMap.java | 6 +-
.../repository/PostgresNodeRepository.java | 2 +-
.../repository/PostgresRelationRepository.java | 2 +-
.../database/repository/PostgresWayRepository.java | 2 +-
.../iploc/data/{Ipv4Range.java => Ipv4.java} | 57 +-
.../org/apache/baremaps/iploc/data/Ipv4Range.java | 53 +-
.../database/InetnumLocationDaoSqliteImpl.java | 22 +-
.../{BlockFunction.java => BlobToBlockMapper.java} | 47 +-
.../openstreetmap/function/BlockConsumer.java | 53 -
.../function/BlockConsumerAdapter.java | 28 -
...tityConsumer.java => BlockEntitiesHandler.java} | 30 +-
.../openstreetmap/function/CacheBuilder.java | 57 +
...ityConsumer.java => ChangeEntitiesHandler.java} | 6 +-
.../openstreetmap/function/ChangeFunction.java | 48 -
.../openstreetmap/function/EntityConsumer.java | 80 --
.../function/EntityConsumerAdapter.java | 40 -
.../openstreetmap/function/EntityFunction.java | 89 --
.../function/EntityGeometryBuilder.java | 59 +
...sumer.java => EntityProjectionTransformer.java} | 33 +-
.../function/EntityToGeometryMapper.java | 46 +
.../function/ExtractGeometryFunction.java | 57 -
...hangeConsumer.java => NodeGeometryBuilder.java} | 32 +-
...yConsumer.java => RelationGeometryBuilder.java} | 94 +-
.../openstreetmap/function/WayGeometryBuilder.java | 64 +
.../apache/baremaps/openstreetmap/model/Blob.java | 2 +-
.../apache/baremaps/openstreetmap/model/Block.java | 26 +-
.../apache/baremaps/openstreetmap/model/Bound.java | 16 +-
.../baremaps/openstreetmap/model/Change.java | 12 -
.../baremaps/openstreetmap/model/DataBlock.java | 15 +-
.../baremaps/openstreetmap/model/Element.java | 6 +-
.../baremaps/openstreetmap/model/Entity.java | 13 +-
.../baremaps/openstreetmap/model/Header.java | 14 +-
.../baremaps/openstreetmap/model/HeaderBlock.java | 16 +-
.../apache/baremaps/openstreetmap/model/Info.java | 2 +-
.../apache/baremaps/openstreetmap/model/Node.java | 14 -
.../baremaps/openstreetmap/model/Relation.java | 14 -
.../apache/baremaps/openstreetmap/model/State.java | 2 +-
.../apache/baremaps/openstreetmap/model/Way.java | 14 -
.../openstreetmap/pbf/DataBlockReader.java | 2 +-
.../openstreetmap/pbf/HeaderBlockReader.java | 2 +-
.../baremaps/openstreetmap/pbf/PbfBlockReader.java | 67 +-
.../openstreetmap/pbf/PbfEntityReader.java | 15 +-
.../openstreetmap/store/DataStoreConsumer.java | 50 -
.../{geometry => utils}/GeometryUtils.java | 6 +-
.../{progress => utils}/InputStreamProgress.java | 2 +-
.../{progress => utils}/ProgressLogger.java | 2 +-
.../{geometry => utils}/ProjectionTransformer.java | 2 +-
.../{progress => utils}/StreamProgress.java | 2 +-
...orm.java => FeatureSetProjectionTransform.java} | 6 +-
.../baremaps/workflow/tasks/ExportVectorTiles.java | 3 +-
.../baremaps/workflow/tasks/ImportGeoPackage.java | 6 +-
.../workflow/tasks/ImportOpenStreetMap.java | 12 +-
.../baremaps/workflow/tasks/ImportShapefile.java | 6 +-
.../workflow/tasks/UpdateOpenStreetMap.java | 8 +-
baremaps-core/src/main/resources/iploc_init.sql | 3 +-
...ockConsumerTest.java => BlockImporterTest.java} | 10 +-
.../database/database/ImportUpdateDataTest.java | 6 +-
.../database/ImportUpdateLiechtensteinTest.java | 22 +-
.../database/database/ImportUpdateMonacoTest.java | 19 +-
.../java/org/apache/baremaps/iploc/IpLocTest.java | 5 +-
.../org/apache/baremaps/iploc/Ipv4RangeTest.java | 24 +-
.../{nic/NicParserTest.java => Ipv4Test.java} | 27 +-
.../baremaps/openstreetmap/OpenStreetMapTest.java | 26 +-
...lerTest.java => EntityGeometryBuilderTest.java} | 30 +-
.../geometry/ProjectionTransformerTest.java | 1 +
...yTest.java => RelationGeometryBuilderTest.java} | 10 +-
.../org/apache/baremaps/ogcapi/PostgisPlugin.java | 2 +-
docs/CNAME | 1 -
docs/Gemfile | 6 -
docs/_config.yml | 12 -
docs/_data/menu.yaml | 18 -
docs/_layouts/default.html | 51 -
docs/_layouts/home.html | 19 -
docs/_sass/normalize.scss | 427 ------
docs/_sass/skeleton.scss | 418 ------
docs/_sass/style.scss | 34 -
docs/about.md | 22 -
docs/assets/css/main.scss | 6 -
docs/assets/demo.html | 72 -
docs/assets/screenshot.jpg | Bin 334131 -> 0 bytes
docs/assets/style.json | 1517 --------------------
docs/examples/contour/index.md | 56 -
docs/examples/contour/indexes.sql | 0
.../contour/liecthenstein-aster-dem-v2-3857.tif | Bin 1966773 -> 0 bytes
.../contour/liecthenstein-aster-dem-v2.tif | Bin 1739201 -> 0 bytes
docs/examples/contour/style.json | 31 -
docs/examples/contour/tileset.json | 29 -
docs/examples/extrusion/index.md | 73 -
docs/examples/extrusion/indexes.sql | 5 -
docs/examples/extrusion/screenshot.png | Bin 288760 -> 0 bytes
docs/examples/extrusion/style.json | 31 -
docs/examples/extrusion/tileset.json | 31 -
docs/examples/extrusion/workflow.json | 42 -
docs/examples/geoadmin/index.md | 50 -
docs/examples/geoadmin/style.json | 31 -
docs/examples/geoadmin/tileset.json | 29 -
docs/examples/geoadmin/tileset.yaml | 19 -
docs/examples/index.md | 15 -
docs/examples/naturalearth/index.md | 46 -
docs/examples/naturalearth/indexes.sql | 135 --
docs/examples/naturalearth/style.json | 33 -
docs/examples/naturalearth/tileset.json | 1360 ------------------
docs/examples/naturalearth/workflow.json | 32 -
docs/examples/openstreetmap/database.png | Bin 59671 -> 0 bytes
docs/examples/openstreetmap/index.md | 143 --
docs/examples/openstreetmap/indexes.sql | 5 -
.../openstreetmap/liechtenstein-latest.osm.pbf | Bin 2710779 -> 0 bytes
docs/examples/openstreetmap/screenshot.png | Bin 262397 -> 0 bytes
docs/examples/openstreetmap/style.js | 26 -
docs/examples/openstreetmap/style.json | 26 -
docs/examples/openstreetmap/tileset.json | 521 -------
docs/examples/openstreetmap/workflow.json | 42 -
docs/examples/serving-vector-tiles.md | 151 --
docs/favicon.ico | Bin 15086 -> 0 bytes
docs/index.html | 29 -
docs/installation.md | 53 -
docs/notes/java-nio.md | 3 -
docs/notes/postgis.md | 3 -
docs/release.md | 5 -
docs/stylesheet.md | 12 -
map/config.js | 6 +
map/queries/osm_landuse_index.sql | 12 +
map/queries/osm_landuse_prepare.sql | 153 +-
map/queries/osm_natural_prepare.sql | 301 +++-
map/style.js | 10 +-
map/tileset.js | 10 +-
map/workflow.js | 242 ++--
137 files changed, 1322 insertions(+), 7040 deletions(-)
create mode 100644 .asf.yaml
rename baremaps-core/src/main/java/org/apache/baremaps/database/{SaveBlockConsumer.java => BlockImporter.java} (58%)
rename baremaps-core/src/main/java/org/apache/baremaps/database/{SaveChangeConsumer.java => ChangeImporter.java} (55%)
copy baremaps-core/src/main/java/org/apache/baremaps/iploc/data/{Ipv4Range.java => Ipv4.java} (65%)
rename baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/{BlockFunction.java => BlobToBlockMapper.java} (50%)
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/BlockConsumer.java
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/BlockConsumerAdapter.java
rename baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/{BlockEntityConsumer.java => BlockEntitiesHandler.java} (60%)
create mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/CacheBuilder.java
rename baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/{ChangeEntityConsumer.java => ChangeEntitiesHandler.java} (86%)
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/ChangeFunction.java
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/EntityConsumer.java
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/EntityConsumerAdapter.java
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/EntityFunction.java
create mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/EntityGeometryBuilder.java
rename baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/{ReprojectEntityConsumer.java => EntityProjectionTransformer.java} (60%)
create mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/EntityToGeometryMapper.java
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/ExtractGeometryFunction.java
rename baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/{ChangeConsumer.java => NodeGeometryBuilder.java} (53%)
rename baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/{CreateGeometryConsumer.java => RelationGeometryBuilder.java} (62%)
create mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/WayGeometryBuilder.java
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/store/DataStoreConsumer.java
rename baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/{geometry => utils}/GeometryUtils.java (93%)
rename baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/{progress => utils}/InputStreamProgress.java (97%)
rename baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/{progress => utils}/ProgressLogger.java (97%)
rename baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/{geometry => utils}/ProjectionTransformer.java (99%)
rename baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/{progress => utils}/StreamProgress.java (96%)
rename baremaps-core/src/main/java/org/apache/baremaps/storage/{FeatureProjectionTransform.java => FeatureSetProjectionTransform.java} (93%)
rename baremaps-core/src/test/java/org/apache/baremaps/database/database/{SaveBlockConsumerTest.java => BlockImporterTest.java} (91%)
copy baremaps-core/src/test/java/org/apache/baremaps/iploc/{nic/NicParserTest.java => Ipv4Test.java} (50%)
rename baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/{GeometryHandlerTest.java => EntityGeometryBuilderTest.java} (91%)
rename baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/geometry/{RelationGeometryTest.java => RelationGeometryBuilderTest.java} (91%)
delete mode 100644 docs/CNAME
delete mode 100644 docs/Gemfile
delete mode 100644 docs/_config.yml
delete mode 100644 docs/_data/menu.yaml
delete mode 100644 docs/_layouts/default.html
delete mode 100644 docs/_layouts/home.html
delete mode 100644 docs/_sass/normalize.scss
delete mode 100644 docs/_sass/skeleton.scss
delete mode 100644 docs/_sass/style.scss
delete mode 100644 docs/about.md
delete mode 100644 docs/assets/css/main.scss
delete mode 100644 docs/assets/demo.html
delete mode 100644 docs/assets/screenshot.jpg
delete mode 100644 docs/assets/style.json
delete mode 100644 docs/examples/contour/index.md
delete mode 100644 docs/examples/contour/indexes.sql
delete mode 100644 docs/examples/contour/liecthenstein-aster-dem-v2-3857.tif
delete mode 100644 docs/examples/contour/liecthenstein-aster-dem-v2.tif
delete mode 100644 docs/examples/contour/style.json
delete mode 100644 docs/examples/contour/tileset.json
delete mode 100644 docs/examples/extrusion/index.md
delete mode 100644 docs/examples/extrusion/indexes.sql
delete mode 100644 docs/examples/extrusion/screenshot.png
delete mode 100644 docs/examples/extrusion/style.json
delete mode 100644 docs/examples/extrusion/tileset.json
delete mode 100644 docs/examples/extrusion/workflow.json
delete mode 100644 docs/examples/geoadmin/index.md
delete mode 100644 docs/examples/geoadmin/style.json
delete mode 100644 docs/examples/geoadmin/tileset.json
delete mode 100644 docs/examples/geoadmin/tileset.yaml
delete mode 100644 docs/examples/index.md
delete mode 100644 docs/examples/naturalearth/index.md
delete mode 100644 docs/examples/naturalearth/indexes.sql
delete mode 100644 docs/examples/naturalearth/style.json
delete mode 100644 docs/examples/naturalearth/tileset.json
delete mode 100644 docs/examples/naturalearth/workflow.json
delete mode 100644 docs/examples/openstreetmap/database.png
delete mode 100644 docs/examples/openstreetmap/index.md
delete mode 100644 docs/examples/openstreetmap/indexes.sql
delete mode 100644 docs/examples/openstreetmap/liechtenstein-latest.osm.pbf
delete mode 100644 docs/examples/openstreetmap/screenshot.png
delete mode 100644 docs/examples/openstreetmap/style.js
delete mode 100644 docs/examples/openstreetmap/style.json
delete mode 100644 docs/examples/openstreetmap/tileset.json
delete mode 100644 docs/examples/openstreetmap/workflow.json
delete mode 100644 docs/examples/serving-vector-tiles.md
delete mode 100644 docs/favicon.ico
delete mode 100644 docs/index.html
delete mode 100644 docs/installation.md
delete mode 100644 docs/notes/java-nio.md
delete mode 100644 docs/notes/postgis.md
delete mode 100644 docs/release.md
delete mode 100644 docs/stylesheet.md
create mode 100644 map/config.js
create mode 100644 map/queries/osm_landuse_index.sql