Merge lp:~zorba-coders/zorba/update3.0_geoproj-module into lp:zorba/geoproj-module

[Juan Zacarias]

Changes for Update 3.0

Changes for Update 3.0

[lp:~zorba-coders/zorba/update3.0_geoproj-module]

41. By Juan Zacarias on 2013-06-19

Reverted changes for update 3.0

42. By Juan Zacarias on 2013-06-19

modified:
  src/com/zorba-xquery/www/modules/geoproj.xq
pending merges:
  [u'sorin.marian.n... 2013-06-17 [merge] - updated project TAG Approved: ...
    sorin.marian.nasoi 2013-06-15 - updated project TAG

43. By Juan Zacarias on 2013-06-19

Made changes for update 3.0, updated documentation and module's namespace.

[Chris Hillery (ceejatec)]

The changes as made seem fine. Two concerns:

1. Are there any errors raised by the module functions? If so, are they documented?

2. Matthias: This seems like it is an ideal candidate for JSONify-ing; would you agree? If so, what would you think is the priority? I'm tempted to merge this revision as it stands, and file a separate lower-priority bug to JSONify this module later if we have time.

review: Needs Information

[Juan Zacarias (juan457)]

> The changes as made seem fine. Two concerns:
>
> 1. Are there any errors raised by the module functions? If so, are they
> documented?
No errors are thrown by the module.

>
> 2. Matthias: This seems like it is an ideal candidate for JSONify-ing; would
> you agree? If so, what would you think is the priority? I'm tempted to merge
> this revision as it stands, and file a separate lower-priority bug to JSONify
> this module later if we have time.

[Chris Hillery (ceejatec)]

Approving the changes as they are. Matthias, let us know if you think it should JSONified immediately or if we can come back to it.

review: Approve

[Chris Hillery (ceejatec)]

One note: we cannot JSONify the geo module [can we?], since it is an EXPath module. There are no common APIs or schemas between geo and geoproj so far as I know, but they might be used by similar people. So, might it be weird if one is XML and one is JSON? Not really sure how to make that call.

[Matthias Brantner (matthias-brantner)]

Yes, we cannot JSONify the EXPath module. More than that, this processing depends on XML data formats for which it doesn't make sense to do it on JSON because the input data is XML and people want to process that.
A JSONiq geo module would be a completely separate effort. Right now, we should just do the basics and that's it.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_geoproj-module/+merge/170214

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== removed file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-08-07 19:49:24 +0000
+++ src/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# all external module libraries are generated in the directory
-# of the corresponding .xq file
-MESSAGE(STATUS "Add com")
-ADD_SUBDIRECTORY(com)
-
-MESSAGE(STATUS "End modules")

=== renamed file 'src/com/zorba-xquery/www/modules/CMakeLists.txt' => 'src/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/CMakeLists.txt	2011-07-27 00:24:29 +0000
+++ src/CMakeLists.txt	2013-06-19 19:41:25 +0000
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 DECLARE_ZORBA_SCHEMA (FILE geoproj-param.xsd
-  URI "http://www.zorba-xquery.com/modules/geoproj-param")
-DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/geoproj" VERSION 1.0 FILE "geoproj.xq")
+  URI "http://zorba.io/modules/geoproj-param")
+DECLARE_ZORBA_MODULE (URI "http://zorba.io/modules/geoproj" VERSION 1.0 FILE "geoproj.xq")

=== removed directory 'src/com'
=== removed file 'src/com/CMakeLists.txt'
--- src/com/CMakeLists.txt	2011-10-06 08:18:23 +0000
+++ src/com/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-ADD_SUBDIRECTORY(zorba-xquery)

=== removed directory 'src/com/zorba-xquery'
=== removed file 'src/com/zorba-xquery/CMakeLists.txt'
--- src/com/zorba-xquery/CMakeLists.txt	2011-10-06 08:18:23 +0000
+++ src/com/zorba-xquery/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-ADD_SUBDIRECTORY(www)

=== removed directory 'src/com/zorba-xquery/www'
=== removed file 'src/com/zorba-xquery/www/CMakeLists.txt'
--- src/com/zorba-xquery/www/CMakeLists.txt	2011-10-06 08:18:23 +0000
+++ src/com/zorba-xquery/www/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-ADD_SUBDIRECTORY(modules)

=== removed directory 'src/com/zorba-xquery/www/modules'
=== renamed file 'src/com/zorba-xquery/www/modules/geoproj-param.xsd' => 'src/geoproj-param.xsd'
--- src/com/zorba-xquery/www/modules/geoproj-param.xsd	2011-08-05 02:22:02 +0000
+++ src/geoproj-param.xsd	2013-06-19 19:41:25 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <schema
-   targetNamespace="http://www.zorba-xquery.com/modules/geoproj-param"
-   xmlns:geoproj="http://www.zorba-xquery.com/modules/geoproj-param"
+   targetNamespace="http://zorba.io/modules/geoproj-param"
+   xmlns:geoproj="http://zorba.io/modules/geoproj-param"
    xmlns="http://www.w3.org/2001/XMLSchema"
    version="1.0.0">
 <!--

=== renamed file 'src/com/zorba-xquery/www/modules/geoproj.xq' => 'src/geoproj.xq'
--- src/com/zorba-xquery/www/modules/geoproj.xq	2013-06-15 19:36:05 +0000
+++ src/geoproj.xq	2013-06-19 19:41:25 +0000
@@ -17,58 +17,58 @@
 :)
 
 (:~
- : Geographic projection module.<br/>
- : Forward and inverse projection from WGS84 lat-long coordinates to Oblique Mercator x-y projection.<br/>
- : Oblique Mercator projection is a sphere to cylinder projection.<br/>
- : This projection results in a conformal output, meaning the shape of small areas is preserved,
+ : <p>Geographic projection module.</p>
+ : <p>Forward and inverse projection from WGS84 lat-long coordinates to Oblique Mercator x-y projection.</p>
+ : <p>Oblique Mercator projection is a sphere to cylinder projection.</p>
+ : <p>This projection results in a conformal output, meaning the shape of small areas is preserved,
  : no matter the distance from the origin. But it is not equal area, meaning the area size increases heavily
  : when getting closer to North or South. The area size increases with the same amount on x and y axes,
- : so the relative shape remains almost the same.   <br/>
- : Mercator projection is the oldest projection, and it is still widely used because it produces a rectangular map.
- : This projection is used in Google Maps because of its conformal output. <br/>
- : For military or measurements purposes the UTM projection is used (or variants). This splits the Earth into small
- : areas and computes the cartesian coordinates relative to each area.<br/>
- : <br/>
- : Here we use Oblique Mercator projection. Its advantage over the normal Mercator is that you can set the tangent point
+ : so the relative shape remains almost the same.</p>   
+ : <p>Mercator projection is the oldest projection, and it is still widely used because it produces a rectangular map.</p>
+ : <p>This projection is used in Google Maps because of its conformal output.</p> 
+ : <p>For military or measurements purposes the UTM projection is used (or variants). This splits the Earth into small
+ : areas and computes the cartesian coordinates relative to each area.</p>
+ : <p/> 
+ : <p>Here we use Oblique Mercator projection. Its advantage over the normal Mercator is that you can set the tangent point
  : between the cylinder and the sphere to be anywhere on Earth. So you can set the center of the map to be close
- : to the area you want projected and be able to measure accurately the distances between points and lines.
- : The map deformation is minimal close to the center point and close to the "equator" line.<br/>
- : The advantage over the UTM projection is that it can also produce a global rectangular map, like Mercator, 
- : which is great for viewing.<br/>
- : The disadvantage over Mercator is that it needs more processing power.<br/>
- : <br/>
- : WGS84 is the ellipsoid aproximation of the Earth, with big radius of 6,378,137 m and small radius of 6,356,752.3 m.
- : The geographic coordinates expressed for this ellipsoid are widely used today in maps and gps coordinates. 
- : It is the default standard for representing geographic coordinates.<br/>
- : <br/>
- : The purpose of this module is to provide convertion from polar to cartesian coordinates, so you can 
- : process the geographic data with the Simple Features API functions implemented in the geo module.
- : That module works only with cartesian coordinates, but most maps have polar coordinates. <br/>
- : <br/>
- : The projection formulas are taken from lib_proj library and implemented in XQuery. 
+ : to the area you want projected and be able to measure accurately the distances between points and lines.</p>
+ : <p>The map deformation is minimal close to the center point and close to the "equator" line.</p>
+ : <p>The advantage over the UTM projection is that it can also produce a global rectangular map, like Mercator, 
+ : which is great for viewing.</p>
+ : <p>The disadvantage over Mercator is that it needs more processing power.</p>
+ : <p/> 
+ : <p>WGS84 is the ellipsoid aproximation of the Earth, with big radius of 6,378,137 m and small radius of 6,356,752.3 m.</p>
+ : <p>The geographic coordinates expressed for this ellipsoid are widely used today in maps and gps coordinates.</p> 
+ : <p>It is the default standard for representing geographic coordinates.</p>
+ : <p/> 
+ : <p>The purpose of this module is to provide convertion from polar to cartesian coordinates, so you can 
+ : process the geographic data with the Simple Features API functions implemented in the geo module.</p>
+ : <p>That module works only with cartesian coordinates, but most maps have polar coordinates.</p> 
+ : <p/> 
+ : <p>The projection formulas are taken from lib_proj library and implemented in XQuery.</p> 
  :
  : @author Daniel Turcanu
  : @project Zorba/Geo Projection
  :)
-module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
+module namespace geoproj = "http://zorba.io/modules/geoproj";
 
 (:~
- : W3C Math namespace URI.
+ : <p>W3C Math namespace URI.</p>
 :)
 declare namespace math="http://www.w3.org/2005/xpath-functions/math";
 
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
 
 (:~
- : Import module for checking if geoproj parameters are validated.
+ : <p>Import module for checking if geoproj parameters are validated.</p>
  :)
 import module namespace schemaOptions = "http://www.zorba-xquery.com/modules/schema";
 
 
 (:~
- : Contains the definitions of the geoproj parameters.
-:)
-import schema namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+ : <p>Contains the definitions of the geoproj parameters.</p>
+ :)
+import schema namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 declare namespace gml="http://www.opengis.net/gml";
 
@@ -76,8 +76,8 @@
 declare option ver:module-version "1.0";
 
 (:~
- : Convert angle from degrees to radians. <br/>
- : The parameter is first reduced to value range of (-360, 360).
+ : <p>Convert angle from degrees to radians.</p> 
+ : <p>The parameter is first reduced to value range of (-360, 360).</p>
  : 
  : @param $deg angle in  degrees
  : @return value in radians (-2PI, 2PI)
@@ -88,7 +88,7 @@
 };
 
 (:~
- : Convert angle from radians to degrees. <br/>
+ : <p>Convert angle from radians to degrees.</p> 
  : 
  : @param $rad value in radians
  : @return value in degrees (-360, 360)
@@ -100,7 +100,7 @@
 
 
 (:~
- : Compute the isometric latitude of $phi latitude.
+ : <p>Compute the isometric latitude of $phi latitude.</p>
  : 
  : @param $phi a latitude
  : @return isometric latitude in radians
@@ -169,36 +169,36 @@
 };
 
 (:~
- : Forward projection from geographic coordinates lat-long on WGS84 ellipsoid to Oblique Mercator cylinder.<br/>
- : The Oblique Mercator projection is like the standard Mercator projection, but you can choose the point of origin.<br/>
- : Specify the coordinates of the center point somewhere near the points being projected, 
- : so the projection deformation is small.<br/>
- : The azimuth in the center point, alpha, is hardcoded to zero, so the true north is preserved.
- : This is a simplification of the standard Oblique Mercator projection. <br/>
- : Gamma, the azimuth of the rectified bearing of center line is also zero, calculated from alpha.<br/>
- : <br/>
- : The radius of the Earth in WGS84 is 6378137 m.<br/>
- : Reverse flatening 298.257223563.<br/>
- : Eccentricity e 0.0818192.<br/>
- :<br/>
+ : <p>Forward projection from geographic coordinates lat-long on WGS84 ellipsoid to Oblique Mercator cylinder.</p>
+ : <p>The Oblique Mercator projection is like the standard Mercator projection, but you can choose the point of origin.</p>
+ : <p>Specify the coordinates of the center point somewhere near the points being projected, 
+ : so the projection deformation is small.</p>
+ : <p>The azimuth in the center point, alpha, is hardcoded to zero, so the true north is preserved.</p>
+ : <p>This is a simplification of the standard Oblique Mercator projection.</p> 
+ : <p>Gamma, the azimuth of the rectified bearing of center line is also zero, calculated from alpha.</p>
+ : <p/> 
+ : <p>The radius of the Earth in WGS84 is 6378137 m.</p>
+ : <p>Reverse flatening 298.257223563.</p>
+ : <p>Eccentricity e 0.0818192.</p>
+ :
  : @param $lat_0 is the latitude for center point, in degrees (-90, 90)
  : @param $long_c is the longitude for center point, in degrees (-180, 180)
  : @param $k0 is the scale in the center point. The scale will increase when going far to north and south.
  :        Use value 1 to get the true distances between points, in meters.
  :        At equator, the distance for 1 degree is aproximately 110 km.
- : @param $lat_long_degrees a sequence of nodes of type <br/>
- :   &lt;latlong&gt;&lt;lat&gt;<i>latitude degree</i>&lt;/lat&gt;&lt;long&gt;<i>longitude degree</i>&lt;/long&gt;&lt;/latlong&gt;<br/>
- :   in namespace "http://www.zorba-xquery.com/modules/geoproj-param". Each node in the sequence is validated
+ : @param $lat_long_degrees a sequence of nodes of type 
+ :   &lt;latlong&gt;&lt;lat&gt;<i>latitude degree</i>&lt;/lat&gt;&lt;long&gt;<i>longitude degree</i>&lt;/long&gt;&lt;/latlong&gt;
+ :   in namespace "http://zorba.io/modules/geoproj-param". Each node in the sequence is validated
  :   against the according schema.
  :
  : @error err:XQDY0027 if any of the nodes passed in the $lat-long-degress parameter is
  :  not valid according to the schema.
  :
- : @return a sequence of x-y coordinates in format <br/>
- :   &lt;coord&gt;&lt;x&gt;<i>x</i>&lt;/x&gt;&lt;y&gt;<i>y</i>&lt;/y&gt;&lt;/coord&gt; <br/>
- :   in namespace "http://www.zorba-xquery.com/modules/geoproj-param" <br/>
- :   Note that the x coordinate corresponds to the longitude, and y coordinate to the latitude.<br/>
- :   The coordinates are expressed in meters.<br/>
+ : @return a sequence of x-y coordinates in format 
+ :   &lt;coord&gt;&lt;x&gt;<i>x</i>&lt;/x&gt;&lt;y&gt;<i>y</i>&lt;/y&gt;&lt;/coord&gt; 
+ :   in namespace "http://zorba.io/modules/geoproj-param" 
+ :   Note that the x coordinate corresponds to the longitude, and y coordinate to the latitude.
+ :   The coordinates are expressed in meters.
  :   The coordinates are relative to the center point.
   @example test/Queries/geo/geoproj1.xq
   @example test/Queries/geo/geoproj5.xq
@@ -226,24 +226,24 @@
 
 
 (:~
- : Forward projection from geographic coordinates lat-long on WGS84 ellipsoid to Oblique Mercator cylinder.<br/>
- : This is an intermediate function for wgs84-to-omerc.<br/>
- : The difference is that it returns the x-y coordinates in gml:pos format,
- : gml being the prefix for the GML namespace "http://www.opengis.net/gml".<br/>
- :<br/>
+ : <p>Forward projection from geographic coordinates lat-long on WGS84 ellipsoid to Oblique Mercator cylinder.</p>
+ : <p>This is an intermediate function for wgs84-to-omerc.</p>
+ : <p>The difference is that it returns the x-y coordinates in gml:pos format,
+ : gml being the prefix for the GML namespace "http://www.opengis.net/gml".</p>
+ :
  : @param $lat_0 is the latitude for center point, in degrees (-90, 90)
  : @param $long_c is the longitude for center point, in degrees (-180, 180)
  : @param $k0 is the scale in the center point. 
- : @param $lat_long_degrees a sequence of nodes of type <br/>
- :   &lt;latlong&gt;&lt;lat&gt;<i>latitude degree</i>&lt;/lat&gt;&lt;long&gt;<i>longitude degree</i>&lt;/long&gt;&lt;/latlong&gt;<br/>
- :   in namespace "http://www.zorba-xquery.com/modules/geoproj-param". Each node in this sequence is validated according
+ : @param $lat_long_degrees a sequence of nodes of type 
+ :   &lt;latlong&gt;&lt;lat&gt;<i>latitude degree</i>&lt;/lat&gt;&lt;long&gt;<i>longitude degree</i>&lt;/long&gt;&lt;/latlong&gt;
+ :   in namespace "http://zorba.io/modules/geoproj-param". Each node in this sequence is validated according
  :   to the according schema.
  :
  : @error err:XQDY0027 if any of the nodes passed in the $lat-long-degress parameter is
  :  not valid according to the schema.
  :
- : @return a sequence of x-y coordinates in format <br/>
- :   &lt;gml:pos&gt;<i>x</i> <i>y</i>&lt;/gml:pos&gt; <br/>
+ : @return a sequence of x-y coordinates in format 
+ :   &lt;gml:pos&gt;<i>x</i> <i>y</i>&lt;/gml:pos&gt; 
  :   in namespace "http://www.opengis.net/gml"
   @example test/Queries/geo/geoproj3.xq
  :)
@@ -274,7 +274,7 @@
 };
 
 (:~
- : Function for iterative computing of the inverse isometric latitude.
+ : <p>Function for iterative computing of the inverse isometric latitude.</p>
  : 
  : @param $i the maximum iterations
  : @param $ts precomputed value
@@ -298,7 +298,7 @@
 };
 
 (:~
- : Function for computing the inverse isometric latitude.
+ : <p>Function for computing the inverse isometric latitude.</p>
  : 
  : @param $ts precomputed value, based on an initial latitude.
  : @param $e the Earth eccentricity. For WGS84 is hardcoded to 0.0818192.
@@ -312,27 +312,27 @@
 };
 
 (:~
- : Inverse projection from cartesian coordinates on Oblique Mercator cylinder
- : to geographic coordinates lat-long on WGS84 ellipsoid.<br/>
- : The parameters for center point and scale should be the same as for the initial forward projection,
- : otherwise you will get wrong results.<br/>
- : <br/>
- :<br/>
+ : <p>Inverse projection from cartesian coordinates on Oblique Mercator cylinder
+ : to geographic coordinates lat-long on WGS84 ellipsoid.</p>
+ : <p>The parameters for center point and scale should be the same as for the initial forward projection,
+ : otherwise you will get wrong results.</p>
+ : 
+ :
  : @param $lat_0 is the latitude for center point, in degrees (-90, 90)
  : @param $long_c is the longitude for center point, in degrees (-180, 180)
  : @param $k0 is the scale in the center point.
- : @param $coords a sequence of nodes of type <br/>
- :   &lt;coord&gt;&lt;x&gt;<i>x</i>&lt;/x&gt;&lt;y&gt;<i>y</i>&lt;/y&gt;&lt;/coord&gt; <br/>
- :   in namespace "http://www.zorba-xquery.com/modules/geoproj-param"<br/>
+ : @param $coords a sequence of nodes of type 
+ :   &lt;coord&gt;&lt;x&gt;<i>x</i>&lt;/x&gt;&lt;y&gt;<i>y</i>&lt;/y&gt;&lt;/coord&gt; 
+ :   in namespace "http://zorba.io/modules/geoproj-param"
  :   The coordinates are expressed in meters.
  :
  : @error err:XQDY0027 if any of the coordinates passed in the $coords parameter is
  :  not valid according to the schema.
  : 
- : @return a sequence of geographic coordinates in format <br/>
- :   &lt;latlong&gt;&lt;lat&gt;<i>latitude degree</i>&lt;/lat&gt;&lt;long&gt;<i>longitude degree</i>&lt;/long&gt;&lt;/latlong&gt;<br/>
- :   in namespace "http://www.zorba-xquery.com/modules/geoproj-param"<br/>
- :   Note that the longitude corresponds to the x coordinate, and the latitude to the y coordinate.<br/>
+ : @return a sequence of geographic coordinates in format 
+ :   &lt;latlong&gt;&lt;lat&gt;<i>latitude degree</i>&lt;/lat&gt;&lt;long&gt;<i>longitude degree</i>&lt;/long&gt;&lt;/latlong&gt;
+ :   in namespace "http://zorba.io/modules/geoproj-param"
+ :   Note that the longitude corresponds to the x coordinate, and the latitude to the y coordinate.
   @example test/Queries/geo/geoproj2.xq
   @example test/Queries/geo/geoproj7.xq
   @example test/Queries/geo/geoproj11.xq
@@ -403,21 +403,21 @@
 };
 
 (:~
- : Inverse projection from cartesian coordinates on Oblique Mercator cylinder
- : to geographic coordinates lat-long on WGS84 ellipsoid.<br/>
- : This is an intermediate function for omerc-to-wgs84.<br/>
- : The difference is that it works with coordinates in gml:pos format,
- : gml being the prefix for the GML namespace "http://www.opengis.net/gml".<br/>
- :<br/>
+ : <p>Inverse projection from cartesian coordinates on Oblique Mercator cylinder
+ : to geographic coordinates lat-long on WGS84 ellipsoid.</p>
+ : <p>This is an intermediate function for omerc-to-wgs84.</p>
+ : <p>The difference is that it works with coordinates in gml:pos format,
+ : gml being the prefix for the GML namespace "http://www.opengis.net/gml".</p>
+ :
  : @param $lat_0 is the latitude for center point, in degrees (-90, 90)
  : @param $long_c is the longitude for center point, in degrees (-180, 180)
  : @param $k0 is the scale in the center point. 
- : @param $gmlposs a sequence of nodes of type <br/>
- :   &lt;gml:pos&gt;<i>x</i> <i>y</i>&lt;/gml:pos&gt; <br/>
+ : @param $gmlposs a sequence of nodes of type 
+ :   &lt;gml:pos&gt;<i>x</i> <i>y</i>&lt;/gml:pos&gt; 
  :   in namespace "http://www.opengis.net/gml"
- : @return a sequence of geographic coordinates in format <br/>v
- :   &lt;latlong&gt;&lt;lat&gt;<i>latitude degree</i>&lt;/lat&gt;&lt;long&gt;<i>longitude degree</i>&lt;/long&gt;&lt;/latlong&gt;<br/>
- :   in namespace "http://www.zorba-xquery.com/modules/geoproj-param"
+ : @return a sequence of geographic coordinates in format v
+ :   &lt;latlong&gt;&lt;lat&gt;<i>latitude degree</i>&lt;/lat&gt;&lt;long&gt;<i>longitude degree</i>&lt;/long&gt;&lt;/latlong&gt;
+ :   in namespace "http://zorba.io/modules/geoproj-param"
   @example test/Queries/geo/geoproj4.xq
  :)
 declare function geoproj:omerc-gmlpos-to-wgs84($lat_0 as xs:double,
@@ -435,18 +435,18 @@
 };
 
 (:~
- : Convertion from Degrees-Minutes-Seconds (DMS) to Degrees.<br/>
- : The values for DMS can be like 11d12'13", meaning 11 degrees, 12 minutes and 13 seconds.<br/>
- : One degree has 60 minutes, and one minute has 60 seconds.<br/>
- : The separator for degrees can be one of the characters [dDoO].<br/>
- : The separator for minutes can be one of the characters ['m].<br/>
- : The separator for seconds can be " or nothing.<br/>
- : The seconds can be a floating point number.<br/>
- : <br/>
- : The seconds can be missing, and if it is missing, the minutes can be missing too.<br/>
- : The negative value can be expressed as -11d12'13" or 11d12'13"S or 11d12'13"W.
- : Values for N (North) and E (East) are positive, and S (South) and W (West) are negative.
- :<br/>
+ : <p>Convertion from Degrees-Minutes-Seconds (DMS) to Degrees.</p>
+ : <p>The values for DMS can be like 11d12'13", meaning 11 degrees, 12 minutes and 13 seconds.</p>
+ : <p>One degree has 60 minutes, and one minute has 60 seconds.</p>
+ : <p>The separator for degrees can be one of the characters [dDoO].</p>
+ : <p>The separator for minutes can be one of the characters ['m].</p>
+ : <p>The separator for seconds can be " or nothing.</p>
+ : <p>The seconds can be a floating point number.</p>
+ : <p/> 
+ : <p>The seconds can be missing, and if it is missing, the minutes can be missing too.</p>
+ : <p>The negative value can be expressed as -11d12'13" or 11d12'13"S or 11d12'13"W.</p>
+ : <p>Values for N (North) and E (East) are positive, and S (South) and W (West) are negative.</p>
+ :
  : @param $dms the degree-minutes-seconds string expressed in the format described above
  : @return the value in degrees 
   @example test/Queries/geo/dms1.xq
@@ -494,8 +494,8 @@
 };
 
 (:~
- : Convertion from Degrees to Degrees-Minutes-Seconds (DMS).<br/>
- : <br/>
+ : <p>Convertion from Degrees to Degrees-Minutes-Seconds (DMS).</p>
+ : 
  : @param $deg the degree value
  : @return the value in DMS format, <i>[-]degree</i><b>d</b><i>minutes</i><b>'</b><i>seconds</i> 
   @example test/Queries/geo/dms2.xq

=== modified file 'test/ExpQueryResults/geo/geoproj1.xml.res'
--- test/ExpQueryResults/geo/geoproj1.xml.res	2011-02-23 12:55:52 +0000
+++ test/ExpQueryResults/geo/geoproj1.xml.res	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geoproj-param:coord xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:coord xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:x>109292.73684961209</geoproj-param:x>
   <geoproj-param:y>110793.18638310062</geoproj-param:y>
 </geoproj-param:coord>
\ No newline at end of file

=== modified file 'test/ExpQueryResults/geo/geoproj10.xml.res'
--- test/ExpQueryResults/geo/geoproj10.xml.res	2011-02-23 12:55:52 +0000
+++ test/ExpQueryResults/geo/geoproj10.xml.res	2013-06-19 19:41:25 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geoproj-param:coord xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:coord xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:x>0</geoproj-param:x>
   <geoproj-param:y>-110618.44951571905</geoproj-param:y>
 </geoproj-param:coord>
-<geoproj-param:coord xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:coord xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:x>0</geoproj-param:x>
   <geoproj-param:y>2.3223354824420721E6</geoproj-param:y>
 </geoproj-param:coord>
\ No newline at end of file

=== modified file 'test/ExpQueryResults/geo/geoproj11.xml.res'
--- test/ExpQueryResults/geo/geoproj11.xml.res	2011-02-23 12:55:52 +0000
+++ test/ExpQueryResults/geo/geoproj11.xml.res	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geoproj-param:latlong xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:latlong xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:lat>-11.000065662385046</geoproj-param:lat>
   <geoproj-param:long>0</geoproj-param:long>
 </geoproj-param:latlong>
\ No newline at end of file

=== modified file 'test/ExpQueryResults/geo/geoproj12.xml.res'
--- test/ExpQueryResults/geo/geoproj12.xml.res	2011-02-23 12:55:52 +0000
+++ test/ExpQueryResults/geo/geoproj12.xml.res	2013-06-19 19:41:25 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geoproj-param:coord xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:coord xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:x>34417.375607682858</geoproj-param:x>
   <geoproj-param:y>-6.7723638717972031E6</geoproj-param:y>
 </geoproj-param:coord>
-<geoproj-param:coord xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:coord xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:x>38106.644879161235</geoproj-param:x>
   <geoproj-param:y>8.983207725162318E6</geoproj-param:y>
 </geoproj-param:coord>
\ No newline at end of file

=== modified file 'test/ExpQueryResults/geo/geoproj2.xml.res'
--- test/ExpQueryResults/geo/geoproj2.xml.res	2011-02-23 12:55:52 +0000
+++ test/ExpQueryResults/geo/geoproj2.xml.res	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geoproj-param:latlong xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:latlong xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:lat>11</geoproj-param:lat>
   <geoproj-param:long>11</geoproj-param:long>
 </geoproj-param:latlong>
\ No newline at end of file

=== modified file 'test/ExpQueryResults/geo/geoproj4.xml.res'
--- test/ExpQueryResults/geo/geoproj4.xml.res	2011-02-23 12:55:52 +0000
+++ test/ExpQueryResults/geo/geoproj4.xml.res	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geoproj-param:latlong xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:latlong xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:lat>11</geoproj-param:lat>
   <geoproj-param:long>11</geoproj-param:long>
 </geoproj-param:latlong>
\ No newline at end of file

=== modified file 'test/ExpQueryResults/geo/geoproj5.xml.res'
--- test/ExpQueryResults/geo/geoproj5.xml.res	2011-02-23 12:55:52 +0000
+++ test/ExpQueryResults/geo/geoproj5.xml.res	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geoproj-param:coord xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:coord xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:x>109292.73684961209</geoproj-param:x>
   <geoproj-param:y>110793.18638310062</geoproj-param:y>
 </geoproj-param:coord>
\ No newline at end of file

=== modified file 'test/ExpQueryResults/geo/geoproj6.xml.res'
--- test/ExpQueryResults/geo/geoproj6.xml.res	2011-02-23 12:55:52 +0000
+++ test/ExpQueryResults/geo/geoproj6.xml.res	2013-06-19 19:41:25 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geoproj-param:coord xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:coord xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:x>547086.3150955874</geoproj-param:x>
   <geoproj-param:y>115174.5700163616</geoproj-param:y>
 </geoproj-param:coord>
-<geoproj-param:coord xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:coord xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:x>545150.00927157491</geoproj-param:x>
   <geoproj-param:y>226184.45457291827</geoproj-param:y>
 </geoproj-param:coord>
\ No newline at end of file

=== modified file 'test/ExpQueryResults/geo/geoproj7.xml.res'
--- test/ExpQueryResults/geo/geoproj7.xml.res	2011-02-23 12:55:52 +0000
+++ test/ExpQueryResults/geo/geoproj7.xml.res	2013-06-19 19:41:25 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geoproj-param:latlong xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:latlong xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:lat>11</geoproj-param:lat>
   <geoproj-param:long>102</geoproj-param:long>
   </geoproj-param:latlong>
-<geoproj-param:latlong xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:latlong xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:lat>12</geoproj-param:lat>
   <geoproj-param:long>102</geoproj-param:long>
 </geoproj-param:latlong>
\ No newline at end of file

=== modified file 'test/ExpQueryResults/geo/geoproj8.xml.res'
--- test/ExpQueryResults/geo/geoproj8.xml.res	2011-02-23 12:55:52 +0000
+++ test/ExpQueryResults/geo/geoproj8.xml.res	2013-06-19 19:41:25 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geoproj-param:coord xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:coord xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:x>-218616.56181767309</geoproj-param:x>
   <geoproj-param:y>111339.45363464409</geoproj-param:y>
 </geoproj-param:coord>
-<geoproj-param:coord xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:coord xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:x>-217845.99308707233</geoproj-param:x>
   <geoproj-param:y>222020.3879810845</geoproj-param:y>
 </geoproj-param:coord>
\ No newline at end of file

=== modified file 'test/ExpQueryResults/geo/geoproj9.xml.res'
--- test/ExpQueryResults/geo/geoproj9.xml.res	2011-02-23 12:55:52 +0000
+++ test/ExpQueryResults/geo/geoproj9.xml.res	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<geoproj-param:coord xmlns:geoproj-param="http://www.zorba-xquery.com/modules/geoproj-param">
+<geoproj-param:coord xmlns:geoproj-param="http://zorba.io/modules/geoproj-param">
   <geoproj-param:x>0</geoproj-param:x>
   <geoproj-param:y>-221150.04824675474</geoproj-param:y>
 </geoproj-param:coord>
\ No newline at end of file

=== modified file 'test/Queries/geo/dms1.xq'
--- test/Queries/geo/dms1.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/dms1.xq	2013-06-19 19:41:25 +0000
@@ -1,4 +1,4 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
 
 (geoproj:dms-to-deg("10d10'10"),
 geoproj:dms-to-deg("10d"),

=== modified file 'test/Queries/geo/dms2.xq'
--- test/Queries/geo/dms2.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/dms2.xq	2013-06-19 19:41:25 +0000
@@ -1,4 +1,4 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
 
 (geoproj:deg-to-dms(10.169444444444444),
  geoproj:deg-to-dms(10),

=== modified file 'test/Queries/geo/geoproj1.xq'
--- test/Queries/geo/geoproj1.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj1.xq	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
-declare namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
+declare namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 geoproj:wgs84-to-omerc(10, 10, 1, 
                         <geoproj-param:latlong>

=== modified file 'test/Queries/geo/geoproj10.xq'
--- test/Queries/geo/geoproj10.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj10.xq	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
-declare namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
+declare namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 geoproj:wgs84-to-omerc(-11, 0, 1, 
                        (<geoproj-param:latlong>

=== modified file 'test/Queries/geo/geoproj11.xq'
--- test/Queries/geo/geoproj11.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj11.xq	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
-declare namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
+declare namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 geoproj:omerc-to-wgs84(-10, 0, 1, 
                        (<geoproj-param:coord>

=== modified file 'test/Queries/geo/geoproj12.xq'
--- test/Queries/geo/geoproj12.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj12.xq	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
-declare namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
+declare namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 geoproj:wgs84-to-omerc(-11, 169, 1, 
                        (<geoproj-param:latlong>

=== modified file 'test/Queries/geo/geoproj2.xq'
--- test/Queries/geo/geoproj2.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj2.xq	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
-declare namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
+declare namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 geoproj:omerc-to-wgs84(10, 10, 1, 
                 (<geoproj-param:coord>

=== modified file 'test/Queries/geo/geoproj3.xq'
--- test/Queries/geo/geoproj3.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj3.xq	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
-declare namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
+declare namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 geoproj:wgs84-to-omerc-gmlpos(10, 10, 1 div 1000, 
                         <geoproj-param:latlong>

=== modified file 'test/Queries/geo/geoproj4.xq'
--- test/Queries/geo/geoproj4.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj4.xq	2013-06-19 19:41:25 +0000
@@ -1,4 +1,4 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
 declare namespace gml="http://www.opengis.net/gml";
 
 geoproj:omerc-gmlpos-to-wgs84(10, 10, 1 div 1000, 

=== modified file 'test/Queries/geo/geoproj5.xq'
--- test/Queries/geo/geoproj5.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj5.xq	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
-declare namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
+declare namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 geoproj:wgs84-to-omerc(10, 100, 1, 
                         <geoproj-param:latlong>

=== modified file 'test/Queries/geo/geoproj6.xq'
--- test/Queries/geo/geoproj6.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj6.xq	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
-declare namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
+declare namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 geoproj:wgs84-to-omerc(10, 85, 1, 
                         (<geoproj-param:latlong>

=== modified file 'test/Queries/geo/geoproj7.xq'
--- test/Queries/geo/geoproj7.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj7.xq	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
-declare namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
+declare namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 geoproj:omerc-to-wgs84(10, 100, 1, 
                 (<geoproj-param:coord>

=== modified file 'test/Queries/geo/geoproj8.xq'
--- test/Queries/geo/geoproj8.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj8.xq	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
-declare namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
+declare namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 geoproj:wgs84-to-omerc(10, -100, 1, 
                        (<geoproj-param:latlong>

=== modified file 'test/Queries/geo/geoproj9.xq'
--- test/Queries/geo/geoproj9.xq	2011-02-23 12:55:52 +0000
+++ test/Queries/geo/geoproj9.xq	2013-06-19 19:41:25 +0000
@@ -1,5 +1,5 @@
-import module namespace geoproj = "http://www.zorba-xquery.com/modules/geoproj";
-declare namespace geoproj-param = "http://www.zorba-xquery.com/modules/geoproj-param";
+import module namespace geoproj = "http://zorba.io/modules/geoproj";
+declare namespace geoproj-param = "http://zorba.io/modules/geoproj-param";
 
 geoproj:wgs84-to-omerc(0, 0, 1, 
                        (<geoproj-param:latlong>