Forráskód Böngészése

对传入的geom进行判断,是否为4490或4326

wangshaobo 6 éve
szülő
commit
31013cee0c

+ 2 - 5
src/geoc_bd09togcj02.sql

@@ -6,11 +6,8 @@ DECLARE
 		multiArr          geometry[]; 
 		multiArr          geometry[]; 
 	
 	
 BEGIN
 BEGIN
-	IF st_srid(geom) != '4490' THEN
-			RETURN geom;
-	end if;
-	IF st_srid(geom) != '4326' THEN
-			RETURN geom;
+IF st_srid(geom) != '4490' and  st_srid(geom) != '4326'THEN
+        RETURN null;
 	end if;
 	end if;
  	CASE ST_GeometryType(geom)
  	CASE ST_GeometryType(geom)
     	when 'ST_LineString' then 
     	when 'ST_LineString' then 

+ 2 - 5
src/geoc_bd09towgs84.sql

@@ -6,11 +6,8 @@ DECLARE
 		multiArr          geometry[]; 
 		multiArr          geometry[]; 
 	
 	
 BEGIN
 BEGIN
-	IF st_srid(geom) != '4490' THEN
-			RETURN geom;
-	end if;
-	IF st_srid(geom) != '4326' THEN
-			RETURN geom;
+	IF st_srid(geom) != '4490' and  st_srid(geom) != '4326'THEN
+        RETURN null;
 	end if;
 	end if;
  	CASE ST_GeometryType(geom)
  	CASE ST_GeometryType(geom)
     	when 'ST_LineString' then 
     	when 'ST_LineString' then 

+ 1 - 4
src/geoc_gcj02tobd09.sql

@@ -2,10 +2,7 @@ CREATE OR REPLACE FUNCTION "public"."geoc_gcj02tobd09"("geom" "public"."geometry
   RETURNS "public"."geometry" AS $BODY$
   RETURNS "public"."geometry" AS $BODY$
 DECLARE
 DECLARE
 BEGIN
 BEGIN
-IF st_srid(geom) != '4490' THEN
-        RETURN null;
-end if;
-IF st_srid(geom) != '4326' THEN
+IF st_srid(geom) != '4490' and  st_srid(geom) != '4326'THEN
         RETURN null;
         RETURN null;
 end if;
 end if;
 case ST_GeometryType(geom)
 case ST_GeometryType(geom)

+ 1 - 4
src/geoc_gcj02towgs84.sql

@@ -2,10 +2,7 @@ CREATE OR REPLACE FUNCTION "public"."geoc_gcj02towgs84"("geom" "public"."geometr
   RETURNS "public"."geometry" AS $BODY$
   RETURNS "public"."geometry" AS $BODY$
 DECLARE
 DECLARE
 BEGIN
 BEGIN
-IF st_srid(geom) != '4490' THEN
-        RETURN null;
-end if;
-IF st_srid(geom) != '4326' THEN
+IF st_srid(geom) != '4490' and  st_srid(geom) != '4326'THEN
         RETURN null;
         RETURN null;
 end if;
 end if;
 case ST_GeometryType(geom)
 case ST_GeometryType(geom)

+ 1 - 4
src/geoc_wgs84tobd09.sql

@@ -2,10 +2,7 @@ CREATE OR REPLACE FUNCTION "public"."geoc_wgs84tobd09"("geom" "public"."geometry
   RETURNS "public"."geometry" AS $BODY$
   RETURNS "public"."geometry" AS $BODY$
 DECLARE
 DECLARE
 BEGIN
 BEGIN
-IF st_srid(geom) != '4490' THEN
-        RETURN null;
-end if;
-IF st_srid(geom) != '4326' THEN
+IF st_srid(geom) != '4490' and  st_srid(geom) != '4326'THEN
         RETURN null;
         RETURN null;
 end if;
 end if;
 case ST_GeometryType(geom)
 case ST_GeometryType(geom)

+ 1 - 4
src/geoc_wgs84togcj02.sql

@@ -6,10 +6,7 @@ DECLARE
 		multiArr          geometry[]; 
 		multiArr          geometry[]; 
 	
 	
 BEGIN
 BEGIN
-	IF st_srid(geom) != '4490' THEN
-        RETURN null;
-end if;
-IF st_srid(geom) != '4326' THEN
+IF st_srid(geom) != '4490' and  st_srid(geom) != '4326'THEN
         RETURN null;
         RETURN null;
 end if;
 end if;
  	CASE ST_GeometryType(geom)
  	CASE ST_GeometryType(geom)