|
|
@@ -50,7 +50,10 @@ class Api_WfsDataServer extends Api_WfsServerBase {
|
|
|
$maxFeatures = V::get('maxFeatures', $maxFeatures, $_REQUEST, 'int');
|
|
|
$maxFeatures = V::get('count', $maxFeatures, $_REQUEST, 'int');
|
|
|
$startIndex = V::get('startIndex', 0, $_REQUEST, 'int');// sql offset
|
|
|
- $ogcFilter = V::get('Filter', '', $_REQUEST);
|
|
|
+ $ogcFilter = '';
|
|
|
+ $ogcFilter = V::get('FILTER', $ogcFilter, $_REQUEST);
|
|
|
+ $ogcFilter = V::get('Filter', $ogcFilter, $_REQUEST);
|
|
|
+ $ogcFilter = urldecode($ogcFilter);
|
|
|
$sortBy = V::get('sortBy', '', $_REQUEST);
|
|
|
$propertyName = V::get('propertyName', '', $_REQUEST);
|
|
|
$propertyName = trim($propertyName);
|
|
|
@@ -78,7 +81,9 @@ class Api_WfsDataServer extends Api_WfsServerBase {
|
|
|
$maxFeatures = V::get('maxFeatures', $maxFeatures, $_REQUEST, 'int');
|
|
|
$maxFeatures = V::get('count', $maxFeatures, $_REQUEST, 'int');
|
|
|
$startIndex = V::get('startIndex', 0, $_REQUEST, 'int');// sql offset
|
|
|
- $ogcFilter = V::get('Filter', '', $_REQUEST);
|
|
|
+ $ogcFilter = '';
|
|
|
+ $ogcFilter = V::get('FILTER', $ogcFilter, $_REQUEST);
|
|
|
+ $ogcFilter = V::get('Filter', $ogcFilter, $_REQUEST);
|
|
|
$sortBy = V::get('sortBy', '', $_REQUEST);
|
|
|
$propertyName = V::get('propertyName', '', $_REQUEST);
|
|
|
$propertyName = trim($propertyName);
|