Skip to content

Commit 31bf412

Browse files
fmigneaultfmigneault
authored
Merge pull request #690 from fmigneault/fix-template-indents
2 parents f646d39 + a929bcf commit 31bf412

File tree

2 files changed

+85
-85
lines changed

2 files changed

+85
-85
lines changed

‎pywps/templates/1.0.0/execute/main.xml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{% if wsdl %}
1111
<wps:WSDL xlink:href="{{ process.wsdl }}"/>
1212
{% endif %}
13-
</wps:Process>
13+
</wps:Process>
1414
<wps:Status creationTime="{{ status.time }}">
1515
{% if status.status == "accepted" %}
1616
<wps:ProcessAccepted percentCompleted="{{ status.percent_done }}">{{ status.message }}</wps:ProcessAccepted>
@@ -29,39 +29,39 @@
2929
</wps:ExceptionReport>
3030
</wps:ProcessFailed>
3131
{% endif %}
32-
</wps:Status>
32+
</wps:Status>
3333
{% if lineage %}
3434
{% if input_definitions %}
35-
<wps:DataInputs>
35+
<wps:DataInputs>
3636
{% for input in input_definitions %}
37-
<wps:Input>
37+
<wps:Input>
3838
<ows:Identifier>{{ input.identifier }}</ows:Identifier>
3939
<ows:Title>{{ get_translation(input, "title", language) }}</ows:Title>
4040
<ows:Abstract>{{ get_translation(input, "abstract", language) }}</ows:Abstract>
4141
{% if input.type == "complex" %}
42-
<wps:Data>
42+
<wps:Data>
4343
<wps:ComplexData mimeType="{{ input.mimetype }}" encoding="{{ input.encoding }}" schema="{{ input.schema }}">{{ input.data | safe }}</wps:ComplexData>
44-
</wps:Data>
44+
</wps:Data>
4545
{% elif input.type == "literal" %}
46-
<wps:Data>
46+
<wps:Data>
4747
<wps:LiteralData {% if input.uom %}uom="{{ input.uom.reference }}"{% endif %}>{{ input.data }}</wps:LiteralData>
48-
</wps:Data>
48+
</wps:Data>
4949
{% elif input.type == "bbox" %}
50-
<wps:Data>
50+
<wps:Data>
5151
<wps:BoundingBoxData crs="{{ input.crs }}" dimensions="{{ input.dimensions }}">
5252
<ows:LowerCorner>{% for c in input.ll %} {{ c }} {% endfor %}</ows:LowerCorner>
5353
<ows:UpperCorner>{% for c in input.ur %} {{ c }} {% endfor %}</ows:UpperCorner>
5454
</wps:BoundingBoxData>
55-
</wps:Data>
55+
</wps:Data>
5656
{% elif input.type == "reference" %}
5757
<wps:Reference xlink:href="{{ input.href }}" method="{{ input.method }}" mimeType="{{ input.mimetype }}" encoding="{{ input.encoding }}" schema="{{ input.schema }}"/>
5858
{% endif %}
59-
</wps:Input>
59+
</wps:Input>
6060
{% endfor %}
61-
</wps:DataInputs>
61+
</wps:DataInputs>
6262
{% endif %}
6363
{% if output_definitions %}
64-
<wps:OutputDefinitions>
64+
<wps:OutputDefinitions>
6565
{% for output in output_definitions %}
6666
{% if output.type in ["complex", "reference"] %}
6767
<wps:Output mimeType="{{ output.mimetype }}" encoding="{{ output.encoding }}" schema="{{ output.schema }}" asReference="{{ output.asreference }}">
@@ -71,38 +71,38 @@
7171
<ows:Identifier>{{ output.identifier }}</ows:Identifier>
7272
<ows:Title>{{ get_translation(output, "title", language) }}</ows:Title>
7373
<ows:Abstract>{{ get_translation(output, "abstract", language) }}</ows:Abstract>
74-
</wps:Output>
74+
</wps:Output>
7575
{% endfor %}
76-
</wps:OutputDefinitions>
76+
</wps:OutputDefinitions>
7777
{% endif %}
7878
{% endif %}
7979
{% if outputs %}
80-
<wps:ProcessOutputs>
80+
<wps:ProcessOutputs>
8181
{% for output in outputs %}
82-
<wps:Output>
82+
<wps:Output>
8383
<ows:Identifier>{{ output.identifier }}</ows:Identifier>
8484
<ows:Title>{{ get_translation(output, "title", language) }}</ows:Title>
8585
<ows:Abstract>{{ get_translation(output, "abstract", language) }}</ows:Abstract>
8686
{% if output.type == "reference" %}
8787
<wps:Reference href="{{ output.href }}" mimeType="{{ output.mimetype }}" encoding="{{ output.encoding }}" schema="{{ output.schema }}"/>
8888
{% elif output.type == "complex" %}
89-
<wps:Data>
89+
<wps:Data>
9090
<wps:ComplexData mimeType="{{ output.mimetype }}" encoding="{{ output.encoding }}" schema="{{ output.schema }}">{{ output.data | safe }}</wps:ComplexData>
91-
</wps:Data>
91+
</wps:Data>
9292
{% elif output.type == "literal" %}
93-
<wps:Data>
93+
<wps:Data>
9494
<wps:LiteralData {% if output.uom %}uom="{{ output.uom.reference }}"{% endif %} dataType="{{ output.data_type }}">{{ output.data }}</wps:LiteralData>
95-
</wps:Data>
95+
</wps:Data>
9696
{% elif output.type == "bbox" %}
97-
<wps:Data>
97+
<wps:Data>
9898
<wps:BoundingBoxData crs="{{ output.crs }}" dimensions="{{ output.dimensions }}">
9999
<ows:LowerCorner>{% for c in output.ll %} {{ c }} {% endfor %}</ows:LowerCorner>
100100
<ows:UpperCorner>{% for c in output.ur %} {{ c }} {% endfor %}</ows:UpperCorner>
101101
</wps:BoundingBoxData>
102-
</wps:Data>
102+
</wps:Data>
103103
{% endif %}
104-
</wps:Output>
104+
</wps:Output>
105105
{% endfor %}
106-
</wps:ProcessOutputs>
106+
</wps:ProcessOutputs>
107107
{% endif %}
108108
</wps:ExecuteResponse>

‎pywps/templates/2.0.0/capabilities/main.xml‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- PyWPS {{ pywps_version }} -->
33
<wps:Capabilities xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:wps="http://www.opengis.net/wps/2.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wps/2.0 ../wps.xsd" service="WPS" version="2.0.0">
4-
<ows:ServiceIdentification>
4+
<ows:ServiceIdentification>
55
<ows:Title>{{ title }}</ows:Title>
66
<ows:Abstract>{{ abstract }}</ows:Abstract>
77
<ows:Keywords>{% for keyword in keywords %}
88
<ows:Keyword>{{ keyword }}</ows:Keyword>{% endfor %}
9-
</ows:Keywords>
10-
<ows:ServiceType>WPS</ows:ServiceType>
11-
<ows:ServiceTypeVersion>2.0.0</ows:ServiceTypeVersion>
9+
</ows:Keywords>
10+
<ows:ServiceType>WPS</ows:ServiceType>
11+
<ows:ServiceTypeVersion>2.0.0</ows:ServiceTypeVersion>
1212
<ows:Fees>{{ fees }}</ows:Fees>
1313
<ows:AccessConstraints>{% for ac in accessconstraints %}{{ ac }} {% endfor %}</ows:AccessConstraints>
14-
</ows:ServiceIdentification>
15-
<ows:ServiceProvider>
14+
</ows:ServiceIdentification>
15+
<ows:ServiceProvider>
1616
<ows:ProviderName>{{ provider.name }}</ows:ProviderName>
1717
<ows:ProviderSite xlink:href="{{ provider.site }}"/>
18-
<ows:ServiceContact>
18+
<ows:ServiceContact>
1919
<ows:individualname>{{ provider.individual }}</ows:individualname>
2020
<ows:positionname>{{ provider.position }}</ows:positionname>
21-
<ows:ContactInfo>
21+
<ows:ContactInfo>
2222
<ows:Phone>
2323
<ows:Voice>{{ provider.voice }}</ows:Voice>
2424
<ows:Facsimile>{{ provider.fascimile }}</ows:Facsimile>
@@ -31,76 +31,76 @@
3131
<ows:Country>{{ provider.address.country }}</ows:Country>
3232
<ows:ElectronicMailAddress>{{ provider.address.email }}</ows:ElectronicMailAddress>
3333
</ows:Address>
34-
</ows:ContactInfo>
35-
</ows:ServiceContact>
36-
</ows:ServiceProvider>
37-
<ows:OperationsMetadata>
38-
<ows:Operation name="GetCapabilities">
39-
<ows:DCP>
40-
<ows:HTTP>
34+
</ows:ContactInfo>
35+
</ows:ServiceContact>
36+
</ows:ServiceProvider>
37+
<ows:OperationsMetadata>
38+
<ows:Operation name="GetCapabilities">
39+
<ows:DCP>
40+
<ows:HTTP>
4141
<ows:Get xlink:href="{{ serviceurl }}"/>
4242
<ows:Post xlink:href="{{ serviceurl }}"/>
43-
</ows:HTTP>
44-
</ows:DCP>
45-
</ows:Operation>
46-
<ows:Operation name="DescribeProcess">
47-
<ows:DCP>
48-
<ows:HTTP>
43+
</ows:HTTP>
44+
</ows:DCP>
45+
</ows:Operation>
46+
<ows:Operation name="DescribeProcess">
47+
<ows:DCP>
48+
<ows:HTTP>
4949
<ows:Get xlink:href="{{ serviceurl }}"/>
5050
<ows:Post xlink:href="{{ serviceurl }}"/>
51-
</ows:HTTP>
52-
</ows:DCP>
53-
</ows:Operation>
54-
<ows:Operation name="Execute">
55-
<ows:DCP>
56-
<ows:HTTP>
51+
</ows:HTTP>
52+
</ows:DCP>
53+
</ows:Operation>
54+
<ows:Operation name="Execute">
55+
<ows:DCP>
56+
<ows:HTTP>
5757
<ows:Post xlink:href="{{ serviceurl }}"/>
58-
</ows:HTTP>
59-
</ows:DCP>
60-
</ows:Operation>
61-
<ows:Operation name="GetStatus">
62-
<ows:DCP>
63-
<ows:HTTP>
58+
</ows:HTTP>
59+
</ows:DCP>
60+
</ows:Operation>
61+
<ows:Operation name="GetStatus">
62+
<ows:DCP>
63+
<ows:HTTP>
6464
<ows:Get xlink:href="{{ serviceurl }}"/>
6565
<ows:Post xlink:href="{{ serviceurl }}"/>
66-
</ows:HTTP>
67-
</ows:DCP>
68-
</ows:Operation>
69-
<ows:Operation name="GetResult">
70-
<ows:DCP>
71-
<ows:HTTP>
66+
</ows:HTTP>
67+
</ows:DCP>
68+
</ows:Operation>
69+
<ows:Operation name="GetResult">
70+
<ows:DCP>
71+
<ows:HTTP>
7272
<ows:Get xlink:href="{{ serviceurl }}"/>
7373
<ows:Post xlink:href="{{ serviceurl }}"/>
74-
</ows:HTTP>
75-
</ows:DCP>
76-
</ows:Operation>
77-
<ows:Operation name="Dismiss">
78-
<ows:DCP>
79-
<ows:HTTP>
74+
</ows:HTTP>
75+
</ows:DCP>
76+
</ows:Operation>
77+
<ows:Operation name="Dismiss">
78+
<ows:DCP>
79+
<ows:HTTP>
8080
<ows:Get xlink:href="{{ serviceurl }}"/>
8181
<ows:Post xlink:href="{{ serviceurl }}"/>
82-
</ows:HTTP>
83-
</ows:DCP>
84-
</ows:Operation>
85-
</ows:OperationsMetadata>
82+
</ows:HTTP>
83+
</ows:DCP>
84+
</ows:Operation>
85+
</ows:OperationsMetadata>
8686
<wps:Contents>{% for process in processes %}
8787
<wps:ProcessSummary jobControlOptions="{% for option in process.control_options %}{{ option }} {% endfor %}" wps:processVersion="{{ process.version }}">
8888

89-
<ows:Title>process.title</ows:Title>
90-
<ows:Identifier>process.identifier</ows:Identifier>
89+
<ows:Title>process.title</ows:Title>
90+
<ows:Identifier>process.identifier</ows:Identifier>
9191
<ows:Abstract>{{ process.abstract }}</ows:Abstract>{% for metadata in process.metadata %}
9292
<ows:Metadata xlink:title="{{ metadata.title }}" xlink:type="{{ metadata.type }}"
93-
{% if metadata.href != None %}
94-
xlink:href="{{ metadata.href }}"
95-
{% endif %}
96-
{% if metadata.role != None %}
97-
xlink:role="{{ metadata.role }}"
98-
{% endif %}
99-
/>
100-
{% endfor %}
93+
{% if metadata.href != None %}
94+
xlink:href="{{ metadata.href }}"
95+
{% endif %}
96+
{% if metadata.role != None %}
97+
xlink:role="{{ metadata.role }}"
98+
{% endif %}
99+
/>
100+
{% endfor %}
101101
<ows:Keywords>{% for keyword in process.keywords %}
102102
<ows:Keyword>{{ keyword }}</ows:Keyword>{% endfor %}
103103
</ows:Keywords>
104104
</wps:ProcessSummary>{% endfor %}
105-
</wps:Contents>
105+
</wps:Contents>
106106
</wps:Capabilities>

0 commit comments

Comments
 (0)