Don't require width, height, bbox for requests with filter or filter_geom

Author: manisandro

src/feature_info_service.py

@@ -140,19 +140,20 @@ def query(self, identity, origin, service_name, layers, params):
             )
 
         # calculate query coordinates and resolutions
-        try:
-            bbox = list(map(float, params["bbox"].split(",")))
-            x = 0.5 * (bbox[0] + bbox[2])
-            y = 0.5 * (bbox[1] + bbox[3])
-            xres = (bbox[2] - bbox[0]) / params['width']
-            yres = (bbox[3] - bbox[1]) / params['height']
-        except Exception as e:
-            x = 0
-            y = 0
-            xres = 0
-            yres = 0
+        x = 0
+        y = 0
+        if params.get('bbox') and params.get('width') and params.get('height'):
+            try:
+                bbox = list(map(float, params["bbox"].split(",")))
+                x = 0.5 * (bbox[0] + bbox[2])
+                y = 0.5 * (bbox[1] + bbox[3])
+                xres = (bbox[2] - bbox[0]) / params['width']
+                yres = (bbox[3] - bbox[1]) / params['height']
+            except Exception as e:
+                xres = 0
+                yres = 0
+            params['resolution'] = max(xres, yres)
 
-        params['resolution'] = max(xres, yres)
         crs = params['crs']
         output_info_format = params.get('info_format').lower()
 

src/server.py

@@ -82,8 +82,8 @@ def get_identity_or_auth(info_service):
 info_parser.add_argument('bbox', type=str)
 info_parser.add_argument('filter', type=str)
 info_parser.add_argument('filter_geom', type=str)
-info_parser.add_argument('height', required=True, type=int)
-info_parser.add_argument('width', required=True, type=int)
+info_parser.add_argument('height', type=int)
+info_parser.add_argument('width', type=int)
 info_parser.add_argument('crs', required=True, type=str)
 info_parser.add_argument('feature_count', default=1, type=int)
 info_parser.add_argument('with_geometry', default="true", type=str)
@@ -170,17 +170,17 @@ def __process_request(self, args, service_name):
 
         layers = params['layers'].split(',')
 
-        if 'filter' in params and params['filter']:
+        if params.get('filter'):
             # OK
             pass
-        elif 'filter_geom' in params and params['filter_geom']:
+        elif params.get('filter_geom'):
             # OK
             pass
-        elif 'i' in params and params['i'] and 'j' in params and params['j'] and 'bbox' in params and params['bbox']:
+        elif params.get('i') and params.get('j') and params.get('bbox') and params.get('width') and params.get('height'):
             # OK
             pass
         else:
-            api.abort(404, "Either filter, filter_geom, or i and j, are required")
+            api.abort(404, "Either filter, filter_geom, or (i, j, bbox, width, height), are required")
 
         origin = request.origin
         headers = request.headers