Merge pull request #50 from locationtech/feature/projection-hashCode

Override Projection hashCode method
locationtech · Aug 26, 2019 · 0c6669f · 0c6669f
2 parents 73d0095 + 41350b3
commit 0c6669f
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 0 deletions.
diff --git a/src/main/java/org/locationtech/proj4j/CoordinateReferenceSystem.java b/src/main/java/org/locationtech/proj4j/CoordinateReferenceSystem.java
@@ -23,6 +23,7 @@
 import org.locationtech.proj4j.units.Units;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * Represents a projected or geodetic geospatial coordinate system,
@@ -134,4 +135,9 @@ public boolean equals(Object that) {
         }
         return false;
     }
+
+    @Override
+	public int hashCode() {
+			return Objects.hash(datum, proj);
+	}
 }
diff --git a/src/main/java/org/locationtech/proj4j/datum/Datum.java b/src/main/java/org/locationtech/proj4j/datum/Datum.java
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import org.locationtech.proj4j.ProjCoordinate;
 
@@ -264,4 +265,9 @@ public void shift(ProjCoordinate xy) {
     public void inverseShift(ProjCoordinate xy) {
         Grid.shift(grids, true, xy);
     }
+
+    @Override
+	public int hashCode() {
+			return Objects.hash(ellipsoid, grids, getTransformType());
+	}
 }
diff --git a/src/main/java/org/locationtech/proj4j/proj/AitoffProjection.java b/src/main/java/org/locationtech/proj4j/proj/AitoffProjection.java
@@ -19,6 +19,8 @@
  */
 package org.locationtech.proj4j.proj;
 
+import java.util.Objects;
+
 import org.locationtech.proj4j.ProjCoordinate;
 
 
@@ -85,4 +87,9 @@ public boolean equals(Object that) {
 			}
 			return false;
 	}
+
+	@Override
+	public int hashCode() {
+			return Objects.hash(winkel, super.hashCode());
+	}
 }
diff --git a/src/main/java/org/locationtech/proj4j/proj/AzimuthalProjection.java b/src/main/java/org/locationtech/proj4j/proj/AzimuthalProjection.java
@@ -16,6 +16,8 @@
 
 package org.locationtech.proj4j.proj;
 
+import java.util.Objects;
+
 import org.locationtech.proj4j.util.ProjectionMath;
 
 /**
@@ -85,4 +87,9 @@ public boolean equals(Object that) {
 			}
 			return false;
 	}
+
+	@Override
+	public int hashCode() {
+			return Objects.hash(mode, sinphi0, cosphi0, mapRadius, super.hashCode());
+	}
 }
diff --git a/src/main/java/org/locationtech/proj4j/proj/GeostationarySatelliteProjection.java b/src/main/java/org/locationtech/proj4j/proj/GeostationarySatelliteProjection.java
@@ -4,6 +4,8 @@
  */
 package org.locationtech.proj4j.proj;
 
+import java.util.Objects;
+
 import org.locationtech.proj4j.ProjCoordinate;
 import org.locationtech.proj4j.ProjectionException;
 import org.locationtech.proj4j.util.ProjectionMath;
@@ -214,5 +216,10 @@ public boolean equals(Object that) {
             return (this.heightOfOrbit == p.heightOfOrbit) && super.equals(that);
         }
         return false;
+    }
+
+    @Override
+	public int hashCode() {
+			return Objects.hash(heightOfOrbit, super.hashCode());
 	}
 }
diff --git a/src/main/java/org/locationtech/proj4j/proj/HammerProjection.java b/src/main/java/org/locationtech/proj4j/proj/HammerProjection.java
@@ -19,6 +19,8 @@
  */
 package org.locationtech.proj4j.proj;
 
+import java.util.Objects;
+
 import org.locationtech.proj4j.ProjCoordinate;
 import org.locationtech.proj4j.ProjectionException;
 
@@ -97,4 +99,9 @@ public boolean equals(Object that) {
 			}
 			return false;
 	}
+
+	@Override
+	public int hashCode() {
+			return Objects.hash(m, w, super.hashCode());
+	}
 }
diff --git a/src/main/java/org/locationtech/proj4j/proj/LagrangeProjection.java b/src/main/java/org/locationtech/proj4j/proj/LagrangeProjection.java
@@ -19,6 +19,8 @@
  */
 package org.locationtech.proj4j.proj;
 
+import java.util.Objects;
+
 import org.locationtech.proj4j.ProjCoordinate;
 import org.locationtech.proj4j.ProjectionException;
 import org.locationtech.proj4j.util.ProjectionMath;
@@ -95,4 +97,9 @@ public boolean equals(Object that) {
 			}
 			return false;
 	}
+
+	@Override
+	public int hashCode() {
+			return Objects.hash(rw, super.hashCode());
+	}
 }
diff --git a/src/main/java/org/locationtech/proj4j/proj/MolleweideProjection.java b/src/main/java/org/locationtech/proj4j/proj/MolleweideProjection.java
@@ -19,6 +19,8 @@
  */
 package org.locationtech.proj4j.proj;
 
+import java.util.Objects;
+
 import org.locationtech.proj4j.ProjCoordinate;
 
 public class MolleweideProjection extends PseudoCylindricalProjection {
@@ -140,4 +142,9 @@ public boolean equals(Object that) {
 			}
 			return false;
 	}
+
+	@Override
+	public int hashCode() {
+			return Objects.hash(type, cx, cy, cp, super.hashCode());
+	}
 }
diff --git a/src/main/java/org/locationtech/proj4j/proj/ObliqueMercatorProjection.java b/src/main/java/org/locationtech/proj4j/proj/ObliqueMercatorProjection.java
@@ -19,6 +19,8 @@
  */
 package org.locationtech.proj4j.proj;
 
+import java.util.Objects;
+
 import org.locationtech.proj4j.ProjCoordinate;
 import org.locationtech.proj4j.ProjectionException;
 import org.locationtech.proj4j.datum.Ellipsoid;
@@ -243,4 +245,9 @@ public boolean equals(Object that) {
 			}
 			return false;
 	}
+
+	@Override
+	public int hashCode() {
+			return Objects.hash(Gamma, alpha, lonc, super.hashCode());
+	}
 }
diff --git a/src/main/java/org/locationtech/proj4j/proj/Projection.java b/src/main/java/org/locationtech/proj4j/proj/Projection.java
@@ -17,6 +17,7 @@
 package org.locationtech.proj4j.proj;
 
 import java.util.NoSuchElementException;
+import java.util.Objects;
 
 import org.locationtech.proj4j.*;
 import org.locationtech.proj4j.datum.AxisOrder;
@@ -820,6 +821,12 @@ public Boolean isGeographic() {
         return false;
     }
 
+    /**
+     * Represents quality between possible outputs of {@link #project(ProjCoordinate, ProjCoordinate) }.
+     * Subclasses of Projection should capture additional state that is used in the project method and delgate to base.
+     *
+     * Note: The name of the projection is not part of equality.
+     */
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -851,4 +858,16 @@ public boolean equals(Object that) {
         }
         return false;
     }
+
+    /**
+     * Hash of those fields considered in Projection equalituy.
+     * Subclasses that override equality should override hashCode.
+     */
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.getClass(),
+            ellipsoid, falseNorthing, falseEasting, scaleFactor, fromMetres, trueScaleLatitude,
+            projectionLatitude, projectionLongitude, projectionLatitude1, projectionLatitude2,
+            minLatitude, maxLatitude, minLongitude, maxLongitude, axes, unit, primeMeridian);
+    }
 }
diff --git a/src/main/java/org/locationtech/proj4j/proj/SimpleConicProjection.java b/src/main/java/org/locationtech/proj4j/proj/SimpleConicProjection.java
@@ -19,6 +19,8 @@
  */
 package org.locationtech.proj4j.proj;
 
+import java.util.Objects;
+
 import org.locationtech.proj4j.ProjCoordinate;
 import org.locationtech.proj4j.ProjectionException;
 import org.locationtech.proj4j.util.ProjectionMath;
@@ -188,4 +190,9 @@ public boolean equals(Object that) {
 			}
 			return false;
 	}
+
+	@Override
+	public int hashCode() {
+			return Objects.hash(type, super.hashCode());
+	}
 }
diff --git a/src/main/java/org/locationtech/proj4j/proj/SineTangentSeriesProjection.java b/src/main/java/org/locationtech/proj4j/proj/SineTangentSeriesProjection.java
@@ -19,6 +19,8 @@
  */
 package org.locationtech.proj4j.proj;
 
+import java.util.Objects;
+
 import org.locationtech.proj4j.ProjCoordinate;
 import org.locationtech.proj4j.util.ProjectionMath;
 
@@ -88,4 +90,9 @@ public boolean equals(Object that) {
 			}
 			return false;
 	}
+
+	@Override
+	public int hashCode() {
+			return Objects.hash(C_x, C_y, C_p, tan_mode, super.hashCode());
+	}
 }
diff --git a/src/main/java/org/locationtech/proj4j/proj/UrmaevFlatPolarSinusoidalProjection.java b/src/main/java/org/locationtech/proj4j/proj/UrmaevFlatPolarSinusoidalProjection.java
@@ -19,6 +19,8 @@
  */
 package org.locationtech.proj4j.proj;
 
+import java.util.Objects;
+
 import org.locationtech.proj4j.ProjCoordinate;
 import org.locationtech.proj4j.ProjectionException;
 import org.locationtech.proj4j.util.ProjectionMath;
@@ -83,4 +85,9 @@ public boolean equals(Object that) {
 			}
 			return false;
 	}
+
+	@Override
+	public int hashCode() {
+			return Objects.hash(n, super.hashCode());
+	}
 }