degree and meter conversions, next version as 2.1.0

Author: bosborn

CHANGELOG.md

@@ -4,10 +4,10 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 2.0.7 (TBD)
+## 2.1.0 (TBD)
 
-* Line intersection geometry utility
-* GeometryEnvelope is empty and contains methods
+* Geometry utilities for line intersections and degree to/from meter conversions
+* GeometryEnvelope serializable and methods for mid values, is empty, and contains
 
 ## [2.0.6](https://github.com/ngageoint/simple-features-java/releases/tag/2.0.6) (04-18-2022)
 

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>mil.nga</groupId>
 	<artifactId>sf</artifactId>
-	<version>2.0.7</version>
+	<version>2.1.0</version>
 	<packaging>jar</packaging>
 	<name>Simple Features</name>
 	<url>https://github.com/ngageoint/simple-features-java</url>

src/main/java/mil/nga/sf/GeometryEnvelope.java

@@ -468,7 +468,7 @@ public boolean isPoint() {
 	 * Get the envelope mid x
 	 * 
 	 * @return mid x
-	 * @since 2.0.7
+	 * @since 2.1.0
 	 */
 	public double getMidX() {
 		return (minX + maxX) / 2.0;
@@ -478,7 +478,7 @@ public double getMidX() {
 	 * Get the envelope mid y
 	 * 
 	 * @return mid y
-	 * @since 2.0.7
+	 * @since 2.1.0
 	 */
 	public double getMidY() {
 		return (minY + maxY) / 2.0;
@@ -498,7 +498,7 @@ public Point getCentroid() {
 	 * Determine if the envelope is empty
 	 * 
 	 * @return true if empty
-	 * @since 2.0.7
+	 * @since 2.1.0
 	 */
 	public boolean isEmpty() {
 		return getXRange() <= 0.0 || getYRange() <= 0.0;
@@ -599,7 +599,7 @@ public GeometryEnvelope union(GeometryEnvelope envelope) {
 	 * @param point
 	 *            point
 	 * @return true if contains
-	 * @since 2.0.7
+	 * @since 2.1.0
 	 */
 	public boolean contains(Point point) {
 		return contains(point.getX(), point.getY());
@@ -613,7 +613,7 @@ public boolean contains(Point point) {
 	 * @param y
 	 *            y value
 	 * @return true if contains
-	 * @since 2.0.7
+	 * @since 2.1.0
 	 */
 	public boolean contains(double x, double y) {
 		return x >= getMinX() && x <= getMaxX() && y >= getMinY()

src/main/java/mil/nga/sf/util/GeometryUtils.java

@@ -57,6 +57,13 @@ public class GeometryUtils {
 	 */
 	public static final double DEFAULT_EPSILON = 0.000000000000001;
 
+	/**
+	 * Half the world distance in either direction
+	 * 
+	 * @since 2.1.0
+	 */
+	public static final double WEB_MERCATOR_HALF_WORLD_WIDTH = 20037508.342789244;
+
 	/**
 	 * Get the dimension of the Geometry, 0 for points, 1 for curves, 2 for
 	 * surfaces. If a collection, the largest dimension is returned.
@@ -178,9 +185,10 @@ public static Point getDegreesCentroid(Geometry geometry) {
 	 * Example: For WGS84 provide a max x of 180.0. Resulting x values will be
 	 * in the range: -540.0 <= x <= 540.0
 	 *
-	 * Example: For web mercator provide a world width of 20037508.342789244.
-	 * Resulting x values will be in the range: -60112525.028367732 <= x
-	 * <= 60112525.028367732
+	 * Example: For web mercator provide a world width of
+	 * {@link GeometryUtils#WEB_MERCATOR_HALF_WORLD_WIDTH}. Resulting x values
+	 * will be in the range: -60112525.028367732 <= x <=
+	 * 60112525.028367732
 	 *
 	 * @param geometry
 	 *            geometry
@@ -369,9 +377,10 @@ private static void minimize(PolyhedralSurface polyhedralSurface,
 	 * Example: For WGS84 provide a max x of 180.0. Resulting x values will be
 	 * in the range: -180.0 <= x <= 180.0.
 	 *
-	 * Example: For web mercator provide a world width of 20037508.342789244.
-	 * Resulting x values will be in the range: -20037508.342789244 <= x
-	 * <= 20037508.342789244.
+	 * Example: For web mercator provide a world width of
+	 * {@link GeometryUtils#WEB_MERCATOR_HALF_WORLD_WIDTH}. Resulting x values
+	 * will be in the range: -20037508.342789244 <= x <=
+	 * 20037508.342789244.
 	 *
 	 * @param geometry
 	 *            geometry
@@ -1149,7 +1158,7 @@ private static boolean pointOnPath(Point point, List<Point> points,
 	 * @param line2
 	 *            second line
 	 * @return intersection point or null if no intersection
-	 * @since 2.0.7
+	 * @since 2.1.0
 	 */
 	public static Point intersection(Line line1, Line line2) {
 		return intersection(line1.startPoint(), line1.endPoint(),
@@ -1168,7 +1177,7 @@ public static Point intersection(Line line1, Line line2) {
 	 * @param line2Point2
 	 *            second point of the second line
 	 * @return intersection point or null if no intersection
-	 * @since 2.0.7
+	 * @since 2.1.0
 	 */
 	public static Point intersection(Point line1Point1, Point line1Point2,
 			Point line2Point1, Point line2Point2) {
@@ -1194,6 +1203,72 @@ public static Point intersection(Point line1Point1, Point line1Point2,
 		return intersection;
 	}
 
+	/**
+	 * Convert a point in degrees to a point in meters
+	 * 
+	 * @param point
+	 *            point in degrees
+	 * @return point in meters
+	 * @since 2.1.0
+	 */
+	public static Point degreesToMeters(Point point) {
+		Point value = degreesToMeters(point.getX(), point.getY());
+		value.setZ(point.getZ());
+		value.setM(point.getM());
+		return value;
+	}
+
+	/**
+	 * Convert a coordinate in degrees to a point in meters
+	 * 
+	 * @param x
+	 *            x value in degrees
+	 * @param y
+	 *            y value in degrees
+	 * @return point in meters
+	 * @since 2.1.0
+	 */
+	public static Point degreesToMeters(double x, double y) {
+		double xValue = x * WEB_MERCATOR_HALF_WORLD_WIDTH / 180;
+		double yValue = Math.log(Math.tan((90 + y) * Math.PI / 360))
+				/ (Math.PI / 180);
+		yValue = yValue * WEB_MERCATOR_HALF_WORLD_WIDTH / 180;
+		return new Point(xValue, yValue);
+	}
+
+	/**
+	 * Convert a point in meters to a point in degrees
+	 * 
+	 * @param point
+	 *            point in meters
+	 * @return point in degrees
+	 * @since 2.1.0
+	 */
+	public static Point metersToDegrees(Point point) {
+		Point value = metersToDegrees(point.getX(), point.getY());
+		value.setZ(point.getZ());
+		value.setM(point.getM());
+		return value;
+	}
+
+	/**
+	 * Convert a coordinate in meters to a point in degrees
+	 * 
+	 * @param x
+	 *            x value in meters
+	 * @param y
+	 *            y value in meters
+	 * @return point in degrees
+	 * @since 2.1.0
+	 */
+	public static Point metersToDegrees(double x, double y) {
+		double xValue = x * 180 / WEB_MERCATOR_HALF_WORLD_WIDTH;
+		double yValue = y * 180 / WEB_MERCATOR_HALF_WORLD_WIDTH;
+		yValue = Math.atan(Math.exp(yValue * (Math.PI / 180))) / Math.PI * 360
+				- 90;
+		return new Point(xValue, yValue);
+	}
+
 	/**
 	 * Determine if the geometries contain a Z value
 	 *