Skip to content

Commit

Permalink
Updated the "locationtech" adapter implementation to use locationtech…
Browse files Browse the repository at this point in the history
… version 1.2.2, and generated a new output csv file "CrsTransformationAdapterProj4jLocationtech_version_1.2.2.csv" with lots of coordinate transformations created by this new version,

which can be compared (e.g. by using WinMerge) with the csv file from the previously used version i.e. the csv file "CrsTransformationAdapterProj4jLocationtech_version_1.1.4.csv"
(and there were no differences)
Also added a new dependency "proj4j-epsg" and updated the license text because of this new dependency.
Below is some text copied from https://github.com/locationtech/proj4j :
"Important! As of 1.2.2 version, proj4-core contains no EPSG Licensed files. In order to make proj4j properly operate, it makes sense to consider proj4-epsg dependency usage."

Some related "locationtech/proj4j" issues and pull requests:

"Proj4j should not use the Apache License if it contains the EPSG data set"
locationtech/proj4j#90

"Split projects into proj4j and proj4j-epsg"
locationtech/proj4j#92

"Move all core resources to epsg submodule"
locationtech/proj4j#95
  • Loading branch information
TomasJohansson committed Jan 5, 2023
1 parent 67157b2 commit d2b5d14
Show file tree
Hide file tree
Showing 5 changed files with 6,459 additions and 5 deletions.
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,9 @@ project(':crs-transformation-adapter-impl-proj4jlocationtech') {
dependencies {
api project(':crs-transformation-adapter-core')
// https://mvnrepository.com/artifact/org.locationtech.proj4j/proj4j/
implementation("org.locationtech.proj4j:proj4j:1.1.4")
implementation("org.locationtech.proj4j:proj4j:1.2.2")
// https://mvnrepository.com/artifact/org.locationtech.proj4j/proj4j-epsg
implementation("org.locationtech.proj4j:proj4j-epsg:1.2.2")
}
publishing {
publications {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
This adapter/facade library "Proj4jLocationtech" is licensed in the same way as the adaptee library itself as specified below.

The license for "locationtech/proj4j" is the Apache License, Version 2.0.
The licenses for "proj4j" and "proj4j-epsg" are the Apache License, Version 2.0,
and the "EPSG database distribution license" as specified below.
https://github.com/locationtech/proj4j/blob/master/LICENSE
https://repo1.maven.org/maven2/org/locationtech/proj4j/proj4j/1.1.1/proj4j-1.1.1.pom
https://github.com/locationtech/proj4j/blob/master/LICENSE.EPSG

The license for "org.locationtech.proj4j/proj4j" is the Apache License, Version 2.0.
https://repo1.maven.org/maven2/org/locationtech/proj4j/proj4j/1.2.2/proj4j-1.2.2.pom

The licenses for "org.locationtech.proj4j/proj4j-epsg" are as quoted below from the URL:
https://repo1.maven.org/maven2/org/locationtech/proj4j/proj4j-epsg/1.2.2/proj4j-epsg-1.2.2.pom
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
<license>
<name>EPSG database distribution license</name>
<url>https://raw.githubusercontent.com/locationtech/proj4j/master/LICENSE.EPSG</url>
</license>
</licenses>
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* to/from the coordinate system in the first EPSG column.
*/

@Disabled // you may want to temporary change this line if you want to run the "tests"
@Disabled // you may want to temporary change this line if you want to run the "tests"
// (and also see comments in the class TestCategory regarding that this "test" file creates files and produces output to the console)
// TODO modify the code in the below methods to make them only generate
// csv files if not already existing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void proj4jLocationtechAdapter_shouldMatchExpectedEnumAndJarfileNameWithVersion(
verifyExpectedEnumAndJarfileVersion(
new CrsTransformationAdapterProj4jLocationtech(),
CrsTransformationImplementationType.LEAF_PROJ4J_LOCATIONTECH,
"1.1.4" // "proj4j-1.1.4.jar"
"1.2.2" // "proj4j-1.2.2.jar"
);
}

Expand Down
Loading

0 comments on commit d2b5d14

Please sign in to comment.