ym4r 0.4.1 → 0.5.1

data/test/test_gm_geocoding.rb

@@ -0,0 +1,28 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'ym4r/google_maps/geocoding'
+require 'test/unit'
+
+include Ym4r::GoogleMaps
+
+class TestGmGeocoding< Test::Unit::TestCase
+  def test_google_maps_geocoding
+    placemarks = Ym4r::GoogleMaps::Geocoding.get("Rue Clovis Paris")
+    assert_equal(Ym4r::GoogleMaps::Geocoding::GEO_SUCCESS,placemarks.status)
+    assert_equal(1,placemarks.length)
+    placemark = placemarks[0]
+    assert_equal("FR",placemark.country_code)
+    assert_equal("Paris",placemark.locality)
+    assert_equal("75005",placemark.postal_code)
+  end
+
+  def test_google_maps_pakistan
+    placemarks = Ym4r::GoogleMaps::Geocoding.get("Lahore PK")
+    assert_equal(Ym4r::GoogleMaps::Geocoding::GEO_SUCCESS,placemarks.status)
+    assert_equal(1,placemarks.length)
+    placemark = placemarks[0]
+    assert_equal("PK",placemark.country_code)
+    assert_equal("Lahore",placemark.locality)
+    assert_equal("",placemark.thoroughfare)
+  end
+end

data/tools/tile_image.rb

@@ -1,5 +1,6 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'ym4r/google_maps/tiler/image_tiler'
+
+require 'ym4r/google_maps/image_tiler'
 include Ym4r::GoogleMaps::Tiler
 
 require 'optparse'

data/tools/tile_wms.rb

@@ -1,5 +1,6 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'ym4r/google_maps/tiler/wms_tiler'
+
+require 'ym4r/google_maps/wms_tiler'
 include Ym4r::GoogleMaps::Tiler
 
 require 'optparse'
@@ -45,10 +46,10 @@ opts = OptionParser.new do |opts|
   opts.on("-g","--gmap-setting SETTING",WmsTiler::FurthestZoom,"Corner coordinates, furthest zoom level, tile width and height") do |fz|
     options.furthest_zoom = fz
   end
-  opts.on("-w","--[no-]geographic","Query the WMS server with LatLon coordinates isntead of using the Mercator projection") do |g|
+  opts.on("-w","--[no-]geographic","Query the WMS server with LatLon coordinates instead of using the Mercator projection") do |g|
     options.geographic = g
   end
-  opts.on("-e", "--epsg SRS","SRS to query the WMS server. Should be a the SRS id of a Simple Mercator projection. Can vary between WMS servers. Is 54004 (Simple Mercator for Mapserver) by default") do |srs|
+  opts.on("-e", "--epsg SRS","SRS to query the WMS server. Should be a the SRS id of a Simple Mercator projection. Can vary between WMS servers. Is 54004 (Simple Mercator for Mapserver) by default. For GeoServer use 41001.") do |srs|
     options.srs = srs
                     
   end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: ym4r
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2006-07-01 00:00:00 +05:00
-summary: Using Google Maps and Yahoo! Maps from Ruby and Rails
+  version: 0.5.1
+date: 2006-07-09 00:00:00 +05:00
+summary: Helping the use of Google Maps and Yahoo! Maps API's from Ruby and Rails
 require_paths: 
 - lib
 email: guilhem.vellut+ym4r@gmail.com
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Guilhem Vellut
 files: 
@@ -32,41 +33,21 @@ files:
 - lib/ym4r/google_maps.rb
 - lib/ym4r/yahoo_maps.rb
 - lib/ym4r/google_maps/api_key.rb
-- lib/ym4r/google_maps/control.rb
 - lib/ym4r/google_maps/geocoding.rb
-- lib/ym4r/google_maps/helper.rb
-- lib/ym4r/google_maps/layer.rb
-- lib/ym4r/google_maps/map.rb
-- lib/ym4r/google_maps/mapping.rb
-- lib/ym4r/google_maps/overlay.rb
-- lib/ym4r/google_maps/point.rb
-- lib/ym4r/google_maps/geocoding/geocoding.rb
-- lib/ym4r/google_maps/tiler/image_tiler.rb
-- lib/ym4r/google_maps/tiler/wms_tiler.rb
+- lib/ym4r/google_maps/image_tiler.rb
+- lib/ym4r/google_maps/wms_tiler.rb
 - lib/ym4r/yahoo_maps/app_id.rb
 - lib/ym4r/yahoo_maps/building_block.rb
-- lib/ym4r/yahoo_maps/flash.rb
 - lib/ym4r/yahoo_maps/building_block/exception.rb
 - lib/ym4r/yahoo_maps/building_block/geocoding.rb
 - lib/ym4r/yahoo_maps/building_block/local_search.rb
 - lib/ym4r/yahoo_maps/building_block/map_image.rb
 - lib/ym4r/yahoo_maps/building_block/traffic.rb
-- lib/ym4r/yahoo_maps/flash/latlon.rb
-- lib/ym4r/yahoo_maps/flash/map.rb
-- lib/ym4r/yahoo_maps/flash/mapping.rb
-- lib/ym4r/yahoo_maps/flash/marker.rb
-- lib/ym4r/yahoo_maps/flash/overlay.rb
-- lib/ym4r/yahoo_maps/flash/tool.rb
-- lib/ym4r/yahoo_maps/flash/widget.rb
 - lib/ym4r/google_maps/config/config.yml
-- lib/ym4r/google_maps/javascript/clusterer.js
-- lib/ym4r/google_maps/javascript/geoRssOverlay.js
-- lib/ym4r/google_maps/javascript/markerGroup.js
-- lib/ym4r/google_maps/javascript/wms-gs.js
 - tools/tile_image.rb
 - tools/tile_wms.rb
 - test/test_geocoding.rb
-- test/test_google_maps.rb
+- test/test_gm_geocoding.rb
 - test/test_local_search.rb
 - test/test_map_image.rb
 - test/test_traffic.rb
@@ -75,7 +56,7 @@ files:
 - rakefile.rb
 test_files: 
 - test/test_geocoding.rb
-- test/test_google_maps.rb
+- test/test_gm_geocoding.rb
 - test/test_local_search.rb
 - test/test_map_image.rb
 - test/test_traffic.rb

data/lib/ym4r/google_maps/control.rb

@@ -1,66 +0,0 @@
-require 'ym4r/google_maps/mapping'
-
-module Ym4r
-  module GoogleMaps
-    #Small map control. Report to the Google Maps API documentation for details.
-    class GSmallMapControl
-      include MappingObject
-      def create
-        "new GSmallMapControl()"
-      end
-    end
-    #Large Map control. Report to the Google Maps API documentation for details.
-    class GLargeMapControl
-      include MappingObject
-      def create
-        "new GLargeMapControl()"
-      end
-    end
-    #Small Zoom control. Report to the Google Maps API documentation for details.
-    class GSmallZoomControl
-      include MappingObject
-      def create
-        "new GSmallZoomControl()"
-      end
-    end
-    #Scale control. Report to the Google Maps API documentation for details.
-    class GScaleControl
-      include MappingObject
-      def create
-        "new GScaleControl()"
-      end
-    end
-    #Map type control. Report to the Google Maps API documentation for details.
-    class GMapTypeControl
-      include MappingObject
-      def create
-        "new GMapTypeControl()"
-      end
-    end
-    #Overview map control. Report to the Google Maps API documentation for details.
-    class GOverviewMapControl
-      include MappingObject
-      def create
-        "new GOverviewMapControl()"
-      end
-    end
-
-    #An object representing a position of a control.
-    #The first argument of the constructor is one of the following : :top_right, :top_left, :bottom_right, :bottom_left.
-    class GControlPosition < Struct.new(:anchor,:offset)
-      include MappingObject
-      def create
-        js_anchor = if anchor == :top_right
-                      "G_ANCHOR_TOP_RIGHT"
-                    elsif anchor == :top_left
-                      "G_ANCHOR_TOP_LEFT"
-                    elsif anchor == :bottom_right
-                      "G_ANCHOR_BOTTOM_RIGHT"
-                    else
-                      "G_ANCHOR_BOTTOM_LEFT"
-                    end
-        "new GControlPosition(#{js_anchor},#{offset})"
-      end
-    end
-  end
-end

data/lib/ym4r/google_maps/geocoding/geocoding.rb

@@ -1,80 +0,0 @@
-require 'ym4r/google_maps/api_key'
-require 'open-uri'
-require 'rexml/document'
-
-module Ym4r
-  module GoogleMaps
-    module Geocoding
-
-      GEO_SUCCESS = 200
-      GEO_MISSING_ADDRESS = 601
-      GEO_UNKNOWN_ADDRESS = 602
-      GEO_UNAVAILABLE_ADDRESS = 603
-      GEO_BAD_KEY = 610
-      GEO_TOO_MANY_QUERIES = 620
-      GEO_SERVER_ERROR = 500
-      
-      #Gets placemarks by querying the Google Maps Geocoding service with the +request+ string
-      def self.get(request)
-        
-        url = "http://maps.google.com/maps/geo?q=#{request}&key=#{API_KEY}&output=xml"
-        begin
-          xml = open(URI.encode(url)).read
-        rescue
-          raise ConnectionException.new("Unable to connect to Google Maps Geocoding service")
-        end
-        
-        doc = REXML::Document.new(xml) 
-                        
-        response = doc.elements['//Response']
-        placemarks = Placemarks.new(response.elements['name'].text,response.elements['Status/code'].text.to_i)
-        response.elements.each("Placemark") do |placemark|
-          data = placemark.elements
-          data_country = data['//CountryNameCode']
-          data_administrative = data['//AdministrativeAreaName']
-          data_sub_administrative = data['//SubAdministrativeAreaName']
-          data_locality = data['//LocalityName']
-          data_dependent_locality = data['//DependentLocalityName']
-          data_thoroughfare = data['//ThoroughfareName']
-          data_postal_code = data['//PostalCodeNumber']
-          placemarks << Geocoding::Placemark.new(data['address'].text,
-                                                 data_country.nil? ? "" : data_country.text,
-                                                 data_administrative.nil? ? "" : data_administrative.text,
-                                                 data_sub_administrative.nil? ? "" : data_sub_administrative.text,
-                                                 data_locality.nil? ? "" : data_locality.text,
-                                                 data_dependent_locality.nil? ? "" : data_dependent_locality.text,
-                                                 data_thoroughfare.nil? ? "" : data_thoroughfare.text,
-                                                 data_postal_code.nil? ? "" : data_postal_code.text,
-                                                 *(data['//coordinates'].text.split(",")[0..1].collect {|l| l.to_f }))
-        end
-        placemarks
-      end
-
-      #Group of placemarks returned by the Geocoding service. If the result is valid the +statius+ attribute should be equal to <tt>Geocoding::GEI_SUCCESS</tt>
-      class Placemarks < Array
-        attr_accessor :name,:status
-
-        def initialize(name,status)
-          super(0)
-          @name = name
-          @status = status
-        end
-      end
-
-      #A result from the Geocoding service.
-      class Placemark < Struct.new(:address,:country_code,:administrative_area,:sub_administrative_area,:locality,:dependent_locality,:thoroughfare,:postal_code,:longitude,:latitude)
-        def lonlat
-          [longitude,latitude]
-        end
-
-        def latlon
-          [latitude,longitude]
-        end
-      end
-    
-      #Raised when the connection to the service is not possible
-      class ConnectionException < StandardError
-      end
-    end
-  end
-end

data/lib/ym4r/google_maps/helper.rb

@@ -1,22 +0,0 @@
-
-Ym4r::GoogleMaps::GPolyline.class_eval do
-  #Creates a GPolyline object from a georuby line string. Assumes the points of the line strings are stored in Longitude(x)/Latitude(y) order.
-  def self.from_georuby(line_string,color = nil,weight = nil,opacity = nil)
-    GPolyline.new(line_string.points.collect { |point| GLatLng.new([point.y,point.x])},color,weight,opacity)
-  end
-end
-
-Ym4r::GoogleMaps::GMarker.class_eval do
-  #Creates a GMarker object from a georuby point. Accepts the same options as the GMarker constructor. Assumes the points of the line strings are stored in Longitude(x)/Latitude(y) order.
-  def self.from_georuby(point,options = {})
-    GMarker.new([point.y,point.x],options)
-  end
-end
-
-Ym4r::GoogleMaps::GLatLng.class_eval do
-  #Creates a GLatLng object from a georuby point. Assumes the points of the line strings are stored in Longitude(x)/Latitude(y) order.
-  def self.from_georuby(point,unbounded = nil)
-    GLatLng.new([point.y,point.x],unbounded)
-  end
-end
-

data/lib/ym4r/google_maps/javascript/clusterer.js

@@ -1,444 +0,0 @@
-// Clusterer.js - marker clustering routines for Google Maps apps
-//
-// The original version of this code is available at:
-// http://www.acme.com/javascript/
-//
-// Copyright � 2005,2006 by Jef Poskanzer <jef@mail.acme.com>.
-// All rights reserved.
-//
-// Modified for inclusion into the YM4R library in accordance with the 
-// following license:
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE.
-//
-// For commentary on this license please see http://www.acme.com/license.html
-
-
-// Constructor.
-Clusterer = function(markers,icon,maxVisibleMarkers,gridSize,minMarkersPerCluster,maxLinesPerInfoBox) {	
-    this.markers = [];
-    if(markers){
-	for(var i =0 ; i< markers.length ; i++){
-	    this.addMarker(markers[i]);
-	}
-    }    
-    this.clusters = [];
-    this.timeout = null;
-        
-    this.maxVisibleMarkers = maxVisibleMarkers || 150;
-    this.gridSize = gridSize || 5;
-    this.minMarkersPerCluster = minMarkersPerCluster || 5;
-    this.maxLinesPerInfoBox = maxLinesPerInfoBox || 10;
-    
-    this.icon = icon || G_DEFAULT_ICON;
-}
-
-Clusterer.prototype = new GOverlay();
-
-Clusterer.prototype.initialize = function ( map ){
-    this.map = map;
-    this.currentZoomLevel = map.getZoom();
-   
-    GEvent.addListener( map, 'zoomend', Clusterer.makeCaller( Clusterer.display, this ) );
-    GEvent.addListener( map, 'moveend', Clusterer.makeCaller( Clusterer.display, this ) );
-    GEvent.addListener( map, 'infowindowclose', Clusterer.makeCaller( Clusterer.popDown, this ) );
-    //Set map for each marker
-    for(var i = 0,len = this.markers.length ; i < len ; i++){
-	this.markers[i].setMap( map );
-    }
-    this.displayLater();
-}
-
-Clusterer.prototype.remove = function(){
-     for ( var i = 0; i < this.markers.length; ++i ){
-	 this.removeMarker(this.markers[i]);
-     }
-}
-
-Clusterer.prototype.copy = function(){
-    return new Clusterer(this.markers,this.icon,this.maxVisibleMarkers,this.gridSize,this.minMarkersPerCluster,this.maxLinesPerInfoBox);
-}
-
-Clusterer.prototype.redraw = function(force){
-    this.displayLater();
-}
-
-// Call this to change the cluster icon.
-Clusterer.prototype.setIcon = function ( icon ){
-    this.icon = icon;
-}
-
-// Call this to add a marker.
-Clusterer.prototype.addMarker = function ( marker, description){
-    marker.onMap = false;
-    this.markers.push( marker );
-    marker.description = marker.description || description;
-    if(this.map != null){
-	marker.setMap(this.map);
-	this.displayLater();
-    }
-};
-
-
-// Call this to remove a marker.
-Clusterer.prototype.removeMarker = function ( marker ){
-    for ( var i = 0; i < this.markers.length; ++i )
-	if ( this.markers[i] == marker ){
-	    if ( marker.onMap )
-		this.map.removeOverlay( marker );
-	    for ( var j = 0; j < this.clusters.length; ++j ){
-		var cluster = this.clusters[j];
-		if ( cluster != null ){
-		    for ( var k = 0; k < cluster.markers.length; ++k )
-			if ( cluster.markers[k] == marker ){
-			    cluster.markers[k] = null;
-			    --cluster.markerCount;
-			    break;
-			}
-		    if ( cluster.markerCount == 0 ){
-			this.clearCluster( cluster );
-			this.clusters[j] = null;
-			}
-		    else if ( cluster == this.poppedUpCluster )
-			Clusterer.rePop( this );
-		    }
-		}
-	    this.markers[i] = null;
-	    break;
-	    }
-    this.displayLater();
-};
-
-Clusterer.prototype.displayLater = function (){
-    if ( this.timeout != null )
-	clearTimeout( this.timeout );
-    this.timeout = setTimeout( Clusterer.makeCaller( Clusterer.display, this ), 50 );
-};
-
-Clusterer.display = function ( clusterer ){
-    var i, j, marker, cluster, len, len2;
-
-    clearTimeout( clusterer.timeout );
-
-    var newZoomLevel = clusterer.map.getZoom();
-    if ( newZoomLevel != clusterer.currentZoomLevel ){
-	// When the zoom level changes, we have to remove all the clusters.
-	for ( i = 0 , len = clusterer.clusters.length; i < len; ++i ){
-	    if ( clusterer.clusters[i] != null ){
-		clusterer.clearCluster( clusterer.clusters[i] );
-		clusterer.clusters[i] = null;
-	    }
-	}
-	clusterer.clusters.length = 0;
-	clusterer.currentZoomLevel = newZoomLevel;
-    }
-
-    // Get the current bounds of the visible area.
-    var bounds = clusterer.map.getBounds();
-
-    // Expand the bounds a little, so things look smoother when scrolling
-    // by small amounts.
-    var sw = bounds.getSouthWest();
-    var ne = bounds.getNorthEast();
-    var dx = ne.lng() - sw.lng();
-    var dy = ne.lat() - sw.lat();
-    dx *= 0.10;
-    dy *= 0.10;
-    bounds = new GLatLngBounds(
-      new GLatLng( sw.lat() - dy, sw.lng() - dx ),
-      new GLatLng( ne.lat() + dy, ne.lng() + dx ) 
-    );
-
-    // Partition the markers into visible and non-visible lists.
-    var visibleMarkers = [];
-    var nonvisibleMarkers = [];
-    for ( i = 0, len = clusterer.markers.length ; i < len; ++i ){
-	marker = clusterer.markers[i];
-	if ( marker != null )
-	    if ( bounds.contains( marker.getPoint() ) )
-		visibleMarkers.push( marker );
-	    else
-		nonvisibleMarkers.push( marker );
-    }
-
-    // Take down the non-visible markers.
-    for ( i = 0, len = nonvisibleMarkers.length ; i < len; ++i ){
-	marker = nonvisibleMarkers[i];
-	if ( marker.onMap ){
-	    clusterer.map.removeOverlay( marker );
-	    marker.onMap = false;
-	}
-    }
-
-    // Take down the non-visible clusters.
-    for ( i = 0, len = clusterer.clusters.length ; i < len ; ++i ){
-	cluster = clusterer.clusters[i];
-	if ( cluster != null && ! bounds.contains( cluster.marker.getPoint() ) && cluster.onMap ){
-	    clusterer.map.removeOverlay( cluster.marker );
-	    cluster.onMap = false;
-	}
-    }
-
-    // Clustering!  This is some complicated stuff.  We have three goals
-    // here.  One, limit the number of markers & clusters displayed, so the
-    // maps code doesn't slow to a crawl.  Two, when possible keep existing
-    // clusters instead of replacing them with new ones, so that the app pans
-    // better.  And three, of course, be CPU and memory efficient.
-    if ( visibleMarkers.length > clusterer.maxVisibleMarkers ){
-	// Add to the list of clusters by splitting up the current bounds
-	// into a grid.
-	var latRange = bounds.getNorthEast().lat() - bounds.getSouthWest().lat();
-	var latInc = latRange / clusterer.gridSize;
-	var lngInc = latInc / Math.cos( ( bounds.getNorthEast().lat() + bounds.getSouthWest().lat() ) / 2.0 * Math.PI / 180.0 );
-	for ( var lat = bounds.getSouthWest().lat(); lat <= bounds.getNorthEast().lat(); lat += latInc )
-	    for ( var lng = bounds.getSouthWest().lng(); lng <= bounds.getNorthEast().lng(); lng += lngInc ){
-		cluster = new Object();
-		cluster.clusterer = clusterer;
-		cluster.bounds = new GLatLngBounds( new GLatLng( lat, lng ), new GLatLng( lat + latInc, lng + lngInc ) );
-		cluster.markers = [];
-		cluster.markerCount = 0;
-		cluster.onMap = false;
-		cluster.marker = null;
-		clusterer.clusters.push( cluster );
-	    }
-
-	// Put all the unclustered visible markers into a cluster - the first
-	// one it fits in, which favors pre-existing clusters.
-	for ( i = 0, len = visibleMarkers.length ; i < len; ++i ){
-	    marker = visibleMarkers[i];
-	    if ( marker != null && ! marker.inCluster ){
-		for ( j = 0, len2 = clusterer.clusters.length ; j < len2 ; ++j ){
-		    cluster = clusterer.clusters[j];
-		    if ( cluster != null && cluster.bounds.contains( marker.getPoint() ) ){
-			cluster.markers.push( marker );
-			++cluster.markerCount;
-			marker.inCluster = true;
-		    }
-		}
-	    }
-	}
-
-	// Get rid of any clusters containing only a few markers.
-	for ( i = 0, len = clusterer.clusters.length ; i < len ; ++i )
-	    if ( clusterer.clusters[i] != null && clusterer.clusters[i].markerCount < clusterer.minMarkersPerCluster ){
-		clusterer.clearCluster( clusterer.clusters[i] );
-		clusterer.clusters[i] = null;
-	    }
-
-	// Shrink the clusters list.
-	for ( i = clusterer.clusters.length - 1; i >= 0; --i )
-	    if ( clusterer.clusters[i] != null )
-		break;
-	    else
-		--clusterer.clusters.length;
-
-	// Ok, we have our clusters.  Go through the markers in each
-	// cluster and remove them from the map if they are currently up.
-	for ( i = 0, len = clusterer.clusters.length ; i < len; ++i ){
-	    cluster = clusterer.clusters[i];
-	    if ( cluster != null ){
-		for ( j = 0 , len2 = cluster.markers.length ; j < len2; ++j ){
-		    marker = cluster.markers[j];
-		    if ( marker != null && marker.onMap ){
-			clusterer.map.removeOverlay( marker );
-			marker.onMap = false;
-		    }
-		}
-	    }
-	}
-	
-	// Now make cluster-markers for any clusters that need one.
-	for ( i = 0, len = clusterer.clusters.length; i < len; ++i ){
-	    cluster = clusterer.clusters[i];
-	    if ( cluster != null && cluster.marker == null ){
-		// Figure out the average coordinates of the markers in this
-		// cluster.
-		var xTotal = 0.0, yTotal = 0.0;
-		for ( j = 0, len2 = cluster.markers.length; j < len2 ; ++j ){
-		    marker = cluster.markers[j];
-		    if ( marker != null ){
-			xTotal += ( + marker.getPoint().lng() );
-			yTotal += ( + marker.getPoint().lat() );
-		    }
-		}
-		var location = new GLatLng( yTotal / cluster.markerCount, xTotal / cluster.markerCount );
-		marker = new GMarker( location, { icon: clusterer.icon } );
-		cluster.marker = marker;
-		GEvent.addListener( marker, 'click', Clusterer.makeCaller( Clusterer.popUp, cluster ) );
-	    }
-	}
-    }
-
-    // Display the visible markers not already up and not in clusters.
-    for ( i = 0, len = visibleMarkers.length; i < len; ++i ){
-	marker = visibleMarkers[i];
-	if ( marker != null && ! marker.onMap && ! marker.inCluster )
-	{
-	    clusterer.map.addOverlay( marker );
-	    marker.addedToMap();
-	    marker.onMap = true;
-	}
-    }
-
-    // Display the visible clusters not already up.
-    for ( i = 0, len = clusterer.clusters.length ; i < len; ++i ){
-	cluster = clusterer.clusters[i];
-	if ( cluster != null && ! cluster.onMap && bounds.contains( cluster.marker.getPoint() )){
-	    clusterer.map.addOverlay( cluster.marker );
-	    cluster.onMap = true;
-	}
-    }
-
-    // In case a cluster is currently popped-up, re-pop to get any new
-    // markers into the infobox.
-    Clusterer.rePop( clusterer );
-};
-
-
-Clusterer.popUp = function ( cluster ){
-    var clusterer = cluster.clusterer;
-    var html = '<table width="300">';
-    var n = 0;
-    for ( var i = 0 , len = cluster.markers.length; i < len; ++i )
-	{
-	var marker = cluster.markers[i];
-	if ( marker != null )
-	    {
-	    ++n;
-	    html += '<tr><td>';
-	    if ( marker.getIcon().smallImage != null )
-		html += '<img src="' + marker.getIcon().smallImage + '">';
-	    else
-		html += '<img src="' + marker.getIcon().image + '" width="' + ( marker.getIcon().iconSize.width / 2 ) + '" height="' + ( marker.getIcon().iconSize.height / 2 ) + '">';
-	    html += '</td><td>' + marker.description + '</td></tr>';
-	    if ( n == clusterer.maxLinesPerInfoBox - 1 && cluster.markerCount > clusterer.maxLinesPerInfoBox  )
-		{
-		html += '<tr><td colspan="2">...and ' + ( cluster.markerCount - n ) + ' more</td></tr>';
-		break;
-		}
-	    }
-	}
-    html += '</table>';
-    clusterer.map.closeInfoWindow();
-    cluster.marker.openInfoWindowHtml( html );
-    clusterer.poppedUpCluster = cluster;
-};
-
-Clusterer.rePop = function ( clusterer ){
-    if ( clusterer.poppedUpCluster != null )
-	Clusterer.popUp( poppedUpCluster );
-};
-
-Clusterer.popDown = function ( clusterer ){
-    clusterer.poppedUpCluster = null;
-};
-
-Clusterer.prototype.clearCluster = function ( cluster ){
-    var i, marker;
-
-    for ( i = 0; i < cluster.markers.length; ++i ){
-	if ( cluster.markers[i] != null ){
-	    cluster.markers[i].inCluster = false;
-	    cluster.markers[i] = null;
-	}
-    }
-    
-    cluster.markers.length = 0;
-    cluster.markerCount = 0;
-    
-    if ( cluster == this.poppedUpCluster )
-	this.map.closeInfoWindow();
-    
-    if ( cluster.onMap )
-    {
-	this.map.removeOverlay( cluster.marker );
-	cluster.onMap = false;
-    }
-};
-
-// This returns a function closure that calls the given routine with the
-// specified arg.
-Clusterer.makeCaller = function ( func, arg ){
-    return function () { func( arg ); };
-};
-
-
-// Augment GMarker so it handles markers that have been created but
-// not yet addOverlayed.
-GMarker.prototype.setMap = function ( map ){
-    this.map = map;
-};
-
-GMarker.prototype.getMap = function (){
-    return this.map;
-}
-
-GMarker.prototype.addedToMap = function (){
-    this.map = null;
-};
-
-
-GMarker.prototype.origOpenInfoWindow = GMarker.prototype.openInfoWindow;
-GMarker.prototype.openInfoWindow = function ( node, opts ){
-    if ( this.map != null )
-	return this.map.openInfoWindow( this.getPoint(), node, opts );
-    else
-	return this.origOpenInfoWindow( node, opts );
-};
-
-GMarker.prototype.origOpenInfoWindowHtml = GMarker.prototype.openInfoWindowHtml;
-GMarker.prototype.openInfoWindowHtml = function ( html, opts ){
-    if ( this.map != null )
-	return this.map.openInfoWindowHtml( this.getPoint(), html, opts );
-    else
-	return this.origOpenInfoWindowHtml( html, opts );
-};
-
-GMarker.prototype.origOpenInfoWindowTabs = GMarker.prototype.openInfoWindowTabs;
-GMarker.prototype.openInfoWindowTabs = function ( tabNodes, opts ){
-    if ( this.map != null )
-	return this.map.openInfoWindowTabs( this.getPoint(), tabNodes, opts );
-    else
-	return this.origOpenInfoWindowTabs( tabNodes, opts );
-};
-
-GMarker.prototype.origOpenInfoWindowTabsHtml = GMarker.prototype.openInfoWindowTabsHtml;
-GMarker.prototype.openInfoWindowTabsHtml = function ( tabHtmls, opts ){
-    if ( this.map != null )
-       return this.map.openInfoWindowTabsHtml( this.getPoint(), tabHtmls, opts );
-    else
-       return this.origOpenInfoWindowTabsHtml( tabHtmls, opts );
-};
-
-GMarker.prototype.origShowMapBlowup = GMarker.prototype.showMapBlowup;
-GMarker.prototype.showMapBlowup = function ( opts ){
-    if ( this.map != null )
-	return this.map.showMapBlowup( this.getPoint(), opts );
-    else
-	return this.origShowMapBlowup( opts );
-};
-
-
-function addDescriptionToMarker(marker, description){
-    marker.description = description;
-    return marker;
-}