Changeset 1236

Timestamp:

10/09/10 19:41:52 (3 years ago)

Author:

d0nut

Message:

may finish gmap 2.0.0 RC 3

Location:

g-map

Files:

• files/js/gmap/AjaxMap.class.js (modified) (4 diffs)
• files/js/gmap/ClusterMarker.class.js (modified) (1 diff)
• files/lib/data/gmap/GmapBounds.class.php (deleted)
• files/lib/data/gmap/GmapCluster.class.php (modified) (4 diffs)
• files/lib/page/MapAjaxPage.class.php (modified) (6 diffs)
• optionals/de.gmap.wbb/package.xml (modified) (2 diffs)
• package.xml (modified) (2 diffs)

g-map/files/js/gmap/AjaxMap.class.js

@@ -8 +8 @@
 var AjaxMap = function(url, divID, switchable) {
         this.url = url;
+        this.requestCounter = 0;
+        this.events = [];
+        this.boundsUsed;
+        this.zoomUsed;
+
         this.constructor(divID, switchable);
-        this.events = [];
-        
+
         this.registerEvent = function(callback) {
                 this.events.push(callback);
         };
-        
+
         /**
          * 
          */
         this.fireClickEvent = function(marker) {
-                marker.openInfoWindowHtml(marker.getLatLng() + "\nzoom: " + this.gmap.getZoom());
-                // start ajax request for ClusterMarker here
+                var id = ++this.requestCounter;
+                marker.openInfoWindowHtml('<div id="info-'+id+'">...</div>');
+                
+                var url = this.url;
+                url += '&zoom='+this.zoomUsed;
+                url += '&bounds='+this.boundsUsed;
+                url += '&action=pick';
+                url += '&lon='+marker.getLatLng().x;
+                url += '&lat='+marker.getLatLng().y;
+                
+                var ajaxRequest = new AjaxRequest();
+                ajaxRequest.openGet(url + SID_ARG_2ND, function(map, id) {
+                        return function() {
+                                if(ajaxRequest.xmlHttpRequest.readyState == 4 && ajaxRequest.xmlHttpRequest.status == 200) {
+                                        var dom = document.getElementById('info-'+id);
+                                        if(!dom) {
+                                                return;
+                                        }
+                                        var data = eval('(' + ajaxRequest.xmlHttpRequest.responseText + ')');
+                                        var html = [];
+                                        for(var i=0; i<data.length; i++) {
+                                                html.push('<a href="index.php?page=User&amp;userID=' + data[i][0] + SID_ARG_2ND + '">' + 
+                                                        data[i][1] +
+                                                        '</a>');
+                                        }
+                                        dom.innerHTML = html.join(', ');
+                                };
+                        };
+                }(this, id));
+        };
+        
+        /**
+         * get current bounds with additional to need refresh data with every move
+         */
+        this.getBounds = function() {
+                var bounds = this.gmap.getBounds();
+                var a = bounds.getSouthWest();
+                var b = bounds.getNorthEast();
+
+                // add additional 30 percent
+                a.y -= Math.abs(a.y - b.y) * 0.3;
+                b.y += Math.abs(a.y - b.y) * 0.3;
+                a.x -= Math.abs(a.x - b.x) * 0.2;
+                b.x += Math.abs(a.x - b.x) * 0.2;
+                
+                bounds.extend(new GLatLng(a.y, a.x));
+                bounds.extend(new GLatLng(b.y, b.x));
+                
+                return bounds;
+        };
+        
+        /**
+         *
+         */
+        this.needsUpdate = function() {
+                if(!this.mapInitialized) {
+                        return true;
+                }
+                
+                if(this.gmap.getZoom() != this.zoomUsed) {
+                        return true;
+                }
+                
+                return !this.boundsUsed.containsBounds(this.gmap.getBounds());
         };
 
+        /**
+         *
+         */
         this.update = function() {
-                // TODO: only run ajax update when leaving bounding box (extra 30%)
-                url = this.url;
-                
+                if(!this.needsUpdate()) {
+                        return;
+                }
+                        
+                var bounds, zoom, url = this.url;
+
                 if(this.mapInitialized) {
-                        url += '&zoom='+this.gmap.getZoom();
-                        url += '&bounds='+this.gmap.getBounds();
-                        url += '&initialized=1';
+                        bounds = this.getBounds();
+                        zoom = this.gmap.getZoom();
+
+                        url += '&zoom='+zoom;
+                        url += '&bounds='+bounds;
+                        url += '&action=update';
+                } else {
+                        url += '&action=initialize';
                 }
 
                 var ajaxRequest = new AjaxRequest();
-                ajaxRequest.openGet(url + SID_ARG_2ND, function(map) {
+                ajaxRequest.openGet(url + SID_ARG_2ND, function(map, bounds, zoom) {
                         return function() {
                                 if(ajaxRequest.xmlHttpRequest.readyState == 4 && ajaxRequest.xmlHttpRequest.status == 200) {
+                                        // remember the used bounds
+                                        map.boundsUsed = bounds;
+                                        map.zoomUsed = zoom;
+
                                         var data = eval('(' + ajaxRequest.xmlHttpRequest.responseText + ')');
                                         var coordinates, overlay;
@@ -42 +123 @@
                                         if(map.mapInitialized) {
                                                 map.gmap.clearOverlays();
-                                                for(var i in data) {
+                                                for(var i=0; i<data.length; i++) {
                                                         coordinates = new GLatLng(data[i].lat, data[i].lon);
 
@@ -66 +147 @@
                                                 map.setCoordinates(coordinates);
                                                 map.gmap.clearOverlays();
-                                                
+                
                                                 map.update();
                                                 map.runEvents();
@@ -72 +153 @@
                                 }
                         };
-                }(this));
+                }(this, bounds, zoom));
         };
-        
+
         this.runEvents = function() {
                 GEvent.addListener(this.gmap, "moveend", function(map) {

g-map/files/js/gmap/ClusterMarker.class.js

@@ -51 +51 @@
         
         this.openInfoWindowHtml = function(html) {
-                var window = this.map_.getInfoWindow();
-                window.reset(this.getLatLng(), [new GInfoWindowTab("", html)]);
-                window.show();
+                this.map_.openInfoWindowHtml(this.getLatLng(), html);
         };
 }

g-map/files/lib/data/gmap/GmapCluster.class.php

@@ -48 +48 @@
          * @return   object Google_Maps_Coordinate
          */
-        protected function getCluster(array $markers) {
+        protected function getCluster(array $markers, $return_ids = false) {
                 $count = count($markers);
+                $ids = array();
 
                 /* Calculate average lat and lon of markers. */
@@ -56 +57 @@
                    $lat_sum += $marker['lat'];
                    $lon_sum += $marker['lon'];
+                   if($return_ids) {
+                        $ids[] = $marker['id'];
+                   }
                 }
                 $lat_avg = $lat_sum / $count;
                 $lon_avg = $lon_sum / $count;
                 
-                return array(
+                $data = array(
                         'count' => $count,
                         'lat' => $lat_avg,
                         'lon' => $lon_avg
                 );
+                if(count($ids)) {
+                        $data['ids'] = $ids;
+                }
+                
+                return $data;
         }
 
@@ -71 +80 @@
          * @param       $markers        Array of lat and lon locations.
          */
-        public function getMarkers(array $markers) {
+        public function getMarkers(array $markers, $pick = array()) {
                 $clustered = array();
 
@@ -102 +111 @@
                 return $clustered;
         }
+
+        /**
+         *
+         * @param       $markers        Array of lat and lon locations.
+         */
+        public function getIDs(array $markers, $lat, $lon) {
+
+                /* Loop until all markers have been compared. */
+                while (count($markers)) {
+                        $marker  = array_pop($markers);
+                        $cluster = array();
+
+                        /* Compare against all markers which are left. */
+                        foreach ($markers as $key => $target) {
+                                $pixels = $this->pixelDistance($marker['lat'], $marker['lon'], $target['lat'], $target['lon'], $this->zoom);
+
+                                /* If two markers are closer than given distance remove */
+                                /* target marker from array and add it to cluster.        */
+                                if ($this->distance > $pixels) {
+                                        unset($markers[$key]);
+                                        $cluster[] = $target;
+                                }
+                        }
+
+                        /* If a marker has been added to cluster, add also the one  */
+                        /* we were comparing to and remove the original from array. */
+                        if (count($cluster) > 0) {
+                                $cluster[] = $marker;
+                                $cluster = $this->getCluster($cluster, true);
+                                if(abs($cluster['lat'] - $lat) < 0.000000001 && abs($cluster['lon'] - $lon) < 0.000000001) {
+                                        return $cluster['ids'];
+                                }
+                        } else {
+                                if(abs($marker['lat'] - $lat) < 0.000000001 && abs($marker['lon'] - $lon) < 0.000000001) {
+                                        return array($marker['id']);
+                                }
+                        }
+                }
+                return null;
+        }
 }

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

@@ -14 +14 @@
  */
 class MapAjaxPage extends AbstractPage {
+        public $action = '';
         protected $zoom = 0;
         protected $distance = 35;
         protected $bounds= array();
-        protected $initialized = false;
         
-        protected $markers = array();
+        protected $datapoints = array();
         
         /**
@@ -42 +42 @@
                                         ),
                                 );
-
-                                // extra 30%
-                                // TODO: let javascript control the bounding box
-                                $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;
                         }
                 }
                 
                 // just get bounds
-                $this->initialized = isset($_GET['initialized']) && $_GET['initialized'];
+                $this->action = $_GET['action'];
                 
                 // load content
                 $this->content = isset($_GET['content']) && $_GET['content'];
+                
+                // coordinates
+                $this->lat = isset($_GET['lat']) ? floatval($_GET['lat']) : 0;
+                $this->lon = isset($_GET['lon']) ? floatval($_GET['lon']) : 0;
         }
         
@@ -67 +64 @@
                 $markers = array();
 
-                $sql = 'SELECT          X(pt) AS lon,
+                $sql = 'SELECT          '.($this->action == 'pick' ? 'userID AS id,' : '').'
+                                        X(pt) AS lon,
                                         Y(pt) AS lat
                         FROM            wcf'.WCF_N.'_gmap_user
@@ -77 +75 @@
                 }
                         
-                if(!$this->initialized) {
+                if(!$this->action == 'initialize') {
                         $sql = 'SELECT  AVG(lon) AS lon,
                                         AVG(lat) AS lat
@@ -91 +89 @@
                 
                 $cluster = new GmapCluster($this->distance, $this->zoom);
-                $this->markers = $cluster->getMarkers($markers);
+                if($this->action == 'pick') {
+                        require_once(WCF_DIR.'lib/data/user/User.class.php');
+                        $ids = $cluster->getIDs($markers, $this->lat, $this->lon);
+                        $this->datapoints = User::getUsers(implode(",", $ids));
+                        $this->datapoints = array_map(create_function('$a', 'return array(
+                                intval($a->userID),
+                                $a->username
+                        );'), $this->datapoints);
+                } else {
+                        $this->datapoints = $cluster->getMarkers($markers);
+                }
         }
 
@@ -100 +108 @@
                 parent::show();
 
-                echo json_encode($this->markers);
+                echo json_encode($this->datapoints);
         }
 }

g-map/optionals/de.gmap.wbb/package.xml

@@ -10 +10 @@
                 <packagedescription language="it"><![CDATA[Questo pacchetto aggiunge alcune ottimizzazioni WBB al G-Map per WCF.]]></packagedescription>
                 <isunique>0</isunique>
-                <version>2.0.0 RC 1</version>
+                <version>2.0.0 RC 3</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wbb</plugin>
@@ -33 +33 @@
         </instructions>
 
-        <instructions type="update" fromversion="2.0.0 RC 1">
+        <instructions type="update" fromversion="2.0.0 RC 2">
                 <files>files.tar</files>
+                <languages languagecode="it">it.xml</languages>
         </instructions>
 </package>

g-map/package.xml

@@ -10 +10 @@
                 <packagedescription language="it"><![CDATA[Questo pacchetto aggiunge una mappa di Google sul tuo forum.]]></packagedescription>
                 <isunique>1</isunique>
-                <version>2.0.0 RC 2</version>
+                <version>2.0.0 RC 1</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -44 +44 @@
         </instructions>
         
-        <instructions type="update" fromversion="2.0.0 RC 1">
+        <instructions type="update" fromversion="2.0.0 RC 2">
                 <files>files.tar</files>
-                <templates>templates.tar</templates>
-                <languages languagecode="de">de.xml</languages>
-                <languages languagecode="en">en.xml</languages>
+                <languages languagecode="it">it.xml</languages>
         </instructions>
 </package>