wangshaobo 6 лет назад
Родитель
Сommit
f32bcdc948

+ 6 - 6
src/geoc_bd09togcj02.sql

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

+ 6 - 6
src/geoc_bd09towgs84.sql

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

+ 6 - 6
src/geoc_gcj02tobd09.sql

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

+ 4 - 1
src/geoc_gcj02towgs84.sql

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

+ 6 - 6
src/geoc_wgs84tobd09.sql

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

+ 6 - 3
src/geoc_wgs84togcj02.sql

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