Author: desruisseaux
Date: Wed Sep 29 10:00:12 2021
New Revision: 1893721
URL: http://svn.apache.org/viewvc?rev=1893721&view=rev
Log:
Update the links to EPSG web site and EPSG terms of use page (changed from
"http://www.epsg.org/TermsOfUse"; to "https://epsg.org/terms-of-use.html";).
Update the EPSG license file from revision "6 November 2014" to revision "8
April 2016". The only difference is a reference to annex F changed to annex A.
Above-cited differences are more easily viewed on the `LICENSE.txt` file; the
differences in `LICENSE.html` file contain also formatting changes.
Modified:
sis/data/non-free/sis-epsg/pom.xml
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/package-info.java
sis/data/non-free/sis-epsg/src/main/resources/META-INF/NOTICE
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/FKeys.sql
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/LICENSE.html
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/LICENSE.txt
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Tables.sql
Modified: sis/data/non-free/sis-epsg/pom.xml
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/pom.xml?rev=1893721&r1=1893720&r2=1893721&view=diff
==============================================================================
--- sis/data/non-free/sis-epsg/pom.xml (original)
+++ sis/data/non-free/sis-epsg/pom.xml Wed Sep 29 10:00:12 2021
@@ -38,19 +38,19 @@
<artifactId>sis-epsg</artifactId>
<name>EPSG dataset for Apache SIS</name>
- <url>http://www.epsg.org</url>
+ <url>https://www.epsg.org/</url>
<description>
The EPSG geodetic dataset provides definitions for thousands of Coordinate
Reference Systems (CRS),
together with parameter values for thousands of Coordinate Operations between
various pairs of CRS.
This 'sis-epsg' module contains the SQL scripts for creating a local copy of
EPSG geodetic dataset.
EPSG is maintained by the IOGP Surveying & Positioning Committee and
reproduced in this module
- with same content. See http://www.epsg.org/ for more information.
+ with same content. See https://www.epsg.org/ for more information.
</description>
<licenses>
<license>
<name>EPSG terms of use</name>
- <url>http://www.epsg.org/TermsOfUse</url>
+ <url>https://epsg.org/terms-of-use.html</url>
<distribution>manual</distribution>
</license>
<license>
Modified:
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java?rev=1893721&r1=1893720&r2=1893721&view=diff
==============================================================================
---
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java
[UTF-8] (original)
+++
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java
[UTF-8] Wed Sep 29 10:00:12 2021
@@ -28,7 +28,7 @@ import org.apache.sis.referencing.factor
/**
* Provides SQL scripts for creating a local copy of the EPSG geodetic dataset.
- * Provides also a copy of the <a href="http://www.epsg.org/TermsOfUse";>EPSG
terms of use</a>,
+ * Provides also a copy of the <a
href="https://epsg.org/terms-of-use.html";>EPSG terms of use</a>,
* which should be accepted by users before the EPSG dataset can be installed.
*
* <p><b>Notice</b></p>
@@ -40,7 +40,7 @@ import org.apache.sis.referencing.factor
* @version 0.8
* @since 0.7
*
- * @see <a href="http://www.epsg.org/";>http://www.epsg.org/</a>
+ * @see <a href="https://www.epsg.org/";>https://www.epsg.org/</a>
*/
public class ScriptProvider extends InstallationScriptProvider {
/**
@@ -59,7 +59,7 @@ public class ScriptProvider extends Inst
* @return the terms of use in plain text or HTML, or {@code null} if the
license is presumed already accepted.
* @throws IOException if an error occurred while reading the license file.
*
- * @see <a
href="http://www.epsg.org/TermsOfUse";>http://www.epsg.org/TermsOfUse</a>
+ * @see <a
href="https://epsg.org/terms-of-use.html";>https://epsg.org/terms-of-use.html</a>
*/
@Override
public String getLicense(final String authority, final Locale locale,
final String mimeType) throws IOException {
Modified:
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/package-info.java
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/package-info.java?rev=1893721&r1=1893720&r2=1893721&view=diff
==============================================================================
---
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/package-info.java
[UTF-8] (original)
+++
sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/package-info.java
[UTF-8] Wed Sep 29 10:00:12 2021
@@ -17,7 +17,7 @@
/**
* SQL scripts for EPSG geodetic data set installation.
- * The <a href="http://www.epsg.org/";>EPSG</a> geodetic dataset provides
definitions for thousands of
+ * The <a href="https://www.epsg.org/";>EPSG</a> geodetic dataset provides
definitions for thousands of
* {@linkplain org.opengis.referencing.crs.CoordinateReferenceSystem
Coordinate Reference Systems} (CRS),
* together with parameter values for thousands of {@linkplain
org.opengis.referencing.operation.ConcatenatedOperation
* Coordinate Operations} between various pairs of CRS. This {@code sis-epsg}
module contains the SQL scripts
@@ -26,7 +26,7 @@
* <p><b>Licensing</b></p>
* EPSG is maintained by the <a href="http://www.iogp.org/";>International
Association of Oil and Gas Producers</a>
* (IOGP) Surveying & Positioning Committee and is reproduced in this
module with identical content, but in a
- * more compact format. All SQL scripts in this module are subject to <a
href="http://www.epsg.org/TermsOfUse";>EPSG
+ * more compact format. All SQL scripts in this module are subject to <a
href="https://epsg.org/terms-of-use.html";>EPSG
* terms of use</a>. The remaining (Java code, configuration files) are under
Apache 2 license.
*
* @author Martin Desruisseaux (Geomatys)
Modified: sis/data/non-free/sis-epsg/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/resources/META-INF/NOTICE?rev=1893721&r1=1893720&r2=1893721&view=diff
==============================================================================
--- sis/data/non-free/sis-epsg/src/main/resources/META-INF/NOTICE [UTF-8]
(original)
+++ sis/data/non-free/sis-epsg/src/main/resources/META-INF/NOTICE [UTF-8] Wed
Sep 29 10:00:12 2021
@@ -7,4 +7,4 @@ The Apache Software Foundation (http://w
This product includes geodetic dataset maintained by the
International Association of Oil and Gas Producers (IOGP)
-http://www.epsg.org/
+https://www.epsg.org/
Modified:
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/FKeys.sql
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/FKeys.sql?rev=1893721&r1=1893720&r2=1893721&view=diff
==============================================================================
---
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/FKeys.sql
[UTF-8] (original)
+++
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/FKeys.sql
[UTF-8] Wed Sep 29 10:00:12 2021
@@ -1,6 +1,6 @@
---
--- Copyright International Association of Oil and Gas Producers (IOGP)
---- See http://www.epsg.org/TermsOfUse (a copy is in ./LICENSE.txt).
+--- See https://epsg.org/terms-of-use.html (a copy is in ./LICENSE.txt).
---
--- This file has been modified for the needs of Apache SIS project.
---
Modified:
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/LICENSE.html
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/LICENSE.html?rev=1893721&r1=1893720&r2=1893721&view=diff
==============================================================================
---
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/LICENSE.html
(original)
+++
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/LICENSE.html
Wed Sep 29 10:00:12 2021
@@ -4,10 +4,20 @@
<title>EPSG dataset terms of use</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <style>
+ body {
+ padding-left: 15px;
+ padding-right: 30px;
+ }
+ p, li {
+ text-align: justify;
+ }
+ </style>
</head>
<body>
- <h1>EPSG dataset terms of use (6 November 2014)</h1>
- <p><a
href="http://www.epsg.org/TermsOfUse";>http://www.epsg.org/TermsOfUse</a></p>
+ <h1>EPSG dataset terms of use</h1>
+ <p><a
href="https://epsg.org/terms-of-use.html";>https://epsg.org/terms-of-use.html</a>
+ â Revised 8 April 2016</p>
<ol>
<li><p>In this document the following definitions of terms apply:</p>
@@ -20,7 +30,7 @@
or through a downloadable MS-Access file or through a set of SQL
scripts that enable a
user to create an Oracle, MySQL, PostgreSQL or other database and
populate that database
with the EPSG Dataset) and associated documentation consisting of
the Release Notes and
- Guidance Notes 7.1 and 7.2</li>
+ Guidance Notes 7.1 and 7.2;</li>
<li>âthe dataâ means the geodetic parameter data and associated
metadata, contained in the
EPSG Dataset; it also refers to any subset of data from the EPSG
Dataset.</li>
</ul>
@@ -34,11 +44,10 @@
<li><p>In order to use the EPSG Facilities, you must agree to these
Terms of Use. You may not use
the EPSG Facilities or any of them in whole or in part unless you
agree to these Terms of Use.</p></li>
- <li><p>You can accept these Terms of Use by clicking the command button
âAccept Termsâ upon registering
- as a new user. You will also be required to accept any revised Terms of
Use prior to using or
- downloading any EPSG Facilities. You understand and agree that any use
of the EPSG Facilities
- or any of them, even if obtained without clicking acceptance, will be
acceptance of these Terms
- of Use.</p></li>
+ <li><p>You can accept these Terms of Use by clicking the command button
âAccept Termsâ upon registering as a new user.
+ You will also be required to accept any revised Terms of Use prior
to using or downloading any EPSG Facilities.
+ You understand and agree that any use of the EPSG Facilities or any
of them, even if obtained without clicking
+ acceptance, will be acceptance of these Terms of Use.</p></li>
<li><p>The data may be used, copied and distributed subject to the
following conditions:</p>
<ol type="i">
@@ -50,8 +59,8 @@
provide the EPSG Facilities of these Terms of Use.</p></li>
<li><p>DATA AND INFORMATION PROVIDED IN THE EPSG FACILITIES ARE
PROVIDED "AS IS" WITHOUT WARRANTY
- OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT
LIMITED TO THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR
PURPOSE.</p></li>
+ OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT
LIMITED TO THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR
PURPOSE.</p></li>
<li><p>The data may be included in any commercial package provided
that any commerciality is
based on value added by the provider and not on a value ascribed
to the EPSG Dataset
@@ -63,7 +72,7 @@
<li><p>Subsets of information may be extracted from the dataset.
Users are advised that
coordinate reference system and coordinate transformation
descriptions are incomplete
unless all elements detailed as essential in IOGP Surveying and
Positioning Guidance
- Note 7-1 annex F are included.</p></li>
+ Note 7-1 Annex A are included.</p></li>
<li><p>Essential elements should preferably be reproduced as
described in the dataset.
Modification of parameter values is permitted as described in
the table 1 to allow
Modified:
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/LICENSE.txt
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/LICENSE.txt?rev=1893721&r1=1893720&r2=1893721&view=diff
==============================================================================
---
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/LICENSE.txt
[UTF-8] (original)
+++
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/LICENSE.txt
[UTF-8] Wed Sep 29 10:00:12 2021
@@ -1,6 +1,6 @@
EPSG dataset terms of use
- Revised 6 November 2014
- http://www.epsg.org/TermsOfUse
+ Revised 8 April 2016
+ https://epsg.org/terms-of-use.html
@@ -17,7 +17,7 @@
or through a downloadable MS-Access file or through a set of SQL scripts
that enable a
user to create an Oracle, MySQL, PostgreSQL or other database and
populate that database
with the EPSG Dataset) and associated documentation consisting of the
Release Notes and
- Guidance Notes 7.1 and 7.2
+ Guidance Notes 7.1 and 7.2;
* “the data” means the geodetic parameter data and associated metadata,
contained in the
EPSG Dataset; it also refers to any subset of data from the EPSG Dataset.
@@ -60,7 +60,7 @@
v. Subsets of information may be extracted from the dataset. Users are
advised that
coordinate reference system and coordinate transformation
descriptions are incomplete
unless all elements detailed as essential in IOGP Surveying and
Positioning Guidance
- Note 7-1 annex F are included.
+ Note 7-1 Annex A are included.
vi. Essential elements should preferably be reproduced as described in
the dataset.
Modification of parameter values is permitted as described in the
table 1 to allow
Modified:
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Tables.sql
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Tables.sql?rev=1893721&r1=1893720&r2=1893721&view=diff
==============================================================================
---
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Tables.sql
[UTF-8] (original)
+++
sis/data/non-free/sis-epsg/src/main/resources/org/apache/sis/referencing/factory/sql/epsg/Tables.sql
[UTF-8] Wed Sep 29 10:00:12 2021
@@ -1,6 +1,6 @@
---
--- Copyright International Association of Oil and Gas Producers (IOGP)
---- See http://www.epsg.org/TermsOfUse (a copy is in ./LICENSE.txt).
+--- See https://epsg.org/terms-of-use.html (a copy is in ./LICENSE.txt).
---
--- This file has been modified for the needs of Apache SIS project.
--- See org.apache.sis.referencing.factory.sql.epsg.DataScriptFormatter
