Zorba

Merge lp:~zorba-coders/zorba/expath_geo_doc into lp:zorba/geo-module

  1. expath_geo_doc
  2. Merge into geo-module
Proposed by William Candillon
Status: Merged
Merged at revision: 39
Proposed branch: lp:~zorba-coders/zorba/expath_geo_doc
Merge into: lp:zorba/geo-module
Diff against target: 141 lines (+55/-61)
1 file modified
src/org/expath/ns/geo.xq (+55/-61)
To merge this branch: bzr merge lp:~zorba-coders/zorba/expath_geo_doc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
William Candillon Approve
Review via email: mp+126447@code.launchpad.net

Commit message

Improve documentation of the EXPath Geo module.

Description of the change

Improve documentation of the EXPath Geo module.

To post a comment you must log in.
Revision history for this message
William Candillon (wcandillon) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/org/expath/ns/geo.xq'
2--- src/org/expath/ns/geo.xq 2011-08-13 00:08:28 +0000
3+++ src/org/expath/ns/geo.xq 2012-09-26 13:14:31 +0000
4@@ -27,75 +27,69 @@
5 : Possible GMLSF geometric structures are:
6 : <dl>
7 : <dt><b>Point</b></dt>
8- : <pre class="brush: xml;">&lt;gml:Point [srsDimension='2|3']?&gt;
9- : &#160;&#160;&lt;gml:pos [srsDimension='2|3']?&gt;double_x double_y &lt;/gml:pos&gt;
10- : &lt;/gml:Point&gt;</pre>
11+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[<gml:Point [srsDimension='2|3']?>
12+ : <gml:pos [srsDimension='2|3']?>double_x double_y </gml:pos>
13+ : </gml:Point>]]></pre>
14 : <dt><b>LineString</b></dt>
15- : <pre class="brush: xml;">&lt;gml:LineString [srsDimension='2|3']?&gt;
16- : &#160;&#160;&lt;gml:posList [srsDimension='2|3']?&gt; double_x1 double_y1 double_x2 double_y2 ... &lt;/gml:posList&gt;
17- : &lt;/gml:LineString&gt;</pre>
18+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[<gml:LineString [srsDimension='2|3']?>
19+ : <gml:posList [srsDimension='2|3']?> double_x1 double_y1 double_x2 double_y2 ... </gml:posList>
20+ : </gml:LineString>]]></pre>
21 : <dt><b>Curve</b></dt>
22- : <pre class="brush: xml;">&lt;gml:Curve [srsDimension='2|3']?&gt;
23- : &lt;gml:segments&gt;
24- : [&lt;gml:LineStringSegment interpolation="linear" [srsDimension='2|3']?&gt;
25- : &#160;&#160;&lt;gml:posList [srsDimension='2|3']?&gt; double_x1 double_y1 double_x2 double_y2 ... &lt;/gml:posList&gt;
26- : &lt;gml:LineStringSegment&gt;]*
27- : &lt;/gml:segments&gt;
28- : &lt;/gml:Curve&gt;
29- : </pre>
30+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[<gml:Curve [srsDimension='2|3']?>
31+ : <gml:segments>
32+ : [<gml:LineStringSegment interpolation="linear" [srsDimension='2|3']?>
33+ : <gml:posList [srsDimension='2|3']?> double_x1 double_y1 double_x2 double_y2 ... </gml:posList>;
34+ : <gml:LineStringSegment>]*
35+ : </gml:segments>
36+ : </gml:Curve>]]></pre>
37 : <dt><b>LinearRing</b></dt>
38- : <pre class="brush: xml;">&lt;gml:LinearRing [srsDimension='2|3']?&gt;
39- : &#160;&#160;&lt;gml:posList [srsDimension='2|3']?&gt; double_x1 double_y1 double_x2 double_y2 ... &lt;/gml:posList&gt;
40- : &lt;/gml:LinearRing&gt;</pre>
41+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[<gml:LinearRing [srsDimension='2|3']?>
42+ : <gml:posList [srsDimension='2|3']?> double_x1 double_y1 double_x2 double_y2 ... </gml:posList>
43+ : </gml:LinearRing>]]></pre>
44 : <dt><b>Surface</b></dt>
45- : <pre class="brush: xml;">&lt;gml:Surface [srsDimension='2|3']?&gt;
46- : &lt;gml:patches&gt;
47- : [&lt;gml:PolygonPatch [srsDimension='2|3']?&gt;
48- : &#160;&#160;&lt;gml:exterior&gt;
49- : &#160;&#160;&#160;&#160;&lt;gml:LinearRing&gt; ... &lt;/gml:LinearRing&gt;
50- : &#160;&#160;&lt;/gml:exterior&gt;
51- : &#160;&#160;[&lt;gml:interior&gt;
52- : &#160;&#160;&#160;&#160;&lt;gml:LinearRing&gt; ... &lt;/gml:LinearRing&gt;
53- : &#160;&#160;&lt;/gml:interior&gt;]*
54- : &lt;/gml:PolygonPatch&gt;]*
55- : &lt;/gml:patches&gt;
56- : &lt;/gml:Surface&gt;
57- : </pre>
58+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[<gml:Surface [srsDimension='2|3']?>
59+ : <gml:patches>
60+ : [<gml:PolygonPatch [srsDimension='2|3']?>
61+ : <gml:exterior>
62+ : <gml:LinearRing> ... </gml:LinearRing>
63+ : </gml:exterior>
64+ : <gml:interior>
65+ : <gml:LinearRing> ... </gml:LinearRing>
66+ : </gml:interior>]*
67+ : </gml:PolygonPatch>]*
68+ : </gml:patches>
69+ : </gml:Surface>]]></pre>
70 : <dt><b>Polygon</b></dt>
71- : <pre class="brush: xml;">&lt;gml:Polygon [srsDimension='2|3']?&gt;
72- : &#160;&#160;&lt;gml:exterior&gt;
73- : &#160;&#160;&#160;&#160;&lt;gml:LinearRing&gt; ... &lt;/gml:LinearRing&gt;
74- : &#160;&#160;&lt;/gml:exterior&gt;
75- : &#160;&#160;[&lt;gml:interior&gt;
76- : &#160;&#160;&#160;&#160;&lt;gml:LinearRing&gt; ... &lt;/gml:LinearRing&gt;
77- : &#160;&#160;&lt;/gml:interior&gt;]*
78- : &lt;/gml:Polygon&gt;
79- : </pre>
80+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[<gml:Polygon [srsDimension='2|3']?>
81+ : <gml:exterior>
82+ : <gml:LinearRing> ... </gml:LinearRing>
83+ : </gml:exterior>
84+ : [<gml:interior>
85+ : <gml:LinearRing> ... </gml:LinearRing>
86+ : </gml:interior>]*
87+ : </gml:Polygon>]]></pre>
88 : <dt><b>MultiPoint</b></dt>
89- : <pre class="brush: xml;">&lt;gml:MultiPoint [srsDimension='2|3']?&gt;
90- : &#160;&#160;[&lt;gml:Point&gt; ... &lt;/gml:Point&gt;]*
91- : &lt;/gml:MultiPoint&gt;
92- : </pre>
93+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[<gml:MultiPoint [srsDimension='2|3']?>
94+ : [<gml:Point> ... </gml:Point>]*
95+ : </gml:MultiPoint>]]></pre>
96 : <dt><b>MultiCurve</b></dt>
97- : <pre class="brush: xml;">&lt;gml:MultiCurve [srsDimension='2|3']?&gt;
98- : &#160;&#160;[&lt;gml:LineString&gt; ... &lt;/gml:LineString&gt;]*
99- : &lt;/gml:MultiCurve&gt;
100- : </pre>
101+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[<gml:MultiCurve [srsDimension='2|3']?>
102+ : [<gml:LineString> ... </gml:LineString>]*
103+ : </gml:MultiCurve>]]></pre>
104 : <dt><b>MultiSurface</b></dt>
105- : <pre class="brush: xml;">&lt;gml:MultiSurface [srsDimension='2|3']?&gt;
106- : &#160;&#160;[&lt;gml:Polygon&gt; ... &lt;/gml:Polygon&gt;]*
107- : &lt;/gml:MultiSurface&gt;
108- : </pre>
109+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[<gml:MultiSurface [srsDimension='2|3']?>
110+ : [<gml:Polygon> ... </gml:Polygon>]*
111+ : </gml:MultiSurface>
112+ : ]]></pre>
113 : <dt><b>MultiGeometry (this is from GML 3 schema)</b></dt>
114- : <pre class="brush: xml;">&lt;gml:MultiGeometry [srsDimension='2|3']?&gt;
115- : &#160;&#160;[&lt;gml:geometryMember&gt;
116- : &#160;&#160;&#160;&#160; ...one geometry...
117- : &#160;&#160;&lt;/gml:geometryMember&gt;]*
118- : &#160;&#160;[&lt;gml:geometryMembers&gt;
119- : &#160;&#160;&#160;&#160; ...a list of geometries...
120- : &#160;&#160;&lt;/gml:geometryMembers&gt;]?
121- : &lt;/gml:MultiGeometry&gt;
122- : </pre>
123+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[<gml:MultiGeometry [srsDimension='2|3']?>
124+ : [<gml:geometryMember>
125+ : ...one geometry...
126+ : </gml:geometryMember>]*
127+ : [<gml:geometryMembers>
128+ : ...a list of geometries...
129+ : </gml:geometryMembers>]?
130+ : </gml:MultiGeometry>]]></pre>
131 : </dl><br/><br/>
132 : Note: When using gml:posList, it is possible to replace this element with a list of gml:pos.<br/>
133 : Note: XLink referencing is not supported.<br/>
134@@ -156,7 +150,7 @@
135 : @see http://www.opengeospatial.org/standards/gml
136 : @see http://trac.osgeo.org/geos/
137 : @library <a href="http://trac.osgeo.org/geos/">GEOS (Geometry Engine - Open Source)</a>
138- : @project geo
139+ : @project EXPath/Geo
140 :)
141 module namespace geo = "http://expath.org/ns/geo";
142

Subscribers

People subscribed via source and target branches

to all changes: