Merge pull request #56 from Esri/bug_fixes

Bug fixes

Author: stolstov

build.xml

@@ -57,7 +57,7 @@
 		<mkdir dir="${dir.result.today}/xml" />
 
 		<junit fork="yes" printsummary="withOutAndErr" haltonfailure="no" haltonerror="no">
-			<jvmarg value="-Xss2m" />
+			<jvmarg value="-ea" />
 			<classpath refid="project.classpath" />
 			<sysproperty key="dir.report.test" value="${dir.result.today}" />
 			<sysproperty key="arcgis.version.target" value="10.2" />

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

@@ -571,8 +571,10 @@ public void eraseRange(int index, int count, int validSize) {
 		if (index + count > m_size)
 			throw new GeometryException("invalid_call");
 
-		System.arraycopy(m_buffer, index + count, m_buffer, index, validSize
-				- (index + count));
+		if (validSize - (index + count) > 0) {
+			System.arraycopy(m_buffer, index + count, m_buffer, index, validSize
+							- (index + count));
+		}
 		m_size -= count;
 	}
 

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

@@ -303,6 +303,10 @@ public int getLast() {
 		return m_buffer[m_size - 1];
 	}
 
+	public void setLast(int v) {
+		m_buffer[m_size - 1] = v;
+	}
+	
 	public void removeLast() {
 		resize(m_size - 1);
 	}

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

@@ -24,17 +24,52 @@
 package com.esri.core.geometry;
 
 class Boundary {
+
+	static boolean hasNonEmptyBoundary(Geometry geom,
+			ProgressTracker progress_tracker) {
+		if (geom.isEmpty())
+			return false;
+
+		Geometry.Type gt = geom.getType();
+		if (gt == Geometry.Type.Polygon) {
+			if (geom.calculateArea2D() == 0)
+				return false;
+
+			return true;
+		} else if (gt == Geometry.Type.Polyline) {
+			boolean[] b = new boolean[1];
+			b[0] = false;
+			calculatePolylineBoundary_(geom._getImpl(), progress_tracker, true,
+					b);
+			return b[0];
+		} else if (gt == Geometry.Type.Envelope) {
+			return true;
+		} else if (Geometry.isSegment(gt.value())) {
+			if (!((Segment) geom).isClosed()) {
+				return true;
+			}
+
+			return false;
+		} else if (Geometry.isPoint(gt.value())) {
+			return false;
+		}
+
+		return false;
+	}
+
 	static Geometry calculate(Geometry geom, ProgressTracker progress_tracker) {
 		int gt = geom.getType().value();
 		if (gt == Geometry.GeometryType.Polygon) {
 			Polyline dst = new Polyline(geom.getDescription());
-			if (!geom.isEmpty()) { 
-				((MultiPathImpl)geom._getImpl())._copyToUnsafe((MultiPathImpl)dst._getImpl());
+			if (!geom.isEmpty()) {
+				((MultiPathImpl) geom._getImpl())
+						._copyToUnsafe((MultiPathImpl) dst._getImpl());
 			}
 
 			return dst;
 		} else if (gt == Geometry.GeometryType.Polyline) {
-			return calculatePolylineBoundary_(geom._getImpl(), progress_tracker);
+			return calculatePolylineBoundary_(geom._getImpl(),
+					progress_tracker, false, null);
 		} else if (gt == Geometry.GeometryType.Envelope) {
 			Polyline dst = new Polyline(geom.getDescription());
 			if (!geom.isEmpty())
@@ -98,9 +133,15 @@ public double getValue(int index) {
 	}
 
 	static MultiPoint calculatePolylineBoundary_(Object impl,
-			ProgressTracker progress_tracker) {
+			ProgressTracker progress_tracker,
+			boolean only_check_non_empty_boundary, boolean[] not_empty) {
+		if (not_empty != null)
+			not_empty[0] = false;
 		MultiPathImpl mpImpl = (MultiPathImpl) impl;
-		MultiPoint dst = new MultiPoint(mpImpl.getDescription());
+		MultiPoint dst = null;
+		if (!only_check_non_empty_boundary)
+			dst = new MultiPoint(mpImpl.getDescription());
+
 		if (!mpImpl.isEmpty()) {
 			AttributeStreamOfInt32 indices = new AttributeStreamOfInt32(0);
 			indices.reserve(mpImpl.getPathCount() * 2);
@@ -151,6 +192,12 @@ static MultiPoint calculatePolylineBoundary_(Object impl,
 					} else {
 						if ((counter & 1) == 0) {// remove boundary point
 							indices.set(ind, NumberUtils.intMax());
+						} else {
+							if (only_check_non_empty_boundary) {
+								if (not_empty != null)
+									not_empty[0] = true;
+								return null;
+							}
 						}
 
 						ptPrev.setCoords(pt);
@@ -161,20 +208,30 @@ static MultiPoint calculatePolylineBoundary_(Object impl,
 
 				if ((counter & 1) == 0) {// remove the point
 					indices.set(ind, NumberUtils.intMax());
+				} else {
+					if (only_check_non_empty_boundary) {
+						if (not_empty != null)
+							not_empty[0] = true;
+						return null;
+					}
 				}
+				if (!only_check_non_empty_boundary) {
+					indices.sort(0, indices.size());
 
-				indices.sort(0, indices.size());
-
-				for (int i = 0, n = indices.size(); i < n; i++) {
-					if (indices.get(i) == NumberUtils.intMax())
-						break;
+					for (int i = 0, n = indices.size(); i < n; i++) {
+						if (indices.get(i) == NumberUtils.intMax())
+							break;
 
-					mpImpl.getPointByVal(indices.get(i), point);
-					dst.add(point);
+						mpImpl.getPointByVal(indices.get(i), point);
+						dst.add(point);
+					}
 				}
 			}
 		}
 
+		if (only_check_non_empty_boundary)
+			return null;
+
 		return dst;
 	}
 }

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

@@ -470,7 +470,7 @@ private Geometry buffer_() {
 		case Geometry.GeometryType.Envelope:
 			return bufferEnvelope_();
 		default:
-			throw new GeometryException("internal error");
+			throw GeometryException.GeometryInternalError();
 		}
 	}
 
@@ -796,7 +796,7 @@ private Polygon bufferConvexPath_(MultiPath src, int ipath) {
 			src_mp.getXY(path_start + (i + 2) % path_size, pt_3);
 			v_1.sub(pt_2, pt_1);
 			if (v_1.length() == 0)
-				throw new GeometryException("internal error");
+				throw GeometryException.GeometryInternalError();
 
 			v_1.leftPerpendicular();
 			v_1.normalize();
@@ -813,7 +813,7 @@ private Polygon bufferConvexPath_(MultiPath src, int ipath) {
 
 			v_2.sub(pt_3, pt_2);
 			if (v_2.length() == 0)
-				throw new GeometryException("internal error");
+				throw GeometryException.GeometryInternalError();
 
 			v_2.leftPerpendicular();
 			v_2.normalize();
@@ -1085,7 +1085,7 @@ private int bufferClosedPath_(Geometry input_geom, int ipath,
 						pt_current, BufferCommand.Flags.enum_arc,
 						m_buffer_commands.size() + 1,
 						m_buffer_commands.size() - 1));
-			} else if (!pt_left_prev.equals(pt)) {
+			} else if (!pt_left_prev.isEqual(pt)) {
 				m_buffer_commands.add(new BufferCommand(pt_left_prev,
 						pt_current, m_buffer_commands.size() + 1,
 						m_buffer_commands.size() - 1, "dummy"));

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

@@ -1180,7 +1180,7 @@ static Geometry clip(Geometry geometry, Envelope2D extent,
 						.queryEnvelopeInGeometry(extent);
 				if (hit == RasterizedGeometry2D.HitType.Inside) {
 					if (geomtype != Geometry.Type.Polygon.value())
-						throw new GeometryException("internal error");
+						throw GeometryException.GeometryInternalError();
 
 					Polygon poly = new Polygon(geometry.getDescription());
 					poly.addEnvelope(extent, false);
@@ -1242,7 +1242,7 @@ static Geometry clip(Geometry geometry, Envelope2D extent,
 					densify_dist);
 		default:
 			assert (false);
-			throw new GeometryException("internal error");
+			throw GeometryException.GeometryInternalError();
 		}
 	}