sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This include the addition of GeodesicCalculator.
Date Fri, 24 May 2019 10:36:31 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 803ee36aa407641d4c1e4fe265f8e3c6e744ce2b
Merge: 3ae456a 17cdbf7
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Fri May 24 12:23:15 2019 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1. This include the addition of GeodesicCalculator.

 .../org/apache/sis/console/TransformCommand.java   |   2 +-
 .../org/apache/sis/openoffice/Transformer.java     |   2 +-
 .../org/apache/sis/services/LocationServlet.java   |  27 +-
 .../sis/referencing/gazetteer/LocationFormat.java  |   2 +-
 .../sis/referencing/gazetteer/SimpleLocation.java  |   2 +-
 core/sis-referencing/pom.xml                       |   5 +
 .../org/apache/sis/distance/DistanceUtils.java     |  13 +-
 .../org/apache/sis/distance/LatLonPointRadius.java |  64 +-
 .../org/apache/sis/geometry/CoordinateFormat.java  | 199 ++++-
 .../java/org/apache/sis/geometry/Shapes2D.java     |   2 +-
 .../apache/sis/internal/referencing/Formulas.java  |  43 +-
 .../referencing/GeodeticObjectBuilder.java         |  57 ++
 .../internal/referencing/PositionTransformer.java  | 268 ++++++
 .../internal/referencing/ReferencingUtilities.java | 106 ++-
 .../apache/sis/internal/referencing/Resources.java |  10 +
 .../sis/internal/referencing/Resources.properties  |   2 +
 .../internal/referencing/Resources_fr.properties   |   2 +
 .../internal/referencing/ServicesForMetadata.java  |   4 +-
 .../sis/internal/referencing/j2d/Bezier.java       | 469 ++++++++++
 .../internal/referencing/j2d/ShapeUtilities.java   |  15 +-
 .../main/java/org/apache/sis/referencing/CRS.java  |   4 +-
 .../apache/sis/referencing/GeodeticCalculator.java | 973 +++++++++++++++++++++
 .../factory/GeodeticAuthorityFactory.java          |   8 +-
 .../operation/projection/ConformalProjection.java  |  51 +-
 .../projection/LambertConicConformal.java          |  23 +-
 .../referencing/operation/projection/Mercator.java |   6 +-
 .../operation/projection/ObliqueMercator.java      |  10 +-
 .../operation/projection/PolarStereographic.java   |   6 +-
 .../apache/sis/geometry/CoordinateFormatTest.java  |  15 +
 .../referencing/ReferencingUtilitiesTest.java      |   6 +-
 .../referencing/j2d/ShapeUtilitiesExt.java         | 150 ++++
 .../referencing/j2d/ShapeUtilitiesTest.java        |  81 +-
 .../referencing/j2d/ShapeUtilitiesViewer.java      |  47 +-
 .../sis/referencing/GeodeticCalculatorTest.java    | 475 ++++++++++
 .../projection/ConformalProjectionTest.java        |  72 +-
 .../projection/MercatorMethodComparison.java       |  10 +-
 .../sis/test/suite/ReferencingTestSuite.java       |   3 +-
 .../org/apache/sis/test/widget/ShapeViewer.java    |  90 ++
 .../apache/sis/test/widget/SwingAssertions.java    |  80 ++
 .../org/apache/sis/test/widget/VisualCheck.java    |  81 ++
 .../org/apache/sis/test/widget/package-info.java   |  40 +
 .../apache/sis/internal/system/DataDirectory.java  |  18 +-
 .../org/apache/sis/internal/util/Numerics.java     |  15 +
 .../java/org/apache/sis/measure/AngleFormat.java   |  73 +-
 .../org/apache/sis/util/resources/Vocabulary.java  |  20 +
 .../sis/util/resources/Vocabulary.properties       |   4 +
 .../sis/util/resources/Vocabulary_fr.properties    |   4 +
 .../org/apache/sis/measure/AngleFormatTest.java    |  22 +-
 .../src/test/java/org/apache/sis/test/Assert.java  |  43 -
 .../java/org/apache/sis/test/OptionalTestData.java | 126 +++
 ide-project/NetBeans/nbproject/genfiles.properties |   2 +-
 ide-project/NetBeans/nbproject/project.properties  |   2 +
 ide-project/NetBeans/nbproject/project.xml         |   3 +
 pom.xml                                            |   6 +
 .../java/org/apache/sis/index/tree/QuadTree.java   |  30 +-
 55 files changed, 3641 insertions(+), 252 deletions(-)

diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index cb2fa3c,89d141d..c8aa7e6
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
  build.xml.data.CRC32=58e6b21c
  build.xml.script.CRC32=462eaba0
  build.xml.stylesheet.CRC32=28e38971@1.53.1.46
- nbproject/build-impl.xml.data.CRC32=86faa61f
 -nbproject/build-impl.xml.data.CRC32=15917a2f
 -nbproject/build-impl.xml.script.CRC32=a7689f96
++nbproject/build-impl.xml.data.CRC32=6a3bef3e
 +nbproject/build-impl.xml.script.CRC32=aa8f5386
  nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.89.1.48
diff --cc ide-project/NetBeans/nbproject/project.properties
index fb333bd,29cf29b..420ae94
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@@ -98,9 -105,9 +98,10 @@@ test.fra-profile.dir = ${project.root}/
  # Those dependencies must exist in the local Maven repository.
  # Those numbers should match the ones declared in the pom.xml files.
  #
 +geoapi.version       = 3.1-SNAPSHOT
  jsr363.version       = 1.0
  jama.version         = 1.0.3
+ geographlib.version  = 1.49
  guava.version        = 18.0
  esri.api.version     = 2.2.2
  jts.version          = 1.16.0
@@@ -151,8 -157,10 +152,9 @@@ javac.test.classpath=
      ${maven.repository}/org/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar:\
      ${maven.repository}/org/hsqldb/hsqldb/${hsqldb.version}/hsqldb-${hsqldb.version}.jar:\
      ${maven.repository}/gov/nist/math/jama/${jama.version}/jama-${jama.version}.jar:\
+     ${maven.repository}/net/sf/geographiclib/GeographicLib-Java/${geographlib.version}/GeographicLib-Java-${geographlib.version}.jar:\
      ${maven.repository}/junit/junit/${junit.version}/junit-${junit.version}.jar:\
      ${maven.repository}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar:\
 -    ${project.GeoAPI}/dist/geoapi-tests.jar:\
      ${build.classes.dir}
  javac.test.processorpath=\
      ${javac.test.classpath}


Mime
View raw message