Changeset 1229

Timestamp:

09/19/10 19:45:42 (3 years ago)

Author:

d0nut

Message:

map update: only fetch data within boundaries

Location:

g-map

Files:

• files/lib/page/MapAjaxPage.class.php (modified) (3 diffs)
• files/lib/system/event/listener/GMapUserPageListener.class.php (modified) (1 diff)
• files/lib/system/event/listener/GMapUserProfileEditFormListener.class.php (modified) (1 diff)
• optionals/de.gmap.wbb/files/lib/acp/action/UpdateMapAction.class.php (modified) (1 diff)

g-map/files/lib/page/MapAjaxPage.class.php

@@ -15 +15 @@
 class MapAjaxPage extends AbstractPage {
         protected $zoom = 0;
-        protected $distance = 10;
+        protected $distance = 35;
         protected $bounds= array();
         protected $initialized = false;
@@ -31 +31 @@
                 // ((50.08930948264218, 10.298652648925781), (50.14434619645057, 10.506362915039062))
                 if(isset($_GET['bounds'])) {
-                        if(preg_match('\((\d+\.?\d*), (\d+\.?\d*)\), \((\d+\.?\d*), (\d+\.?\d*)\)', $_GET['bounds'], $match)) {
-                                $this->bounds = $match;
+                        if(preg_match('/^\(\((-?\d+\.?\d*), (-?\d+\.?\d*)\), \((-?\d+\.?\d*), (-?\d+\.?\d*)\)\)$/', $_GET['bounds'], $match)) {
+                                $this->bounds = array(
+                                        array(
+                                                'lat' => $match[1],
+                                                'lon' => $match[2]
+                                        ),
+                                        array(
+                                                'lat' => $match[3],
+                                                'lon' => $match[4]
+                                        ),
+                                );
+
+                                // extra 30%
+                                $this->bounds[0]['lat'] -= abs($this->bounds[0]['lat'] - $this->bounds[1]['lat']) * 0.3;
+                                $this->bounds[1]['lat'] += abs($this->bounds[0]['lat'] - $this->bounds[1]['lat']) * 0.3;
+                                $this->bounds[0]['lon'] -= abs($this->bounds[0]['lon'] - $this->bounds[1]['lon']) * 0.3;
+                                $this->bounds[1]['lon'] += abs($this->bounds[0]['lon'] - $this->bounds[1]['lon']) * 0.3;
                         }
                 }
@@ -50 +65 @@
                 $sql = 'SELECT          X(pt) AS lon,
                                         Y(pt) AS lat
-                        FROM            wcf'.WCF_N.'_gmap_user';
+                        FROM            wcf'.WCF_N.'_gmap_user
+                        WHERE           1';
+                        
+                if($this->bounds) {
+                        $sql .= ' AND X(pt) BETWEEN '.floatval($this->bounds[0]['lon']).' AND '.floatval($this->bounds[1]['lon']).' ';
+                        $sql .= ' AND Y(pt) BETWEEN '.floatval($this->bounds[0]['lat']).' AND '.floatval($this->bounds[1]['lat']).' ';
+                }
                         
                 if(!$this->initialized) {

g-map/files/lib/system/event/listener/GMapUserPageListener.class.php

@@ -54 +54 @@
                         ));
                         // if user position exists
-                        WCF::getTPL()->append('additionalBoxes2', WCF::getTPL()->fetch('userProfileMapSide'));
+                        WCF::getTPL()->append('additionalBoxes1', WCF::getTPL()->fetch('userProfileMapSide'));
                 }
 
                 // if user is owner or user has personal maps
-                if(WCF::getUser()->userID == $this->userID || $this->personal_maps) {
+                if(false && WCF::getUser()->userID == $this->userID || $this->personal_maps) {
                         WCF::getTPL()->append('additionalContents3', WCF::getTPL()->fetch('userProfileMapCenter'));
                 }

g-map/files/lib/system/event/listener/GMapUserProfileEditFormListener.class.php

@@ -20 +20 @@
                 $this->className = $className;
                 
-                
+                $this->$eventName();
         }
         
         protected function saved() {
-                if($this->eventObj->activeCategory == 'profile' && $eventName == 'saved') {
+                if($this->eventObj->activeCategory == 'profile') {
                         if(isset($this->eventObj->values['location']) && !empty($this->eventObj->values['location'])) {
                                 
                                 // update user location
-                                // MapDiscover::update();
-                                
-                                // show info message if no location was found
+                                require_once(WCF_DIR.'lib/data/gmap/GmapApi.class.php');
+                                $api = new GmapApi();
+                                $point = $api->search($this->eventObj->values['location']);
+                        
+                                if($point) {
+                                        $sql = "REPLACE INTO    wcf".WCF_N."_gmap_user
+                                                                (userID, pt)
+                                                VALUES          (".$this->eventObj->user->userID.", PointFromText('POINT(".$point['lon']." ".$point['lat'].")'))";
+                                        WCF::getDB()->sendQuery($sql);
+                                }
                         }
                 }

g-map/optionals/de.gmap.wbb/files/lib/acp/action/UpdateMapAction.class.php

@@ -42 +42 @@
                                         ".$col." AS loc
                         FROM            wcf".WCF_N."_user_option_value
-                        ORDER BY        userID";
+                        WHERE           ".$col." != ''
+                        ORDER BY        userID ASC";
                 $result = WCF::getDB()->sendQuery($sql, $this->limit, ($this->limit * $this->loop));
                 while ($row = WCF::getDB()->fetchArray($result)) {