reflect review comments. fix formatting in a test

Author: stolstov

src/main/java/com/esri/core/geometry/OperatorDifferenceLocal.java

@@ -81,10 +81,6 @@ static Geometry difference(Geometry geometry_a, Geometry geometry_b,
 		if (!env_a_inflated.isIntersecting(env_b))
 			return geometry_a;
 
-		/*if (dimension_a == 1 && dimension_b == 2)
-			return polylineMinusArea_(geometry_a, geometry_b, type_b,
-					spatial_reference, progress_tracker);*/
-
 		if (type_a == Geometry.GeometryType.Point) {
 			Geometry geometry_b_;
 			if (MultiPath.isSegment(type_b)) {
@@ -357,38 +353,5 @@ static Geometry multiPointMinusPoint_(MultiPoint multi_point, Point point,
 
 		return new_multipoint;
 	}
-
-	/*
-	 This optimization causes a bug when polyline segments are on the boundary.
-	 static Geometry polylineMinusArea_(Geometry geometry, Geometry area,
-			int area_type, SpatialReference sr, ProgressTracker progress_tracker) {
-		// construct the complement of the Polygon (or Envelope)
-		Envelope envelope = new Envelope();
-		geometry.queryEnvelope(envelope);
-		Envelope2D env_2D = new Envelope2D();
-		area.queryEnvelope2D(env_2D);
-		envelope.merge(env_2D);
-		double dw = 0.1 * envelope.getWidth();
-		double dh = 0.1 * envelope.getHeight();
-		envelope.inflate(dw, dh);
-
-		Polygon complement = new Polygon();
-		complement.addEnvelope(envelope, false);
-
-		MultiPathImpl complementImpl = (MultiPathImpl) (complement._getImpl());
-
-		if (area_type == Geometry.GeometryType.Polygon) {
-			MultiPathImpl polygonImpl = (MultiPathImpl) (area._getImpl());
-			complementImpl.add(polygonImpl, true);
-		} else
-			complementImpl.addEnvelope((Envelope) (area), true);
-
-		OperatorFactoryLocal projEnv = OperatorFactoryLocal.getInstance();
-		OperatorIntersection operatorIntersection = (OperatorIntersection) projEnv
-				.getOperator(Operator.Type.Intersection);
-		Geometry difference = operatorIntersection.execute(geometry,
-				complement, sr, progress_tracker);
-		return difference;
-	}*/
-
 }
+

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

@@ -598,33 +598,7 @@ public boolean contains(OGCGeometry another) {
 		if (this == another)
 			return true;
 
-		//TODO: a simple envelope test
-		
-		OGCConcreteGeometryCollection flattened1 = flatten();
-		if (flattened1.isEmpty())
-			return true;
-		OGCConcreteGeometryCollection otherCol = new OGCConcreteGeometryCollection(another, esriSR);
-		OGCConcreteGeometryCollection flattened2 = otherCol.flatten();
-		if (flattened2.isEmpty())
-			return true;
-		
-		for (int i = 0, n2 = flattened2.numGeometries(); i < n2; ++i) {
-			OGCGeometry g2 = flattened2.geometryN(i);
-			boolean good = false;
-			for (int j = 0, n1 = flattened1.numGeometries(); j < n1; ++j) {
-				OGCGeometry g1 = flattened1.geometryN(i);
-				if (g1.contains(g2)) {
-					good = true;
-					break;
-				}
-			}
-			
-			if (!good)
-				return false;
-		}
-		
-		//each geometry of another is contained in a geometry from this.
-		return true;
+		return another.difference(this).isEmpty();
 	}
 
 	@Override