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