back out of coordinate updates

Author: tomkralidis

pycsw/core/metadata.py

@@ -1995,7 +1995,7 @@ def bbox_from_polygons(bboxs):
         multi_pol = MultiPolygon(
             [loads(bbox) for bbox in bboxs]
         )
-        bstr = ",".join([str(b) for b in multi_pol.bounds])
+        bstr = ",".join([f"{b:.2f}" for b in multi_pol.bounds])
         return util.bbox2wktpolygon(bstr)
     except Exception as err:
         raise RuntimeError('Cannot aggregate polygons: %s' % str(err)) from err

pycsw/core/util.py

@@ -240,13 +240,13 @@ def bbox2wktpolygon(bbox):
 
     """
 
+    precision = int(os.environ.get('COORDINATE_PRECISION', 2))
     if bbox.startswith('ENVELOPE'):
         bbox = wktenvelope2bbox(bbox)
-
-    minx, miny, maxx, maxy = [float(coord) for coord in bbox.split(",")]
-
-    return 'POLYGON((%s %s, %s %s, %s %s, %s %s, %s %s))' \
+    minx, miny, maxx, maxy = [f"{float(coord):.{precision}f}" for coord in bbox.split(",")]
+    wktGeometry = 'POLYGON((%s %s, %s %s, %s %s, %s %s, %s %s))' \
         % (minx, miny, minx, maxy, maxx, maxy, maxx, miny, minx, miny)
+    return wktGeometry
 
 
 def transform_mappings(queryables, typename):

tests/unittests/test_metadata.py

@@ -41,7 +41,7 @@
             "POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))",
             "POLYGON ((2 2, 2 3, 3 3, 3 2, 2 2))",
         ],
-        "POLYGON((0.0 0.0, 0.0 3.0, 3.0 3.0, 3.0 0.0, 0.0 0.0))"
+        "POLYGON((0.00 0.00, 0.00 3.00, 3.00 3.00, 3.00 0.00, 0.00 0.00))"
     ),
 ])
 def test_bbox_from_polygons(bboxes, expected):

tests/unittests/test_util.py

@@ -141,19 +141,13 @@ def test_wkt2geom(wkt, bounds, expected):
 @pytest.mark.parametrize("bbox, expected", [
     (
         "0.0, 10.0, 30.0, 15.0",
-        "POLYGON((0.0 10.0, 0.0 15.0, 30.0 15.0, "
-        "30.0 10.0, 0.0 10.0))"
+        "POLYGON((0.00 10.00, 0.00 15.00, 30.00 15.00, "
+        "30.00 10.00, 0.00 10.00))"
     ),
     (
         "-10.0, 10.0, 30.0, 15.0",
-        "POLYGON((-10.0 10.0, -10.0 15.0, 30.0 15.0, "
-        "30.0 10.0, -10.0 10.0))"
-    ),
-    (
-        "25.0815883093, 62.1306897126, 27.1935425597, 63.129387237",
-        "POLYGON((25.0815883093 62.1306897126, 25.0815883093 63.129387237, "
-        "27.1935425597 63.129387237, 27.1935425597 62.1306897126, "
-        "25.0815883093 62.1306897126))"
+        "POLYGON((-10.00 10.00, -10.00 15.00, 30.00 15.00, "
+        "30.00 10.00, -10.00 10.00))"
     )
 ])
 def test_bbox2wktpolygon(bbox, expected):