WebSVN – eFlore/Applications.cel – Path Comparison – / – /branches/v1.5-cisaille/jrest Rev 1138 and /branches/v1.5-cisaille/jrest Rev 1139

Ignore whitespace Rev 1138 → Rev 1139

/branches/v1.5-cisaille/jrest/services/CelWidgetMapPoint.php
251,7 → 251,6
if (is_numeric($commune['lat']) && is_numeric($commune['lng'])) {
extract($commune);
$id = self::MARQUEUR_COMMUNE.':'.$lat.'\|'.$lng;
//$this->definirLatLngMaxMin($marqueurs, $lat, $lng);
$lata = round($lat, 5);
$lnga = round($lng, 5);

 /branches/v1.5-cisaille/jrest/lib/CartoGroupage.php
 ,10 → 93,14
         }
         public static function mettreAJourBornes(&$point) {
-                self::$bornesMax['latMin'] = (is_numeric($point['lat']) && $point['lat'] < self::$bornesMax['latMin'] || self::$bornesMax['latMin'] == null) ? $point['lat'] : self::$bornesMax['latMin'] ;
-                self::$bornesMax['lngMin'] = (is_numeric($point['lng']) && $point['lng'] < self::$bornesMax['lngMin'] || self::$bornesMax['lngMin'] == null) ? $point['lng'] : self::$bornesMax['lngMin'] ;
-                self::$bornesMax['latMax'] = (is_numeric($point['lat']) && $point['lat'] > self::$bornesMax['latMax'] || self::$bornesMax['latMax'] == null) ? $point['lat'] : self::$bornesMax['latMax'] ;
-                self::$bornesMax['lngMax'] = (is_numeric($point['lng']) && $point['lng'] > self::$bornesMax['lngMax'] || self::$bornesMax['lngMax'] == null) ? $point['lng'] : self::$bornesMax['lngMax'] ;
+                if(!is_numeric($point['lat']) || abs($point['lat']) > 90) return;
+                if(!is_numeric($point['lng']) || abs($point['lng']) > 180) return;
+                self::$bornesMax['latMin'] = ($point['lat'] < self::$bornesMax['latMin'] || self::$bornesMax['latMin'] == null) ? $point['lat'] : self::$bornesMax['latMin'] ;
+                self::$bornesMax['lngMin'] = ($point['lng'] < self::$bornesMax['lngMin'] || self::$bornesMax['lngMin'] == null) ? $point['lng'] : self::$bornesMax['lngMin'] ;
+                self::$bornesMax['latMax'] = ($point['lat'] > self::$bornesMax['latMax'] || self::$bornesMax['latMax'] == null) ? $point['lat'] : self::$bornesMax['latMax'] ;
+                self::$bornesMax['lngMax'] = ($point['lng'] > self::$bornesMax['lngMax'] || self::$bornesMax['lngMax'] == null) ? $point['lng'] : self::$bornesMax['lngMax'] ;
         }
         public static function getBornes() {

Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 1138 → Rev 1139