From: Olivier Courtin <olivier.courtin@camptocamp.com>
Date: Fri, 10 May 2013 16:23:22 +0000 (+0000)
Subject: Use ST_MinkowskiSum rather than ST_Minkowski userland.
X-Git-Tag: 2.1.0beta2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a17aee759628af2cf6138b2ecd3ed1e8915b0e67;p=postgis

Use ST_MinkowskiSum rather than ST_Minkowski userland.

git-svn-id: http://svn.osgeo.org/postgis/trunk@11408 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/doc/reference_sfcgal.xml b/doc/reference_sfcgal.xml
index 01f038520..94aa4ce92 100644
--- a/doc/reference_sfcgal.xml
+++ b/doc/reference_sfcgal.xml
@@ -156,9 +156,9 @@
 
 	</refentry>
 
-	<refentry id="ST_Triangulate">
+	<refentry id="ST_MinkowskiSum">
 	  <refnamediv>
-		<refname>ST_Minkowski</refname>
+		<refname>ST_MinkowskiSum</refname>
 
 		<refpurpose>Perform Minkowski sum</refpurpose>
 	  </refnamediv>
diff --git a/postgis/sfcgal.sql.in b/postgis/sfcgal.sql.in
index 344cfa9cc..1ff6e0fc0 100644
--- a/postgis/sfcgal.sql.in
+++ b/postgis/sfcgal.sql.in
@@ -55,7 +55,7 @@ CREATE OR REPLACE FUNCTION ST_Orientation(geometry)
        LANGUAGE 'c' IMMUTABLE STRICT
        COST 100;
 
-CREATE OR REPLACE FUNCTION ST_Minkowski(geometry, geometry)
+CREATE OR REPLACE FUNCTION ST_MinkowskiSum(geometry, geometry)
        RETURNS geometry
        AS 'MODULE_PATHNAME','sfcgal_minkowski_sum'
        LANGUAGE 'c' IMMUTABLE STRICT
diff --git a/postgis/uninstall_sfcgal.sql.in b/postgis/uninstall_sfcgal.sql.in
index cb5a2fe44..dea74665e 100644
--- a/postgis/uninstall_sfcgal.sql.in
+++ b/postgis/uninstall_sfcgal.sql.in
@@ -29,7 +29,7 @@ DROP FUNCTION IF EXISTS ST_ForceLHR(geometry);
 
 DROP FUNCTION IF EXISTS ST_Orientation(geometry);
 
-DROP FUNCTION IF EXISTS ST_Minkowski(geometry, geometry);
+DROP FUNCTION IF EXISTS ST_MinkowskiSum(geometry, geometry);
 
 DROP FUNCTION IF EXISTS ST_StraightSkeleton(geometry);
 
diff --git a/regress/regress_sfcgal.sql b/regress/regress_sfcgal.sql
index 6f00f67e3..4111bff66 100644
--- a/regress/regress_sfcgal.sql
+++ b/regress/regress_sfcgal.sql
@@ -14,7 +14,7 @@ SELECT 'ST_Extrude_surface', ST_AsText(ST_Extrude(ST_Extrude(ST_Extrude('POINT(0
 SELECT 'ST_ForceLHR', ST_AsText(ST_ForceLHR('POLYGON((0 0,0 1,1 1,1 0,0 0))'));
 SELECT 'ST_Orientation_1', ST_Orientation(ST_ForceLHR('POLYGON((0 0,0 1,1 1,1 0,0 0))'));
 SELECT 'ST_Orientation_2', ST_Orientation(ST_ForceRHR('POLYGON((0 0,0 1,1 1,1 0,0 0))'));
-SELECT 'ST_Minkowski', ST_AsText(ST_Minkowski('LINESTRING(0 0,4 0)','POLYGON((0 0,1 0,1 1,0 1,0 0))'));
+SELECT 'ST_MinkowskiSum', ST_AsText(ST_MinkowskiSum('LINESTRING(0 0,4 0)','POLYGON((0 0,1 0,1 1,0 1,0 0))'));
 SELECT 'ST_StraightSkeleton', ST_AsText(ST_StraightSkeleton('POLYGON((0 0,1 0,1 1,0 1,0 0))'));
 
 -- Backend switch tests
diff --git a/regress/regress_sfcgal_expected b/regress/regress_sfcgal_expected
index 10ca36287..d0f8d3c33 100644
--- a/regress/regress_sfcgal_expected
+++ b/regress/regress_sfcgal_expected
@@ -7,7 +7,7 @@ ST_Extrude_surface|POLYHEDRALSURFACE Z (((1 1 0,1 0 0,0 1 0,1 1 0)),((0 1 1,1 0
 ST_ForceLHR|POLYGON((0 0,1 0,1 1,0 1,0 0))
 ST_Orientation_1|-1
 ST_Orientation_2|1
-ST_Minkowski|MULTIPOLYGON(((0 0,1 0,5 0,5 1,4 1,0 1,0 0)))
+ST_MinkowskiSum|MULTIPOLYGON(((0 0,1 0,5 0,5 1,4 1,0 1,0 0)))
 ST_StraightSkeleton|MULTILINESTRING((0 0,0.5 0.5),(1 0,0.5 0.5),(1 1,0.5 0.5),(0 1,0.5 0.5))
 intersection_geos|POINT(0 0)
 intersection_sfcgal|POINT(-0 -0)