Subversion Repositories eFlore/Applications.cel

Rev

Rev 1003 | Rev 1014 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1003 Rev 1004
Line 234... Line 234...
234 
		if ($communes !== false) {
 234 
		if ($communes !== false) {
235 
			foreach ($communes as $commune) {
 235 
			foreach ($communes as $commune) {
236 
				if (is_numeric($commune['lat']) && is_numeric($commune['lng'])) {
 236 
				if (is_numeric($commune['lat']) && is_numeric($commune['lng'])) {
237 
					extract($commune);
 237 
					extract($commune);
238 
					$id = self::MARQUEUR_COMMUNE.':'.$lat.'|'.$lng;
 238 
					$id = self::MARQUEUR_COMMUNE.':'.$lat.'|'.$lng;
239 
					$this->definirLatLngMaxMin($marqueurs, $lat, $lng);
 239 
					//$this->definirLatLngMaxMin($marqueurs, $lat, $lng);
240 
					$lata = round($lat, 5);
 240 
					$lata = round($lat, 5);
241 
					$lnga = round($lng, 5);
 241 
					$lnga = round($lng, 5);
Line 242... Line 242...
242 
 
 242 
 
243 
					if (!isset($points[$id])) {
 243 
					if (!isset($points[$id])) {
Line 256... Line 256...
256 
		if ($stations !== false) {
 256 
		if ($stations !== false) {
257 
			foreach ($stations as $station) {
 257 
			foreach ($stations as $station) {
258 
				if (is_numeric($station['lat']) && is_numeric($station['lng'])) {
 258 
				if (is_numeric($station['lat']) && is_numeric($station['lng'])) {
259 
					extract($station);
 259 
					extract($station);
260 
					$id = self::MARQUEUR_STATION.':'.$lat.'|'.$lng;
 260 
					$id = self::MARQUEUR_STATION.':'.$lat.'|'.$lng;
261 
					$this->definirLatLngMaxMin($marqueurs, $lat, $lng);
 261 
					//$this->definirLatLngMaxMin($marqueurs, $lat, $lng);
262 
					$lata = round($lat, 5);
 262 
					$lata = round($lat, 5);
263 
					$lnga = round($lng, 5);
 263 
					$lnga = round($lng, 5);
264 
					$nom = $this->etreNull($nom) ? $lata.','.$lnga : $nom;
 264 
					$nom = $this->etreNull($nom) ? $lata.','.$lnga : $nom;
Line 265... Line 265...
265 
 
 265 
 
Line 282... Line 282...
282 
			$sw = $this->decomposerLatLng($this->parametres['sw']);
 282 
			$sw = $this->decomposerLatLng($this->parametres['sw']);
283 
			$marqueurs['points'] = CartoGroupage::creerGroupesQuadtree(&$points, $ne['lat'], $ne['lng'], $sw['lat'], $sw['lng'], $zoom);
 283 
			$marqueurs['points'] = CartoGroupage::creerGroupesQuadtree(&$points, $ne['lat'], $ne['lng'], $sw['lat'], $sw['lng'], $zoom);
284 
		} else {
 284 
		} else {
285 
			$marqueurs['points'] = $points;
 285 
			$marqueurs['points'] = $points;
286 
		}
 286 
		}
287 
		$marqueurs['stats']['latDiff'] = abs($marqueurs['stats']['latMin'] - $marqueurs['stats']['latMax']);
 287 
		//$marqueurs['stats']['latDiff'] = abs($marqueurs['stats']['latMin'] - $marqueurs['stats']['latMax']);
288 
		$marqueurs['stats']['lngDiff'] = abs($marqueurs['stats']['lngMin'] - $marqueurs['stats']['lngMax']);
 288 
		//$marqueurs['stats']['lngDiff'] = abs($marqueurs['stats']['lngMin'] - $marqueurs['stats']['lngMax']);
Line 289... Line 289...
289 
 
 289 
 
290 
		return $marqueurs;
 290 
		return $marqueurs;
Line 291... Line 291...
291 
	}
 291 
	}