| Index: trunk/extensions/SemanticMaps/Services/GoogleMaps/SM_GoogleMapsForms.js |
| — | — | @@ -41,7 +41,7 @@ |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | | - * This function holds specific functionality for the Google Maps form input of Semantic Maps |
| | 45 | + * This function holds specific functionality for the Google Maps form input of Semantic Maps. |
| 46 | 46 | */ |
| 47 | 47 | function showGAddress(address, mapName, outputElementName, notFoundFormat) { |
| 48 | 48 | var map = GMaps[mapName]; |
| Index: trunk/extensions/SemanticMaps/GeoCoords/SM_AreaValueDescription.php |
| — | — | @@ -143,12 +143,15 @@ |
| 144 | 144 | |
| 145 | 145 | $isEq = $this->getComparator() == SMW_CMP_EQ; |
| 146 | 146 | |
| 147 | | - $conditions = array(); |
| 148 | 147 | |
| | 148 | + |
| 149 | 149 | if ( $smgUseSpatialExtensions ) { |
| 150 | 150 | // TODO |
| | 151 | + $sql = ''; |
| 151 | 152 | } |
| 152 | 153 | else { |
| | 154 | + $conditions = array(); |
| | 155 | + |
| 153 | 156 | $smallerThen = $isEq ? '<' : '>='; |
| 154 | 157 | $biggerThen = $isEq ? '>' : '<='; |
| 155 | 158 | $joinCond = $isEq ? '&&' : '||'; |
| — | — | @@ -156,10 +159,12 @@ |
| 157 | 160 | $conditions[] = "{$tableName}.$fieldNames[0] $smallerThen $north"; |
| 158 | 161 | $conditions[] = "{$tableName}.$fieldNames[0] $biggerThen $south"; |
| 159 | 162 | $conditions[] = "{$tableName}.$fieldNames[1] $smallerThen $east"; |
| 160 | | - $conditions[] = "{$tableName}.$fieldNames[1] $biggerThen $west"; |
| | 163 | + $conditions[] = "{$tableName}.$fieldNames[1] $biggerThen $west"; |
| | 164 | + |
| | 165 | + $sql = implode( " $joinCond ", $conditions ); |
| 161 | 166 | } |
| 162 | 167 | |
| 163 | | - return implode( " $joinCond ", $conditions ); |
| | 168 | + return $sql; |
| 164 | 169 | } |
| 165 | 170 | |
| 166 | 171 | /** |
| Index: trunk/extensions/SemanticMaps/GeoCoords/SM_GeoCoordsValue.php |
| — | — | @@ -196,8 +196,7 @@ |
| 197 | 197 | global $smgUseSpatialExtensions, $smgQPCoodFormat, $smgQPCoodDirectional; |
| 198 | 198 | |
| 199 | 199 | if ( $smgUseSpatialExtensions ) { |
| 200 | | - //die(__METHOD__); |
| 201 | | - //var_dump($args);exit; |
| | 200 | + // var_dump($args);exit; |
| 202 | 201 | } |
| 203 | 202 | else { |
| 204 | 203 | $this->coordinateSet['lat'] = $args[0]; |