|
@@ -1087,17 +1087,17 @@ class PHP_CRUD_API {
|
1087
|
1087
|
}
|
1088
|
1088
|
} else {
|
1089
|
1089
|
switch ($comparator) {
|
1090
|
|
- case 'sco': return array('ST_Contains(!,ST_GeomFromText(?))=1',$field,$value);
|
1091
|
|
- case 'scr': return array('ST_Crosses(!,ST_GeomFromText(?))=1',$field,$value);
|
1092
|
|
- case 'sdi': return array('ST_Disjoint(!,ST_GeomFromText(?))=1',$field,$value);
|
1093
|
|
- case 'seq': return array('ST_Equals(!,ST_GeomFromText(?))=1',$field,$value);
|
1094
|
|
- case 'sin': return array('ST_Intersects(!,ST_GeomFromText(?))=1',$field,$value);
|
1095
|
|
- case 'sov': return array('ST_Overlaps(!,ST_GeomFromText(?))=1',$field,$value);
|
1096
|
|
- case 'sto': return array('ST_Touches(!,ST_GeomFromText(?))=1',$field,$value);
|
1097
|
|
- case 'swi': return array('ST_Within(!,ST_GeomFromText(?))=1',$field,$value);
|
1098
|
|
- case 'sic': return array('ST_IsClosed(!)=1',$field);
|
1099
|
|
- case 'sis': return array('ST_IsSimple(!)=1',$field);
|
1100
|
|
- case 'siv': return array('ST_IsValid(!)=1',$field);
|
|
1090
|
+ case 'sco': return array('ST_Contains(!,ST_GeomFromText(?))=TRUE',$field,$value);
|
|
1091
|
+ case 'scr': return array('ST_Crosses(!,ST_GeomFromText(?))=TRUE',$field,$value);
|
|
1092
|
+ case 'sdi': return array('ST_Disjoint(!,ST_GeomFromText(?))=TRUE',$field,$value);
|
|
1093
|
+ case 'seq': return array('ST_Equals(!,ST_GeomFromText(?))=TRUE',$field,$value);
|
|
1094
|
+ case 'sin': return array('ST_Intersects(!,ST_GeomFromText(?))=TRUE',$field,$value);
|
|
1095
|
+ case 'sov': return array('ST_Overlaps(!,ST_GeomFromText(?))=TRUE',$field,$value);
|
|
1096
|
+ case 'sto': return array('ST_Touches(!,ST_GeomFromText(?))=TRUE',$field,$value);
|
|
1097
|
+ case 'swi': return array('ST_Within(!,ST_GeomFromText(?))=TRUE',$field,$value);
|
|
1098
|
+ case 'sic': return array('ST_IsClosed(!)=TRUE',$field);
|
|
1099
|
+ case 'sis': return array('ST_IsSimple(!)=TRUE',$field);
|
|
1100
|
+ case 'siv': return array('ST_IsValid(!)=TRUE',$field);
|
1101
|
1101
|
}
|
1102
|
1102
|
}
|
1103
|
1103
|
} else {
|
|
@@ -1124,17 +1124,17 @@ class PHP_CRUD_API {
|
1124
|
1124
|
}
|
1125
|
1125
|
} else {
|
1126
|
1126
|
switch ($comparator) {
|
1127
|
|
- case 'nsco': return array('ST_Contains(!,ST_GeomFromText(?))=0',$field,$value);
|
1128
|
|
- case 'nscr': return array('ST_Crosses(!,ST_GeomFromText(?))=0',$field,$value);
|
1129
|
|
- case 'nsdi': return array('ST_Disjoint(!,ST_GeomFromText(?))=0',$field,$value);
|
1130
|
|
- case 'nseq': return array('ST_Equals(!,ST_GeomFromText(?))=0',$field,$value);
|
1131
|
|
- case 'nsin': return array('ST_Intersects(!,ST_GeomFromText(?))=0',$field,$value);
|
1132
|
|
- case 'nsov': return array('ST_Overlaps(!,ST_GeomFromText(?))=0',$field,$value);
|
1133
|
|
- case 'nsto': return array('ST_Touches(!,ST_GeomFromText(?))=0',$field,$value);
|
1134
|
|
- case 'nswi': return array('ST_Within(!,ST_GeomFromText(?))=0',$field,$value);
|
1135
|
|
- case 'nsic': return array('ST_IsClosed(!)=0',$field);
|
1136
|
|
- case 'nsis': return array('ST_IsSimple(!)=0',$field);
|
1137
|
|
- case 'nsiv': return array('ST_IsValid(!)=0',$field);
|
|
1127
|
+ case 'nsco': return array('ST_Contains(!,ST_GeomFromText(?))=FALSE',$field,$value);
|
|
1128
|
+ case 'nscr': return array('ST_Crosses(!,ST_GeomFromText(?))=FALSE',$field,$value);
|
|
1129
|
+ case 'nsdi': return array('ST_Disjoint(!,ST_GeomFromText(?))=FALSE',$field,$value);
|
|
1130
|
+ case 'nseq': return array('ST_Equals(!,ST_GeomFromText(?))=FALSE',$field,$value);
|
|
1131
|
+ case 'nsin': return array('ST_Intersects(!,ST_GeomFromText(?))=FALSE',$field,$value);
|
|
1132
|
+ case 'nsov': return array('ST_Overlaps(!,ST_GeomFromText(?))=FALSE',$field,$value);
|
|
1133
|
+ case 'nsto': return array('ST_Touches(!,ST_GeomFromText(?))=FALSE',$field,$value);
|
|
1134
|
+ case 'nswi': return array('ST_Within(!,ST_GeomFromText(?))=FALSE',$field,$value);
|
|
1135
|
+ case 'nsic': return array('ST_IsClosed(!)=FALSE',$field);
|
|
1136
|
+ case 'nsis': return array('ST_IsSimple(!)=FALSE',$field);
|
|
1137
|
+ case 'nsiv': return array('ST_IsValid(!)=FALSE',$field);
|
1138
|
1138
|
}
|
1139
|
1139
|
}
|
1140
|
1140
|
}
|