This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sedona.git
The following commit(s) were added to refs/heads/master by this push:
new a8efbc8 [SEDONA-33] Fix the copyright issue according to ASF policy
after the initial release (#526)
a8efbc8 is described below
commit a8efbc8d7de8fff3eb876c7dc08dc59cdf950a9a
Author: Jia Yu <[email protected]>
AuthorDate: Tue May 18 17:15:37 2021 -0700
[SEDONA-33] Fix the copyright issue according to ASF policy after the
initial release (#526)
* Update the licenses
* Use the official GeoJSONwriter
* Fix the references of the GeoJSONwriter
* Fix the website requirements, use the logos on ASF dot org logos, remove
unnecessary logos from the root
* Add license for test data
* Update DISCLAIMER-WIP
---
DISCLAIMER-WIP | 4 +-
GeoSpark_logo.png | Bin 27203 -> 0 bytes
LICENSE | 35 +++++-
README.md | 4 +-
.../core/geometryObjects/GeoJSONWriterNew.java | 121 ---------------------
.../apache/sedona/core/spatialRDD/SpatialRDD.java | 4 +-
docs-overrides/main.html | 2 +-
docs-overrides/partials/footer.html | 5 +-
incubator_logo.png | Bin 30207 -> 0 bytes
licenses/LICENSE-nasa | 81 ++++++++++++++
licenses/LICENSE-us-census-bureau | 41 +++++++
.../LICENSE-zeppelin-helium-plugin | 0
mkdocs.yml | 4 +-
pom.xml | 2 +-
sedona_logo.png | Bin 586724 -> 0 bytes
.../sql/sedona_sql/expressions/Functions.scala | 8 +-
16 files changed, 171 insertions(+), 140 deletions(-)
diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP
index 0df680a..93343ef 100644
--- a/DISCLAIMER-WIP
+++ b/DISCLAIMER-WIP
@@ -1,7 +1,5 @@
Apache Sedona is an effort undergoing incubation at The Apache Software
Foundation (ASF), sponsored by the name of Apache TLP sponsor. Incubation is
required of all newly accepted projects until a further review indicates that
the infrastructure, communications, and decision making process have stabilized
in a manner consistent with other successful ASF projects. While incubation
status is not necessarily a reflection of the completeness or stability of the
code, it does indicate that th [...]
-Some of the incubating project’s releases may not be fully compliant with ASF
policy. For example, releases may have incomplete or un-reviewed licensing
conditions. What follows is a list of known issues the project is currently
aware of (note that this list, by definition, is likely to be incomplete):
-
-1. The content of GeoJSONWriterNew is directly copied from jts2geojson library
(MIT License). This is to fix the incompatibility between jts2geojson 1.4.3 and
JTS 1.17+. GeoJSONWriterNew will be removed in the future if the developer of
jts2geojson fixes this issue.
+Some of the incubating project’s releases may not be fully compliant with ASF
policy. For example, releases may have incomplete or un-reviewed licensing
conditions.
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 this work. For the current status of this
project through the Apache Incubator visit:
https://incubator.apache.org/projects/sedona.html
\ No newline at end of file
diff --git a/GeoSpark_logo.png b/GeoSpark_logo.png
deleted file mode 100644
index d7eee52..0000000
Binary files a/GeoSpark_logo.png and /dev/null differ
diff --git a/LICENSE b/LICENSE
index f49a4e1..17d0891 100644
--- a/LICENSE
+++ b/LICENSE
@@ -198,4 +198,37 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
+ limitations under the License.
+
+------------------------------------------------------------------------------------
+This product bundles various third-party components under other open source
licenses.
+This section summarizes those components and their licenses. See licenses/
+for text of these licenses.
+
+BSD 2-Clause License
+--------------------------------------
+zeppelin/index.js (modified based on volume-leaflet:
https://github.com/volumeint/helium-volume-leaflet)
+
+
+No-copyright data used in unit tests
+--------------------------------------
+
+TIGER/Line from United States Census Bureau
+---------------
+core/src/test/resources/arealm-small.csv
+core/src/test/resources/arealm.csv
+core/src/test/resources/county_small.tsv
+core/src/test/resources/county_small_wkb.tsv
+core/src/test/resources/primaryroads-linestring.csv
+core/src/test/resources/primaryroads-polygon.csv
+core/src/test/resources/primaryroads.csv
+core/src/test/resources/zcta510-small.csv
+core/src/test/resources/zcta510.csv
+
+
+MODIS Land Surface Temperature and Emissivity MYD11_L2 from United States
National Aeronautics and Space Administration
+---------------
+core/src/test/resources/MYD11_L2.A2017091.0140.006.2017094143804.hdf
+core/src/test/resources/MYD11_L2.A2017091.0145.006.2017094151110.hdf
+core/src/test/resources/MYD11_L2.A2017091.0150.006.2017094151114.hdf
+core/src/test/resources/MYD11_L2.A2017091.0155.006.2017094143610.hdf
\ No newline at end of file
diff --git a/README.md b/README.md
index 2521fd5..b84e690 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<img src="./sedona_logo.png" width="400">
+<img src="https://www.apache.org/logos/res/sedona/sedona.png"; width="400">
[](https://github.com/apache/incubator-sedona/actions?query=workflow%3A%22Scala+and+Java+build%22)
[](https://github.com/apache/incubator-sedona/actions?query=workflow%3A%22Python+build%22)
](https://git
## Powered by
-<img src="./incubator_logo.png" width="400">
+<img src="http://apache.org/logos/res/incubator/incubator.png"; width="400">
diff --git
a/core/src/main/java/org/apache/sedona/core/geometryObjects/GeoJSONWriterNew.java
b/core/src/main/java/org/apache/sedona/core/geometryObjects/GeoJSONWriterNew.java
deleted file mode 100644
index 225498a..0000000
---
a/core/src/main/java/org/apache/sedona/core/geometryObjects/GeoJSONWriterNew.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sedona.core.geometryObjects;
-
-import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.Geometry;
-import org.locationtech.jts.geom.GeometryCollection;
-import org.locationtech.jts.geom.LineString;
-import org.locationtech.jts.geom.MultiLineString;
-import org.locationtech.jts.geom.MultiPoint;
-import org.locationtech.jts.geom.MultiPolygon;
-import org.locationtech.jts.geom.Point;
-import org.locationtech.jts.geom.Polygon;
-import org.wololo.jts2geojson.GeoJSONReader;
-
-public class GeoJSONWriterNew
-{
- final static GeoJSONReader reader = new GeoJSONReader();
-
- public org.wololo.geojson.Geometry write(Geometry geometry) {
- Class<? extends Geometry> c = geometry.getClass();
- if (c.equals(Point.class)) {
- return convert((Point) geometry);
- } else if (c.equals(LineString.class)) {
- return convert((LineString) geometry);
- } else if (c.equals(Polygon.class)) {
- return convert((Polygon) geometry);
- } else if (c.equals(MultiPoint.class)) {
- return convert((MultiPoint) geometry);
- } else if (c.equals(MultiLineString.class)) {
- return convert((MultiLineString) geometry);
- } else if (c.equals(MultiPolygon.class)) {
- return convert((MultiPolygon) geometry);
- } else if (c.equals(GeometryCollection.class)) {
- return convert((GeometryCollection) geometry);
- } else {
- throw new UnsupportedOperationException();
- }
- }
-
- org.wololo.geojson.Point convert(Point point) {
- org.wololo.geojson.Point json = new org.wololo.geojson.Point(
- convert(point.getCoordinate()));
- return json;
- }
-
- org.wololo.geojson.MultiPoint convert(MultiPoint multiPoint) {
- return new org.wololo.geojson.MultiPoint(
- convert(multiPoint.getCoordinates()));
- }
-
- org.wololo.geojson.LineString convert(LineString lineString) {
- return new org.wololo.geojson.LineString(
- convert(lineString.getCoordinates()));
- }
-
- org.wololo.geojson.MultiLineString convert(MultiLineString
multiLineString) {
- int size = multiLineString.getNumGeometries();
- double[][][] lineStrings = new double[size][][];
- for (int i = 0; i < size; i++) {
- lineStrings[i] =
convert(multiLineString.getGeometryN(i).getCoordinates());
- }
- return new org.wololo.geojson.MultiLineString(lineStrings);
- }
-
- org.wololo.geojson.Polygon convert(Polygon polygon) {
- int size = polygon.getNumInteriorRing() + 1;
- double[][][] rings = new double[size][][];
- rings[0] = convert(polygon.getExteriorRing().getCoordinates());
- for (int i = 0; i < size - 1; i++) {
- rings[i + 1] =
convert(polygon.getInteriorRingN(i).getCoordinates());
- }
- return new org.wololo.geojson.Polygon(rings);
- }
-
- org.wololo.geojson.MultiPolygon convert(MultiPolygon multiPolygon) {
- int size = multiPolygon.getNumGeometries();
- double[][][][] polygons = new double[size][][][];
- for (int i = 0; i < size; i++) {
- polygons[i] = convert((Polygon)
multiPolygon.getGeometryN(i)).getCoordinates();
- }
- return new org.wololo.geojson.MultiPolygon(polygons);
- }
-
- org.wololo.geojson.GeometryCollection convert(GeometryCollection gc) {
- int size = gc.getNumGeometries();
- org.wololo.geojson.Geometry[] geometries = new
org.wololo.geojson.Geometry[size];
- for (int i = 0; i < size; i++) {
- geometries[i] = write((Geometry) gc.getGeometryN(i));
- }
- return new org.wololo.geojson.GeometryCollection(geometries);
- }
-
- double[] convert(Coordinate coordinate) {
- if(Double.isNaN( coordinate.getZ() )) {
- return new double[] { coordinate.x, coordinate.y };
- }
- else {
- return new double[] { coordinate.x, coordinate.y,
coordinate.getZ() };
- }
- }
-
- double[][] convert(Coordinate[] coordinates) {
- double[][] array = new double[coordinates.length][];
- for (int i = 0; i < coordinates.length; i++) {
- array[i] = convert(coordinates[i]);
- }
- return array;
- }
-}
diff --git
a/core/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
b/core/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
index ca7fdee..3eb6ae7 100644
--- a/core/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
+++ b/core/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
@@ -23,7 +23,6 @@ import org.apache.commons.lang.NullArgumentException;
import org.apache.log4j.Logger;
import org.apache.sedona.core.enums.GridType;
import org.apache.sedona.core.enums.IndexType;
-import org.apache.sedona.core.geometryObjects.GeoJSONWriterNew;
import org.apache.sedona.core.spatialPartitioning.FlatGridPartitioner;
import org.apache.sedona.core.spatialPartitioning.KDBTree;
import org.apache.sedona.core.spatialPartitioning.KDBTreePartitioner;
@@ -57,6 +56,7 @@ import org.opengis.referencing.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.MathTransform;
import org.wololo.geojson.Feature;
+import org.wololo.jts2geojson.GeoJSONWriter;
import scala.Tuple2;
import java.io.Serializable;
@@ -579,7 +579,7 @@ public class SpatialRDD<T extends Geometry>
throws Exception
{
ArrayList<String> result = new ArrayList();
- GeoJSONWriterNew writer = new GeoJSONWriterNew();
+ GeoJSONWriter writer = new GeoJSONWriter();
while (iterator.hasNext()) {
Geometry spatialObject = iterator.next();
Feature jsonFeature;
diff --git a/docs-overrides/main.html b/docs-overrides/main.html
index 9df7849..c772e8e 100644
--- a/docs-overrides/main.html
+++ b/docs-overrides/main.html
@@ -16,7 +16,7 @@
<div class="md-grid md-typeset">
<div class="tx-hero">
<div class="tx-hero__image">
- <img
src="https://raw.githubusercontent.com/apache/incubator-sedona/master/docs/image/sedona_logo.png";
width="300">
+ <img src="http://apache.org/logos/res/sedona/sedona.png";
width="300">
</div>
<div class="tx-hero__content">
<p>{{ config.site_description }}</p>
diff --git a/docs-overrides/partials/footer.html
b/docs-overrides/partials/footer.html
index 32d55b0..669a4fd 100644
--- a/docs-overrides/partials/footer.html
+++ b/docs-overrides/partials/footer.html
@@ -47,10 +47,9 @@
{{ config.copyright }}
</div>
{% endif %}
-<img
src="https://raw.githubusercontent.com/apache/incubator-sedona/master/docs/image/apache_incubator_red.svg";
width="300">
+<img
src="https://incubator.apache.org/images/incubator_feather_egg_logo_bw_crop.png";
width="300">
<br>
-Apache Sedona is an effort undergoing incubation at The Apache Software
Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of
all newly accepted projects until a further review indicates that the
infrastructure, communications, and decision making process have stabilized in
a manner consistent with other successful ASF projects. While incubation status
is not necessarily a reflection of the completeness or stability of the code,
it does indicate that the project [...]
- </a>
+Apache Sedona is an effort undergoing incubation at <a
href="http://www.apache.org/";>The Apache Software Foundation (ASF)</a> ,
sponsored by the Apache Incubator. Incubation is required of all newly accepted
projects until a further review indicates that the infrastructure,
communications, and decision making process have stabilized in a manner
consistent with other successful ASF projects. While incubation status is not
necessarily a reflection of the completeness or stability of the co [...]
</div>
{% include "partials/social.html" %}
</div>
diff --git a/incubator_logo.png b/incubator_logo.png
deleted file mode 100644
index 338169e..0000000
Binary files a/incubator_logo.png and /dev/null differ
diff --git a/licenses/LICENSE-nasa b/licenses/LICENSE-nasa
new file mode 100644
index 0000000..580ada2
--- /dev/null
+++ b/licenses/LICENSE-nasa
@@ -0,0 +1,81 @@
+Original documentation:
https://science.nasa.gov/earth-science/earth-science-data/data-information-policy/data-rights-related-issues
+
+Data Rights & Related Issues
+Preamble
+In order to implement our data policy tenet that algorithms, including
scientific source code, be included in the term data, and be shared fully and
openly, the following alternate “Data Rights” clause was created by NASA to
include in Cooperative Agreements and Contracts with data providers supported
by NASA.
+
+1. Introduction
+
+NASA’s Earth Science program was established to use the advanced technology of
NASA to understand and protect our home planet by using our view from space to
study the Earth system and improve prediction of Earth system change. To meet
this challenge, NASA promotes the full and open sharing of all data with the
research and applications communities, private industry, academia, and the
general public. The greater the availability of the data, the more quickly and
effectively the user comm [...]
+
+Included below is the Data Rights clause created specifically for this type of
partner agreement, which will be part of the Cooperative Agreement between NASA
and successful Earth Science Data System solicitation respondents.
+
+2. Rights in Data Clause
+
+The following Rights in Data clause created for NASA’s Earth Science Data
Cooperative Agreements is used for this Cooperative Agreement and replaces the
standard Rights in Data clause (1260.30) of the “NASA Grant and Cooperative
Agreement Handbook.”
+
+
+Rights in Data
+(December 2006, amended January 2012)
+
+A. Introduction
+
+NASA intends to protect Recipient’s rights to data that embodies trade secrets
or comprises commercial or financial information which is privileged or
confidential. No data transfer or “cross fertilization” of concepts will be
performed by NASA participants, should two or more cooperative agreements be
awarded. While NASA will require that the data that embodies trade secrets or
comprises commercial or financial information which is privileged or
confidential generated by the Recipient b [...]
+
+B. Definitions
+
+“Data” means recorded information, regardless of form, the media on which it
may be recorded, or the method of recording. The term includes, but is not
limited to, data of a scientific or technical nature, software and
documentation thereof, and data comprising commercial and financial information.
+“Computer Data Base” means a collection of Data in a form capable of being
processed and operated on by a computer through the use of a computer program
performing the function of storing, manipulating, or formatting. A “computer
data base” is not software.
+“Metadata” means information about a Data set provided by the data supplier or
the generating algorithm and which provides a description of the content,
format, and utility of the Data set. Metadata provide criteria, which may be
used to select Data for a particular scientific investigation.
+“Object Code” means machine language, i.e., that programming language directly
readable by a computer.
+“Software” means computer programs (a set of statements or instructions, in
object code, to be used directly or indirectly in a computer in order to bring
about a certain result), source code, source code listings, and design details,
algorithms, processes, flow charts, formulae and related material that would
enable the software or a functionally equivalent software to be reproduced,
recreated, or recompiled, regardless of the form or media on which such
information is recorded.
+“Software Documentation” means Data that explain the capabilities of the
software, or provide operating instructions for using the software, to obtain
the desired results from a computer such as: (a) owner’s manuals, (b) user’s
manuals, (c) installation instructions, (d) operating instructions, and other
similar items.
+C. Data Products
+
+Scientific Data: Earth system science products, with accompanying metadata and
quality assessments, made available through production or services provided by
the project. Some examples of Scientific Data include: geophysical parameters,
such as sea surface temperature, sea surface height, atmospheric
pressure/temperature levels, precipitation, atmospheric chemical species and
aerosols, ice sheet mass balance, and various terrestrial surface measurements.
+Scientific Computer Data Base: Collection of Scientific Data.
+Scientific Software: Scientific software is that software used for processing
raw Earth Observation remote sensing instrument Data into Scientific Data.
+Information System Software: Software produced as part of the project pursuant
to the technology objectives of this Cooperative Agreement that comprises any
part of, access to, or management of Data in the data system of the project, or
tools that access, manipulate, or analyze Scientific Computer Data Base. Some
examples of Information System Software include client/server applications,
user interfaces, tools for selecting, manipulating and analyzing Scientific
Data, and database manage [...]
+D. Data Rights
+
+Data exchanged between NASA and Recipient under this Cooperative Agreement
will be exchanged without restriction as to its disclosure, use, or duplication
except as otherwise provided below in this clause. In particular, rights in
Scientific Data, Scientific Computer Data Bases, and Scientific Software, as
defined in paragraph C of this clause, are provided under this paragraph D.1.
+
+Background Data: (Recipient’s and NASA’s)
+a. Recipient: In the event it is necessary for Recipient to furnish NASA with
Data which existed prior to, or produced outside of, this Cooperative
Agreement, and such Data embodies trade secrets or comprises commercial or
financial information which is privileged or confidential, and such Data is so
identified with a suitable notice or legend, the Data will be maintained in
confidence and disclosed and used by NASA and its contractors (under suitable
protective conditions) only for the [...]
+b. NASA: Earth Observing System Core System (ECS) Software - No license rights
to the ECS software are granted or implied by this Cooperative Agreement. ECS
software is being provided for Government purposes and may not be used for
commercial purposes during or upon completion of this Cooperative Agreement.
Upon completion of activities under this Cooperative Agreement, such Data will
be disposed of as requested by NASA. Any modification to these rights will be
expressly made through a s [...]
+
+Data first produced by Recipient:
+a. In the event Data first produced by Recipient in carrying out Recipient’s
responsibilities under this Cooperative Agreement is furnished to NASA, and
Recipient considers such Data to embody trade secrets or comprise commercial or
financial information which is privileged or confidential, and such Data is so
identified with a suitable notice or legend, the Data will be maintained in
confidence for a period of two years after completion of this Cooperative
Agreement and be disclosed and [...]
+b. In particular, rights in Information System Software, as defined in
paragraph C of this clause, are provided under this paragraph D.3, except that
object code shall be treated under paragraph D.1 of this clause as Data
exchanged without restriction as to its disclosure, use or duplication.
+c. Within one month of the completion of this Cooperative Agreement, the
recipient shall provide written documentation of its intent to commercialize
“Data first produced by Recipient” under this Cooperative Agreement. If the
Recipient intends to commercialize such Data, Recipient shall mark the Data
with a suitable notice and NASA shall, to the extent permitted by law, maintain
such Data in confidence for a period of two years after completion of this
Cooperative Agreement. During the a [...]
+d. If the Recipient determines not to commercialize such Data (or otherwise
make the data available to the user community, such as “open source”), or if
the Recipient fails to provide written documentation indicating its intent to
commercialize the Data, Recipient agrees that NASA shall have the rights
specified in paragraph D.1 of this clause and all such Data can be made
available without restriction as to its disclosure, use or duplication.
Alternatively, at NASA’s option, NASA may re [...]
+
+Data first produced by NASA: Data first produced by NASA in carrying out
NASA’s responsibilities under this Cooperative Agreement that would embody
trade secrets or would comprise commercial or financial information that is
privileged or confidential if it had been obtained from the Recipient, will be
marked with a suitable notice or legend and maintained in confidence for an
agreed period of up to two (2) years after completion of this Cooperative
Agreement, with the express understandi [...]
+
+Copyright:
+a. In the event Data is exchanged with a notice indicating the Data are
protected as a published copyrighted work, or are deposited for registration as
a published work in the U.S. Copyright Office, the following paid-up licenses
shall apply:
+(i) If it is indicated on the Data that the Data existed prior to, or was
produced outside of, this Cooperative Agreement, the receiving party and others
acting on its behalf, may reproduce, distribute, and prepare derivative works
for the purpose of carrying out the receiving party’s responsibilities under
this Cooperative Agreement; and
+(ii) If the furnished Data does not contain the indication of paragraph
D.5.a.(i) of this clause, it will be assumed that the Data was first produced
under this Cooperative Agreement, and the receiving party and others acting on
its behalf, shall be granted a paid-up, nonexclusive, irrevocable, world-wide
license for all such Data to reproduce, distribute copies to the public,
prepare derivative works, and perform publicly and display publicly, by or on
behalf of the receiving party. For [...]
+b. When claim is made to copyright, the Recipient shall affix the applicable
copyright notice of 17 U.S.C. 401 or 402 and acknowledgment of Government
sponsorship to the Data when and if the Data are delivered to the Government.
+
+Oral and Visual Information:
+If information which the Recipient considers to embody trade secrets or to
comprise commercial or financial information which is privileged or
confidential is disclosed orally or visually to NASA, such information must be
reduced to tangible, recorded form (i.e., converted into Data as defined
herein), marked with a suitable notice or legend, and furnished to NASA within
10 days after such oral or visual disclosure, or NASA shall have no duty to
limit or restrict, and shall not incur any [...]
+
+Disclaimer of Liability:
+Notwithstanding the above, NASA shall not be restricted in, or incur any
liability for, the disclosure and use of:
+a. Data not identified with a suitable notice or legend as set in paragraphs
D.2.a., D.3.a., and D.3.c. of this clause; or
+b. Information contained in any Data for which disclosure and use is
restricted under paragraphs D.2. or D.3. of this clause, if such information:
+(i) is publicly available at the time of disclosure or thereafter becomes
publicly available without breach of this Cooperative Agreement;
+(ii) is known to, in the possession of, or developed by NASA independent of
carrying out the NASA’s responsibilities under this Cooperative Agreement;
+(iii) is received from a third party having the right to disclose such
information without restriction; or
+(iv) is required to be produced or released by the receiving Party pursuant to
a court order or other legal requirement.
+E. Marking of Data
+
+All Data or Information System Software object code created under this
Cooperative Agreement, by NASA or the Recipient shall be marked with the notice
provided below.
+
+Copyright <enter year of first publication> <enter Participant’s name OR
United States Government as represented by the Administrator of the National
Aeronautics and Space Administration, as applicable>. No copyright is claimed
in the United States under Title 17, U.S. Code to any U.S. Government created
work. This work has been developed under Cooperative Agreement with NASA and
the Government has certain rights. This work is released without restriction as
to its disclosure, use or rep [...]
+This work is provided “as is” without any warranty of any kind, either
express, implied, or statutory, including, but not limited to, any warranty
that the software will conform to specifications, any implied warranties of
merchantability, fitness for a particular purpose, and freedom from
infringement, and any warranty that the documentation will conform to the
software, or any warranty that the software will be error free.
+In no event shall NASA be liable for any damages, including, but not limited
to direct, indirect, special, or consequential damages, arising out of,
resulting from, or in any way connected with this work, whether or not based
upon warranty, contract, tort, or otherwise, whether or not injury was
sustained by persons or property or otherwise, and whether or not loss was
sustained from, or arose out of the results of, or use of, the work provided
hereunder.
+F. Lower Tier Agreements
+
+Recipient shall include this provision, suitably modified to identify the
parties, in all subcontracts or lower tier agreements, regardless of tier, for
experimental, developmental, or research work conducted under or in association
with this Cooperative Agreement.
\ No newline at end of file
diff --git a/licenses/LICENSE-us-census-bureau
b/licenses/LICENSE-us-census-bureau
new file mode 100644
index 0000000..9973610
--- /dev/null
+++ b/licenses/LICENSE-us-census-bureau
@@ -0,0 +1,41 @@
+Original documentation:
https://www2.census.gov/geo/pdfs/maps-data/data/tiger/tgrshp2020/TGRSHP2020_TechDoc.pdf
+
+1. Legal Disclaimer, Citation Information and Contact
+1.1 TIGER/Line Shapefile Legal Disclaimers
+
+No warranty, expressed or implied, is made with regard to the accuracy of the
data in the TIGER/Line
+Shapefiles, and no liability is assumed by the United States Government in
general, or the Census
+Bureau specifically, as to the positional or attribute accuracy of the data.
The boundary information in the
+TIGER/Line Shapefiles is for statistical data collection and tabulation
purposes only. Their depiction and
+designation for statistical purposes does not constitute a determination of
jurisdictional authority or rights
+of ownership or entitlement and are not legal land descriptions.
+
+TIGER/Line® is a registered trademark of the Census Bureau. TIGER/Line cannot
be used as or within
+the proprietary product names of any commercial product including or otherwise
relevant to Census
+Bureau data and may only be used to refer to the nature of such a product. The
Census Bureau requests
+that any repackaging of the TIGER/Line Shapefile data, documentation, and
other files accompanying it
+for distribution include a conspicuously placed statement to this effect on
the product's cover, the first
+page of the website, or elsewhere of comparable visibility. Further, Census
Bureau trademarks, when
+used in reference to the nature of the product, should be accompanied by the ®
(registered) symbol or ™
+symbol, where convenient.
+
+1.2 Citation Information
+
+Copyright protection is not available for any work of the United States
Government (Title 17 U.S.C.,
+Section 105). Thus, you are free to reproduce census materials as you see fit.
We would ask, however,
+that you cite the Census Bureau as the source.
+
+1.3 Contact Information
+
+Members of the public can obtain the TIGER/Line Shapefiles free of charge
through the Census Bureau’s
+website and should direct questions about these files to the Spatial Data
Collection and Products Branch,
+Geography Division, U.S. Census Bureau. If you obtain the TIGER/Line
Shapefiles from a third party, we
+recommend you contact that vendor for assistance.
+
+Spatial Data Collection and Products Branch
+Geography Division,
+U.S. Census Bureau
+4600 Silver Hill Road
+Washington, DC 20233-7400
+Office: (301) 763-1128
+E-mail: [email protected]
\ No newline at end of file
diff --git a/zeppelin/LICENSE b/licenses/LICENSE-zeppelin-helium-plugin
similarity index 100%
rename from zeppelin/LICENSE
rename to licenses/LICENSE-zeppelin-helium-plugin
diff --git a/mkdocs.yml b/mkdocs.yml
index 5909d9d..55ef13a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -101,7 +101,7 @@ theme:
palette:
primary: 'deep orange'
accent: 'green'
- favicon: image/sedona_logo.png
+ favicon: https://www.apache.org/logos/res/sedona/sedona.png
icon:
logo: fontawesome/solid/globe-americas
repo: fontawesome/brands/github
@@ -116,7 +116,7 @@ extra:
link: 'https://github.com/apache/incubator-sedona'
- icon: fontawesome/brands/twitter
link: 'https://twitter.com/ApacheSedona'
-copyright: Apache Sedona, Apache Incubator, Apache, the Apache feather logo,
and the Apache Incubator project logo are trademarks or registered trademarks
of The Apache Software Foundation.
+copyright: Apache Sedona, Apache Incubator, Apache, the Apache feather logo,
and the Apache Incubator project logo are trademarks or registered trademarks
of The Apache Software Foundation. Copyright © 2021 The Apache Software
Foundation
markdown_extensions:
- admonition
- attr_list
diff --git a/pom.xml b/pom.xml
index 560b6d8..cd827fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dependency.scope>provided</dependency.scope>
<jts.version>1.18.0</jts.version>
- <jts2geojson.version>0.14.3</jts2geojson.version>
+ <jts2geojson.version>0.16.1</jts2geojson.version>
</properties>
<dependencies>
diff --git a/sedona_logo.png b/sedona_logo.png
deleted file mode 100644
index befb982..0000000
Binary files a/sedona_logo.png and /dev/null differ
diff --git
a/sql/src/main/scala/org/apache/spark/sql/sedona_sql/expressions/Functions.scala
b/sql/src/main/scala/org/apache/spark/sql/sedona_sql/expressions/Functions.scala
index ec2afea..7ba88a2 100644
---
a/sql/src/main/scala/org/apache/spark/sql/sedona_sql/expressions/Functions.scala
+++
b/sql/src/main/scala/org/apache/spark/sql/sedona_sql/expressions/Functions.scala
@@ -18,7 +18,7 @@
*/
package org.apache.spark.sql.sedona_sql.expressions
-import org.apache.sedona.core.geometryObjects.{Circle, GeoJSONWriterNew}
+import org.apache.sedona.core.geometryObjects.Circle
import org.apache.sedona.core.utils.GeomUtils
import org.apache.sedona.sql.utils.GeometrySerializer
import org.apache.spark.internal.Logging
@@ -34,15 +34,15 @@ import org.geotools.geometry.jts.JTS
import org.geotools.referencing.CRS
import org.locationtech.jts.algorithm.MinimumBoundingCircle
import org.locationtech.jts.geom.{PrecisionModel, _}
-import org.locationtech.jts.io.WKBWriter
+import org.locationtech.jts.linearref.LengthIndexedLine
import org.locationtech.jts.operation.IsSimpleOp
import org.locationtech.jts.operation.buffer.BufferParameters
import org.locationtech.jts.operation.linemerge.LineMerger
import org.locationtech.jts.operation.valid.IsValidOp
import org.locationtech.jts.precision.GeometryPrecisionReducer
import org.locationtech.jts.simplify.TopologyPreservingSimplifier
-import org.locationtech.jts.linearref.LengthIndexedLine
import org.opengis.referencing.operation.MathTransform
+import org.wololo.jts2geojson.GeoJSONWriter
import java.util
import scala.collection.mutable.ArrayBuffer
@@ -479,7 +479,7 @@ case class ST_AsGeoJSON(inputExpressions: Seq[Expression])
inputExpressions.validateLength(1)
val geometry = inputExpressions.head.toGeometry(input)
- val writer = new GeoJSONWriterNew()
+ val writer = new GeoJSONWriter()
UTF8String.fromString(writer.write(geometry).toString)
}
![https://www.apache.org/logos/res/sedona/sedona.png"](https://www.apache.org/logos/res/sedona/sedona.png"){kind=link}
![http://apache.org/logos/res/incubator/incubator.png"](http://apache.org/logos/res/incubator/incubator.png"){kind=link}
![https://raw.githubusercontent.com/apache/incubator-sedona/master/docs/image/sedona_logo.png"](https://raw.githubusercontent.com/apache/incubator-sedona/master/docs/image/sedona_logo.png"){kind=link}
![http://apache.org/logos/res/sedona/sedona.png"](http://apache.org/logos/res/sedona/sedona.png"){kind=link}
![https://raw.githubusercontent.com/apache/incubator-sedona/master/docs/image/apache_incubator_red.svg"](https://raw.githubusercontent.com/apache/incubator-sedona/master/docs/image/apache_incubator_red.svg"){kind=link}
![https://incubator.apache.org/images/incubator_feather_egg_logo_bw_crop.png"](https://incubator.apache.org/images/incubator_feather_egg_logo_bw_crop.png"){kind=link}
