diff --git a/build.gradle b/build.gradle index e48fa5a3..6ba81242 100644 --- a/build.gradle +++ b/build.gradle @@ -52,8 +52,9 @@ plugins { // The version number below ("ext.crsTransformationVersion") should be the same as in // the method 'CrsTransformationAdapterComposite.getVersionOfImplementationAdapteeLibrary()' -ext.snapshotSuffixOrEmpty = "-SNAPSHOT" // this value should be equal to "-SNAPSHOT" or "" (for a release) +ext.snapshotSuffixOrEmpty = ""//"-SNAPSHOT" // this value should be equal to "-SNAPSHOT" or "" (for a release) ext.crsTransformationGroupId = 'com.programmerare.crs-transformation' +// The below version number is used for all artifacts EXCEPT "crs-transformation-constants" which has a release number corresponding to the version number used by EPSG at http://www.epsg-registry.org ext.crsTransformationVersion = '1.1.0' + rootProject.snapshotSuffixOrEmpty // currently the above crsTransformationVersion number should be used in the method CrsTransformationAdapterComposite.getVersionOfImplementationAdapteeLibrary() // TODO: try to avoid the above mentioned duplication in CrsTransformationAdapterComposite @@ -129,21 +130,24 @@ subprojects { p-> } task dokkadocJar(type: Jar, dependsOn: dokkaJavadoc) { - classifier = 'javadoc' + classifier 'javadoc' from javadoc.destinationDir } task javadocTask(type: Javadoc) { - source = sourceSets.main.allJava + source = sourceSets.main.java } task javadocJar(type: Jar, dependsOn: javadocTask) { - classifier = 'javadoc' + classifier 'javadoc' from javadoc.destinationDir } - - task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource + + // https://docs.gradle.org/current/dsl/org.gradle.api.publish.maven.MavenPublication.html + // https://docs.gradle.org/current/dsl/org.gradle.api.tasks.bundling.Jar.html + task sourcesJar(type: Jar) { + from sourceSets.main.java + archiveClassifier = "sources" + includeEmptyDirs false } // https://solidsoft.wordpress.com/2014/11/13/gradle-tricks-display-dependencies-for-all-subprojects-in-multi-project-build/ @@ -510,8 +514,8 @@ project(':crs-transformation-adapter-test') { project(':crs-transformation-code-generation') { // command line execution examples: - // gradle generateClassesWithEpsgConstants --args="v9_5_4 epsg_version_9_5_4 dbUserName dbUserPassword java" - // gradle generateClassesWithEpsgConstants --args="v9_5_4 epsg_version_9_5_4 dbUserName dbUserPassword csv" + // gradle generateClassesWithEpsgConstants --args="v9_8_9 epsg_version_9_8_9 dbUserName dbUserPassword java" + // gradle generateClassesWithEpsgConstants --args="v9_8_9 epsg_version_9_8_9 dbUserName dbUserPassword csv" task generateClassesWithEpsgConstants(type:JavaExec) { main = project.hasProperty("mainClass") ? project.getProperty("mainClass") : "com.programmerare.crsCodeGeneration.constantsGenerator.ConstantClassGenerator" classpath = sourceSets.main.runtimeClasspath @@ -626,14 +630,21 @@ project(':crs-transformation-adapter-core') { } project(':crs-transformation-constants') { + sourceSets { + main { + java { + include "**/v9_8_9/*.java" + } + } + } publishing { publications { crstransformationsconstants(MavenPublication) { artifactId = 'crs-transformation-constants' - version = '9.5.4' + rootProject.snapshotSuffixOrEmpty + version = '9.8.9' + rootProject.snapshotSuffixOrEmpty from components.java artifact sourcesJar - artifact javadocJar // Only Java code in this project. No Kotlin. Therfore not using dokkadoc here + artifact javadocJar // Only Java code in this project. No Kotlin. Therefore not using dokkadoc here pom { // https://central.sonatype.org/pages/requirements.html // A common and acceptable practice for name is to assemble it from the coordinates using Maven properties: diff --git a/crs-transformation-adapter-impl-goober/src/main/kotlin/com/programmerare/crsTransformationAdapterGooberCTL/CrsTransformationAdapterGooberCTL.kt b/crs-transformation-adapter-impl-goober/src/main/kotlin/com/programmerare/crsTransformationAdapterGooberCTL/CrsTransformationAdapterGooberCTL.kt index 62cd4da5..8609e491 100644 --- a/crs-transformation-adapter-impl-goober/src/main/kotlin/com/programmerare/crsTransformationAdapterGooberCTL/CrsTransformationAdapterGooberCTL.kt +++ b/crs-transformation-adapter-impl-goober/src/main/kotlin/com/programmerare/crsTransformationAdapterGooberCTL/CrsTransformationAdapterGooberCTL.kt @@ -111,7 +111,7 @@ class CrsTransformationAdapterGooberCTL : CrsTransformationAdapterBaseLeaf(), Cr // then constants would definitely have been preferred, // but adding 20 constants for only one usage is not very motivated. // Another option would have been to reuse the already existing constants in the module "crs-transformation-constants" i.e. constants like this: - // com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber.SWEDEN__SWEREF99_TM__3006 + // com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber.SWEDEN__SWEREF99_TM__3006 // However, that would introduce a dependency to a module with LOTS OF constants just to use this few values below. // http://spatialreference.org/ref/?search=rt90 @@ -164,4 +164,4 @@ class CrsTransformationAdapterGooberCTL : CrsTransformationAdapterBaseLeaf(), Cr } // TODO: maybe more validation, for example validate coordinates to be reasonable i.e. within Sweden since this is an implementation with only coordinate systems used in Sweden } -} \ No newline at end of file +} diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/com/programmerare/testData/CoordinateTestDataGeneratedFromEpsgDatabaseTest.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/com/programmerare/testData/CoordinateTestDataGeneratedFromEpsgDatabaseTest.java index ebdc22ba..5022497d 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/com/programmerare/testData/CoordinateTestDataGeneratedFromEpsgDatabaseTest.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/com/programmerare/testData/CoordinateTestDataGeneratedFromEpsgDatabaseTest.java @@ -1,7 +1,7 @@ package com.programmerare.com.programmerare.testData; import com.google.common.io.Resources; // library "com.google.guava:guava" -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformationAdapterGeoPackageNGA.CrsTransformationAdapterGeoPackageNGA; import com.programmerare.crsTransformationAdapterGeoTools.CrsTransformationAdapterGeoTools; import com.programmerare.crsTransformationAdapterGooberCTL.CrsTransformationAdapterGooberCTL; diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/com/programmerare/testData/CoordinateTestDataGeneratedFromEpsgDatabaseTest2.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/com/programmerare/testData/CoordinateTestDataGeneratedFromEpsgDatabaseTest2.java index 9043e38c..6dcbad47 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/com/programmerare/testData/CoordinateTestDataGeneratedFromEpsgDatabaseTest2.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/com/programmerare/testData/CoordinateTestDataGeneratedFromEpsgDatabaseTest2.java @@ -1,6 +1,6 @@ package com.programmerare.com.programmerare.testData; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.*; import com.programmerare.crsTransformations.compositeTransformations.CrsTransformationAdapterComposite; import com.programmerare.crsTransformations.compositeTransformations.CrsTransformationAdapterCompositeFactory; @@ -724,4 +724,4 @@ public void write(int b) throws IOException { Coordinate(xEastingLongitude=3.186578287771716E-14, yNorthingLatitude=-74.99999999999775, crsIdentifier=CrsIdentifier(crsCode=EPSG:4326, isEpsgCode=true, epsgNumber=4326)) , com.programmerare.crsTransformationAdapterOrbisgisCTS.CrsTransformationAdapterOrbisgisCTS Coordinate(xEastingLongitude=3.186578287771716E-14, yNorthingLatitude=-75.00000000000007, crsIdentifier=CrsIdentifier(crsCode=EPSG:4326, isEpsgCode=true, epsgNumber=4326)) , com.programmerare.crsTransformationAdapterProj4J.CrsTransformationAdapterProj4J - */ \ No newline at end of file + */ diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformationAdapterOrbisgisCTS/CrsTransformationAdapterOrbisgisCtsTest.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformationAdapterOrbisgisCTS/CrsTransformationAdapterOrbisgisCtsTest.java index 6442bb8d..15dc6093 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformationAdapterOrbisgisCTS/CrsTransformationAdapterOrbisgisCtsTest.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformationAdapterOrbisgisCTS/CrsTransformationAdapterOrbisgisCtsTest.java @@ -1,6 +1,6 @@ package com.programmerare.crsTransformationAdapterOrbisgisCTS; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.coordinate.CrsCoordinate; import com.programmerare.crsTransformations.CrsTransformationResultStatistic; import com.programmerare.crsTransformations.CrsTransformationResult; @@ -32,4 +32,4 @@ void testingNAN() { // transformResult : Coordinate(xEastingLongitude=NaN, yNorthingLatitude=NaN, crsIdentifier=CrsIdentifier(crsCode=EPSG:2163, isEpsgCode=true, epsgNumber=2163)) } -} \ No newline at end of file +} diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterLeafFactoryTest.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterLeafFactoryTest.java index 27a9a422..8736f4a4 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterLeafFactoryTest.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterLeafFactoryTest.java @@ -1,6 +1,6 @@ package com.programmerare.crsTransformations; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformationAdapterGeoPackageNGA.CrsTransformationAdapterGeoPackageNGA; import com.programmerare.crsTransformationAdapterGeoTools.CrsTransformationAdapterGeoTools; import com.programmerare.crsTransformationAdapterGooberCTL.CrsTransformationAdapterGooberCTL; diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterParameterizedTests.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterParameterizedTests.java index c10ad03a..5aee5a10 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterParameterizedTests.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterParameterizedTests.java @@ -1,7 +1,7 @@ package com.programmerare.crsTransformations; import com.programmerare.com.programmerare.testData.TestCategory; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.coordinate.CrsCoordinate; import com.programmerare.crsTransformations.coordinate.CrsCoordinateFactory; import com.programmerare.crsTransformations.crsIdentifier.CrsIdentifier; diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterTest.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterTest.java index 99fe8243..20c4e2ae 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterTest.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationAdapterTest.java @@ -303,7 +303,7 @@ void isReliable_shouldReturnTrueForLeafs_whenUsingCriteriaNumberOfResultsOneAndM // it will be the Composite FirstSuccess which also will only have one result // and thus can be tested in the same way as the leafs in this method final CrsCoordinate wgs84coordinateInSweden = CrsCoordinateFactory.latLon(59.29,18.03); - final CrsTransformationResult resultWhenTransformingToSwedishCRS = crsTransformationAdapterLeaf.transform(wgs84coordinateInSweden, com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber.SWEDEN__SWEREF99_TM__3006); + final CrsTransformationResult resultWhenTransformingToSwedishCRS = crsTransformationAdapterLeaf.transform(wgs84coordinateInSweden, com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber.SWEDEN__SWEREF99_TM__3006); assertNotNull(resultWhenTransformingToSwedishCRS); assertTrue(resultWhenTransformingToSwedishCRS.isSuccess()); final CrsTransformationResultStatistic crsTransformationResultStatistic = resultWhenTransformingToSwedishCRS.getCrsTransformationResultStatistic(); @@ -349,7 +349,7 @@ void isReliable_shouldReturnTrueOrFalseForComposites_dependingOnCriteriasUsedAsM for (CrsTransformationAdapter crsTransformationAdapterComposite : crsTransformationAdapterImplementationsExpectingManyResults) { final CrsCoordinate wgs84coordinateInSweden = CrsCoordinateFactory.latLon(59.29,18.03); - final CrsTransformationResult resultWhenTransformingToSwedishCRS = crsTransformationAdapterComposite.transform(wgs84coordinateInSweden, com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber.SWEDEN__SWEREF99_TM__3006); + final CrsTransformationResult resultWhenTransformingToSwedishCRS = crsTransformationAdapterComposite.transform(wgs84coordinateInSweden, com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber.SWEDEN__SWEREF99_TM__3006); assertNotNull(resultWhenTransformingToSwedishCRS); assertTrue(resultWhenTransformingToSwedishCRS.isSuccess()); final CrsTransformationResultStatistic crsTransformationResultStatistic = resultWhenTransformingToSwedishCRS.getCrsTransformationResultStatistic(); diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationTestBase.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationTestBase.java index d7ae5214..4a795b3d 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationTestBase.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/CrsTransformationTestBase.java @@ -1,6 +1,6 @@ package com.programmerare.crsTransformations; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformationAdapterGeoPackageNGA.CrsTransformationAdapterGeoPackageNGA; import com.programmerare.crsTransformationAdapterGeoTools.CrsTransformationAdapterGeoTools; import com.programmerare.crsTransformationAdapterGooberCTL.CrsTransformationAdapterGooberCTL; diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForAverageValueTest.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForAverageValueTest.java index 49743ab6..9e46a430 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForAverageValueTest.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForAverageValueTest.java @@ -4,7 +4,7 @@ import com.programmerare.crsTransformations.coordinate.CrsCoordinate; import com.programmerare.crsTransformations.coordinate.CrsCoordinateFactory; import com.programmerare.crsTransformations.crsIdentifier.CrsIdentifier; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.CrsTransformationResult; import org.junit.jupiter.api.Test; diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForFirstSuccessTest.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForFirstSuccessTest.java index e4c4a79e..4d0844b7 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForFirstSuccessTest.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForFirstSuccessTest.java @@ -1,6 +1,6 @@ package com.programmerare.crsTransformations.compositeTransformations; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.coordinate.CrsCoordinate; import com.programmerare.crsTransformations.CrsTransformationAdapter; import com.programmerare.crsTransformations.CrsTransformationResult; diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForMedianValueTest.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForMedianValueTest.java index 10465e58..748f9406 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForMedianValueTest.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForMedianValueTest.java @@ -2,7 +2,7 @@ import com.programmerare.crsTransformations.coordinate.CrsCoordinate; import com.programmerare.crsTransformations.CrsTransformationAdapter; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.CrsTransformationResult; import com.programmerare.crsTransformations.coordinate.CrsCoordinateFactory; import com.programmerare.crsTransformations.utils.MedianValueUtility; @@ -45,4 +45,4 @@ private CrsCoordinate calculateMedianCoordinate(List coordinateRe return CrsCoordinateFactory.createFromXEastingLongitudeAndYNorthingLatitude(medianLongitude, medianLatitude, EpsgNumber.SWEDEN__SWEREF99_TM__3006); } -} \ No newline at end of file +} diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForWeightedAverageValueTest.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForWeightedAverageValueTest.java index 7dcff437..62696a5d 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForWeightedAverageValueTest.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyForWeightedAverageValueTest.java @@ -1,6 +1,6 @@ package com.programmerare.crsTransformations.compositeTransformations; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformationAdapterGeoPackageNGA.CrsTransformationAdapterGeoPackageNGA; import com.programmerare.crsTransformationAdapterGeoTools.CrsTransformationAdapterGeoTools; import com.programmerare.crsTransformationAdapterGooberCTL.CrsTransformationAdapterGooberCTL; diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyTestBase.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyTestBase.java index fa72629f..d9dd8255 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyTestBase.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyTestBase.java @@ -8,7 +8,7 @@ import com.programmerare.crsTransformationAdapterProj4jLocationtech.CrsTransformationAdapterProj4jLocationtech; import com.programmerare.crsTransformations.CrsTransformationAdapter; import com.programmerare.crsTransformations.coordinate.CrsCoordinate; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.coordinate.CrsCoordinateFactory; import org.junit.jupiter.api.BeforeAll; diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyTestsUsingTestDoubles.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyTestsUsingTestDoubles.java index f71615b3..0394b0b3 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyTestsUsingTestDoubles.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CompositeStrategyTestsUsingTestDoubles.java @@ -1,6 +1,6 @@ package com.programmerare.crsTransformations.compositeTransformations; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.*; import com.programmerare.crsTransformations.coordinate.CrsCoordinate; import com.programmerare.crsTransformations.coordinate.CrsCoordinateFactory; @@ -273,4 +273,4 @@ void simpleExampleShowingHowToUseTestStubbingWithMockito() { assertEquals("second", mockedList.get(1)); } // -------------------------------------------------------------- -} \ No newline at end of file +} diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CrsTransformationAdapterCompositeTest.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CrsTransformationAdapterCompositeTest.java index 6be21c02..fa4022d4 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CrsTransformationAdapterCompositeTest.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/compositeTransformations/CrsTransformationAdapterCompositeTest.java @@ -1,6 +1,6 @@ package com.programmerare.crsTransformations.compositeTransformations; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.coordinate.CrsCoordinate; import com.programmerare.crsTransformations.CrsTransformationResultStatistic; import com.programmerare.crsTransformations.CrsTransformationResult; diff --git a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/coordinate/CrsCoordinateTest.java b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/coordinate/CrsCoordinateTest.java index d4a0d69e..4da73e3b 100644 --- a/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/coordinate/CrsCoordinateTest.java +++ b/crs-transformation-adapter-test/src/test/java/com/programmerare/crsTransformations/coordinate/CrsCoordinateTest.java @@ -1,6 +1,6 @@ package com.programmerare.crsTransformations.coordinate; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.crsIdentifier.CrsIdentifier; import com.programmerare.crsTransformations.crsIdentifier.CrsIdentifierFactory; import org.junit.jupiter.api.Test; @@ -333,4 +333,4 @@ private void assertExceptionMessageForIllegalArgumentException(IllegalArgumentEx assertThat(actualEceptionMessage, containsString(expectedEceptionMessagePart1)); assertThat(actualEceptionMessage, containsString(expectedEceptionMessagePart2)); } -} \ No newline at end of file +} diff --git a/crs-transformation-adapter-test/src/test/kotlin/com/programmerare/crsConstants/ConstantsGeneratedTest.kt b/crs-transformation-adapter-test/src/test/kotlin/com/programmerare/crsConstants/ConstantsGeneratedTest.kt index 82f73d32..1b71c658 100644 --- a/crs-transformation-adapter-test/src/test/kotlin/com/programmerare/crsConstants/ConstantsGeneratedTest.kt +++ b/crs-transformation-adapter-test/src/test/kotlin/com/programmerare/crsConstants/ConstantsGeneratedTest.kt @@ -9,15 +9,15 @@ class ConstantsGeneratedTest { fun constantNumberTest() { // Note that the package names below are different (the part beginning with "constantsBy") val list = listOf( -// com.programmerare.crsConstants.constantsByNumberNameArea.v9_5_4.EpsgNumber._3006__SWEREF99_TM__SWEDEN, -// com.programmerare.crsConstants.constantsByNumberAreaName.v9_5_4.EpsgNumber._3006__SWEDEN__SWEREF99_TM, +// com.programmerare.crsConstants.constantsByNumberNameArea.v9_8_9.EpsgNumber._3006__SWEREF99_TM__SWEDEN, +// com.programmerare.crsConstants.constantsByNumberAreaName.v9_8_9.EpsgNumber._3006__SWEDEN__SWEREF99_TM, - com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber.SWEDEN__SWEREF99_TM__3006, + com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber.SWEDEN__SWEREF99_TM__3006, 3006 -// com.programmerare.crsConstants.constantsByAreaNumberName.v9_5_4.EpsgNumber.SWEDEN__3006__SWEREF99_TM, +// com.programmerare.crsConstants.constantsByAreaNumberName.v9_8_9.EpsgNumber.SWEDEN__3006__SWEREF99_TM, -// com.programmerare.crsConstants.constantsByNameAreaNumber.v9_5_4.EpsgNumber.SWEREF99_TM__SWEDEN__3006, -// com.programmerare.crsConstants.constantsByNameNumberArea.v9_5_4.EpsgNumber.SWEREF99_TM__3006__SWEDEN +// com.programmerare.crsConstants.constantsByNameAreaNumber.v9_8_9.EpsgNumber.SWEREF99_TM__SWEDEN__3006, +// com.programmerare.crsConstants.constantsByNameNumberArea.v9_8_9.EpsgNumber.SWEREF99_TM__3006__SWEDEN ) assertAllElementsAreEqual(list) } @@ -25,14 +25,14 @@ class ConstantsGeneratedTest { // @Test // fun constantStringTest() { // val list = listOf( -// com.programmerare.crsConstants.constantsByNumberNameArea.v9_5_4.EpsgCode._3006__SWEREF99_TM__SWEDEN, -// com.programmerare.crsConstants.constantsByNumberAreaName.v9_5_4.EpsgCode._3006__SWEDEN__SWEREF99_TM, +// com.programmerare.crsConstants.constantsByNumberNameArea.v9_8_9.EpsgCode._3006__SWEREF99_TM__SWEDEN, +// com.programmerare.crsConstants.constantsByNumberAreaName.v9_8_9.EpsgCode._3006__SWEDEN__SWEREF99_TM, - // com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgCode.SWEDEN__SWEREF99_TM__3006 -// com.programmerare.crsConstants.constantsByAreaNumberName.v9_5_4.EpsgCode.SWEDEN__3006__SWEREF99_TM, + // com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgCode.SWEDEN__SWEREF99_TM__3006 +// com.programmerare.crsConstants.constantsByAreaNumberName.v9_8_9.EpsgCode.SWEDEN__3006__SWEREF99_TM, -// com.programmerare.crsConstants.constantsByNameAreaNumber.v9_5_4.EpsgCode.SWEREF99_TM__SWEDEN__3006, -// com.programmerare.crsConstants.constantsByNameNumberArea.v9_5_4.EpsgCode.SWEREF99_TM__3006__SWEDEN +// com.programmerare.crsConstants.constantsByNameAreaNumber.v9_8_9.EpsgCode.SWEREF99_TM__SWEDEN__3006, +// com.programmerare.crsConstants.constantsByNameNumberArea.v9_8_9.EpsgCode.SWEREF99_TM__3006__SWEDEN // ) // assertAllElementsAreEqual(list) // } @@ -46,4 +46,4 @@ class ConstantsGeneratedTest { ) } } -} \ No newline at end of file +} diff --git a/crs-transformation-code-generation/src/main/kotlin/com/programmerare/crsCodeGeneration/utils/JavaPackageToCSharpeNamespaceConverter.kt b/crs-transformation-code-generation/src/main/kotlin/com/programmerare/crsCodeGeneration/utils/JavaPackageToCSharpeNamespaceConverter.kt index 8f635161..1537c6a1 100644 --- a/crs-transformation-code-generation/src/main/kotlin/com/programmerare/crsCodeGeneration/utils/JavaPackageToCSharpeNamespaceConverter.kt +++ b/crs-transformation-code-generation/src/main/kotlin/com/programmerare/crsCodeGeneration/utils/JavaPackageToCSharpeNamespaceConverter.kt @@ -5,8 +5,8 @@ object JavaPackageToCSharpeNamespaceConverter { private val regexMatchingVersionPart = Regex("""v[_\d]+""") /** - * @param nameOfJavaPackage e.g. "com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4" - * @return something like "Programmerare.CrsConstants.ConstantsByAreaNameNumber.v9_5_4" + * @param nameOfJavaPackage e.g. "com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9" + * @return something like "Programmerare.CrsConstants.ConstantsByAreaNameNumber.v9_8_9" */ fun getAsNameOfCSharpeNameSpace(nameOfJavaPackage: String): String { val parts = nameOfJavaPackage.split('.') diff --git a/crs-transformation-code-generation/src/test/kotlin/com/programmerare/crsCodeGeneration/utils/JavaPackageToCSharpeNamespaceConverterTest.kt b/crs-transformation-code-generation/src/test/kotlin/com/programmerare/crsCodeGeneration/utils/JavaPackageToCSharpeNamespaceConverterTest.kt index 77c3ff8c..ec72976c 100644 --- a/crs-transformation-code-generation/src/test/kotlin/com/programmerare/crsCodeGeneration/utils/JavaPackageToCSharpeNamespaceConverterTest.kt +++ b/crs-transformation-code-generation/src/test/kotlin/com/programmerare/crsCodeGeneration/utils/JavaPackageToCSharpeNamespaceConverterTest.kt @@ -7,10 +7,10 @@ internal class JavaPackageToCSharpeNamespaceConverterTest { @Test fun getAsNameOfCSharpeNameSpace() { assertEquals( - "Programmerare.CrsConstants.ConstantsByAreaNameNumber.v9_5_4", + "Programmerare.CrsConstants.ConstantsByAreaNameNumber.v9_8_9", JavaPackageToCSharpeNamespaceConverter.getAsNameOfCSharpeNameSpace( - "com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4" + "com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9" ) ) } -} \ No newline at end of file +} diff --git a/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_5_4/EpsgNumber.java b/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_5_4/EpsgNumber.java index ebf6fadb..d8e1529b 100644 --- a/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_5_4/EpsgNumber.java +++ b/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_5_4/EpsgNumber.java @@ -16,6 +16,15 @@ * Distribution for profit is forbidden ... * Ownership of the EPSG Dataset by IOGP must be acknowledged... " */ + +// The below comments row (and the annotation 'Deprecated') above the class are manually written. +// The rest of this file has been generated. +// This class should be considered as deprecated since at least one more recent version has been published. +// https://search.maven.org/artifact/com.programmerare.crs-transformation/crs-transformation-constants +// https://mvnrepository.com/artifact/com.programmerare.crs-transformation/crs-transformation-constants +// Please also note that the EPSG version number (from www.epsg-registry.org) is reflected in the package name, for example as the below row illustrates with version 9.8.9: +// package com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9; +@Deprecated public class EpsgNumber { /** @@ -40415,4 +40424,4 @@ public class EpsgNumber { * https://epsg.io/5859 */ public final static int _ENTER_HERE_APPLICABLE_EXTENT__ENTER_HERE_NAME_OF__I__J_90__BIN_GRID__5859 = 5859; -} \ No newline at end of file +} diff --git a/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_6/EpsgNumber.java b/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_6/EpsgNumber.java index 176e246d..527c25f2 100644 --- a/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_6/EpsgNumber.java +++ b/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_6/EpsgNumber.java @@ -16,6 +16,18 @@ * Distribution for profit is forbidden ... * Ownership of the EPSG Dataset by IOGP must be acknowledged... " */ + +// The below comments row (and the annotation 'Deprecated') above the class are manually written. +// The rest of this file has been generated. +// This class should not been used. Consider it as deprecated. +// In fact, this version 9.6 have never even been published as a binary release to SSRH (a.k.a. "Maven Central"). +// So, if you for some reason are using the source code in this class with constants, you should +// rather consider to use a version which is more recent and published, for example version 9.8.9. +// https://search.maven.org/artifact/com.programmerare.crs-transformation/crs-transformation-constants +// https://mvnrepository.com/artifact/com.programmerare.crs-transformation/crs-transformation-constants +// Please also note that the EPSG version number (from www.epsg-registry.org) is reflected in the package name, for example as the below row illustrates with version 9.8.9: +// package com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9; +@Deprecated public class EpsgNumber { /** @@ -40451,4 +40463,4 @@ public class EpsgNumber { * https://epsg.io/5859 */ public final static int _ENTER_HERE_APPLICABLE_EXTENT__ENTER_HERE_NAME_OF__I__J_90__BIN_GRID__5859 = 5859; -} \ No newline at end of file +} diff --git a/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_6_3/EpsgNumber.java b/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_6_3/EpsgNumber.java index f353ef8c..05cd8288 100644 --- a/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_6_3/EpsgNumber.java +++ b/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_6_3/EpsgNumber.java @@ -16,6 +16,18 @@ * Distribution for profit is forbidden ... * Ownership of the EPSG Dataset by IOGP must be acknowledged... " */ + +// The below comments row (and the annotation 'Deprecated') above the class are manually written. +// The rest of this file has been generated. +// This class should not been used. Consider it as deprecated. +// In fact, this version 9.6.3 have never even been published as a binary release to SSRH (a.k.a. "Maven Central"). +// So, if you for some reason are using the source code in this class with constants, you should +// rather consider to use a version which is more recent and published, for example version 9.8.9. +// https://search.maven.org/artifact/com.programmerare.crs-transformation/crs-transformation-constants +// https://mvnrepository.com/artifact/com.programmerare.crs-transformation/crs-transformation-constants +// Please also note that the EPSG version number (from www.epsg-registry.org) is reflected in the package name, for example as the below row illustrates with version 9.8.9: +// package com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9; +@Deprecated public class EpsgNumber { /** @@ -40733,4 +40745,4 @@ public class EpsgNumber { * https://epsg.io/5859 */ public final static int _ENTER_HERE_APPLICABLE_EXTENT__ENTER_HERE_NAME_OF__I__J_90__BIN_GRID__5859 = 5859; -} \ No newline at end of file +} diff --git a/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_7/EpsgNumber.java b/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_7/EpsgNumber.java index d58e314c..80abf868 100644 --- a/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_7/EpsgNumber.java +++ b/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_7/EpsgNumber.java @@ -16,6 +16,18 @@ * Distribution for profit is forbidden ... * Ownership of the EPSG Dataset by IOGP must be acknowledged... " */ + +// The below comments row (and the annotation 'Deprecated') above the class are manually written. +// The rest of this file has been generated. +// This class should not been used. Consider it as deprecated. +// In fact, this version 9.7 have never even been published as a binary release to SSRH (a.k.a. "Maven Central"). +// So, if you for some reason are using the source code in this class with constants, you should +// rather consider to use a version which is more recent and published, for example version 9.8.9. +// https://search.maven.org/artifact/com.programmerare.crs-transformation/crs-transformation-constants +// https://mvnrepository.com/artifact/com.programmerare.crs-transformation/crs-transformation-constants +// Please also note that the EPSG version number (from www.epsg-registry.org) is reflected in the package name, for example as the below row illustrates with version 9.8.9: +// package com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9; +@Deprecated public class EpsgNumber { /** @@ -41165,4 +41177,4 @@ public class EpsgNumber { * https://epsg.io/5859 */ public final static int _ENTER_HERE_APPLICABLE_EXTENT__ENTER_HERE_NAME_OF__I__J_90__BIN_GRID__5859 = 5859; -} \ No newline at end of file +} diff --git a/docs/README.md b/docs/README.md index 2cb96a2f..e2a1606a 100644 --- a/docs/README.md +++ b/docs/README.md @@ -175,7 +175,7 @@ The following seven artifacts from this code project have been released/distribu * crs-transformation-adapter-*impl*-**goober** (version 1.0.0, only used for Swedish CRS, see comment below) * crs-transformation-*constants* - (version **9.5.4**) + (version **9.8.9**) The five above libraries which includes "*impl*" in the name are adapter implementations of the above "*core*" library. Those five adapters are using the five adaptee libraries for the coordinate transformations. @@ -188,7 +188,7 @@ The above artifact "crs-transformation-*constants*" is actually totally independ It is not depending on anything and nothing depends on it. It is a **Java** library (i.e. not even depending on Kotlin) with only one class with a lot of Java constants. (the other six artifacts/libraries are implemented with Kotlin and thus have an implicit dependency to a Kotlin artifact) -The constant class has been generated from the [EPSG database](http://www.epsg-registry.org) version 9.5.4 which is the reason for the version number. +The constant class has been generated from the [EPSG database](http://www.epsg-registry.org) version 9.8.9 which is the reason for the version number. # Gradle configuration The "core" library is not necessary to include since there is an implicit/transitive dependency from all the "impl" libraries to the "core". @@ -217,7 +217,7 @@ dependencies { implementation "com.programmerare.crs-transformation:crs-transformation-adapter-impl-geotools:1.0.0" // include the above geotools repository implementation "com.programmerare.crs-transformation:crs-transformation-adapter-impl-goober:1.0.0" // only swedish CRS - implementation "com.programmerare.crs-transformation:crs-transformation-constants:9.5.4" // only one class with constants + implementation "com.programmerare.crs-transformation:crs-transformation-constants:9.8.9" // only one class with constants ... } ``` @@ -271,7 +271,7 @@ pom.xml com.programmerare.crs-transformation crs-transformation-constants - 9.5.4 + 9.8.9 ... @@ -304,7 +304,7 @@ fun main(args: Array) { val epsgSweRef = 3006 // alternative to the above hardcoding: use the library "crs-transformation-constants" // and constants EpsgNumber.WORLD__WGS_84__4326 and EpsgNumber.SWEDEN__SWEREF99_TM__3006 - // from the Java class com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber + // from the Java class com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber val centralStockholmWgs84 = latLon(59.330231, 18.059196, epsgWgs84) @@ -338,7 +338,7 @@ public class SmallJavaExample { final int epsgSweRef = 3006; // alternative to the above hardcoding: use the library "crs-transformation-constants" // and constants EpsgNumber.WORLD__WGS_84__4326 and EpsgNumber.SWEDEN__SWEREF99_TM__3006 - // from the class com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber + // from the class com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber CrsCoordinate centralStockholmWgs84 = CrsCoordinateFactory.latLon(59.330231, 18.059196, epsgWgs84); @@ -360,7 +360,7 @@ public class SmallJavaExample { Another Java example with some more code and comments: ```java import java.util.List; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.CrsTransformationAdapteeType; import com.programmerare.crsTransformations.CrsTransformationAdapter; import com.programmerare.crsTransformations.CrsTransformationResult; @@ -526,7 +526,8 @@ Screenshots from Intellij IDEA when using intellisense/autocompletion with the c ![epsg_dropdown_usa](images/epsg_dropdown_usa.png) ![epsg_dropdown_sweden](images/epsg_dropdown_sweden.png) -Some examples of constant names in the Java class [com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber](https://github.com/TomasJohansson/crsTransformations/blob/master/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_5_4/EpsgNumber.java): +Some examples of constant names in the Java class [com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber](https://github.com/TomasJohansson/crsTransformations/blob/master/crs-transformation-constants/src/main/java/com/programmerare/crsConstants/constantsByAreaNameNumber/v9_5_4/EpsgNumber.java): +(but please note that version 9.5.4 is **not** the [latest published version of "crs-transformation-constants"](https://mvnrepository.com/artifact/com.programmerare.crs-transformation/crs-transformation-constants)) ```java WORLD__WGS_84__4326 WORLD__85_S_TO_85_N__WGS_84__PSEUDO_MERCATOR__3857 diff --git a/sample_code/groovy/build.gradle b/sample_code/groovy/build.gradle index 79bcd002..34c1999c 100644 --- a/sample_code/groovy/build.gradle +++ b/sample_code/groovy/build.gradle @@ -27,7 +27,7 @@ dependencies { // Use the latest Groovy version for building this library implementation 'org.codehaus.groovy:groovy-all:2.5.10' - implementation 'com.programmerare.crs-transformation:crs-transformation-constants:9.5.4' + implementation 'com.programmerare.crs-transformation:crs-transformation-constants:9.8.9' // The above "crs-transformation-constants" is a Java library // while the below "crs-transformation-adapter-*" are Kotlin libraries implementation 'com.programmerare.crs-transformation:crs-transformation-adapter-core:1.0.0' diff --git a/sample_code/groovy/src/main/groovy/groovy_sample/CrsTransformation.groovy b/sample_code/groovy/src/main/groovy/groovy_sample/CrsTransformation.groovy index bd9b17bb..32fc2b52 100644 --- a/sample_code/groovy/src/main/groovy/groovy_sample/CrsTransformation.groovy +++ b/sample_code/groovy/src/main/groovy/groovy_sample/CrsTransformation.groovy @@ -1,7 +1,7 @@ package groovy_sample // the package below is from the Java library "crs-transformation-constants" -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber // the other "com.programmerare" imports below are from Kotlin libraries ( artifactId's starting with "crs-transformation-adapter-" , https://mvnrepository.com/artifact/com.programmerare.crs-transformation ) import com.programmerare.crsTransformations.coordinate.CrsCoordinateFactory diff --git a/sample_code/groovy/src/test/groovy/groovy_sample/CrsTransformationTest.groovy b/sample_code/groovy/src/test/groovy/groovy_sample/CrsTransformationTest.groovy index 1906a157..92e1fcfb 100644 --- a/sample_code/groovy/src/test/groovy/groovy_sample/CrsTransformationTest.groovy +++ b/sample_code/groovy/src/test/groovy/groovy_sample/CrsTransformationTest.groovy @@ -2,7 +2,7 @@ package groovy_sample import spock.lang.Shared import spock.lang.Specification -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber import com.programmerare.crsTransformations.coordinate.CrsCoordinateFactory class CrsTransformationTest extends Specification { diff --git a/sample_code/ivy_dependencies/ivy.xml b/sample_code/ivy_dependencies/ivy.xml index 444d124e..4293097b 100644 --- a/sample_code/ivy_dependencies/ivy.xml +++ b/sample_code/ivy_dependencies/ivy.xml @@ -7,17 +7,17 @@ - + - + - \ No newline at end of file + diff --git a/sample_code/java/build.gradle b/sample_code/java/build.gradle index b87a7881..1b443f05 100644 --- a/sample_code/java/build.gradle +++ b/sample_code/java/build.gradle @@ -34,7 +34,7 @@ dependencies { // This dependency is used by the application. implementation 'com.google.guava:guava:28.2-jre' - implementation 'com.programmerare.crs-transformation:crs-transformation-constants:9.5.4' + implementation 'com.programmerare.crs-transformation:crs-transformation-constants:9.8.9' implementation 'com.programmerare.crs-transformation:crs-transformation-adapter-core:1.0.0' implementation 'com.programmerare.crs-transformation:crs-transformation-adapter-impl-proj4j:1.0.0' implementation 'com.programmerare.crs-transformation:crs-transformation-adapter-impl-orbisgis:1.0.0' diff --git a/sample_code/java/pom.xml b/sample_code/java/pom.xml index 8a0060ca..a41a39ec 100644 --- a/sample_code/java/pom.xml +++ b/sample_code/java/pom.xml @@ -23,7 +23,7 @@ com.programmerare.crs-transformation crs-transformation-constants - 9.5.4 + 9.8.9 diff --git a/sample_code/java/src/main/java/java_sample/CrsTransformation.java b/sample_code/java/src/main/java/java_sample/CrsTransformation.java index 4658ebd6..1b92ba06 100644 --- a/sample_code/java/src/main/java/java_sample/CrsTransformation.java +++ b/sample_code/java/src/main/java/java_sample/CrsTransformation.java @@ -1,6 +1,6 @@ package java_sample; -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber; +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber; import com.programmerare.crsTransformations.coordinate.CrsCoordinate; import com.programmerare.crsTransformations.coordinate.CrsCoordinateFactory; import com.programmerare.crsTransformations.crsIdentifier.CrsIdentifier; diff --git a/sample_code/jruby/CrsTransformation.rb b/sample_code/jruby/CrsTransformation.rb index 455c46dd..caeaece9 100644 --- a/sample_code/jruby/CrsTransformation.rb +++ b/sample_code/jruby/CrsTransformation.rb @@ -14,9 +14,9 @@ # cd sample_code/jruby # jruby CrsTransformation.rb -# "crs-transformation-constants-9.5.4.jar" is one of the jar files that are "required" above +# "crs-transformation-constants-9.8.9.jar" is one of the jar files that are "required" above # in the above "each" iteration. That jar file contains the below imported class "EpsgNumber" -java_import "com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber" +java_import "com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber" java_import "com.programmerare.crsTransformations.coordinate.CrsCoordinateFactory" java_import "com.programmerare.crsTransformations.crsIdentifier.CrsIdentifierFactory" @@ -97,4 +97,4 @@ def transform( if __FILE__ == $0 # "__FILE__ is the magic variable that contains the name of the current file." https://www.ruby-lang.org/en/documentation/quickstart/4/ crsTransformation = CrsTransformation.new crsTransformation.main() -end \ No newline at end of file +end diff --git a/sample_code/jython/CrsTransformation.py b/sample_code/jython/CrsTransformation.py index 76d24a4a..2402522e 100644 --- a/sample_code/jython/CrsTransformation.py +++ b/sample_code/jython/CrsTransformation.py @@ -14,9 +14,9 @@ # cd sample_code/jython # jython CrsTransformation.py -# "crs-transformation-constants-9.5.4.jar" is one of the jar files that are appended to the path above +# "crs-transformation-constants-9.8.9.jar" is one of the jar files that are appended to the path above # in the above iteration. That jar file contains the below imported class "EpsgNumber" -from com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4 import EpsgNumber +from com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9 import EpsgNumber from com.programmerare.crsTransformations.coordinate import CrsCoordinateFactory from com.programmerare.crsTransformations.crsIdentifier import CrsIdentifierFactory diff --git a/sample_code/kotlin/build.gradle b/sample_code/kotlin/build.gradle index ea597b6c..4cdf4fc8 100644 --- a/sample_code/kotlin/build.gradle +++ b/sample_code/kotlin/build.gradle @@ -28,7 +28,7 @@ dependencies { // Use the Kotlin JDK 8 standard library. implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' - implementation 'com.programmerare.crs-transformation:crs-transformation-constants:9.5.4' + implementation 'com.programmerare.crs-transformation:crs-transformation-constants:9.8.9' implementation 'com.programmerare.crs-transformation:crs-transformation-adapter-core:1.0.0' implementation 'com.programmerare.crs-transformation:crs-transformation-adapter-impl-proj4j:1.0.0' implementation 'com.programmerare.crs-transformation:crs-transformation-adapter-impl-orbisgis:1.0.0' diff --git a/sample_code/kotlin/src/main/kotlin/kotlin_sample/CrsTransformation.kt b/sample_code/kotlin/src/main/kotlin/kotlin_sample/CrsTransformation.kt index 648fa84a..1387c3a6 100644 --- a/sample_code/kotlin/src/main/kotlin/kotlin_sample/CrsTransformation.kt +++ b/sample_code/kotlin/src/main/kotlin/kotlin_sample/CrsTransformation.kt @@ -1,6 +1,6 @@ package kotlin_sample -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber import com.programmerare.crsTransformations.coordinate.CrsCoordinate import com.programmerare.crsTransformations.coordinate.latLon import com.programmerare.crsTransformations.crsIdentifier.createFromEpsgNumber diff --git a/sample_code/scala/build.sbt b/sample_code/scala/build.sbt index 59ffa605..578d6e97 100644 --- a/sample_code/scala/build.sbt +++ b/sample_code/scala/build.sbt @@ -12,7 +12,7 @@ libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.1" % "test" // https://mvnrepository.com/artifact/com.programmerare.crs-transformation/crs-transformation-constants -libraryDependencies += "com.programmerare.crs-transformation" % "crs-transformation-constants" % "9.5.4" +libraryDependencies += "com.programmerare.crs-transformation" % "crs-transformation-constants" % "9.8.9" // https://mvnrepository.com/artifact/com.programmerare.crs-transformation/crs-transformation-adapter-core diff --git a/sample_code/scala/src/main/scala/sample/CrsTransformation.scala b/sample_code/scala/src/main/scala/sample/CrsTransformation.scala index f2935cdf..faa18516 100644 --- a/sample_code/scala/src/main/scala/sample/CrsTransformation.scala +++ b/sample_code/scala/src/main/scala/sample/CrsTransformation.scala @@ -1,7 +1,7 @@ package sample // the package below is from the Java library "crs-transformation-constants" -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber // the other "com.programmerare" packages below are from Kotlin libraries ( artifactId's starting with "crs-transformation-adapter-" , https://mvnrepository.com/artifact/com.programmerare.crs-transformation ) import com.programmerare.crsTransformations.coordinate.{CrsCoordinate, CrsCoordinateFactory} @@ -49,9 +49,6 @@ object CrsTransformation { // COMPOSITE_AVERAGE : X / Y ===> 674032.3572312444 / 6580821.991747889 // COMPOSITE_FIRST_SUCCESS : X / Y ===> 674032.357 / 6580821.991 // COMPOSITE_WEIGHTED_AVERAGE : X / Y ===> 674032.3571927036 / 6580821.991623241 - - Process finished with exit code 0 - } private lazy val inputCoordinate = CrsCoordinateFactory.latLon(59.330231, 18.059196) // Implicit/Default CrsIdentifier for latitude/longitude: EpsgNumber.WORLD__WGS_84__4326 diff --git a/sample_code/scala/src/test/scala/sample/CrsTransformationTest.scala b/sample_code/scala/src/test/scala/sample/CrsTransformationTest.scala index 8b9efdb6..0bd60d83 100644 --- a/sample_code/scala/src/test/scala/sample/CrsTransformationTest.scala +++ b/sample_code/scala/src/test/scala/sample/CrsTransformationTest.scala @@ -4,7 +4,7 @@ import org.scalatest.matchers.should.Matchers._ import org.scalatest.funsuite.AnyFunSuite // the import below is from the Java library "crs-transformation-constants" -import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_5_4.EpsgNumber +import com.programmerare.crsConstants.constantsByAreaNameNumber.v9_8_9.EpsgNumber // the three imports below are from the core Kotlin library "crs-transformation-adapter-core" import com.programmerare.crsTransformations.coordinate.CrsCoordinate