WMS can be version 1.3.0, close #138

Author: drewbo

label_maker/utils.py

@@ -91,13 +91,17 @@ def get_tile_wms(tile, imagery, folder, imagery_offset):
  """
  Read a WMS endpoint with query parameters corresponding to a TMS tile
 
- Converts the tile boundaries to the spatial reference system (SRS) specified
- by the WMS query parameter.
+ Converts the tile boundaries to the spatial/coordinate reference system
+ (SRS or CRS) specified by the WMS query parameter.
  """
  # retrieve the necessary parameters from the query string
  query_dict = parse_qs(imagery.lower())
- image_format = query_dict['format'][0].split('/')[1]
- wms_srs = query_dict['srs'][0]
+ image_format = query_dict.get('format')[0].split('/')[1]
+ wms_version = query_dict.get('version')[0]
+ if wms_version == '1.3.0':
+ wms_srs = query_dict.get('crs')[0]
+ else:
+ wms_srs = query_dict.get('srs')[0]
 
  # find our tile bounding box
  bound = bounds(*[int(t) for t in tile.split('-')])
@@ -107,7 +111,10 @@ def get_tile_wms(tile, imagery, folder, imagery_offset):
  # project the tile bounding box from lat/lng to WMS SRS
  tile_ll_proj = transform(p1, p2, bound.west, bound.south)
  tile_ur_proj = transform(p1, p2, bound.east, bound.north)
- bbox = tile_ll_proj + tile_ur_proj
+ if wms_version == '1.3.0':
+ bbox = tile_ll_proj[::-1] + tile_ur_proj[::-1]
+ else:
+ bbox = tile_ll_proj + tile_ur_proj
 
  # request the image with the transformed bounding box and save
  wms_url = imagery.replace('{bbox}', ','.join([str(b) for b in bbox]))