| /branches/v1.5-cisaille/widget/modules/cartopoint/squelettes/scripts/carto.js |
|---|
| 49,6 → 49,7 |
| var marqueursCache = new Array(); |
| var zonesCache = new Array(); |
| var requeteChargementPoints; |
| var urlVars = null; |
| /*+--------------------------------------------------------------------------------------------------------+*/ |
| // INITIALISATION DU CODE |
| 58,6 → 59,7 |
| }); |
| function initialiserWidget() { |
| urlVars = getUrlVars(); |
| definirTailleTitre(); |
| initialiserAffichageCarte(); |
| initialiserAffichagePanneauLateral(); |
| 70,6 → 72,19 |
| programmerRafraichissementCarte(); |
| } |
| function getUrlVars() |
| { |
| var vars = [], hash; |
| var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); |
| for(var i = 0; i < hashes.length; i++) |
| { |
| hash = hashes[i].split('='); |
| vars.push(hash[0]); |
| vars[hash[0]] = hash[1]; |
| } |
| return vars; |
| } |
| /*+--------------------------------------------------------------------------------------------------------+*/ |
| // AFFICHAGE GÉNÉRAL |
| 204,6 → 219,9 |
| } |
| premierChargement = true; |
| function doitCentrerCarte() { |
| return premierChargement && urlVars != null && urlVars.length > 0; |
| } |
| function rafraichirMarqueurs(data) { |
| $.each(marqueurs, function(index, marqueur) { |
| 221,7 → 239,7 |
| } |
| }); |
| if(premierChargement) { |
| if(doitCentrerCarte()) { |
| premierChargement = false; |
| var bounds = new google.maps.LatLngBounds(); |
| var latMax = new google.maps.LatLng(data.stats.coordmax.latMax, data.stats.coordmax.lngMax); |
| /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 |
|---|
| 93,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() { |