Changeset 196

Show
Ignore:
Timestamp:
04/19/06 01:06:36 (2 years ago)
Author:
ogawa
Message:

Update to use Google Maps API version 2 instead of version 1.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Mapper/trunk/Mapper.pl

    r194 r196  
    131131 
    132132my $preamble_tmpl = <<'EOT'; 
    133 <script type="text/javascript" src="http://maps.google.com/maps?<TMPL_IF NAME="language">hl=<TMPL_VAR NAME="language">&amp;</TMPL_IF>file=api&amp;v=1&amp;key=<TMPL_VAR NAME="google_maps_key">" charset="utf-8"></script> 
     133<script type="text/javascript" src="http://maps.google.com/maps?<TMPL_IF NAME="language">hl=<TMPL_VAR NAME="language">&amp;</TMPL_IF>file=api&amp;v=2&amp;key=<TMPL_VAR NAME="google_maps_key">" charset="utf-8"></script> 
    134134<script type="text/javascript"> 
    135135//<![CDATA[ 
    …… 
    139139        func : function(e) { old(e); return func(e); }; 
    140140} 
    141 function generateGMap(mapid, address, latitude, longitude, maptype, zoom) { 
     141function generateGMap(mapid, address, lat, lng, zoom, maptype) { 
    142142    if (GBrowserIsCompatible()) { 
    143         var icon = new GIcon(); 
    144         icon.image = "http://www.google.com/mapfiles/marker.png"; 
    145         icon.shadow = "http://www.google.com/mapfiles/shadow50.png"; 
    146         icon.iconSize = new GSize(20, 34); 
    147         icon.shadowSize = new GSize(37, 34); 
    148         icon.iconAnchor = new GPoint(6, 20); 
    149         icon.infoWindowAnchor = new GPoint(5, 1); 
    150  
    151         var map = new GMap(document.getElementById(mapid)); 
    152         map.setMapType((typeof maptype == 'string') ? eval(maptype) : maptype); 
     143        var map = new GMap2(document.getElementById(mapid)); 
    153144        map.addControl(new GSmallMapControl()); 
    154145        map.addControl(new GMapTypeControl()); 
    155         var point = new GPoint(longitude, latitude); 
    156         map.centerAndZoom(point, zoom); 
    157         var marker = new GMarker(point, icon); 
     146        var center = new GLatLng(lat, lng); 
     147        if (typeof maptype == 'string') maptype = eval(maptype); 
     148        map.setCenter(center, zoom, maptype); 
     149        var marker = new GMarker(center, G_DEFAULT_ICON); 
    158150        map.addOverlay(marker); 
    159151        var html = '<div style="width:12em;font-size:small">'+address+'</div>'; 
    …… 
    184176//<![CDATA[ 
    185177attachOnLoad(function() { 
    186     generateGMap('<TMPL_VAR NAME="mapid">','<TMPL_VAR NAME="address">',<TMPL_VAR NAME="latitude">,<TMPL_VAR NAME="longitude">,'<TMPL_VAR NAME="maptype">',<TMPL_VAR NAME="zoom">); 
     178    generateGMap('<TMPL_VAR NAME="mapid">','<TMPL_VAR NAME="address">',<TMPL_VAR NAME="latitude">,<TMPL_VAR NAME="longitude">,<TMPL_VAR NAME="zoom">,'<TMPL_VAR NAME="maptype">'); 
    187179}); 
    188180//]]> 
    …… 
    201193                 longitude => $lon, 
    202194                 address => $adr, 
    203                  maptype => $this->{maptype} || 'G_MAP_TYPE', 
    204                  zoom => (defined $this->{zoom}) ? $this->{zoom} : 4 
     195                 maptype => $this->{maptype} || 'G_NORMAL_MAP', 
     196                 zoom => (defined $this->{zoom}) ? $this->{zoom} : 13 
    205197                 ); 
    206198    $tmpl->output;