Minor fixes: error messages on import; gitignore artifacts; make NumberUtils available to UDFs

Author: Philip (flip) Kromer

.gitignore

@@ -32,3 +32,4 @@ libs/
 Icon?
 ehthumbs.db
 Thumbs.db
+target/*

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

@@ -24,13 +24,13 @@
 
 package com.esri.core.geometry;
 
-class NumberUtils {
+public class NumberUtils {
 
-	static int snap(int v, int minv, int maxv) {
+	public static int snap(int v, int minv, int maxv) {
 		return v < minv ? minv : v > maxv ? maxv : v;
 	}
 
-	static long snap(long v, long minv, long maxv) {
+	public static long snap(long v, long minv, long maxv) {
 		return v < minv ? minv : v > maxv ? maxv : v;
 	}
 

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

@@ -42,7 +42,7 @@ static void exportToWkt(int export_flags, Geometry geometry,
 					|| (export_flags & WktExportFlags.wktExportMultiLineString) != 0
 					|| (export_flags & WktExportFlags.wktExportPoint) != 0
 					|| (export_flags & WktExportFlags.wktExportMultiPoint) != 0)
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Cannot export a Polygon as Line/Point : "+export_flags);
 
 			exportPolygonToWkt(export_flags, (Polygon) geometry, string);
 			return;
@@ -52,7 +52,7 @@ static void exportToWkt(int export_flags, Geometry geometry,
 					|| (export_flags & WktExportFlags.wktExportMultiPolygon) != 0
 					|| (export_flags & WktExportFlags.wktExportPoint) != 0
 					|| (export_flags & WktExportFlags.wktExportMultiPoint) != 0)
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Cannot export a Polyline as (Multi)Polygon/(Multi)Point : "+export_flags);
 
 			exportPolylineToWkt(export_flags, (Polyline) geometry, string);
 			return;
@@ -62,7 +62,7 @@ static void exportToWkt(int export_flags, Geometry geometry,
 					|| (export_flags & WktExportFlags.wktExportMultiLineString) != 0
 					|| (export_flags & WktExportFlags.wktExportPolygon) != 0
 					|| (export_flags & WktExportFlags.wktExportMultiPolygon) != 0)
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Cannot export a MultiPoint as (Multi)LineString/(Multi)Polygon: "+export_flags);
 
 			exportMultiPointToWkt(export_flags, (MultiPoint) geometry, string);
 			return;
@@ -72,7 +72,7 @@ static void exportToWkt(int export_flags, Geometry geometry,
 					|| (export_flags & WktExportFlags.wktExportMultiLineString) != 0
 					|| (export_flags & WktExportFlags.wktExportPolygon) != 0
 					|| (export_flags & WktExportFlags.wktExportMultiPolygon) != 0)
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Cannot export a Point as (Multi)LineString/(Multi)Polygon: "+export_flags);
 
 			exportPointToWkt(export_flags, (Point) geometry, string);
 			return;
@@ -82,7 +82,7 @@ static void exportToWkt(int export_flags, Geometry geometry,
 					|| (export_flags & WktExportFlags.wktExportMultiLineString) != 0
 					|| (export_flags & WktExportFlags.wktExportPoint) != 0
 					|| (export_flags & WktExportFlags.wktExportMultiPoint) != 0)
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Cannot export an Envelop as (Multi)LineString/(Multi)Point: "+export_flags);
 
 			exportEnvelopeToWkt(export_flags, (Envelope) geometry, string);
 			return;
@@ -149,7 +149,7 @@ static void exportPolygonToWkt(int export_flags, Polygon polygon,
 
 		if ((export_flags & WktExportFlags.wktExportPolygon) != 0) {
 			if (polygon_count > 1)
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Cannot export a Polygon with specified export flags: "+export_flags);
 
 			polygonTaggedText_(precision, b_export_zs, b_export_ms, zs, ms,
 					position, path_flags, paths, path_count, string);
@@ -207,7 +207,7 @@ static void exportPolylineToWkt(int export_flags, Polyline polyline,
 
 		if ((export_flags & WktExportFlags.wktExportLineString) != 0) {
 			if (path_count > 1)
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Cannot export a LineString with specified export flags: "+export_flags);
 
 			lineStringTaggedText_(precision, b_export_zs, b_export_ms, zs, ms,
 					position, path_flags, paths, string);
@@ -256,7 +256,7 @@ static void exportMultiPointToWkt(int export_flags, MultiPoint multipoint,
 
 		if ((export_flags & WktExportFlags.wktExportPoint) != 0) {
 			if (point_count > 1)
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Cannot export a Point with specified export flags: "+export_flags);
 
 			pointTaggedTextFromMultiPoint_(precision, b_export_zs, b_export_ms,
 					zs, ms, position, string);

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

@@ -264,7 +264,9 @@ private void geometry_() {
 			m_current_token_type = WktToken.geometrycollection;
 			m_function_stack.add(State.geometryCollectionStart);
 		} else {
-			throw new IllegalArgumentException();
+            String snippet = (m_wkt_string.length() > 200 ?
+                m_wkt_string.substring(0,200)+"..." : m_wkt_string);
+			throw new IllegalArgumentException("Could not parse Well-Known Text: "+snippet);
 		}
 
 		m_function_stack.add(State.attributes);