From 5f40fa9cb399c1c1e81236b14220cf8ef6f099dc Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Fri, 6 Nov 2015 17:57:20 +0000 Subject: [PATCH] back to using geography_gserialized, but don't add box (gserialized does that) (but we must still set geodetic for some ungodly reason) references #3355 references #3356 git-svn-id: http://svn.osgeo.org/postgis/trunk@14362 b70326c6-7e19-0410-871a-916f4a2858ee --- postgis/geography_inout.c | 6 ++++-- postgis/geography_measurement.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/postgis/geography_inout.c b/postgis/geography_inout.c index 7659d882c..a4f779c6b 100644 --- a/postgis/geography_inout.c +++ b/postgis/geography_inout.c @@ -600,8 +600,10 @@ Datum geography_from_geometry(PG_FUNCTION_ARGS) /* force recalculate of box by dropping */ lwgeom_drop_bbox(lwgeom); - - g_ser = gserialized_geography_from_lwgeom(lwgeom, -1); + + lwgeom_set_geodetic(lwgeom, true); + /* We are trusting geography_serialize will add a box for us if needed */ + g_ser = geography_serialize(lwgeom); lwgeom_free(lwgeom); diff --git a/postgis/geography_measurement.c b/postgis/geography_measurement.c index e98252635..d5d4804d3 100644 --- a/postgis/geography_measurement.c +++ b/postgis/geography_measurement.c @@ -1092,8 +1092,8 @@ Datum geography_segmentize(PG_FUNCTION_ARGS) /* Recalculate the boxes after re-setting the geodetic bit */ lwgeom_drop_bbox(lwgeom2); - lwgeom_add_bbox(lwgeom2); + /* We are trusting geography_serialize will add a box if needed */ g2 = geography_serialize(lwgeom2); /* Clean up */ -- 2.40.0