This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/main by this push:
new 78397fc6 List the derived files in the NOTICE (#771)
78397fc6 is described below
commit 78397fc62f918dd354ddcee31a16db9be3c10703
Author: Bertil Chapuis <[email protected]>
AuthorDate: Tue Sep 12 21:22:29 2023 +0200
List the derived files in the NOTICE (#771)
* List the derived files in the NOTICE
* Improve LICENSE and DISCLAIMER files
---
DISCLAIMER-WIP | 4 ++++
LICENSE | 4 +++-
NOTICE | 38 +++++++++++++++++++++++++++++++-------
3 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP
index aba18ca6..a3b5bfed 100644
--- a/DISCLAIMER-WIP
+++ b/DISCLAIMER-WIP
@@ -12,6 +12,10 @@ the project is currently aware of (this list is likely to be
incomplete):
* Releases may have incomplete licensing conditions.
* Releases may not have been voted on by the community.
* Releases contain the incompatible proj4j-epsg dependency.
+ * Releases contain excerpts of the OpenStreetMap data.
+ * Releases contain excerpts of the Natural Earth data.
+ * Releases contain excerpts of the GeoNames data.
+ * Releases contain excerpts of the RIPE NCC data.
If you are planning to incorporate this work into your product/project, please
be aware that you
will need to conduct a thorough licensing review to determine the overall
implications of including
diff --git a/LICENSE b/LICENSE
index 1307b508..a87d1857 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,9 +207,11 @@
additional license terms:
- OSMPBF, MIT License
+ - Mapbox Vector Tile, Creative Commons Public License
- Palantir Streams, Apache License 2.0
- Planetiler, Apache License 2.0
- - EPSG, EPSG Terms of Use
- OpenStreetMap, Open Data Commons Open Database License (ODbL)
+ - EPSG, EPSG Terms of Use
+ - Natural Earth, Public Domain
- GeoNames, Creative Commons Attribution 4.0 License
- RIPE NCC, RIPE NCC Terms and Conditions
diff --git a/NOTICE b/NOTICE
index f1f5f5fa..461257a3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,31 +4,55 @@ Copyright 2022-2023 The Apache Software Foundation.
Baremaps development team
Copyright 2020-2022.
-This product includes protocol buffers definitions copied from OSMPBF.
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes protocol buffers definitions derived from OSMPBF.
MIT License.
Please visit the following URLs for the licensing information:
-https://github.com/openstreetmap/OSM-binary/issues/18
-https://github.com/openstreetmap/OSM-binary/pull/35
+- https://github.com/openstreetmap/OSM-binary/issues/18
+- https://github.com/openstreetmap/OSM-binary/pull/35
+The derived files are:
+- baremaps-core/src/main/proto/osmformat.proto
+- baremaps-core/src/main/proto/fileformat.proto
+
+This product includes protocol buffers definitions derived from Mapbox Vector
Tile.
+Creative Commons Public License.
+Please visit the following URL for the licensing information:
+- https://github.com/mapbox/vector-tile-spec/blob/master/LICENSE
+The derived files are:
+- baremaps-core/src/main/proto/vector_tile.proto
This product includes code derived from Palantir Streams.
Apache License, Version 2.0
Please visit the following URL for the full text of the Palantir license:
https://github.com/palantir/streams/blob/develop/LICENSE
+The derived files are:
+-
baremaps-core/src/main/java/org/apache/baremaps/stream/BufferedSpliterator.java
This product includes code derived from Planetiler.
Apache License, Version 2.0
Please visit the following URL for the full text of the Planetiler license:
https://github.com/onthegomap/planetiler/blob/main/LICENSE
-
-This product includes data from the European Petroleum Survey Group (EPSG).
-Please visit the following URL for the full text of the EPSG Terms of Use:
-https://epsg.org/terms-of-use.html
+The derived files are:
+-
baremaps-core/src/main/java/org/apache/baremaps/database/collection/MemoryAlignedDataMap.java
+-
baremaps-core/src/main/java/org/apache/baremaps/database/collection/MonotonicDataMap.java
+-
baremaps-core/src/main/java/org/apache/baremaps/database/collection/MonotonicFixedSizeDataMap.java
This product includes test data derived from OpenStreetMap.
Open Data Commons Open Database License (ODbL).
Please visit the following URL for the full text of the ODbL license:
https://opendatacommons.org/licenses/odbl/1.0/
+This product includes data from the European Petroleum Survey Group (EPSG).
+Please visit the following URL for the full text of the EPSG Terms of Use:
+https://epsg.org/terms-of-use.html
+
+This product includes test data derived from NaturalEarth.
+Public Domain.
+Please visit the following URL for the full text of the terms of use:
+https://www.naturalearthdata.com/about/terms-of-use/
+
This product includes test data derived from GeoNames.
Creative Commons Attribution 4.0 License.
Please visit the following URL for the full text of the CC-BY license:
