From 8ba8f32f672fbe30cacd8c6600aa40560c41b8bf Mon Sep 17 00:00:00 2001 From: Russell Grew Date: Fri, 7 May 2021 08:39:13 +1000 Subject: [PATCH] gdal version smarts for lat/lon order --- contrib/stack/topsStack/plotBursts.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/contrib/stack/topsStack/plotBursts.py b/contrib/stack/topsStack/plotBursts.py index 6ebb961..b54da34 100755 --- a/contrib/stack/topsStack/plotBursts.py +++ b/contrib/stack/topsStack/plotBursts.py @@ -48,7 +48,7 @@ def main(iargs=None): inps=cmdLineParse(iargs) - from osgeo import ogr, osr + from osgeo import gdal, ogr, osr import matplotlib if inps.shapefile is not None: matplotlib.use('Agg') @@ -138,11 +138,18 @@ def main(iargs=None): lateNear = burst.orbit.rdr2geo(t1,r0) ring = ogr.Geometry(ogr.wkbLinearRing) - ring.AddPoint(earlyNear[0], earlyNear[1]) - ring.AddPoint(earlyFar[0], earlyFar[1]) - ring.AddPoint(lateFar[0], lateFar[1]) - ring.AddPoint(lateNear[0], lateNear[1]) - ring.AddPoint(earlyNear[0], earlyNear[1]) + if int(gdal.__version__[0]) >= 3: + ring.AddPoint(earlyNear[0], earlyNear[1]) + ring.AddPoint(earlyFar[0], earlyFar[1]) + ring.AddPoint(lateFar[0], lateFar[1]) + ring.AddPoint(lateNear[0], lateNear[1]) + ring.AddPoint(earlyNear[0], earlyNear[1]) + else: + ring.AddPoint(earlyNear[1], earlyNear[0]) + ring.AddPoint(earlyFar[1], earlyFar[0]) + ring.AddPoint(lateFar[1], lateFar[0]) + ring.AddPoint(lateNear[1], lateNear[0]) + ring.AddPoint(earlyNear[1], earlyNear[0]) feature = ogr.Feature(layer.GetLayerDefn()) feature.SetField('Name', 'IW{0}-{1}'.format(swath, ii))