From e499aec0558322fff2155cd352f7f60b8537982c Mon Sep 17 00:00:00 2001 From: Russell Grew Date: Mon, 3 May 2021 13:03:11 +1000 Subject: [PATCH 1/3] Swap lat/lon for proj6 and gdal3. --- contrib/stack/topsStack/plotBursts.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/stack/topsStack/plotBursts.py b/contrib/stack/topsStack/plotBursts.py index 5fae2e6..6ebb961 100755 --- a/contrib/stack/topsStack/plotBursts.py +++ b/contrib/stack/topsStack/plotBursts.py @@ -138,11 +138,11 @@ def main(iargs=None): lateNear = burst.orbit.rdr2geo(t1,r0) ring = ogr.Geometry(ogr.wkbLinearRing) - 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]) + 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]) feature = ogr.Feature(layer.GetLayerDefn()) feature.SetField('Name', 'IW{0}-{1}'.format(swath, ii)) From 8ba8f32f672fbe30cacd8c6600aa40560c41b8bf Mon Sep 17 00:00:00 2001 From: Russell Grew Date: Fri, 7 May 2021 08:39:13 +1000 Subject: [PATCH 2/3] 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)) From 21084da4dfd8f71511998c94a0c8e884eb97124b Mon Sep 17 00:00:00 2001 From: Russell Grew <42530666+RussellGrew@users.noreply.github.com> Date: Tue, 11 May 2021 16:00:12 +1000 Subject: [PATCH 3/3] Robust GDAL version check Co-authored-by: Ryan Burns --- contrib/stack/topsStack/plotBursts.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/stack/topsStack/plotBursts.py b/contrib/stack/topsStack/plotBursts.py index b54da34..1187d4b 100755 --- a/contrib/stack/topsStack/plotBursts.py +++ b/contrib/stack/topsStack/plotBursts.py @@ -138,7 +138,8 @@ def main(iargs=None): lateNear = burst.orbit.rdr2geo(t1,r0) ring = ogr.Geometry(ogr.wkbLinearRing) - if int(gdal.__version__[0]) >= 3: + from distutils.version import StrictVersion + if StrictVersion(gdal.__version__) >= StrictVersion("3.0"): ring.AddPoint(earlyNear[0], earlyNear[1]) ring.AddPoint(earlyFar[0], earlyFar[1]) ring.AddPoint(lateFar[0], lateFar[1])