Fixed encoding problems

es.alrocar.poiproxy/src/main/java/es/alrocar/jpe/parser/csv/CSVParser.java

@@ -85,7 +85,7 @@ public ArrayList<JTSFeature> parse(String contentFile,
 								|| filter.apply(element);
 					}
 
-					addAttribute(element, feature, destProp);
+					addAttribute(service.encode(element), feature, destProp);
 				}
 
 				try {

es.alrocar.poiproxy/src/main/java/es/alrocar/jpe/parser/handler/BaseContentHandler.java

@@ -179,11 +179,11 @@ public void processValue(String arg0) {
 			if (hasToBeParsed(fType, destProp)) {
 				checkValidAttribute(localFilter, arg0.toString());
 				if (writerContentHandler != null)
-					writerContentHandler.addElementToFeature(arg0.toString(),
+					writerContentHandler.addElementToFeature(service.encode(arg0.toString()),
 							destProp, this.currentFeatureGeoJSON);
 
 				// System.out.println(destProp + " --- " + arg0);
-				contentHandler.addElementToFeature(arg0.toString(), destProp,
+				contentHandler.addElementToFeature(service.encode(arg0.toString()), destProp,
 						this.currentFeature);
 				return;
 			}
@@ -408,16 +408,16 @@ public void endNewElement() {
 
 	public Object fillService(JPEContentHandler handler, Object feature,
 			DescribeService service) {
-		return handler.addElementToFeature(service.getId(), JPEParser.SERVICE,
+		return handler.addElementToFeature(service.encode(service.getId()), JPEParser.SERVICE,
 				feature);
 	}
 
 	public Object fillCategories(JPEContentHandler handler, Object feature,
 			DescribeService service) {
 		String categories = service.getCategoriesAsString();
 
-		return handler.addElementToFeature(categories, JPEParser.CATEGORIES,
-				feature);
+		return handler.addElementToFeature(service.encode(categories),
+				JPEParser.CATEGORIES, feature);
 	}
 
 	/**

es.alrocar.poiproxy/src/main/java/es/alrocar/jpe/parser/kml/KMLParser.java

@@ -133,7 +133,8 @@ public ArrayList<JTSFeature> parse(String contentFile,
 								hasPassedFilter = hasPassedFilter
 										|| filter.apply(attribute);
 							}
-							addAttribute(attribute, feature, destProp);
+							addAttribute(service.encode(attribute), feature,
+									destProp);
 						} catch (IOException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();

es.alrocar.poiproxy/src/main/java/es/alrocar/poiproxy/configuration/DescribeService.java

@@ -33,6 +33,7 @@
 
 package es.alrocar.poiproxy.configuration;
 
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -71,7 +72,7 @@ public class DescribeService {
 
 	public final static String SEARCH_TYPE = "search";
 	public final static String BROWSE_TYPE = "browse";
-	private static final String DEFAULT_ENCODING = "UTF-8";
+	public static final String DEFAULT_ENCODING = "UTF-8";
 	public static final String DEFAULT_SRS = "EPSG:4326";
 
 	public static final String TIMESTAMP = "timestamp";
@@ -84,7 +85,7 @@ public class DescribeService {
 
 	@JsonIgnore
 	private Auth auth = new Auth();
-	
+
 	private String format;
 	private String dateFormat = TIMESTAMP;
 	private String csvSeparator;
@@ -247,6 +248,15 @@ public String getRequestForParam(List<Param> optionalParam,
 		return url + optionalUrl;
 	}
 
+	public String encode(String element) {
+		try {
+			return new String(element.getBytes(this.getEncoding()),
+					DescribeService.DEFAULT_ENCODING);
+		} catch (UnsupportedEncodingException e) {
+			return element;
+		}
+	}
+
 	private String processRequestParams(ArrayList<String> requestParams,
 			ServiceParams params) {
 		String p;

es.alrocar.poiproxy/src/main/java/es/alrocar/poiproxy/proxy/POIProxy.java

@@ -686,7 +686,7 @@ public String doRequest(String url, DescribeService service, String id)
 					+ id + File.separator + service.getContentFile());
 		}
 
-		return new String(data);
+		return new String(data, service.getEncoding());
 	}
 
 	/**