tutos-commits Mailing List for TUTOS (Page 17)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 942
          http://sourceforge.net/p/tutos/code/942
Author:   gokohnert
Date:     2013-02-14 18:54:43 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
changed to latest Maps API

Modified Paths:
--------------
    trunk/php/google_earth/google_earth.pinc

Modified: trunk/php/google_earth/google_earth.pinc
===================================================================

--- trunk/php/google_earth/google_earth.pinc	2013-02-11 09:14:43 UTC (rev 941)
+++ trunk/php/google_earth/google_earth.pinc	2013-02-14 18:54:43 UTC (rev 942)
@@ -30,8 +30,7 @@
  *  @license   http://www.opensource.org/licenses/gpl-2.0.php GPL2+
  *  @link      http://www.tutos.org
  */
-class Google_Earth extends tutos_handler
-{
+class Google_Earth extends tutos_handler {
     /**
      * run the handler
      *
@@ -41,8 +40,7 @@
      *
      * @return html code
      */
-    function handle($obj, $arg, $cnt)
-    {
+    function handle($obj, $arg, $cnt) {
         global $tutos,$lang,$current_user;
 
         $msg = '';
@@ -88,79 +86,46 @@
 
         if ($showmap) {
             if ($id == 0) {
-                $msg .= '<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key='.$tutos['googlemapkey'][$current_user->dbconn->db->id].'" type="text/javascript"></script>';
+                //                $msg .= '<script src="http://maps.google.com/maps?file=api&amp;v=3&amp;key='.$tutos['googlemapkey'][$current_user->dbconn->db->id].'" type="text/javascript"></script>';
+                $msg .= '<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&amp;sensor=false&amp;key='.$tutos['googlemapkey'][$current_user->dbconn->db->id].'" type="text/javascript"></script>';
             }
             $msg .= '<div id="map_canvas'.$id.'" style="width:'.$width.'px; height:'.$height.'px"></div>';
 
             $msg .= '<script type="text/javascript">';
             $msg .= '//<![CDATA[';
-            $msg .= '
-    function initialize() {
-      if (GBrowserIsCompatible()) {
-        var map = new GMap2(document.getElementById("map_canvas'.$id.'"));
-        var geocoder = new GClientGeocoder();
+            $msg .= "
+function initialize() {
+  var geocoder = new google.maps.Geocoder();
+  geocoder.geocode( {'address':'".$query."'},function(results,status) {
+    if (status == google.maps.GeocoderStatus.OK) {
+       var mapOptions = {
+          zoom: 12,
+          center: results[0].geometry.location,
+          mapTypeId: google.maps.MapTypeId.ROADMAP
+      };
+      map = new google.maps.Map(document.getElementById('map_canvas'+".$id."), mapOptions);
+      var marker = new google.maps.Marker({
+            map: map,
+            title: '',
+            position: results[0].geometry.location
+      });
+    } else {
+//      alert('Geocode was not successful for the following reason: ' + status);
+    }
+  });
 
-        // Create a base icon for all of our markers that specifies the
-        // shadow, icon dimensions, etc.
-        var baseIcon = new GIcon(G_DEFAULT_ICON);
-        baseIcon.shadow = "http://www.google.com/mapfiles/shadow50.png";
-        baseIcon.iconSize = new GSize(20, 34);
-        baseIcon.shadowSize = new GSize(37, 34);
-        baseIcon.iconAnchor = new GPoint(9, 34);
-        baseIcon.infoWindowAnchor = new GPoint(9, 2);
-
-        // Creates a marker whose info window displays the letter corresponding
-        // to the given index.
-        function createMarker(point,index,name) {
-          // Create a lettered icon for this point using our icon class
-          var letter = String.fromCharCode("A".charCodeAt(0) + index);
-          var letteredIcon = new GIcon(baseIcon);
-          letteredIcon.image = "http://www.google.com/mapfiles/marker" + letter + ".png";
-
-          // Set up our GMarkerOptions object
-          markerOptions = { icon:letteredIcon };
-          var marker = new GMarker(point, markerOptions);
-
-          GEvent.addListener(marker, "click", function() {
-            marker.openInfoWindowHtml(name + "</b>");
-          });
-          return marker;
-        }
-
-          ';
+}
+google.maps.event.addDomListener(window, 'load', initialize);
+";
             if ($mode == 1) {
-                $msg .= '
-geocoder.getLatLng("'.$query.'", function(point) {
-      if (!point) {
-        alert("'.$query.'" + " not found");
-      } else {
-        map.setCenter(point, 13);
-        map.addOverlay(createMarker(point,0,"'.$lang[$obj->getType()].'<br>'.addslashes($obj->getLink()).'"));
-      }
-    }
-  );
-          ';
             }
             if ($mode == 2) {
-                $msg .= '
-        var here = new GLatLng('.$x[1].','.$x[0].');
-        map.setCenter(here, 13);
-        map.addOverlay(createMarker(here,0,"'.$lang[$obj->getType()].'<br>'.addslashes($obj->getLink()).'"));
-          ';
             }
 
-            $msg .= '
-        map.addControl(new GSmallMapControl());
-        map.addControl(new GMapTypeControl());
-        return;
-    }
-}
-initialize();
-';
             $msg .= '//]]>';
             $msg .= '</script>';
         }
-        $tutos['googlehandler_show'] = 1;
+        $tutos['googlehandler_show']++;
         return $msg;
     }
 
@@ -172,10 +137,8 @@
      *
      * @return bool true if ok
      */
-    function check($obj,$arg)
-    {
+    function check($obj,$arg) {
         return true;
     }
-}
-
+  }
 ?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2001	Jan	Feb	Mar	Apr	May	Jun	Jul (13)	Aug (214)	Sep (144)	Oct (22)	Nov (22)	Dec (93)
2002	Jan (25)	Feb (31)	Mar (92)	Apr (70)	May (103)	Jun (130)	Jul (265)	Aug (325)	Sep (233)	Oct (244)	Nov (261)	Dec (157)
2003	Jan (101)	Feb (135)	Mar (148)	Apr (164)	May (53)	Jun (116)	Jul (149)	Aug (126)	Sep (45)	Oct (109)	Nov (36)	Dec (61)
2004	Jan (131)	Feb (236)	Mar (278)	Apr (259)	May (92)	Jun (110)	Jul (150)	Aug (64)	Sep (141)	Oct (141)	Nov (146)	Dec (65)
2005	Jan (70)	Feb (77)	Mar (129)	Apr (153)	May (161)	Jun (63)	Jul (42)	Aug (16)	Sep (30)	Oct (3)	Nov (8)	Dec (40)
2006	Jan (114)	Feb (16)	Mar (12)	Apr (15)	May (4)	Jun (9)	Jul (69)	Aug (27)	Sep (12)	Oct (80)	Nov (62)	Dec (41)
2007	Jan (34)	Feb (2)	Mar (38)	Apr (82)	May (61)	Jun (37)	Jul (16)	Aug (64)	Sep (7)	Oct (52)	Nov (18)	Dec (28)
2008	Jan (168)	Feb (26)	Mar (27)	Apr (19)	May (10)	Jun (58)	Jul (58)	Aug (91)	Sep (14)	Oct (23)	Nov (56)	Dec (38)
2009	Jan (58)	Feb (90)	Mar (204)	Apr (90)	May (27)	Jun (177)	Jul (116)	Aug (53)	Sep (42)	Oct (120)	Nov (51)	Dec (58)
2010	Jan (117)	Feb (231)	Mar (163)	Apr (90)	May (40)	Jun (139)	Jul (49)	Aug (118)	Sep (25)	Oct (80)	Nov (102)	Dec (99)
2011	Jan (176)	Feb (42)	Mar (60)	Apr (52)	May (30)	Jun (29)	Jul (27)	Aug (16)	Sep (51)	Oct (70)	Nov (63)	Dec (58)
2012	Jan (28)	Feb (26)	Mar (7)	Apr (12)	May (41)	Jun (61)	Jul (59)	Aug (38)	Sep (30)	Oct (28)	Nov (14)	Dec (31)
2013	Jan (24)	Feb (54)	Mar (45)	Apr (22)	May (35)	Jun (8)	Jul (18)	Aug (38)	Sep (11)	Oct (8)	Nov (19)	Dec (20)
2014	Jan (20)	Feb (22)	Mar (4)	Apr (6)	May (13)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec (6)
2015	Jan	Feb (1)	Mar (4)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (1)
2016	Jan (4)	Feb	Mar	Apr (1)	May	Jun	Jul (2)	Aug (4)	Sep (1)	Oct (1)	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (8)	Aug (13)	Sep (12)	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2020	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2021	Jan	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

tutos-commits Mailing List for TUTOS (Page 17)

Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory

tutos-commits — SVN commits