Просмотр исходного кода

fixed parse WFS GetFeature resolve if wfs:propertName is not set in ogc:Filter

Piotr Labudda 8 лет назад
Родитель
Сommit
5ac740ac67
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      SE/se-lib/Api/Wfs/GetFeature.php

+ 3 - 3
SE/se-lib/Api/Wfs/GetFeature.php

@@ -64,11 +64,11 @@ class Api_Wfs_GetFeature {
 				if (!empty($parsedRequest['wfs:PropertyName'])) {
 					$args['filterFields'] = array_merge($args['filterFields'], $parsedRequest['wfs:PropertyName']);
 				}
-			} else if ($args['resolve'] && $args['resolveDepth'] > 0) {
-				$args['filterFields'][] = '*' . str_repeat("/*", $args['resolveDepth'] - 1);
 			}
 		}
-
+		if (empty($args['filterFields']) && $args['resolve'] && $args['resolveDepth'] > 0) {
+			$args['filterFields'][] = '*' . str_repeat("/*", $args['resolveDepth'] - 1);
+		}
 		$args['sortBy'] = V::get('sortby', '', $lowerArgs);// TODO: split to array of array(fieldName, (asc | desc))
 
 		$args['wfs:propertyName'] = trim(V::get('propertyname', '', $lowerArgs));