Changeset 1424

Timestamp:

05/17/11 22:48:03 (2 years ago)

Author:

Torben Brodt

Message:

updates for gmap v3

Location:

g-map

Files:

• files/js/gmap/AjaxMap.class.js (modified) (4 diffs)
• optionals/de.gmap.wcf.data.message.bbcode.map/files/js/gmap/BBCodeMap.class.js (modified) (1 diff)
• optionals/de.gmap.wcf.data.message.bbcode.map/package.xml (modified) (2 diffs)
• optionals/de.gmap.wcf.data.message.bbcode.map/templates/mapBBCode.tpl (modified) (1 diff)
• templates/mapOverview.tpl (modified) (2 diffs)

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

@@ -26 +26 @@
                 this.zoomUsed = null;
                 this.zoomDisplayed = null;
+                this.infoWindow = null;
         },
         
@@ -35 +36 @@
                 var id = ++this.requestCounter;
 
-                var infoWindow = new google.maps.InfoWindow({ content: '<div style="overflow:auto;width:217px;height:70px;" id="info-' + id + '">' +
-                        '<img src="' + RELATIVE_WCF_DIR + 'icon/gmap/ajax-loader.gif" alt="" />' + '</div>' });
-                infoWindow.setPosition(marker.getLatLng());
-                infoWindow.open(this.gmap);
+                if(this.infoWindow === null) {
+                        this.infoWindow = new google.maps.InfoWindow({
+                                content: '<div style="overflow:auto;width:217px;height:70px;" id="' + this.divID + 'infoWindow">' +
+                                        '<img src="' + RELATIVE_WCF_DIR + 'icon/gmap/ajax-loader.gif" alt="" />' + 
+                                        '</div>'
+                        });
+                }
+
+                var c = this.coordinates[marker.getLatLng()];
+                this.infoWindow.setPosition(new google.maps.LatLng(c[0], c[1]));
+                this.infoWindow.open(this.gmap);
                 
                 var url = this.url;
@@ -49 +57 @@
                         return function () {
                                 if (ajaxRequest.xmlHttpRequest.readyState == 4 && ajaxRequest.xmlHttpRequest.status == 200) {
-                                        var avatar, dom = document.getElementById('info-' + id);
+                                        var avatar, dom = document.getElementById(map.divID + 'infoWindow');
                                         if (!dom) {
                                                 return;
@@ -156 +164 @@
                                                         }
                                                         marker.getLatLng = function() {
-                                                                return coordinates;
+                                                                return this.idx;
                                                         };
                                                         marker.idx = i;
-                                                
+
                                                         // increase marker count
+                                                        map.markerCount = i;
                                                         map.coordinates[map.markerCount] = [data[i].lat, data[i].lon];
-                                                        map.markers.push(marker);
-                                                        map.markerCount++;
+                                                        map.markers[map.markerCount] = marker;
                                                 }
                                         } 

g-map/optionals/de.gmap.wcf.data.message.bbcode.map/files/js/gmap/BBCodeMap.class.js

@@ -7 +7 @@
  */
 if ( typeof BBCodeMap === 'undefined' ) {
-        var BBCodeMap = function(switchable) {
-
-                // instance counter
-                if ( typeof BBCodeMap.counter === 'undefined' ) {
-                        // It has not... perform the initilization
-                        BBCodeMap.counter = 0;
-                }
-                ++BBCodeMap.counter;
+        var BBCodeMap = Class.create(Map3, {
+                initialize: function($super, switchable) {
+                        // instance counter
+                        if ( typeof BBCodeMap.counter === 'undefined' ) {
+                                // It has not... perform the initilization
+                                BBCodeMap.counter = 0;
+                        }
+                        ++BBCodeMap.counter;
         
-                this.constructor('bbcodemap-' + BBCodeMap.counter, switchable);
+                        $super('bbcodemap-' + BBCodeMap.counter, switchable);
         
-                this.events = [];
+                        this.events = [];
+                },
         
-                this.registerEvent = function(callback) {
+                registerEvent: function(callback) {
                         this.events.push(callback);
-                };
+                },
         
                 /**
                  * document write div containers
                  */
-                this.write = function() {
+                write: function() {
                         document.write('<div id="' + this.divID + '"><div id="' + this.divID + 'Canvas" style="height: 330px"></div></div>');
-                }
-        
-                this.runEvents = function() {
+                },
+
+                runEvents: function() {
                         for(var i=0; i<this.events.length; i++) {
                                 this.events[i]();
                         }
-                };
-        };
-        BBCodeMap.prototype = new Map();
+                }
+        });
 }

g-map/optionals/de.gmap.wcf.data.message.bbcode.map/package.xml

@@ -6 +6 @@
                 <packagedescription><![CDATA[This BBCode allows you to add a map with infinite markers to your posting.]]></packagedescription>
                 <isunique>1</isunique>
-                <version>2.0.3</version>
+                <version>3.0.0 Beta 1</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf.data.message.bbcode</plugin>
@@ -30 +30 @@
                 <languages languagecode="fr">fr.xml</languages>
         </instructions>
+        
+        <instructions type="update" fromversion="2.0.3">
+                <templates>templates.tar</templates>
+                <files>files.tar</files>
+        </instructions>
         
         <instructions type="update" fromversion="2.0.2">

g-map/optionals/de.gmap.wcf.data.message.bbcode.map/templates/mapBBCode.tpl

@@ -1 +1 @@
 {include file='gmapConstants'}
-<script type="text/javascript">
-//<![CDATA[
-GMAP_ENABLE_STREETVIEW = 1; 
-GMAP_MAP_CONTROL = 'off';
-//]]>
-</script>
-<script src="{@RELATIVE_WCF_DIR}js/gmap/Map.class.js" type="text/javascript"></script>
+<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&amp;language={@$this->language->getLanguageCode()}"></script>
+<script src="{@RELATIVE_WCF_DIR}js/gmap/Map3.class.js" type="text/javascript"></script>
 <script src="{@RELATIVE_WCF_DIR}js/gmap/BBCodeMap.class.js" type="text/javascript"></script>
 <script type="text/javascript">
 //<![CDATA[
-if (GMAP_API_KEY != '') {
-        document.write('<script src="http://maps.google.com/maps?file=api&amp;v=2.118&amp;hl={@$this->language->getLanguageCode()}&amp;key=' + GMAP_API_KEY + '&amp;oe={CHARSET}" type="text/javascript"><\/script>');
-}
+onloadEvents.push(function() {
+        var sv, gmap = new BBCodeMap();
+        gmap.registerEvent(function(map) {
+                return function() {
+                        gmap.gmap.setZoom({$bbcodemap_zoom});
+                };
+        }(gmap));
+
+        // write div layer with unique id
+        gmap.write();
+
+        return function() {
+                var marker, coordinates;
+                var data = {@$bbcodemap_data|json_encode};
+
+                var coordinates = [];
+                for(var i=0; i<data.length; i++) {
+                        coordinates.push({
+                                latitude: data[i].lat,
+                                longitude: data[i].lon
+                        });
+                }
+
+                if(coordinates.length) {
+                        gmap.loadMarkers(coordinates);
+                        gmap.showMap();
+                        gmap.runEvents();
+                }
+        };
+}());
 //]]>
 </script>
-<script type="text/javascript">
-//<![CDATA[
-if (GMAP_API_KEY != '')  {
-        document.write('<script src="{@RELATIVE_WCF_DIR}js/gmap/StreetViewControl.class.js" type="text/javascript"><\/script>');
-        onloadEvents.push(function() {
-                var sv, gmap = new BBCodeMap();
-                gmap.registerEvent(function(map) {
-                        return function() {
-                                gmap.gmap.setZoom({$bbcodemap_zoom});
-                                if(GMAP_ENABLE_STREETVIEW) {
-                                        sv = new StreetViewControl();
-                                        gmap.gmap.addControl(sv);
-                                }
-                        };
-                }(gmap));
-                
-                // write div layer with unique id
-                gmap.write();
-
-                return function() {
-                        if (GBrowserIsCompatible()) {
-                                var marker, coordinates;
-                                var data = {@$bbcodemap_data|json_encode};
-                                for(var i=0; i<data.length; i++) {
-                                        coordinates = new GLatLng(data[i].lat, data[i].lon);
-                                        if(i == 0) {
-                                                gmap.setCoordinates(coordinates);
-                                                gmap.gmap.clearOverlays();
-                                                gmap.runEvents();
-                                        }
-                                        
-                                        marker = new GMarker(coordinates);
-                                        gmap.gmap.addOverlay(marker);
-                                }
-                                // enable street view from beginning?
-                                if(false && sv && data.length > 0) {
-                                        coordinates = new GLatLng(data[0].lat, data[0].lon);
-                                        sv.container2.showstreetview(coordinates);
-                                }
-                        }
-                };
-        }());
-}
-//]]>
-</script>

g-map/templates/mapOverview.tpl

@@ -11 +11 @@
         //]]>
         </script>
+        <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&amp;language={@$this->language->getLanguageCode()}"></script>
         <script src="{@RELATIVE_WCF_DIR}js/gmap/Map3.class.js" type="text/javascript"></script>
         <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/AjaxRequest.class.js"></script>
-        <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&amp;language=de"></script>
         <script type="text/javascript">
         //<![CDATA[
@@ -24 +24 @@
         //]]>
         </script>
+        <style type="text/css">
+        #gmapCanvas {
+                color:#333 !important;
+        }
+        </style>
 </head>
 <body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>