mirror of
https://github.com/pgpointcloud/pointcloud.git
synced 2025-12-08 20:36:04 +00:00
Consider that pointcloud, postgis and pointcloud_postgis are in the same schema
This commit is contained in:
parent
ef64a02104
commit
4fc5df14be
@ -2,6 +2,6 @@
|
||||
comment = 'data type for lidar point clouds'
|
||||
default_version = '#POINTCLOUD_VERSION#'
|
||||
module_pathname = '$libdir/pointcloud-#POINTCLOUD_VERSION_MAJOR#'
|
||||
relocatable = true
|
||||
relocatable = false
|
||||
superuser = true
|
||||
#requires = 'postgis'
|
||||
|
||||
@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS pointcloud_formats (
|
||||
);
|
||||
|
||||
-- Register pointcloud_formats table so the contents are included in pg_dump output
|
||||
SELECT pg_catalog.pg_extension_config_dump('pointcloud_formats', '');
|
||||
SELECT pg_catalog.pg_extension_config_dump('@extschema@.pointcloud_formats', '');
|
||||
|
||||
CREATE OR REPLACE FUNCTION PC_SchemaGetNDims(pcid integer)
|
||||
RETURNS integer
|
||||
@ -98,9 +98,9 @@ DECLARE
|
||||
scrver TEXT;
|
||||
version TEXT;
|
||||
BEGIN
|
||||
libver := pc_lib_version();
|
||||
scrver := pc_script_version();
|
||||
version := _pc_version_no_commit(libver, scrver);
|
||||
libver := @extschema@.pc_lib_version();
|
||||
scrver := @extschema@.pc_script_version();
|
||||
version := @extschema@._pc_version_no_commit(libver, scrver);
|
||||
RETURN version;
|
||||
END;
|
||||
$$
|
||||
@ -118,12 +118,12 @@ DECLARE
|
||||
libxml2ver TEXT;
|
||||
lazperfenabled BOOLEAN;
|
||||
BEGIN
|
||||
pclibver := pc_lib_version();
|
||||
pcscrver := pc_script_version();
|
||||
pcver := _pc_version_no_commit(pclibver, pcscrver);
|
||||
pgsqlver := pc_pgsql_version();
|
||||
libxml2ver := pc_libxml2_version();
|
||||
lazperfenabled := pc_lazperf_enabled();
|
||||
pclibver := @extschema@.pc_lib_version();
|
||||
pcscrver := @extschema@.pc_script_version();
|
||||
pcver := @extschema@._pc_version_no_commit(pclibver, pcscrver);
|
||||
pgsqlver := @extschema@.pc_pgsql_version();
|
||||
libxml2ver := @extschema@.pc_libxml2_version();
|
||||
lazperfenabled := @extschema@.pc_lazperf_enabled();
|
||||
RETURN 'POINTCLOUD="' || pclibver || '" PGSQL="' || pgsqlver || '" LIBXML2="' || libxml2ver ||
|
||||
' LAZPERF enabled=' || lazperfenabled;
|
||||
END;
|
||||
@ -168,7 +168,7 @@ BEGIN
|
||||
END IF;
|
||||
END IF;
|
||||
|
||||
RETURN pc_version();
|
||||
RETURN @extschema@.pc_version();
|
||||
END;
|
||||
$$ LANGUAGE 'plpgsql' VOLATILE;
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# pointcloud postgis integration extension
|
||||
comment = 'integration for pointcloud LIDAR data and PostGIS geometry data'
|
||||
default_version = '@POINTCLOUD_VERSION@'
|
||||
relocatable = true
|
||||
relocatable = false
|
||||
superuser = false
|
||||
requires = 'postgis, pointcloud'
|
||||
|
||||
@ -5,10 +5,10 @@ CREATE OR REPLACE FUNCTION PC_Intersection(pcpatch, geometry)
|
||||
RETURNS pcpatch AS
|
||||
$$
|
||||
WITH
|
||||
pts AS (SELECT PC_Explode($1) AS pt),
|
||||
pgpts AS (SELECT ST_GeomFromEWKB(PC_AsBinary(pt)) AS pgpt, pt FROM pts),
|
||||
ipts AS (SELECT pt FROM pgpts WHERE ST_Intersects(pgpt, $2)),
|
||||
ipch AS (SELECT PC_Patch(pt) AS pch FROM ipts)
|
||||
pts AS (SELECT @extschema@.PC_Explode($1) AS pt),
|
||||
pgpts AS (SELECT @extschema@.ST_GeomFromEWKB(@extschema@.PC_AsBinary(pt)) AS pgpt, pt FROM pts),
|
||||
ipts AS (SELECT pt FROM pgpts WHERE @extschema@.ST_Intersects(pgpt, $2)),
|
||||
ipch AS (SELECT @extschema@.PC_Patch(pt) AS pch FROM ipts)
|
||||
SELECT pch FROM ipch;
|
||||
$$
|
||||
LANGUAGE 'sql';
|
||||
@ -19,14 +19,14 @@ CREATE OR REPLACE FUNCTION PC_Intersection(pcpatch, geometry)
|
||||
CREATE OR REPLACE FUNCTION PC_EnvelopeGeometry(pcpatch)
|
||||
RETURNS geometry AS
|
||||
$$
|
||||
SELECT ST_GeomFromEWKB(PC_EnvelopeAsBinary($1))
|
||||
SELECT @extschema@.ST_GeomFromEWKB(@extschema@.PC_EnvelopeAsBinary($1))
|
||||
$$
|
||||
LANGUAGE 'sql';
|
||||
|
||||
CREATE OR REPLACE FUNCTION geometry(pcpatch)
|
||||
RETURNS geometry AS
|
||||
$$
|
||||
SELECT PC_EnvelopeGeometry($1)
|
||||
SELECT @extschema@.PC_EnvelopeGeometry($1)
|
||||
$$
|
||||
LANGUAGE 'sql';
|
||||
|
||||
@ -39,7 +39,7 @@ CREATE CAST (pcpatch AS geometry) WITH FUNCTION PC_EnvelopeGeometry(pcpatch);
|
||||
CREATE OR REPLACE FUNCTION geometry(pcpoint)
|
||||
RETURNS geometry AS
|
||||
$$
|
||||
SELECT ST_GeomFromEWKB(PC_AsBinary($1))
|
||||
SELECT @extschema@.ST_GeomFromEWKB(@extschema@.PC_AsBinary($1))
|
||||
$$
|
||||
LANGUAGE 'sql';
|
||||
|
||||
@ -52,14 +52,14 @@ CREATE CAST (pcpoint AS geometry) WITH FUNCTION geometry(pcpoint);
|
||||
CREATE OR REPLACE FUNCTION PC_Intersects(pcpatch, geometry)
|
||||
RETURNS boolean AS
|
||||
$$
|
||||
SELECT ST_Intersects($2, PC_EnvelopeGeometry($1))
|
||||
SELECT @extschema@.ST_Intersects($2, @extschema@.PC_EnvelopeGeometry($1))
|
||||
$$
|
||||
LANGUAGE 'sql';
|
||||
|
||||
CREATE OR REPLACE FUNCTION PC_Intersects(geometry, pcpatch)
|
||||
RETURNS boolean AS
|
||||
$$
|
||||
SELECT PC_Intersects($2, $1)
|
||||
SELECT @extschema@.PC_Intersects($2, $1)
|
||||
$$
|
||||
LANGUAGE 'sql';
|
||||
|
||||
@ -69,7 +69,7 @@ CREATE OR REPLACE FUNCTION PC_Intersects(geometry, pcpatch)
|
||||
CREATE OR REPLACE FUNCTION PC_BoundingDiagonalGeometry(pcpatch)
|
||||
RETURNS geometry AS
|
||||
$$
|
||||
SELECT ST_GeomFromEWKB(PC_BoundingDiagonalAsBinary($1))
|
||||
SELECT @extschema@.ST_GeomFromEWKB(@extschema@.PC_BoundingDiagonalAsBinary($1))
|
||||
$$
|
||||
LANGUAGE 'sql';
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user