|
@@ -361,24 +361,14 @@ def projInfo():
|
|
|
"""Return region projection and map units information,
|
|
|
taken from render.py
|
|
|
"""
|
|
|
-
|
|
|
- projinfo = dict()
|
|
|
-
|
|
|
- ret = RunCommand('g.proj', read=True, flags='p')
|
|
|
-
|
|
|
- if not ret:
|
|
|
- return projinfo
|
|
|
-
|
|
|
- for line in ret.splitlines():
|
|
|
- if ':' in line:
|
|
|
- key, val = line.split(':')
|
|
|
- projinfo[key.strip()] = val.strip()
|
|
|
- elif "XY location (unprojected)" in line:
|
|
|
- projinfo['proj'] = 'xy'
|
|
|
- projinfo['units'] = ''
|
|
|
- break
|
|
|
-
|
|
|
- return projinfo
|
|
|
+ proj_info = RunCommand(
|
|
|
+ 'g.proj', flags='g', read=True, parse=grass.parse_key_val,
|
|
|
+ )
|
|
|
+
|
|
|
+ return (
|
|
|
+ proj_info if proj_info.get('name') != 'xy_location_unprojected'
|
|
|
+ else {'proj': 'xy', 'units': ''}
|
|
|
+ )
|
|
|
|
|
|
|
|
|
def GetMapBounds(filename, env, portrait=True):
|