Subversion Repositories eFlore/Projets.eflore-projets

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1064 → Rev 1065

/trunk/services/modules/0.1/osm/ZoneAdmin.php
127,7 → 127,7
 
private function construireRequeteUnion() {
$requeteTpl = 'SELECT osm_id, '.
"(($this->lon - X(centre)) * ($this->lon -X(centre)) + ($this->lat - Y(centre)) * ($this->lat - Y(centre))) AS distance ".
"(($this->lon - centre_lng) * ($this->lon -centre_lng) + ($this->lat - centre_lat) * ($this->lat - centre_lat)) AS distance ".
'FROM osm_zones_admin '.
'WHERE niveau = %s '.
'ORDER BY distance ASC '.
Property changes:
Added: svn:mergeinfo
Merged /branches/v5.2-alpage/services/modules/0.1/osm/ZoneAdmin.php:r976,978
Merged /branches/v5.7-arrayanal/services/modules/0.1/osm/ZoneAdmin.php:r1050,1052,1064
Merged /branches/v5.1-acheb/services/modules/0.1/osm/ZoneAdmin.php:r927