Merge pull request #7 from seongsujeong/bug_fix_min_xy

Bug fix min/max x/y order
opera-adt · Dec 15, 2022 · cf2729e · cf2729e
2 parents 1042999 + 3191ecf
commit cf2729e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 from setuptools import setup
 
-__version__ = version = VERSION = '0.1.0'
+__version__ = VERSION = '0.1.0'
 
 LONG_DESCRIPTION = 'Burst database for OPERA SAS'
 
@@ -18,7 +18,7 @@
 
 setup(
     name = 'burst_db',
-    version = version,
+    version = VERSION,
     description = 'Burst database for OPERA SAS',
     package_dir = {'burst_db': 'src/burst_db'},
     include_package_data = True,

diff --git a/__init__.py → src/burst_db/__init__.py b/__init__.py → src/burst_db/__init__.py
diff --git a/src/burst_db/build_database.py b/src/burst_db/build_database.py
@@ -183,12 +183,12 @@ def main(args):
         envelope_geom_tformed = list(geom_burst.GetEnvelope())
 
         # Apply margin
-        envelope_geom_tformed[0] -= args.mxy[0]
-        envelope_geom_tformed[1] -= args.mxy[1]
-        envelope_geom_tformed[2] += args.mxy[0]
-        envelope_geom_tformed[3] += args.mxy[1]
+        minmax_xy = (envelope_geom_tformed[0] - args.mxy[0],
+                     envelope_geom_tformed[2] - args.mxy[0],
+                     envelope_geom_tformed[1] + args.mxy[1],
+                     envelope_geom_tformed[3] + args.mxy[1])
 
-        xmin, ymin, xmax, ymax = bd.snap_extent(tuple(envelope_geom_tformed),
+        xmin, ymin, xmax, ymax = bd.snap_extent(minmax_xy,
                                                 args.sxy[0],
                                                 args.sxy[1])
 

diff --git a/version.py → src/burst_db/version.py b/version.py → src/burst_db/version.py