You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sedona.apache.org by ji...@apache.org on 2021/09/07 05:00:47 UTC
[incubator-sedona] branch master updated: [SEDONA-62] Fix licenses,
ignore HDF tests, delete all NASA data (#540)
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 eea460f [SEDONA-62] Fix licenses, ignore HDF tests, delete all NASA data (#540)
eea460f is described below
commit eea460f332d78516ec61cd4b67e817f19b10bc53
Author: Jia Yu <ji...@apache.org>
AuthorDate: Mon Sep 6 22:00:44 2021 -0700
[SEDONA-62] Fix licenses, ignore HDF tests, delete all NASA data (#540)
---
LICENSE | 15 ++--
.../apache/sedona/core/io/EarthdataHDFTest.java | 6 +-
.../MYD11_L2.A2017091.0140.006.2017094143804.hdf | Bin 5575227 -> 0 bytes
.../MYD11_L2.A2017091.0145.006.2017094151110.hdf | Bin 1683008 -> 0 bytes
.../MYD11_L2.A2017091.0150.006.2017094151114.hdf | Bin 1399991 -> 0 bytes
.../MYD11_L2.A2017091.0155.006.2017094143610.hdf | Bin 1054705 -> 0 bytes
core/src/test/resources/modis/modis.csv | 4 -
.../scala/org/apache/sedona/core/scalaTest.scala | 3 +-
licenses/LICENSE-nasa | 81 ---------------------
licenses/LICENSE-zeppelin-helium-plugin | 2 +-
.../org/apache/sedona/sql/adapterTestScala.scala | 3 +-
.../org/apache/sedona/viz/rdd/scalaTest.scala | 3 +-
zeppelin/index.js | 39 ++++++----
13 files changed, 40 insertions(+), 116 deletions(-)
diff --git a/LICENSE b/LICENSE
index 17d0891..9daca34 100644
--- a/LICENSE
+++ b/LICENSE
@@ -205,11 +205,14 @@ This product bundles various third-party components under other open source lice
This section summarizes those components and their licenses. See licenses/
for text of these licenses.
+Apache 2.0 License
+--------------------------------------
+scalastyle_config.xml (copied from https://github.com/scalastyle/scalastyle/blob/master/lib/scalastyle_config.xml)
+
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
--------------------------------------
@@ -223,12 +226,4 @@ 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
+core/src/test/resources/zcta510.csv
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/sedona/core/io/EarthdataHDFTest.java b/core/src/test/java/org/apache/sedona/core/io/EarthdataHDFTest.java
index 414cf72..4debeef 100644
--- a/core/src/test/java/org/apache/sedona/core/io/EarthdataHDFTest.java
+++ b/core/src/test/java/org/apache/sedona/core/io/EarthdataHDFTest.java
@@ -30,6 +30,7 @@ import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.storage.StorageLevel;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.locationtech.jts.geom.Envelope;
@@ -37,6 +38,7 @@ import org.locationtech.jts.geom.Envelope;
/**
* The Class EarthdataHDFTest.
+ * All tests here have been ignored. A new feature that reads HDF will be added.
*/
public class EarthdataHDFTest
{
@@ -143,7 +145,7 @@ public class EarthdataHDFTest
*
* @throws Exception the exception
*/
- @Test
+ @Ignore
public void testSpatialRangeQuery()
throws Exception
{
@@ -161,7 +163,7 @@ public class EarthdataHDFTest
*
* @throws Exception the exception
*/
- @Test
+ @Ignore
public void testSpatialRangeQueryUsingIndex()
throws Exception
{
diff --git a/core/src/test/resources/modis/MYD11_L2.A2017091.0140.006.2017094143804.hdf b/core/src/test/resources/modis/MYD11_L2.A2017091.0140.006.2017094143804.hdf
deleted file mode 100644
index ea1bf1b..0000000
Binary files a/core/src/test/resources/modis/MYD11_L2.A2017091.0140.006.2017094143804.hdf and /dev/null differ
diff --git a/core/src/test/resources/modis/MYD11_L2.A2017091.0145.006.2017094151110.hdf b/core/src/test/resources/modis/MYD11_L2.A2017091.0145.006.2017094151110.hdf
deleted file mode 100644
index 374258f..0000000
Binary files a/core/src/test/resources/modis/MYD11_L2.A2017091.0145.006.2017094151110.hdf and /dev/null differ
diff --git a/core/src/test/resources/modis/MYD11_L2.A2017091.0150.006.2017094151114.hdf b/core/src/test/resources/modis/MYD11_L2.A2017091.0150.006.2017094151114.hdf
deleted file mode 100644
index 83ce41f..0000000
Binary files a/core/src/test/resources/modis/MYD11_L2.A2017091.0150.006.2017094151114.hdf and /dev/null differ
diff --git a/core/src/test/resources/modis/MYD11_L2.A2017091.0155.006.2017094143610.hdf b/core/src/test/resources/modis/MYD11_L2.A2017091.0155.006.2017094143610.hdf
deleted file mode 100644
index 3858fef..0000000
Binary files a/core/src/test/resources/modis/MYD11_L2.A2017091.0155.006.2017094143610.hdf and /dev/null differ
diff --git a/core/src/test/resources/modis/modis.csv b/core/src/test/resources/modis/modis.csv
deleted file mode 100644
index 1318027..0000000
--- a/core/src/test/resources/modis/modis.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-MYD11_L2.A2017091.0155.006.2017094143610.hdf
-MYD11_L2.A2017091.0150.006.2017094151114.hdf
-MYD11_L2.A2017091.0145.006.2017094151110.hdf
-MYD11_L2.A2017091.0140.006.2017094143804.hdf
\ No newline at end of file
diff --git a/core/src/test/scala/org/apache/sedona/core/scalaTest.scala b/core/src/test/scala/org/apache/sedona/core/scalaTest.scala
index 3dab72d..94ce205 100644
--- a/core/src/test/scala/org/apache/sedona/core/scalaTest.scala
+++ b/core/src/test/scala/org/apache/sedona/core/scalaTest.scala
@@ -178,7 +178,8 @@ class scalaTest extends SparkUtil {
}
}
- test("should pass earthdata format mapper test") {
+ // Tests here have been ignored. A new feature that reads HDF will be added.
+ ignore("should pass earthdata format mapper test") {
val InputLocation = System.getProperty("user.dir") + "/src/test/resources/modis/modis.csv"
val splitter = FileDataSplitter.CSV
val indexType = IndexType.RTREE
diff --git a/licenses/LICENSE-nasa b/licenses/LICENSE-nasa
deleted file mode 100644
index 580ada2..0000000
--- a/licenses/LICENSE-nasa
+++ /dev/null
@@ -1,81 +0,0 @@
-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-zeppelin-helium-plugin b/licenses/LICENSE-zeppelin-helium-plugin
index 6a13b51..ded1d49 100644
--- a/licenses/LICENSE-zeppelin-helium-plugin
+++ b/licenses/LICENSE-zeppelin-helium-plugin
@@ -1,6 +1,6 @@
BSD 2-Clause License
-Copyright (c) 2020-2021, Apache Sedona
+Copyright 2019 - 2021 Jia Yu (jiayu@apache.org)
Copyright (c) 2017, Volume Integration
Copyright (c) 2017, Tom Grant
All rights reserved.
diff --git a/sql/src/test/scala/org/apache/sedona/sql/adapterTestScala.scala b/sql/src/test/scala/org/apache/sedona/sql/adapterTestScala.scala
index aad5b88..3261715 100644
--- a/sql/src/test/scala/org/apache/sedona/sql/adapterTestScala.scala
+++ b/sql/src/test/scala/org/apache/sedona/sql/adapterTestScala.scala
@@ -182,7 +182,8 @@ class adapterTestScala extends TestBaseScala with GivenWhenThen{
assert(df.count() == 1)
}
- it("load HDF data from RDD to a DataFrame") {
+ // Tests here have been ignored. A new feature that reads HDF will be added.
+ ignore("load HDF data from RDD to a DataFrame") {
val InputLocation = "file://" + resourceFolder + "modis/modis.csv"
val numPartitions = 5
val HDFincrement = 5
diff --git a/viz/src/test/scala/org/apache/sedona/viz/rdd/scalaTest.scala b/viz/src/test/scala/org/apache/sedona/viz/rdd/scalaTest.scala
index 54c9b07..592917d 100644
--- a/viz/src/test/scala/org/apache/sedona/viz/rdd/scalaTest.scala
+++ b/viz/src/test/scala/org/apache/sedona/viz/rdd/scalaTest.scala
@@ -164,7 +164,8 @@ class scalaTest extends FunSpec with BeforeAndAfterAll{
true
}
- it("should pass earth data hdf scatter plot") {
+ // Tests here have been ignored. A new feature that reads HDF will be added.
+ ignore("should pass earth data hdf scatter plot") {
val earthdataHDFPoint = new EarthdataHDFPointMapper(HDFIncrement, HDFOffset, HDFRootGroupName,
HDFDataVariableList, HDFDataVariableName, HDFswitchXY, urlPrefix)
val spatialRDD = new PointRDD(sparkContext, earthdataInputLocation, earthdataNumPartitions, earthdataHDFPoint, StorageLevel.MEMORY_ONLY)
diff --git a/zeppelin/index.js b/zeppelin/index.js
index 3ce5838..0de3c87 100644
--- a/zeppelin/index.js
+++ b/zeppelin/index.js
@@ -1,20 +1,29 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+/**
+ * Copyright 2019 - 2021 Jia Yu (jiayu@apache.org)
+ * Copyright 2017 Volume Integration
+ * Copyright 2017 Tom Grant
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
*/
import Visualization from 'zeppelin-vis'
import ColumnselectorTransformation from 'zeppelin-tabledata/columnselector'