Prechádzať zdrojové kódy

updated errors in js get feature

Piotr Labudda 8 rokov pred
rodič
commit
7ae90fe78c
1 zmenil súbory, kde vykonal 2 pridanie a 1 odobranie
  1. 2 1
      SE/static/p5WFS/GetFeature.js

+ 2 - 1
SE/static/p5WFS/GetFeature.js

@@ -145,7 +145,7 @@ function p5WFS_GetFeature(typeName, query) { // @returns Promise
 		} else if ('<wfs:Query>' === query['ogc:Filter'].substr(0, '<wfs:Query>'.length)) {
 			postData = headerOgcFilter + query['ogc:Filter'] + '</GetFeature>'
 		} else {
-			return Promise.reject(new Error('Error - wrong syntax ogc:Filter'))
+			return Promise.reject(new Error('Wrong syntax ogc:Filter'))
 		}
 	}
 	if ('graphql:query' in query && 'string' === typeof query['graphql:query']) { // TODO: http://graphql.org/learn/queries/
@@ -156,6 +156,7 @@ function p5WFS_GetFeature(typeName, query) { // @returns Promise
 	if ('maxFeatures' in query) link += '&maxFeatures=' + query['maxFeatures']
 	if ('count' in query) link += '&count=' + query['count']
 	if ('primaryKey' in query) link += '&primaryKey=' + query['primaryKey']
+	if ('resolveDepth' in query && !('resolve' in query)) return Promise.reject(new Error('ResolveDepth set but missing resolve="all"'))
 	if ('resolve' in query) link += '&resolve=' + query['resolve']
 	if ('resolveDepth' in query) link += '&resolveDepth=' + query['resolveDepth']
 	if ('xlink' in query) link += '&xlink=' + query['xlink'] // NOTE: replace '#' to '/'