Changeset 1378

Timestamp:

04/03/11 19:14:28 (2 years ago)

Author:

Torben Brodt

Message:

drop some deprecated packages

Files:

• footscript (deleted)
• g-map/files/js/gmap/AjaxMap.class.js (modified) (2 diffs)
• g-map/files/lib/data/gmap/GmapCluster.class.php (modified) (3 diffs)
• g-map/files/lib/page/MapAjaxPage.class.php (modified) (2 diffs)
• g-map/package.xml (modified) (2 diffs)
• googlewave (deleted)

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

@@ -24 +24 @@
                 url += '&bounds=' + this.boundsUsed;
                 url += '&action=pick';
-                url += '&lon=' + marker.getLatLng().x;
-                url += '&lat=' + marker.getLatLng().y;
+                url += '&index=' + marker.index;
                 var ajaxRequest = new AjaxRequest();
                 ajaxRequest.openGet(url + SID_ARG_2ND, function (map, id) {
@@ -100 +99 @@
                                                                 marker = new GMarker(coordinates);
                                                         }
+                                                        marker.index = i;
                                                         GEvent.addListener(marker, "click", function (map, marker) {
                                                                 return function () {

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

@@ -80 +80 @@
          * @param       $markers        Array of lat and lon locations.
          */
-        public function getMarkers(array $markers, $pick = array()) {
+        public function getMarkers(array $markers, $pick = null) {
                 $clustered = array();
 
@@ -104 +104 @@
                         if (count($cluster) > 0) {
                                 $cluster[] = $marker;
+                                if($pick !== null && count($clustered) == $pick - 1) {
+                                        $tmp = $this->getCluster($cluster, true);
+                                        return $tmp['ids'];
+                                }
                                 $clustered[] = $this->getCluster($cluster);
                         } else {
+                                if($pick !== null && count($clustered) == $pick - 1) {
+                                        return array($marker['id']);
+                                }
                                 $clustered[] = $marker;
                         }
@@ -116 +123 @@
          * @param       $markers        Array of lat and lon locations.
          */
-        public function getIDs(array $markers, $lat, $lon) {
+        public function getIDs(array $markers, $idx) {
 
                 /* Loop until all markers have been compared. */

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

@@ -54 +54 @@
                 $this->lat = isset($_GET['lat']) ? floatval($_GET['lat']) : 0;
                 $this->lon = isset($_GET['lon']) ? floatval($_GET['lon']) : 0;
+                
+                // pick action
+                $this->idx = isset($_GET['idx']) ? intval($_GET['idx']) : 0;
         }
 
@@ -90 +93 @@
                 $cluster = new GmapCluster($this->distance, $this->zoom);
                 if($this->action == 'pick') {
-                        $ids = $cluster->getIDs($markers, $this->lat, $this->lon);
+                        $ids = $cluster->getIDs($markers, $this->idx);
                         if($ids === null) {
                                 $this->datapoints = array();    

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.5</version>
+                <version>2.0.6</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -45 +45 @@
                 <eventlistener>eventlistener.xml</eventlistener>
         </instructions>
+        
+        <instructions type="update" fromversion="2.0.5">
+                <files>files.tar</files>
+                <templates>templates.tar</templates>
+        </instructions>
         
         <instructions type="update" fromversion="2.0.4">