<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -5,9 +5,10 @@
     &lt;title&gt;Mapstraction V2 demo&lt;/title&gt;
     &lt;script type=&quot;text/javascript&quot; src=&quot;http://maps.google.com/maps?file=api&amp;amp;v=2&amp;amp;key=ABQIAAAAY70wuSo0zF3ZtJVp5bDm1BS1Y2ErAqCHV5rDhHSzgjy23KqwdRRaoSBuZk72oDzzAYxVBjtsLqSmTw&quot;&gt;&lt;/script&gt;
 	&lt;script type=&quot;text/javascript&quot; src=&quot;http://api.maps.yahoo.com/ajaxymap?v=3.8&amp;appid=5wTxDW_V34GQjK.7glLG6OnJSRxCvfLj7ktMsuOoR42Gkm16vDVEjjw6FGWJ1Gky&quot;&gt;&lt;/script&gt;	
-	&lt;script charset=&quot;UTF-8&quot; type=&quot;text/javascript&quot; src=&quot;http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.2&quot;&gt;&lt;/script&gt;
+  &lt;script charset=&quot;UTF-8&quot; type=&quot;text/javascript&quot; src=&quot;http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.2&quot;&gt;&lt;/script&gt;
+	&lt;script src=&quot;http://openlayers.org/api/OpenLayers.js&quot;&gt;&lt;/script&gt;
 	&lt;!--&lt;script src=&quot;domReady.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;--&gt;
-	&lt;script src=&quot;../source/mxn.js?(google, yahoo, microsoft)&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
+	&lt;script src=&quot;../source/mxn.js?(google, yahoo, microsoft, openlayers)&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
 
 	&lt;script type=&quot;text/javascript&quot;&gt;
     //&lt;![CDATA[
@@ -37,7 +38,7 @@
 		var infoElm = document.getElementById('info');		
 		var eventsElm = document.getElementById('events');
 		
-		var m = new mxn.Mapstraction('map');
+		var m = new mxn.Mapstraction('map', 'google');
 		
 		m.endPan.addHandler(function(sEvtName, oEvtSource, oEvtArgs){
 			var center = oEvtSource.getCenter();
@@ -62,80 +63,92 @@
 		};
 		
 		var ops = [
-			{ 
-				desc: 'Center map', 
-				action: function(){
-					m.setCenterAndZoom(new mxn.LatLonPoint(37.4419, -122.1419), 10);
-				} 
-			},
+      { 
+       desc: 'Center map', 
+       action: function(){
+         m.setCenterAndZoom(new mxn.LatLonPoint(37.4419, -122.1419), 10);
+       } 
+      },
+      {
+       desc: 'Pan map',
+       action: function(){
+         m.setCenter(new mxn.LatLonPoint(37.3419, -122.0419), {pan: true});
+       }
+      },
+      {
+       desc: 'Get info',
+       action: function(){
+         infoElm.innerHTML = 'Info&lt;br/&gt;';
+         var bb = m.getBounds();
+         infoElm.innerHTML += 'Bounds:&lt;br/&gt;SW(' + bb.sw.lat.toFixed(5) + ','+ bb.sw.lon.toFixed(5) +')&lt;br/&gt;NE(' + bb.ne.lat.toFixed(5) + ','+ bb.ne.lon.toFixed(5) +')&lt;br/&gt;';
+         var ll = m.getCenter();
+         infoElm.innerHTML += 'Center: (' + ll.lat.toFixed(5) + ','+ ll.lon.toFixed(5) +')&lt;br/&gt;';
+         infoElm.innerHTML += 'Map type: ' + m.getMapType() + '&lt;br/&gt;';
+         infoElm.innerHTML += 'Zoom: ' + m.getZoom() + '&lt;br/&gt;';
+       }
+      },
+      {
+       desc: 'Set zoom',
+       action: function(){
+         m.setZoom(8);
+       }
+      },
+      {
+       desc: 'Add marker',
+       action: function(){
+         var mkr = new mxn.Marker(new mxn.LatLonPoint(37.3419, -122.0419));
+         mkr.setLabel('Some random place');
+         mkr.setInfoBubble('Some information about the random place');
+         mkr.click.addHandler(markerEventHandler);
+         mkr.openInfoBubble.addHandler(markerEventHandler);
+         mkr.closeInfoBubble.addHandler(markerEventHandler);
+         m.addMarker(mkr);
+       }
+      },
+      {
+       desc: 'Add marker offscreen',
+       action: function(){
+         var mkr = new mxn.Marker(new mxn.LatLonPoint(37.3419, -117.0419));
+         mkr.setLabel('Some other place');
+         m.addMarker(mkr);
+       }
+      },
+      {
+       desc: 'Auto center',
+       action: function(){
+         m.autoCenterAndZoom();
+       }
+      },
+      {
+       desc: 'Add line',
+       action: function(){
+         var pl = new mxn.Polyline([
+           new mxn.LatLonPoint(37.3419, -122.0419),
+           new mxn.LatLonPoint(36.3419, -120.0419),
+           new mxn.LatLonPoint(38.3419, -119.0419),
+           new mxn.LatLonPoint(37.3419, -117.0419)
+         ]);
+         pl.color = '#00DD55';
+         m.addPolyline(pl);
+       }
+      },
 			{
-				desc: 'Pan map',
+				desc: 'Swap API (yahoo)',
 				action: function(){
-					m.setCenter(new mxn.LatLonPoint(37.3419, -122.0419), {pan: true});
-				}
+ 					m.swap('map', 'yahoo');
+  			}
 			},
 			{
-				desc: 'Get info',
+				desc: 'Swap API (microsoft)',
 				action: function(){
-					infoElm.innerHTML = 'Info&lt;br/&gt;';
-					var bb = m.getBounds();
-					infoElm.innerHTML += 'Bounds:&lt;br/&gt;SW(' + bb.sw.lat.toFixed(5) + ','+ bb.sw.lon.toFixed(5) +')&lt;br/&gt;NE(' + bb.ne.lat.toFixed(5) + ','+ bb.ne.lon.toFixed(5) +')&lt;br/&gt;';
-					var ll = m.getCenter();
-					infoElm.innerHTML += 'Center: (' + ll.lat.toFixed(5) + ','+ ll.lon.toFixed(5) +')&lt;br/&gt;';
-					infoElm.innerHTML += 'Map type: ' + m.getMapType() + '&lt;br/&gt;';
-					infoElm.innerHTML += 'Zoom: ' + m.getZoom() + '&lt;br/&gt;';
-				}
+ 					m.swap('map', 'microsoft');
+  			}
 			},
 			{
-				desc: 'Set zoom',
+				desc: 'Swap API (openlayers)',
 				action: function(){
-					m.setZoom(8);
-				}
-			},
-			{
-				desc: 'Add marker',
-				action: function(){
-					var mkr = new mxn.Marker(new mxn.LatLonPoint(37.3419, -122.0419));
-					mkr.setLabel('Some random place');
-					mkr.setInfoBubble('Some information about the random place');
-					mkr.click.addHandler(markerEventHandler);
-					mkr.openInfoBubble.addHandler(markerEventHandler);
-					mkr.closeInfoBubble.addHandler(markerEventHandler);
-					m.addMarker(mkr);
-				}
-			},
-			{
-				desc: 'Add marker offscreen',
-				action: function(){
-					var mkr = new mxn.Marker(new mxn.LatLonPoint(37.3419, -117.0419));
-					mkr.setLabel('Some other place');
-					m.addMarker(mkr);
-				}
-			},
-			{
-				desc: 'Auto center',
-				action: function(){
-					m.autoCenterAndZoom();
-				}
-			},
-			{
-				desc: 'Add line',
-				action: function(){
-					var pl = new mxn.Polyline([
-						new mxn.LatLonPoint(37.3419, -122.0419),
-						new mxn.LatLonPoint(36.3419, -120.0419),
-						new mxn.LatLonPoint(38.3419, -119.0419),
-						new mxn.LatLonPoint(37.3419, -117.0419)
-					]);
-					pl.color = '#00DD55';
-					m.addPolyline(pl);
-				}
-			},
-			{
-				desc: 'Swap API',
-				action: function(){
-					m.swap('map', 'yahoo');
-				}
+ 					m.swap('map', 'openlayers');
+  			}
 			},
 			
 			{ desc: 'Done.', action: function(){} }</diff>
      <filename>tests/index.htm</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>67404e4f47d245e58373e980a604469048ad3f5b</id>
    </parent>
    <parent>
      <id>80fba19b934f55dab382526d9bbd43e9dc43c3e6</id>
    </parent>
  </parents>
  <author>
    <name>Andrew Turner</name>
    <email>andrew@highearthorbit.com</email>
  </author>
  <url>http://github.com/mapstraction/mxn/commit/0d4bd3bc8869098ec44a2a0878824eee6129da8c</url>
  <id>0d4bd3bc8869098ec44a2a0878824eee6129da8c</id>
  <committed-date>2009-10-03T09:27:46-07:00</committed-date>
  <authored-date>2009-10-03T09:27:46-07:00</authored-date>
  <message>Resolving merge conflicts with the Github branch</message>
  <tree>e4852c9dcd9aafe84f3a6b9345696b5139169c96</tree>
  <committer>
    <name>Andrew Turner</name>
    <email>andrew@highearthorbit.com</email>
  </committer>
</commit>
