simple fixes to gpx format

rfecher · rfecher · commit b18dc5521059 · 2017-04-06T09:27:57.000-04:00
diff --git a/extensions/adapters/vector/src/main/java/mil/nga/giat/geowave/adapter/vector/ingest/AbstractSimpleFeatureIngestPlugin.java b/extensions/adapters/vector/src/main/java/mil/nga/giat/geowave/adapter/vector/ingest/AbstractSimpleFeatureIngestPlugin.java
@@ -174,7 +174,7 @@ protected CloseableIterator<GeoWaveData<SimpleFeature>> wrapIteratorWithFilters(
 						public boolean apply(
 								final GeoWaveData<SimpleFeature> input ) {
 							if ((internalTypeNameProvider != null)
-									&& internalTypeNameProvider.typeNameMatches(input.getAdapterId().getString())) {
+									&& !internalTypeNameProvider.typeNameMatches(input.getAdapterId().getString())) {
 								return false;
 							}
 							if ((internalFilterProvider != null) && !internalFilterProvider.evaluate(input.getValue())) {
diff --git a/extensions/formats/gpx/src/main/java/mil/nga/giat/geowave/format/gpx/GPXConsumer.java b/extensions/formats/gpx/src/main/java/mil/nga/giat/geowave/format/gpx/GPXConsumer.java
@@ -147,7 +147,7 @@ public GPXConsumer(
 				nextFeature = null;
 			}
 		}
-		catch (IOException | XMLStreamException e) {
+		catch (Exception e) {
 			LOGGER.error(
 					"Error processing GPX input stream",
 					e);
@@ -166,7 +166,7 @@ public GeoWaveData<SimpleFeature> next() {
 		try {
 			nextFeature = getNext();
 		}
-		catch (final XMLStreamException e) {
+		catch (final Exception e) {
 			LOGGER.error(
 					"Error processing GPX input stream",
 					e);
@@ -195,7 +195,7 @@ public void close()
 
 	private void init()
 			throws IOException,
-			XMLStreamException {
+			Exception {
 
 		while (eventReader.hasNext()) {
 			final XMLEvent event = eventReader.nextEvent();
@@ -214,7 +214,7 @@ private void init()
 	}
 
 	private GeoWaveData<SimpleFeature> getNext()
-			throws XMLStreamException {
+			throws Exception {
 
 		GPXDataElement currentElement = currentElementStack.peek();
 		GeoWaveData<SimpleFeature> newFeature = null;
@@ -254,7 +254,7 @@ else if (currentElementStack.size() == 1) {
 	private String getChildCharacters(
 			final XMLEventReader eventReader,
 			final String elType )
-			throws XMLStreamException {
+			throws Exception {
 		final StringBuilder buf = new StringBuilder();
 		XMLEvent event = eventReader.nextEvent();
 		while (!(event.isEndElement() && event.asEndElement().getName().getLocalPart().equals(
@@ -271,8 +271,7 @@ private String getChildCharacters(
 	private void processElementAttributes(
 			final StartElement node,
 			final GPXDataElement element )
-			throws NumberFormatException,
-			XMLStreamException {
+			throws Exception {
 		@SuppressWarnings("unchecked")
 		final Iterator<Attribute> attributes = node.getAttributes();
 		while (attributes.hasNext()) {
@@ -291,8 +290,7 @@ else if (a.getName().getLocalPart().equals(
 	private boolean processElementValues(
 			final StartElement node,
 			final GPXDataElement element )
-			throws NumberFormatException,
-			XMLStreamException {
+			throws Exception {
 		switch (node.getName().getLocalPart()) {
 			case "ele": {
 				element.elevation = Double.parseDouble(getChildCharacters(

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ protected CloseableIterator<GeoWaveData<SimpleFeature>> wrapIteratorWithFilters(`
`174`	`174`	`public boolean apply(`
`175`	`175`	`final GeoWaveData<SimpleFeature> input ) {`
`176`	`176`	`if ((internalTypeNameProvider != null)`
`177`		`- && internalTypeNameProvider.typeNameMatches(input.getAdapterId().getString())) {`
	`177`	`+ && !internalTypeNameProvider.typeNameMatches(input.getAdapterId().getString())) {`
`178`	`178`	`return false;`
`179`	`179`	`}`
`180`	`180`	`if ((internalFilterProvider != null) && !internalFilterProvider.evaluate(input.getValue())) {`