1.1 --- a/README	Thu Mar 21 21:30:20 2013 +0200
     1.2 +++ b/README	Fri Mar 22 15:23:36 2013 +0200
     1.3 @@ -211,7 +211,7 @@
     1.4  * Charalampos Nikolaou	<charnik@di.uoa.gr>
     1.5  * Stella Gianakopoulou	<sgian@di.uoa.gr>
     1.6  * Panagiotis Smeros	<psmeros@di.uoa.gr>
     1.7 -* Kallirroi Dogani	<roi@di.uoa.gr>
     1.8 +* Kallirroi Dogani	<kallirroi@di.uoa.gr>
     1.9  
    1.10  
    1.11  Mailing-list

     2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Thu Mar 21 21:30:20 2013 +0200
     2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Fri Mar 22 15:23:36 2013 +0200
     2.3 @@ -17,6 +17,7 @@
     2.4   * 
     2.5   * @author Charalampos Nikolaou <charnik@di.uoa.gr>
     2.6   * @author Kostis Kyzirakos <kkyzir@di.uoa.gr>
     2.7 + * @author Kallirroi Dogani <kallirroi@di.uoa.gr>
     2.8   */
     2.9  public class GeoConstants {
    2.10  	/**																		*
    2.11 @@ -69,9 +70,24 @@
    2.12  	public static final String GML_OGC					= "http://www.opengis.net/gml";
    2.13  	
    2.14  	/**
    2.15 +	 * The namespace for GeoSPARQL ontology
    2.16 +	 */
    2.17 +	public static final String geo						= "http://www.opengis.net/ont/geosparql#";
    2.18 +	
    2.19 +	/**
    2.20  	 * The namespace for geometry functions declared by GeoSPARQL
    2.21  	 */
    2.22 -	public static final String geof						= "http://www.opengis.net/def/queryLanguage/OGC-GeoSPARQL/1.0/function/";
    2.23 +	public static final String geof						= "http://www.opengis.net/def/function/geosparql/";
    2.24 +	
    2.25 +	/**
    2.26 +	 * The URI for the datatype wktLiteral
    2.27 +	 */
    2.28 +	public static final String WKTLITERAL				=  geo + "wktLiteral";
    2.29 +	
    2.30 +	/**
    2.31 +	 * The URI for the datatype gmlLiteral
    2.32 +	 */
    2.33 +	public static final String GMLLITERAL				=  geo + "gmlLiteral";
    2.34  	
    2.35  	/**																		*
    2.36  	 *  						Extended functions 							*
    2.37 @@ -199,7 +215,7 @@
    2.38  	public static final String rdfiEC						= rdfi + "EC";
    2.39  	public static final String rdfiPO						= rdfi + "PO";
    2.40  	public static final String rdfiNTPP						= rdfi + "NTPP";
    2.41 -	public static final String rdfiNTPPi						= rdfi + "NTPPi";
    2.42 +	public static final String rdfiNTPPi					= rdfi + "NTPPi";
    2.43  	public static final String rdfiTPP						= rdfi + "TPP";
    2.44  	public static final String rdfiTPPi						= rdfi + "TPPi";
    2.45  	public static final String rdfiEQ						= rdfi + "EQ";