From bd723085ca595b6d9b29ecef08d983ef551b1a3a Mon Sep 17 00:00:00 2001
From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Tue, 30 Apr 2019 16:45:35 +0000
Subject: [PATCH] Add json casts to doc, set json cast precision to defaults
 used in other functions

git-svn-id: http://svn.osgeo.org/postgis/trunk@17418 b70326c6-7e19-0410-871a-916f4a2858ee
---
 doc/reference_output.xml | 18 ++++++------------
 doc/reference_type.xml   |  8 ++++++++
 postgis/lwgeom_export.c  |  4 ++--
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/doc/reference_output.xml b/doc/reference_output.xml
index e585afba8..7cea2f22a 100644
--- a/doc/reference_output.xml
+++ b/doc/reference_output.xml
@@ -329,22 +329,22 @@ CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)
 		<funcsynopsis>
 			<funcprototype>
 				<funcdef>text <function>ST_AsGeoJSON</function></funcdef>
-				<paramdef><type>record </type> <parameter>feature</parameter></paramdef>
-				<paramdef choice="opt"><type>text </type> <parameter>geomcolumnname</parameter></paramdef>
+				<paramdef><type>geometry </type> <parameter>geom</parameter></paramdef>
 				<paramdef choice="opt"><type>integer </type> <parameter>maxdecimaldigits=15</parameter></paramdef>
-				<paramdef choice="opt"><type>boolean </type> <parameter>prettyprint=false</parameter></paramdef>
+				<paramdef choice="opt"><type>integer </type> <parameter>options=0</parameter></paramdef>
 			</funcprototype>
 			<funcprototype>
 				<funcdef>text <function>ST_AsGeoJSON</function></funcdef>
-				<paramdef><type>geometry </type> <parameter>geom</parameter></paramdef>
+				<paramdef><type>geography </type> <parameter>geog</parameter></paramdef>
 				<paramdef choice="opt"><type>integer </type> <parameter>maxdecimaldigits=15</parameter></paramdef>
 				<paramdef choice="opt"><type>integer </type> <parameter>options=0</parameter></paramdef>
 			</funcprototype>
 			<funcprototype>
 				<funcdef>text <function>ST_AsGeoJSON</function></funcdef>
-				<paramdef><type>geography </type> <parameter>geog</parameter></paramdef>
+				<paramdef><type>record </type> <parameter>feature</parameter></paramdef>
+				<paramdef choice="opt"><type>text </type> <parameter>geomcolumnname</parameter></paramdef>
 				<paramdef choice="opt"><type>integer </type> <parameter>maxdecimaldigits=15</parameter></paramdef>
-				<paramdef choice="opt"><type>integer </type> <parameter>options=0</parameter></paramdef>
+				<paramdef choice="opt"><type>boolean </type> <parameter>prettyprint=false</parameter></paramdef>
 			</funcprototype>
 		</funcsynopsis>
 	  </refsynopsisdiv>
@@ -377,12 +377,6 @@ CIRCULARSTRING(220268 150415 1,220227 150505 2,220227 150406 3)
 				</listitem>
 			  </itemizedlist>
 			</para>
-			<para>Version 1: ST_AsGeoJSON(geom) / maxdecimaldigits=15 version=1 options=0</para>
-			<para>Version 2: ST_AsGeoJSON(geom, maxdecimaldigits) / version=1 options=0</para>
-			<para>Version 3: ST_AsGeoJSON(geom, maxdecimaldigits, options) / version=1</para>
-			<para>Version 4: ST_AsGeoJSON(gj_version, geom) / maxdecimaldigits=15 options=0</para>
-			<para>Version 5: ST_AsGeoJSON(gj_version, geom, maxdecimaldigits) / options=0</para>
-			<para>Version 6: ST_AsGeoJSON(gj_version, geom, maxdecimaldigits, options)</para>
 
 			<para>Availability: 1.3.4</para>
 			<para>Availability: 1.5.0 geography support was introduced.</para>
diff --git a/doc/reference_type.xml b/doc/reference_type.xml
index 62f1b0ebe..7f5eecb90 100644
--- a/doc/reference_type.xml
+++ b/doc/reference_type.xml
@@ -143,6 +143,14 @@
 				<entry>text</entry>
 				<entry>automatic</entry>
 			  </row>
+			  <row>
+				<entry>json</entry>
+				<entry>automatic</entry>
+			  </row>
+			  <row>
+				<entry>jsonb</entry>
+				<entry>automatic</entry>
+			  </row>
 			</tbody>
 		</tgroup>
 		</informaltable>
diff --git a/postgis/lwgeom_export.c b/postgis/lwgeom_export.c
index 54aac7ac1..7759b8970 100644
--- a/postgis/lwgeom_export.c
+++ b/postgis/lwgeom_export.c
@@ -431,7 +431,7 @@ Datum geometry_to_json(PG_FUNCTION_ARGS)
 {
 	GSERIALIZED *geom = PG_GETARG_GSERIALIZED_P(0);
 	LWGEOM *lwgeom = lwgeom_from_gserialized(geom);
-	char *geojson = lwgeom_to_geojson(lwgeom, NULL, 9, 0);
+	char *geojson = lwgeom_to_geojson(lwgeom, NULL, 15, 0);
 	text *result = cstring_to_text(geojson);
 	lwgeom_free(lwgeom);
 	pfree(geojson);
@@ -444,7 +444,7 @@ Datum geometry_to_jsonb(PG_FUNCTION_ARGS)
 {
 	GSERIALIZED *geom = PG_GETARG_GSERIALIZED_P(0);
 	LWGEOM *lwgeom = lwgeom_from_gserialized(geom);
-	char *geojson = lwgeom_to_geojson(lwgeom, NULL, 9, 0);
+	char *geojson = lwgeom_to_geojson(lwgeom, NULL, 15, 0);
 	lwgeom_free(lwgeom);
 	PG_RETURN_DATUM(DirectFunctionCall1(jsonb_in, PointerGetDatum(geojson)));
 }
-- 
2.40.0