Strabon

changeset 1358:65db010f01ac

removed dependency to epsg-wkt.jar since one epsg (epsg-hsql.jar) suffices and duplication might rise exceptions (according to this page: http://docs.geotools.org/latest/userguide/faq.html#q-how-to-choose-an-epsg-authority)
author Babis Nikolaou <charnik@di.uoa.gr>
date Sat Sep 13 18:21:21 2014 +0300 (2014-09-13)
parents c37086c4a55f
children 6f201ce361e2
files endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/UpdateBean.java pom.xml runtime/pom.xml runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java
line diff
     1.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java	Thu Sep 11 19:00:22 2014 +0300
     1.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java	Sat Sep 13 18:21:21 2014 +0300
     1.3 @@ -13,16 +13,16 @@
     1.4  import java.io.OutputStream;
     1.5  import java.net.URL;
     1.6  import java.util.ArrayList;
     1.7 +import java.util.Arrays;
     1.8  import java.util.Iterator;
     1.9 -import java.util.ArrayList;
    1.10  import java.util.List;
    1.11 +import java.util.Properties;
    1.12  import java.util.regex.Matcher;
    1.13  import java.util.regex.Pattern;
    1.14  
    1.15  import org.openrdf.query.BindingSet;
    1.16  import org.openrdf.query.MalformedQueryException;
    1.17  import org.openrdf.query.QueryEvaluationException;
    1.18 -import org.openrdf.query.TupleQuery;
    1.19  import org.openrdf.query.TupleQueryResult;
    1.20  import org.openrdf.query.TupleQueryResultHandlerException;
    1.21  import org.openrdf.repository.RepositoryException;
    1.22 @@ -31,6 +31,8 @@
    1.23  import org.slf4j.Logger;
    1.24  import org.slf4j.LoggerFactory;
    1.25  
    1.26 +import com.sun.xml.bind.v2.runtime.unmarshaller.XsiNilLoader.Array;
    1.27 +
    1.28  import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
    1.29  import eu.earthobservatory.runtime.generaldb.Strabon;
    1.30  import eu.earthobservatory.utils.Format;
     2.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/UpdateBean.java	Thu Sep 11 19:00:22 2014 +0300
     2.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/UpdateBean.java	Sat Sep 13 18:21:21 2014 +0300
     2.3 @@ -28,8 +28,7 @@
     2.4  import org.springframework.web.context.support.WebApplicationContextUtils;
     2.5  
     2.6  /**
     2.7 - * @author charnik
     2.8 - *
     2.9 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    2.10   */
    2.11  public class UpdateBean extends HttpServlet {
    2.12  
     3.1 --- a/pom.xml	Thu Sep 11 19:00:22 2014 +0300
     3.2 +++ b/pom.xml	Sat Sep 13 18:21:21 2014 +0300
     3.3 @@ -475,11 +475,14 @@
     3.4  				<version>${geotools.version}</version>
     3.5  			</dependency>
     3.6  
     3.7 +			<!--
     3.8 +			     One epsg jar file suffices. Read this: http://docs.geotools.org/latest/userguide/faq.html#q-how-to-choose-an-epsg-authority
     3.9  			<dependency>
    3.10  				<groupId>org.geotools</groupId>
    3.11  				<artifactId>gt-epsg-wkt</artifactId>
    3.12  				<version>${geotools.version}</version>
    3.13  			</dependency>
    3.14 +			-->
    3.15  
    3.16  			<dependency>
    3.17  				<groupId>org.geotools</groupId>
     4.1 --- a/runtime/pom.xml	Thu Sep 11 19:00:22 2014 +0300
     4.2 +++ b/runtime/pom.xml	Sat Sep 13 18:21:21 2014 +0300
     4.3 @@ -316,10 +316,12 @@
     4.4  		</dependency>
     4.5  
     4.6  		<!-- Geotools -->
     4.7 +		<!-- One epsg jar file suffices. Read this: http://docs.geotools.org/latest/userguide/faq.html#q-how-to-choose-an-epsg-authority
     4.8  		<dependency>
     4.9  			<groupId>org.geotools</groupId>
    4.10  			<artifactId>gt-epsg-wkt</artifactId>
    4.11  		</dependency>
    4.12 +		-->
    4.13  		
    4.14  		<dependency>
    4.15  			<groupId>org.geotools</groupId>
     5.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Thu Sep 11 19:00:22 2014 +0300
     5.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Sat Sep 13 18:21:21 2014 +0300
     5.3 @@ -18,6 +18,7 @@
     5.4  import java.sql.SQLException;
     5.5  import java.util.ArrayList;
     5.6  
     5.7 +import org.geotools.factory.Hints;
     5.8  import org.openrdf.model.URI;
     5.9  import org.openrdf.model.ValueFactory;
    5.10  import org.openrdf.query.BindingSet;
    5.11 @@ -114,6 +115,7 @@
    5.12  		//Setting up store
    5.13  
    5.14  		//Used for the conversions taking place involving JTS + WGS84 (4326)
    5.15 +		//Hints.putSystemDefault(Hints.FORCE_LONGITUDE_FIRST_AXIS_ORDER, Boolean.TRUE);
    5.16  		System.setProperty("org.geotools.referencing.forceXY", "true");
    5.17  		
    5.18  		//our repository