Changeset 269

Timestamp:

02/17/10 21:43:34 (2 years ago)

Author:

takanori

Message:

use create map and marker function

Location:

Products.ATGoogleMaps/trunk/Products/ATGoogleMaps/skins/ATGoogleMaps

Files:

• atgooglemaps.js.dtml (modified) (2 diffs)
• gmap.py (modified) (2 diffs)

Products.ATGoogleMaps/trunk/Products/ATGoogleMaps/skins/ATGoogleMaps/atgooglemaps.js.dtml

@@ -1 @@
-function createMap(map_id, lat, lng, zoom, map, type, scale, overview, map_type) {
-    if(lat == undefined) {
-        lat = 0.0;
-    }
-    if(lng == undefined) {
-        lng = 0.0;
-    }
-    if(zoom == undefined) {
-        zoom = 0;
-    }
-    if(map == undefined) {
-        map = 'small';
-    }
-    if(type == undefined) {
-        type = 'small';
-    }
-    if(scale == undefined) {
-        scale = false;
-    }
-    if(overview == undefined) {
-        overview = false;
-    }
-    if(map_type == undefined || map_type == 'map') {
-        map_type = G_NORMAL_MAP;
-    }
-    else if(map_type == 'satellite') {
-        map_type = G_SATELLITE_MAP;
+function createMap(map_id, lat, lng, zoom, mapType, typeCtl, navCtl) {
+    var options = {
+        zoom: zoom,
+        center: new google.maps.LatLng(lat, lng),
+    };
+    options.mapTypeId = eval("google.maps.MapTypeId." + mapType);
+
+    if (typeCtl != null) {
+        if (typeCtl == "hide") {
+            options.mapTypeControl = false;
+        }
+        else {
+            options.mapTypeControl = true;
+            options.mapTypeControlOptions = {};
+            options.mapTypeControlOptions.style = eval("google.maps.MapTypeControlStyle." + typeCtl);
+        }
     }
 
-    // Create map
-    var gmap = new GMap2(document.getElementById(map_id));
-    // set center
-    gmap.setCenter(new GLatLng(lat, lng), zoom, map_type);
-    // map control
-    if (map == 'large') {
-        gmap.addControl(new GLargeMapControl());
+    if (navCtl != null) {
+        if (navCtl == "hide") {
+            options.navigationControl = false;
+        }
+        else {
+            options.navigationControl = true;
+            options.navigationControlOptions = {};
+            options.navigationControlOptions.style = eval("google.maps.NavigationControlStyle." + navCtl);
+        }
     }
-    else if (map == 'small') {
-        gmap.addControl(new GSmallMapControl());
-    }
-    else if (map == 'zoom') {
-        gmap.addControl(new GSmallZoomControl());
-    }
-    // map type control
-    if (type == 'small') {
-        gmap.addControl(new GMapTypeControl(true));
-    }
-    else if (type) {
-        gmap.addControl(new GMapTypeControl());
-    }
-    // scale control
-    if (scale) {
-        gmap.addControl(new GScaleControl());
-    }
-    // overview control
-    if (overview) {
-        gmap.addControl(new GOverviewMapControl());
-    }
-    return gmap;
+
+    return new google.maps.Map(document.getElementById(map_id), options);
 }
 
-url = "<dtml-var portal_url>"
+function createMarker(map, lat, lng, title) {
+    var marker = new google.maps.Marker({
+        position: new google.maps.LatLng(lat, lng),
+        map: map,
+        title: title
+    });
+
+    var infowindow = new google.maps.InfoWindow({
+        content: "<div>" + title + "</div>"
+    });
+
+    google.maps.event.addListener(marker, 'click', function() {
+        infowindow.open(map, marker);
+    });
+    return marker;
+}
+
+var url = "<dtml-var portal_url>"
+
+/*
 // Create marker icon
 var icon = new GIcon();
@@ -78 +68 @@
 center_icon.iconAnchor = new GPoint( 11 , 11 );
 
-// Create markers and events
-function createMarker(map, lat, lng) {
-    var point = new GLatLng(lat, lng);
-    var marker = new GMarker(point, icon);
-    map.addOverlay(marker);
-    return marker;
-}
-
-function addMarker(map, tabs, marker_id, lat, lng) {
-    var point = new GLatLng(lat, lng);
-    var marker = new GMarker(point, icon);
-    map.addOverlay(marker);
-    f = function() {marker.openInfoWindowTabsHtml(tabs)};
-    GEvent.addListener(marker, 'click', f);
-    var marker_field = document.getElementById('marker_link_'+ marker_id);
-    if(marker_field){
-        marker_field.onmousedown = f;
-    }
-}
-
-function addCenterMarker(map) {
-    var center_marker = new GMarker(map.getCenter(), center_icon);
-    map.addOverlay(center_marker);
-
-    GEvent.addListener(map , "moveend" , function() {
-    map.removeOverlay(center_marker);
-        center_marker = new GMarker(map.getCenter(), center_icon);
-        map.addOverlay(center_marker);
-    });
-}
-
+*/

Products.ATGoogleMaps/trunk/Products/ATGoogleMaps/skins/ATGoogleMaps/gmap.py

@@ -2 +2 @@
 
 def add_markers(js, markers):
-    #js.extend(('function addMarker()'))
     for marker in markers:
         lat = marker.point['latitude']
         lng = marker.point['longitude']
-        js.extend(('  var marker_%s = new google.maps.Marker({' % marker.id,
-                   '    position: new google.maps.LatLng(%s, %s),' % (lat, lng),
-                   '    map: map,',
-                   '    title: "%s"' % unicode(marker.Title(), site_encoding),
-#                   '    icon: image',
-                   '  });',
-                   ))
-        js.extend(('  var infowindow_%s = new google.maps.InfoWindow({' % marker.id,
-                   '    content: "<h2>%s</h2>"' % unicode(marker.Title(), site_encoding),
-                   '  });',
-                   "  google.maps.event.addListener(marker_%s, 'click', function() {" % marker.id,
-                   '    infowindow_%s.open(map, marker_%s)' % (marker.id, marker.id),
-                   '  });',
-                   ))
+        js.append('  var marker_%s = createMarker(map, %s, %s, "%s");' % (marker.id, lat, lng, marker.title))
 #      shape: shape,
 #      shadow: shadow,
@@ -28 +14 @@
     lng = context.center['longitude']
     js.extend(('function initialize() {',
-               '  var myOptions = {',
-               '    zoom: %s,' % context.zoom,
-               '    center: new google.maps.LatLng(%s, %s),' % (lat, lng),
-               '    mapTypeId: google.maps.MapTypeId.%s,' % context.mapType,
-               ))
+               '  var map = createMap("map_canvas", %s, %s, %s, "%s", "%s", "%s");' % (lat, lng, context.zoom, context.mapType, context.mapTypeControl, context.navigationControl),
+               ))
 
-    # set mapTypeControl
-    if context.mapTypeControl == "nothing":
-        js.append('    mapTypeControl: false,')
-    else:
-        js.extend(('    mapTypeControl: true,',
-                   '    mapTypeControlOptions: {',
-                   '      style: google.maps.MapTypeControlStyle.%s,' % context.mapTypeControl,
-                   '    },',
-                   ))
+    add_markers(js, context.objectValues(['GMarker']))
 
-    # set mavigationControl
-    if context.navigationControl == "nothing":
-        js.append('    navigationControl: false,')
-    else:
-        js.extend(('    navigationControl: true,',
-                   '    navigationControlOptions: {',
-                   '      style: google.maps.NavigationControlStyle.%s' % context.navigationControl,
-                   '    },',
-                   ))
-
-    js.extend(('  };',
-               '  var map = new google.maps.Map(document.getElementById("map_canvas"), myOptions);',
-               ))
-    add_markers(js, context.objectValues(['GMarker']))
     js.append('}')