Changeset 6609

Timestamp:

Jun 26, 2010, 9:13:30 PM (14 years ago)

Author:

rvelices

Message:

rv_gmaps - start using google.maps JS namespace

Location:

extensions/rv_gmaps/trunk/template

Files:

• map.tpl (modified) (9 diffs)
• markers/small_bullet_orange.tpl (modified) (1 diff)
• markers/small_bullet_red.tpl (modified) (1 diff)
• markers/small_bullet_yellow.tpl (modified) (1 diff)
• markers/small_dot_blue.tpl (modified) (1 diff)
• markers/small_dot_green.tpl (modified) (1 diff)
• markers/small_dot_purple.tpl (modified) (1 diff)
• markers/small_dot_red.tpl (modified) (1 diff)

extensions/rv_gmaps/trunk/template/map.tpl

@@ -45 +45 @@
 
         var mapElement = document.getElementById("map");
-        map = new GMap2( mapElement );
+        map = new google.maps.Map2( mapElement );
 
         map.addMapType( G_PHYSICAL_MAP );
-        map.addControl(new GLargeMapControl3D());
-        map.addControl(new GHierarchicalMapTypeControl());
-        map.addControl(new GScaleControl());
+        map.addControl(new google.maps.LargeMapControl3D());
+        map.addControl(new google.maps.HierarchicalMapTypeControl());
+        map.addControl(new google.maps.ScaleControl());
 
         pwgPageLinker = new PageLinker(map, "aLinkToThisPage" );
@@ -57 +57 @@
 {/literal}
                 {if isset($initial_bounds)}
-                var bounds = new GLatLngBounds( new GLatLng({$initial_bounds.s},{$initial_bounds.w}), new GLatLng({$initial_bounds.n},{$initial_bounds.e}) );
+                var bounds = new google.maps.LatLngBounds( new google.maps.LatLng({$initial_bounds.s},{$initial_bounds.w}), new google.maps.LatLng({$initial_bounds.n},{$initial_bounds.e}) );
                 map.setCenter( bounds.getCenter(), map.getBoundsZoomLevel( bounds ) );
                 {/if}
 {literal}
                 if ( !map.isLoaded() )
-                        map.setCenter( new GLatLng(0,0), 2 );
+                        map.setCenter( new google.maps.LatLng(0,0), 2 );
         }
 
         try {
                 // the overview must be added after setting map center
-                var ovcontrol = new GOverviewMapControl(new GSize(165,165));
+                var ovcontrol = new google.maps.OverviewMapControl(new google.maps.Size(165,165));
                 map.addControl(ovcontrol);
         }
@@ -78 +78 @@
 
         map.pwgDataLoader = new PwgDataLoader(map, {rectangle_of_confusion: pwgMarkerIcon.iconSize} );
-        GEvent.addListener(map.pwgDataLoader, "dataloading", function() {
+        google.maps.Event.addListener(map.pwgDataLoader, "dataloading", function() {
                 var pre = '<img src="{/literal}{$PLUGIN_ROOT_URL}{literal}/icons/progress_s.gif" width="16" height="16" alt="~" /> ';
                 document.getElementById("dataLoadStatus").innerHTML = pre + Localization.get("Loading");
@@ -84 +84 @@
         );
   
-        GEvent.addListener(map.pwgDataLoader, "dataloadfailed", function(responseCode) {
+        google.maps.Event.addListener(map.pwgDataLoader, "dataloadfailed", function(responseCode) {
                 document.getElementById("dataLoadStatus").innerHTML = Localization.get("Failed") + " "+responseCode;
                 }
@@ -90 +90 @@
 
         map.pwgDataHandler = new PwgDataHandler(map, {icon: pwgMarkerIcon, show_all_img_src: "{/literal}{$PLUGIN_ROOT_URL}{literal}/icons/pic_s.gif" } );
-        GEvent.addListener(map.pwgDataLoader, "dataloaded", map.pwgDataHandler.handle.bind(map.pwgDataHandler) );
+        google.maps.Event.addListener(map.pwgDataLoader, "dataloaded", map.pwgDataHandler.handle.bind(map.pwgDataHandler) );
 
         map.pwgDataLoader.start( "{/literal}{$U_MAP_DATA}{literal}" );
@@ -96 +96 @@
         if (document.is_debug)
         {
-                GEvent.addListener(map, "moveend", function() { GLog.write("movend c:"+map.getCenter().toUrlValue());} );
-                GEvent.addListener(map, "maptypechanged", function() { GLog.write("maptypechanged");} );
-                GEvent.addListener(map, "infowindowopen", function() { GLog.write("infowindowopen");} );
-                GEvent.addListener(map, "infowindowclose", function() { GLog.write("infowindowclose");} );
+                google.maps.Event.addListener(map, "moveend", function() { google.maps.Log.write("movend c:"+map.getCenter().toUrlValue());} );
+                google.maps.Event.addListener(map, "maptypechanged", function() { google.maps.Log.write("maptypechanged");} );
+                google.maps.Event.addListener(map, "infowindowopen", function() { google.maps.Log.write("infowindowopen");} );
+                google.maps.Event.addListener(map, "infowindowclose", function() { google.maps.Log.write("infowindowclose");} );
         }
 }
@@ -117 +117 @@
         if (!q.length) return false;
         if (!geocoder)
-                geocoder = new GClientGeocoder();
+                geocoder = new google.maps.ClientGeocoder();
         geocoder.getLocations(q, function(resp)
           {
@@ -136 +136 @@
                           case 7: case 8: zoom=16; break; //intersection/exact
                         }
-                        map.setCenter( new GLatLng( resp.Placemark[0].Point.coordinates[1], resp.Placemark[0].Point.coordinates[0] ), zoom);
+                        map.setCenter( new google.maps.LatLng( resp.Placemark[0].Point.coordinates[1], resp.Placemark[0].Point.coordinates[0] ), zoom);
                   }
                   else
@@ -169 +169 @@
                 if (lang_str == undefined)
                 {
-                        if (document.is_debug) GLog.write("Language string undefined '"+ str+"'");
+                        if (document.is_debug) google.maps.Log.write("Language string undefined '"+ str+"'");
                         return str;
                 }

extensions/rv_gmaps/trunk/template/markers/small_bullet_orange.tpl

@@ -1 @@
-var icon = new GIcon();
+var icon = new google.maps.Icon();
 icon.image = "{$PLUGIN_ROOT_URL}/template/markers/small_bullet_orange.png";
-icon.iconSize = new GSize(11, 11);
-icon.iconAnchor = new GPoint(5, 5);
-icon.infoWindowAnchor = new GPoint(5, 0);
+icon.iconSize = new google.maps.Size(11, 11);
+icon.iconAnchor = new google.maps.Point(5, 5);
+icon.infoWindowAnchor = new google.maps.Point(5, 0);
 return icon;

extensions/rv_gmaps/trunk/template/markers/small_bullet_red.tpl

@@ -1 @@
-var icon = new GIcon();
+var icon = new google.maps.Icon();
 icon.image = "{$PLUGIN_ROOT_URL}/template/markers/small_bullet_red.png";
-icon.iconSize = new GSize(11, 11);
-icon.iconAnchor = new GPoint(5, 5);
-icon.infoWindowAnchor = new GPoint(5, 0);
+icon.iconSize = new google.maps.Size(11, 11);
+icon.iconAnchor = new google.maps.Point(5, 5);
+icon.infoWindowAnchor = new google.maps.Point(5, 0);
 return icon;

extensions/rv_gmaps/trunk/template/markers/small_bullet_yellow.tpl

@@ -1 @@
-var icon = new GIcon();
+var icon = new google.maps.Icon();
 icon.image = "{$PLUGIN_ROOT_URL}/template/markers/small_bullet_yellow.png";
-icon.iconSize = new GSize(11, 11);
-icon.iconAnchor = new GPoint(5, 5);
-icon.infoWindowAnchor = new GPoint(5, 0);
+icon.iconSize = new google.maps.Size(11, 11);
+icon.iconAnchor = new google.maps.Point(5, 5);
+icon.infoWindowAnchor = new google.maps.Point(5, 0);
 return icon;

extensions/rv_gmaps/trunk/template/markers/small_dot_blue.tpl

@@ -1 @@
-var icon = new GIcon();
+var icon = new google.maps.Icon();
 icon.image = "http://labs.google.com/ridefinder/images/mm_20_blue.png";
 icon.shadow = "http://labs.google.com/ridefinder/images/mm_20_shadow.png";
-icon.iconSize = new GSize(12, 20);
-icon.shadowSize = new GSize(22, 20);
-icon.iconAnchor = new GPoint(6, 20);
-icon.infoWindowAnchor = new GPoint(5, 1);
+icon.iconSize = new google.maps.Size(12, 20);
+icon.shadowSize = new google.maps.Size(22, 20);
+icon.iconAnchor = new google.maps.Point(6, 20);
+icon.infoWindowAnchor = new google.maps.Point(5, 1);
 return icon;

extensions/rv_gmaps/trunk/template/markers/small_dot_green.tpl

@@ -1 @@
-var icon = new GIcon();
+var icon = new google.maps.Icon();
 icon.image = "http://labs.google.com/ridefinder/images/mm_20_green.png";
 icon.shadow = "http://labs.google.com/ridefinder/images/mm_20_shadow.png";
-icon.iconSize = new GSize(12, 20);
-icon.shadowSize = new GSize(22, 20);
-icon.iconAnchor = new GPoint(6, 20);
-icon.infoWindowAnchor = new GPoint(5, 1);
+icon.iconSize = new google.maps.Size(12, 20);
+icon.shadowSize = new google.maps.Size(22, 20);
+icon.iconAnchor = new google.maps.Point(6, 20);
+icon.infoWindowAnchor = new google.maps.Point(5, 1);
 return icon;

extensions/rv_gmaps/trunk/template/markers/small_dot_purple.tpl

@@ -1 @@
-var icon = new GIcon();
+var icon = new google.maps.Icon();
 icon.image = "http://labs.google.com/ridefinder/images/mm_20_purple.png";
 icon.shadow = "http://labs.google.com/ridefinder/images/mm_20_shadow.png";
-icon.iconSize = new GSize(12, 20);
-icon.shadowSize = new GSize(22, 20);
-icon.iconAnchor = new GPoint(6, 20);
-icon.infoWindowAnchor = new GPoint(5, 1);
+icon.iconSize = new google.maps.Size(12, 20);
+icon.shadowSize = new google.maps.Size(22, 20);
+icon.iconAnchor = new google.maps.Point(6, 20);
+icon.infoWindowAnchor = new google.maps.Point(5, 1);
 return icon;

extensions/rv_gmaps/trunk/template/markers/small_dot_red.tpl

@@ -1 @@
-var icon = new GIcon();
+var icon = new google.maps.Icon();
 icon.image = "http://labs.google.com/ridefinder/images/mm_20_red.png";
 icon.shadow = "http://labs.google.com/ridefinder/images/mm_20_shadow.png";
-icon.iconSize = new GSize(12, 20);
-icon.shadowSize = new GSize(22, 20);
-icon.iconAnchor = new GPoint(6, 20);
-icon.infoWindowAnchor = new GPoint(5, 1);
+icon.iconSize = new google.maps.Size(12, 20);
+icon.shadowSize = new google.maps.Size(22, 20);
+icon.iconAnchor = new google.maps.Point(6, 20);
+icon.infoWindowAnchor = new google.maps.Point(5, 1);
 return icon;