From 8d4626e7060062dbfe8df5671d94f6ef72e4e4a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20M=C3=A9liani?= <m.meliani@neogeo-online.net>
Date: Wed, 5 Jun 2013 18:20:05 +0200
Subject: [PATCH] Rewriting code...
---
src/tools.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/tools.py b/src/tools.py
index 567f5e0..8429aa6 100644
--- a/src/tools.py
+++ b/src/tools.py
@@ -172,11 +172,10 @@ def wkt_to_authority(wkt):
srs.ImportFromWkt(wkt)
# Are there really no other with osgeo? Oo
-
- if srs.GetAuthorityCode('PROJCS') == None and srs.GetAuthorityCode('GEOGCS') != None :
- return srs.GetAuthorityName('GEOGCS'), srs.GetAuthorityCode('GEOGCS')
+
if srs.GetAuthorityCode('PROJCS') != None:
return srs.GetAuthorityName('PROJCS'), srs.GetAuthorityCode('PROJCS')
+ elif srs.GetAuthorityCode('GEOGCS') != None :
+ return srs.GetAuthorityName('GEOGCS'), srs.GetAuthorityCode('GEOGCS')
else:
raise KeyError("Unable to get authority from %s" % wkt)
-
--
GitLab