@@ -146,31 +146,21 @@ const gfiRequest =
146
146
} : PolarActionContext < GfiState , GfiGetters > ,
147
147
{ coordinateOrExtent, modifierPressed = false } : GetFeatureInfoParameters
148
148
) : Promise < void > => {
149
- const {
150
- afterLoadFunction,
151
- featureInformation,
152
- geometryLayerKeys,
153
- layerKeys,
154
- } = getters
149
+ const { afterLoadFunction, layerKeys } = getters
155
150
// fetch new feature information for all configured layers
156
- const promisedFeatures = getPromisedFeatures (
157
- map ,
158
- configuration ,
159
- layerKeys ,
160
- coordinateOrExtent
161
- )
162
- const features = ( await Promise . allSettled ( promisedFeatures ) ) . map (
163
- ( result ) =>
164
- result . status === 'fulfilled'
165
- ? result . value
166
- : errorSymbol ( result . reason . message )
151
+ const features = (
152
+ await Promise . allSettled (
153
+ getPromisedFeatures ( map , configuration , layerKeys , coordinateOrExtent )
154
+ )
155
+ ) . map ( ( result ) =>
156
+ result . status === 'fulfilled'
157
+ ? result . value
158
+ : errorSymbol ( result . reason . message )
167
159
)
168
160
const srsName : string = map . getView ( ) . getProjection ( ) . getCode ( )
169
161
let featuresByLayerId = filterAndMapFeaturesToLayerIds (
170
162
layerKeys ,
171
- // NOTE if there was no configuration, we would not be here
172
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
173
- configuration . gfi ! ,
163
+ getters . gfiConfiguration ,
174
164
features ,
175
165
srsName
176
166
)
@@ -183,13 +173,13 @@ const gfiRequest =
183
173
}
184
174
if ( modifierPressed ) {
185
175
featuresByLayerId = createSelectionDiff (
186
- featureInformation ,
176
+ getters . featureInformation ,
187
177
featuresByLayerId
188
178
)
189
179
}
190
180
commit ( 'setFeatureInformation' , featuresByLayerId )
191
181
// render feature geometries to help layer
192
- geometryLayerKeys
182
+ getters . geometryLayerKeys
193
183
. filter ( ( key ) => Array . isArray ( featuresByLayerId [ key ] ) )
194
184
. forEach ( ( key ) =>
195
185
filterFeatures ( featuresByLayerId ) [ key ] . forEach ( ( feature ) =>
0 commit comments