Skip to content

Commit 22d7b6c

Browse files
ghtmttghtmtt
committedJul 11, 2018
fixing indentation?
·
ltr-3_40final-3_4_0
1 parent 5507c34 commit 22d7b6c

File tree

7 files changed

+174
-37
lines changed

7 files changed

+174
-37
lines changed
 

‎python/plugins/processing/algs/qgis/RasterSampling.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ def initAlgorithm(self, config=None):
7676
)
7777
)
7878

79-
8079
self.addParameter(
8180
QgsProcessingParameterMultipleLayers(
8281
self.RASTERCOPY,
@@ -116,15 +115,12 @@ def processAlgorithm(self, parameters, context, feedback):
116115
for i in sampled_rasters:
117116
for b in range(i.bandCount()):
118117
raster_fields.append(QgsField(
119-
i.name() + str('_{}'.format(b+1)),
120-
QVariant.Double)
118+
i.name() + str('_{}'.format(b + 1)), QVariant.Double)
121119
)
122120

123-
124121
# combine all the vector fields
125122
out_fields = QgsProcessingUtils.combineFields(source_fields, raster_fields)
126123

127-
128124
(sink, dest_id) = self.parameterAsSink(
129125
parameters,
130126
self.OUTPUT,
@@ -134,7 +130,6 @@ def processAlgorithm(self, parameters, context, feedback):
134130
source.sourceCrs()
135131
)
136132

137-
138133
if sink is None:
139134
raise QgsProcessingException(self.invalidSinkError(parameters, self.OUTPUT))
140135

@@ -147,25 +142,22 @@ def processAlgorithm(self, parameters, context, feedback):
147142

148143
attrs = i.attributes()
149144

150-
if rr.bandCount() >1:
145+
if rr.bandCount() > 1:
151146

152147
for b in range(rr.bandCount()):
153148
attrs.append(
154149
rr.dataProvider().identify(i.geometry().asPoint(),
155-
QgsRaster.IdentifyFormatValue).results()[b+1]
150+
QgsRaster.IdentifyFormatValue).results()[b + 1]
156151
)
157152

158-
159153
attrs.append(
160154
rr.dataProvider().identify(i.geometry().asPoint(),
161-
QgsRaster.IdentifyFormatValue).results()[1]
155+
QgsRaster.IdentifyFormatValue).results()[1]
162156
)
163157

164-
165158
i.setAttributes(attrs)
166159

167160
sink.addFeature(i, QgsFeatureSink.FastInsert)
168161
feedback.setProgress(int(n * total))
169162

170-
171163
return {self.OUTPUT: dest_id}

‎python/plugins/processing/tests/testdata/custom/sampling_points.gml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<ogr:FeatureCollection
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://ogr.maptools.org/ sampling_points.xsd"
5+
xmlns:ogr="http://ogr.maptools.org/"
6+
xmlns:gml="http://www.opengis.net/gml">
7+
<gml:boundedBy>
8+
<gml:Box>
9+
<gml:coord><gml:X>18.66907337319408</gml:X><gml:Y>45.78164855298462</gml:Y></gml:coord>
10+
<gml:coord><gml:X>18.69811881698106</gml:X><gml:Y>45.80559559440474</gml:Y></gml:coord>
11+
</gml:Box>
12+
</gml:boundedBy>
13+
14+
<gml:featureMember>
15+
<ogr:sampling_points fid="sampling_points.0">
16+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6716225743775,45.8055955944047</gml:coordinates></gml:Point></ogr:geometryProperty>
17+
</ogr:sampling_points>
18+
</gml:featureMember>
19+
<gml:featureMember>
20+
<ogr:sampling_points fid="sampling_points.1">
21+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6825918643183,45.8040506239905</gml:coordinates></gml:Point></ogr:geometryProperty>
22+
</ogr:sampling_points>
23+
</gml:featureMember>
24+
<gml:featureMember>
25+
<ogr:sampling_points fid="sampling_points.2">
26+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6905484619515,45.7973300026888</gml:coordinates></gml:Point></ogr:geometryProperty>
27+
</ogr:sampling_points>
28+
</gml:featureMember>
29+
<gml:featureMember>
30+
<ogr:sampling_points fid="sampling_points.3">
31+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6882310063302,45.7870559494343</gml:coordinates></gml:Point></ogr:geometryProperty>
32+
</ogr:sampling_points>
33+
</gml:featureMember>
34+
<gml:featureMember>
35+
<ogr:sampling_points fid="sampling_points.4">
36+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6778024560343,45.7857427245822</gml:coordinates></gml:Point></ogr:geometryProperty>
37+
</ogr:sampling_points>
38+
</gml:featureMember>
39+
<gml:featureMember>
40+
<ogr:sampling_points fid="sampling_points.5">
41+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6833643495254,45.7918453577183</gml:coordinates></gml:Point></ogr:geometryProperty>
42+
</ogr:sampling_points>
43+
</gml:featureMember>
44+
<gml:featureMember>
45+
<ogr:sampling_points fid="sampling_points.6">
46+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6974235802947,45.8035871328663</gml:coordinates></gml:Point></ogr:geometryProperty>
47+
</ogr:sampling_points>
48+
</gml:featureMember>
49+
<gml:featureMember>
50+
<ogr:sampling_points fid="sampling_points.7">
51+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6981188169811,45.7852019849373</gml:coordinates></gml:Point></ogr:geometryProperty>
52+
</ogr:sampling_points>
53+
</gml:featureMember>
54+
<gml:featureMember>
55+
<ogr:sampling_points fid="sampling_points.8">
56+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6690733731941,45.7816485529846</gml:coordinates></gml:Point></ogr:geometryProperty>
57+
</ogr:sampling_points>
58+
</gml:featureMember>
59+
<gml:featureMember>
60+
<ogr:sampling_points fid="sampling_points.9">
61+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6707728406497,45.7915363636355</gml:coordinates></gml:Point></ogr:geometryProperty>
62+
</ogr:sampling_points>
63+
</gml:featureMember>
64+
</ogr:FeatureCollection>

‎python/plugins/processing/tests/testdata/custom/sampling_points.xsd

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<xs:schema targetNamespace="http://ogr.maptools.org/" xmlns:ogr="http://ogr.maptools.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="1.0">
3+
<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/2.1.2/feature.xsd"/>
4+
<xs:element name="FeatureCollection" type="ogr:FeatureCollectionType" substitutionGroup="gml:_FeatureCollection"/>
5+
<xs:complexType name="FeatureCollectionType">
6+
<xs:complexContent>
7+
<xs:extension base="gml:AbstractFeatureCollectionType">
8+
<xs:attribute name="lockId" type="xs:string" use="optional"/>
9+
<xs:attribute name="scope" type="xs:string" use="optional"/>
10+
</xs:extension>
11+
</xs:complexContent>
12+
</xs:complexType>
13+
<xs:element name="sampling_points" type="ogr:sampling_points_Type" substitutionGroup="gml:_Feature"/>
14+
<xs:complexType name="sampling_points_Type">
15+
<xs:complexContent>
16+
<xs:extension base="gml:AbstractFeatureType">
17+
<xs:sequence>
18+
<xs:element name="geometryProperty" type="gml:PointPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
19+
</xs:sequence>
20+
</xs:extension>
21+
</xs:complexContent>
22+
</xs:complexType>
23+
</xs:schema>

‎python/plugins/processing/tests/testdata/expected/raster_sampling.geojson

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎python/plugins/processing/tests/testdata/expected/sampling_raster.gml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<ogr:FeatureCollection
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://ogr.maptools.org/ sampling_raster.xsd"
5+
xmlns:ogr="http://ogr.maptools.org/"
6+
xmlns:gml="http://www.opengis.net/gml">
7+
<gml:boundedBy>
8+
<gml:Box>
9+
<gml:coord><gml:X>18.6690733731941</gml:X><gml:Y>45.7816485529846</gml:Y></gml:coord>
10+
<gml:coord><gml:X>18.6981188169811</gml:X><gml:Y>45.8055955944047</gml:Y></gml:coord>
11+
</gml:Box>
12+
</gml:boundedBy>
13+
14+
<gml:featureMember>
15+
<ogr:sampling_raster fid="sampling_points.0">
16+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6716225743775,45.8055955944047</gml:coordinates></gml:Point></ogr:geometryProperty>
17+
<ogr:dem_1>91.9159927368164</ogr:dem_1>
18+
</ogr:sampling_raster>
19+
</gml:featureMember>
20+
<gml:featureMember>
21+
<ogr:sampling_raster fid="sampling_points.1">
22+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6825918643183,45.8040506239905</gml:coordinates></gml:Point></ogr:geometryProperty>
23+
<ogr:dem_1>88.300178527832</ogr:dem_1>
24+
</ogr:sampling_raster>
25+
</gml:featureMember>
26+
<gml:featureMember>
27+
<ogr:sampling_raster fid="sampling_points.2">
28+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6905484619515,45.7973300026888</gml:coordinates></gml:Point></ogr:geometryProperty>
29+
<ogr:dem_1>182.22380065918</ogr:dem_1>
30+
</ogr:sampling_raster>
31+
</gml:featureMember>
32+
<gml:featureMember>
33+
<ogr:sampling_raster fid="sampling_points.3">
34+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6882310063302,45.7870559494343</gml:coordinates></gml:Point></ogr:geometryProperty>
35+
<ogr:dem_1>126.56761932373</ogr:dem_1>
36+
</ogr:sampling_raster>
37+
</gml:featureMember>
38+
<gml:featureMember>
39+
<ogr:sampling_raster fid="sampling_points.4">
40+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6778024560343,45.7857427245822</gml:coordinates></gml:Point></ogr:geometryProperty>
41+
<ogr:dem_1>131.698287963867</ogr:dem_1>
42+
</ogr:sampling_raster>
43+
</gml:featureMember>
44+
<gml:featureMember>
45+
<ogr:sampling_raster fid="sampling_points.5">
46+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6833643495254,45.7918453577183</gml:coordinates></gml:Point></ogr:geometryProperty>
47+
<ogr:dem_1>150</ogr:dem_1>
48+
</ogr:sampling_raster>
49+
</gml:featureMember>
50+
<gml:featureMember>
51+
<ogr:sampling_raster fid="sampling_points.6">
52+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6974235802947,45.8035871328663</gml:coordinates></gml:Point></ogr:geometryProperty>
53+
<ogr:dem_1>123.953346252441</ogr:dem_1>
54+
</ogr:sampling_raster>
55+
</gml:featureMember>
56+
<gml:featureMember>
57+
<ogr:sampling_raster fid="sampling_points.7">
58+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6981188169811,45.7852019849373</gml:coordinates></gml:Point></ogr:geometryProperty>
59+
<ogr:dem_1>188.614822387695</ogr:dem_1>
60+
</ogr:sampling_raster>
61+
</gml:featureMember>
62+
<gml:featureMember>
63+
<ogr:sampling_raster fid="sampling_points.8">
64+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6690733731941,45.7816485529846</gml:coordinates></gml:Point></ogr:geometryProperty>
65+
<ogr:dem_1>168.492599487305</ogr:dem_1>
66+
</ogr:sampling_raster>
67+
</gml:featureMember>
68+
<gml:featureMember>
69+
<ogr:sampling_raster fid="sampling_points.9">
70+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>18.6707728406497,45.7915363636355</gml:coordinates></gml:Point></ogr:geometryProperty>
71+
<ogr:dem_1>96.8800735473633</ogr:dem_1>
72+
</ogr:sampling_raster>
73+
</gml:featureMember>
74+
</ogr:FeatureCollection>

‎python/plugins/processing/tests/testdata/expected/raster_sampling.xsd renamed to ‎python/plugins/processing/tests/testdata/expected/sampling_raster.xsd

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,12 @@
1010
</xs:extension>
1111
</xs:complexContent>
1212
</xs:complexType>
13-
<xs:element name="raster_sampling" type="ogr:raster_sampling_Type" substitutionGroup="gml:_Feature"/>
14-
<xs:complexType name="raster_sampling_Type">
13+
<xs:element name="sampling_raster" type="ogr:sampling_raster_Type" substitutionGroup="gml:_Feature"/>
14+
<xs:complexType name="sampling_raster_Type">
1515
<xs:complexContent>
1616
<xs:extension base="gml:AbstractFeatureType">
1717
<xs:sequence>
1818
<xs:element name="geometryProperty" type="gml:PointPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
19-
<xs:element name="id" nillable="true" minOccurs="0" maxOccurs="1">
20-
<xs:simpleType>
21-
<xs:restriction base="xs:long">
22-
<xs:totalDigits value="10"/>
23-
</xs:restriction>
24-
</xs:simpleType>
25-
</xs:element>
2619
<xs:element name="dem_1" nillable="true" minOccurs="0" maxOccurs="1">
2720
<xs:simpleType>
2821
<xs:restriction base="xs:decimal">

‎python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5729,10 +5729,10 @@ tests:
57295729
type: vector
57305730

57315731
- algorithm: qgis:rastersampling
5732-
name: Test (qgis:rastersampling)
5732+
name: Single band raster
57335733
params:
57345734
INPUT:
5735-
name: custom/points_over.shp
5735+
name: custom/sampling_points.gml
57365736
type: vector
57375737
RASTERCOPY:
57385738
params:
@@ -5741,8 +5741,12 @@ tests:
57415741
type: multi
57425742
results:
57435743
OUTPUT:
5744-
name: expected/raster_sampling.geojson
5744+
name: expected/sampling_raster.gml
57455745
type: vector
5746+
compare:
5747+
fields:
5748+
fid: skip
5749+
57465750

57475751

57485752
# See ../README.md for a description of the file format

0 commit comments

Comments
 (0)
Please sign in to comment.