<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-cloudmade.html</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -26,7 +26,7 @@
   &lt;link rel=&quot;stylesheet&quot; href=&quot;codemirror/css/docs.css&quot;
         media=&quot;screen,projection&quot; type=&quot;text/css&quot;&gt;
   &lt;!-- JavaScript --&gt;
-  &lt;title&gt;Mapstraction API Sandbox&lt;/title&gt;
+  &lt;title&gt;Mapstraction v2 API Sandbox&lt;/title&gt;
   &lt;script src=&quot;codemirror/js/prod_codemirrorz_513eeb9927a9d790c360886e3bb09a43.js&quot; type=&quot;text/javascript&quot; charset=&quot;utf-8&quot;&gt;&lt;/script&gt;
   &lt;script src=&quot;http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js&quot; type=&quot;text/javascript&quot; charset=&quot;utf-8&quot;&gt;&lt;/script&gt;
   &lt;script src=&quot;js/jquery-ui-packed.js&quot; type=&quot;text/javascript&quot; charset=&quot;utf-8&quot;&gt;&lt;/script&gt;
@@ -75,7 +75,7 @@
           
         &lt;/td&gt;
         &lt;td valign=middle style=&quot;width: 60%&quot;&gt;
-          &lt;h1 id=&quot;header&quot;&gt;Mapstraction API Sandbox&lt;/h1&gt;
+          &lt;h1 id=&quot;header&quot;&gt;Mapstraction v2 API Sandbox&lt;/h1&gt;
         &lt;/td&gt;
         &lt;td style=&quot;width:80%;&quot;&gt;&amp;nbsp;&lt;/td&gt;
       &lt;/tr&gt;</diff>
      <filename>index.html</filename>
    </modified>
    <modified>
      <diff>@@ -15,17 +15,11 @@ var tempJSON = [
     &quot;category&quot;:&quot;Mapstraction API-Providers&quot;,
     &quot;samples&quot;:[
     {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-google.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-google.js&quot;], &quot;sampleName&quot;:&quot;Google&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;google&quot;},
+    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-google.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-osm.js&quot;], &quot;sampleName&quot;:&quot;OpenStreetMap&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;google&quot;},
     {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-yahoo.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-yahoo.js&quot;], &quot;sampleName&quot;:&quot;Yahoo&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;yahoo&quot;},
     {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-microsoft.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-microsoft.js&quot;], &quot;sampleName&quot;:&quot;Microsoft&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;microsoft&quot;},
-    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-mapquest.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-mapquest.js&quot;], &quot;sampleName&quot;:&quot;MapQuest&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;mapquest&quot;},
     {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-openlayers.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-openlayers.js&quot;], &quot;sampleName&quot;:&quot;OpenLayers&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;openlayers&quot;},
-    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-google.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-osm.js&quot;], &quot;sampleName&quot;:&quot;OpenStreetMap&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;google&quot;},
-    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-multimap.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-multimap.js&quot;], &quot;sampleName&quot;:&quot;MultiMap&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;multimap&quot;},
-    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-map24.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-map24.js&quot;], &quot;sampleName&quot;:&quot;Map24&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;map24&quot;},
-    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-freeearth.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-freeearth.js&quot;], &quot;sampleName&quot;:&quot;FreeEarth&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;freeearth&quot;},
-    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-viamichelin.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-viamichelin.js&quot;], &quot;sampleName&quot;:&quot;ViaMichelin&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;viamichelin&quot;},
-    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-openspace.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-openspace.js&quot;], &quot;sampleName&quot;:&quot;OpenSpace&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;openspace&quot;},
-    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-cloudmade.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-cloudmade.js&quot;], &quot;sampleName&quot;:&quot;CloudMade&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;cloudmade&quot;}    
+    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-cloudmade.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-cloudmade.js&quot;], &quot;sampleName&quot;:&quot;CloudMade&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;&quot;}    
     ],
     &quot;docsUrl&quot;: &quot;http://mapstraction.com/doc/&quot;
 },  
@@ -47,7 +41,7 @@ var tempJSON = [
     {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-google.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-json.js&quot;], &quot;sampleName&quot;:&quot;JSON&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;google&quot;},
     {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-geocode.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-csv.js&quot;], &quot;sampleName&quot;:&quot;CSV&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;google&quot;},
     {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-openlayers.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-polylines.js&quot;], &quot;sampleName&quot;:&quot;Polylines&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;openlayers&quot;},    
-    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-yahoo.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-overlay.js&quot;], &quot;sampleName&quot;:&quot;Image Overlay&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;google&quot;},
+    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-google.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-overlay.js&quot;], &quot;sampleName&quot;:&quot;Image Overlay&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;google&quot;},
     {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-tiles.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-tiles.js&quot;], &quot;sampleName&quot;:&quot;Tiles&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;google&quot;}
     ],
     &quot;docsUrl&quot;: &quot;http://mapstraction.com/doc/&quot;
@@ -67,12 +61,16 @@ var tempJSON = [
     {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-openlayers_style.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-openlayers.js&quot;], &quot;sampleName&quot;:&quot;Styling&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;google&quot;}
     ],
     &quot;docsUrl&quot;: &quot;http://mapstraction.com/doc/&quot;
-},    
+},
 {
-    &quot;category&quot;:&quot;Mapstraction API-mxn&quot;,
+    &quot;category&quot;:&quot;Mapstraction v1-Providers&quot;,
     &quot;samples&quot;:[
-    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-mxn.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-mxn.js&quot;], &quot;sampleName&quot;:&quot;Mapstraction v2&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;&quot;},
-    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-geocommons.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-geocommons.js&quot;], &quot;sampleName&quot;:&quot;GeoCommons&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;&quot;}
+    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-mapquest.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-mapquest.js&quot;], &quot;sampleName&quot;:&quot;MapQuest&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;mapquest&quot;},
+    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-multimap.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-multimap.js&quot;], &quot;sampleName&quot;:&quot;MultiMap&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;multimap&quot;},
+    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-map24.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-map24.js&quot;], &quot;sampleName&quot;:&quot;Map24&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;map24&quot;},
+    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-freeearth.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-freeearth.js&quot;], &quot;sampleName&quot;:&quot;FreeEarth&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;freeearth&quot;},
+    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-viamichelin.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-viamichelin.js&quot;], &quot;sampleName&quot;:&quot;ViaMichelin&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;viamichelin&quot;},
+    {&quot;boilerplateLoc&quot;:&quot;samples/boilerplateHTML/mapstraction/mapstraction-openspace.html&quot;, &quot;files&quot;:[&quot;samples/js/mapstraction/mapstraction-openspace.js&quot;], &quot;sampleName&quot;:&quot;OpenSpace&quot;, &quot;tags&quot;: &quot;&quot;, &quot;providers&quot;: &quot;openspace&quot;}
     ],
     &quot;docsUrl&quot;: &quot;http://mapstraction.com/doc/&quot;
 }</diff>
      <filename>samples/TOC/mapstraction_api_samples.js</filename>
    </modified>
    <modified>
      <diff>@@ -11,9 +11,7 @@
     &lt;meta http-equiv=&quot;content-type&quot; content=&quot;text/html; charset=utf-8&quot;/&gt;
     &lt;title&gt;Mapstraction API Sample&lt;/title&gt;
 	  &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://maker.news.geocommons.com/javascripts/embed.js&quot;&gt;&lt;/script&gt;  
-    &lt;script src=&quot;http://github.com/mapstraction/mxn/raw/a338873f0e4fe4dee97548144092386b0baa3e46/source/mxn.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
-    &lt;script src=&quot;http://github.com/mapstraction/mxn/raw/a338873f0e4fe4dee97548144092386b0baa3e46/source/mxn.core.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
-    &lt;script src=&quot;http://github.com/mapstraction/mxn/raw/a338873f0e4fe4dee97548144092386b0baa3e46/source/mxn.geocommons.core.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;  
+    &lt;script src=&quot;http://github.com/mapstraction/mxn/raw/master/source/mxn.js?(geocommons)&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
     &lt;script type=&quot;text/javascript&quot;&gt;
 
     {{ INSERT_JAVASCRIPT_HERE }}</diff>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-geocommons.html</filename>
    </modified>
    <modified>
      <diff>@@ -11,7 +11,7 @@
     &lt;meta http-equiv=&quot;content-type&quot; content=&quot;text/html; charset=utf-8&quot;/&gt;
     &lt;title&gt;Mapstraction API Sample&lt;/title&gt;
     &lt;script src=&quot;http://maps.google.com/maps?file=api&amp;amp;v=2&amp;amp;sensor=false&amp;amp;key={{ key }}&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
-    &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://mapstraction.com/mapstraction-js/mapstraction.js&quot;&gt;&lt;/script&gt;
+    &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://github.com/mapstraction/mxn/raw/master/source/mxn.js?(google)&quot;&gt;&lt;/script&gt;
     &lt;script type=&quot;text/javascript&quot;&gt;
 
     {{ INSERT_JAVASCRIPT_HERE }}</diff>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-google.html</filename>
    </modified>
    <modified>
      <diff>@@ -7,7 +7,7 @@
   &lt;script type=&quot;text/javascript&quot; src=&quot;http://api.maps.yahoo.com/ajaxymap?v=3.0&amp;appid=MapstractionDemo&quot;&gt;&lt;/script&gt;
   &lt;script src=&quot;http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6&quot;&gt;&lt;/script&gt;
   &lt;script src=&quot;http://openlayers.org/api/OpenLayers.js&quot;&gt;&lt;/script&gt;
-  &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://mapstraction.com/mapstraction-js/mapstraction.js&quot;&gt;&lt;/script&gt;
+  &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://github.com/mapstraction/mxn/raw/master/source/mxn.js?(google, yahoo, microsoft, openlayers)&quot;&gt;&lt;/script&gt;
   &lt;script type=&quot;text/javascript&quot;&gt;
 
   {{ INSERT_JAVASCRIPT_HERE }}</diff>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-gymol.html</filename>
    </modified>
    <modified>
      <diff>@@ -11,7 +11,7 @@
     &lt;meta http-equiv=&quot;content-type&quot; content=&quot;text/html; charset=utf-8&quot;/&gt;
     &lt;title&gt;Mapstraction API Sample&lt;/title&gt;
     &lt;script src=&quot;http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6&quot;&gt;&lt;/script&gt;
-    &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://mapstraction.com/mapstraction-js/mapstraction.js&quot;&gt;&lt;/script&gt;
+    &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://github.com/mapstraction/mxn/raw/master/source/mxn.js?(microsoft)&quot;&gt;&lt;/script&gt;
     &lt;script type=&quot;text/javascript&quot;&gt;
 
     {{ INSERT_JAVASCRIPT_HERE }}</diff>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-microsoft.html</filename>
    </modified>
    <modified>
      <diff>@@ -11,9 +11,7 @@
     &lt;meta http-equiv=&quot;content-type&quot; content=&quot;text/html; charset=utf-8&quot;/&gt;
     &lt;title&gt;Mapstraction API Sample&lt;/title&gt;
     &lt;script src=&quot;http://maps.google.com/maps?file=api&amp;amp;v=2&amp;amp;sensor=false&amp;amp;key={{ key }}&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
-    &lt;script src=&quot;http://github.com/mapstraction/mxn/raw/a338873f0e4fe4dee97548144092386b0baa3e46/source/mxn.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
-    &lt;script src=&quot;http://github.com/mapstraction/mxn/raw/a338873f0e4fe4dee97548144092386b0baa3e46/source/mxn.core.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
-    &lt;script src=&quot;http://github.com/mapstraction/mxn/raw/a338873f0e4fe4dee97548144092386b0baa3e46/source/mxn.google.core.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;  
+    &lt;script src=&quot;http://github.com/mapstraction/mxn/raw/master/source/mxn.js?(google)&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
     &lt;script type=&quot;text/javascript&quot;&gt;
 
     {{ INSERT_JAVASCRIPT_HERE }}</diff>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-mxn.html</filename>
    </modified>
    <modified>
      <diff>@@ -11,7 +11,7 @@
     &lt;meta http-equiv=&quot;content-type&quot; content=&quot;text/html; charset=utf-8&quot;/&gt;
     &lt;title&gt;Mapstraction API Sample&lt;/title&gt;
     &lt;script src=&quot;http://openlayers.org/api/OpenLayers.js&quot;&gt;&lt;/script&gt;
-    &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://mapstraction.com/mapstraction-js/mapstraction.js&quot;&gt;&lt;/script&gt;
+    &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://github.com/mapstraction/mxn/raw/master/source/mxn.js?(openlayers)&quot;&gt;&lt;/script&gt;
     &lt;script type=&quot;text/javascript&quot;&gt;
 
     {{ INSERT_JAVASCRIPT_HERE }}</diff>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-openlayers.html</filename>
    </modified>
    <modified>
      <diff>@@ -14,7 +14,7 @@
       div.gray .olControlZoomPanel {&#8232;    top: 14px;&#8232;    left: 14px;&#8232;} &#8232;&#8232;div.gray .olControlZoomPanel div {&#8232;    background-image: url(img/gray/gray_zoom_horiz.png);&#8232;    height: 18px;&#8232;    width: 18px;&#8232;}&#8232;&#8232;div.gray .olControlZoomPanel .olControlZoomInItemInactive {&#8232;    top: 0px;&#8232;    left: 25px;&#8232;    background-position: 18px 0px;&#8232;}&#8232;&#8232;div.gray .olControlZoomPanel .olControlZoomToMaxExtentItemInactive {&#8232;    top: 0px;&#8232;    left: 0px;&#8232;    background-position: 0px -18px;&#8232;}&#8232;&#8232;div.gray .olControlZoomPanel .olControlZoomOutItemInactive {&#8232;    top: 0px;&#8232;    left: 0px;&#8232;    background-position: 0px 0px;&#8232;}
     &lt;/style&gt;
     &lt;script src=&quot;http://openlayers.org/api/OpenLayers.js&quot;&gt;&lt;/script&gt;
-    &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://mapstraction.com/mapstraction-js/mapstraction.js&quot;&gt;&lt;/script&gt;
+    &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://github.com/mapstraction/mxn/raw/master/source/mxn.js?(openlayers)&quot;&gt;&lt;/script&gt;
     &lt;script type=&quot;text/javascript&quot;&gt;
 
     {{ INSERT_JAVASCRIPT_HERE }}</diff>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-openlayers_style.html</filename>
    </modified>
    <modified>
      <diff>@@ -16,7 +16,7 @@
   &lt;/style&gt;
 
   &lt;script src=&quot;http://maps.google.com/maps?file=api&amp;amp;v=2&amp;amp;sensor=false&amp;amp;key={{ key }}&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
-  &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://mapstraction.com/mapstraction-js/mapstraction.js&quot;&gt;&lt;/script&gt;
+  &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://github.com/mapstraction/mxn/raw/master/source/mxn.js?(google)&quot;&gt;&lt;/script&gt;
   &lt;script src=&quot;http://mapstraction.appspot.com/lib/prototype.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
   &lt;script src=&quot;http://mapstraction.appspot.com/lib/scriptaculous.js?load=slider&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
   &lt;script type=&quot;text/javascript&quot;&gt;</diff>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-sliders.html</filename>
    </modified>
    <modified>
      <diff>@@ -6,8 +6,8 @@
   &lt;script src=&quot;http://maps.google.com/maps?file=api&amp;v=2&amp;key={{ key }}&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
   &lt;script type=&quot;text/javascript&quot; src=&quot;http://api.maps.yahoo.com/ajaxymap?v=3.0&amp;appid=MapstractionDemo&quot;&gt;&lt;/script&gt;
   &lt;script src=&quot;http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6&quot;&gt;&lt;/script&gt;
-  &lt;script   src=&quot;http://btilelog.beta.mapquest.com/tilelog/transaction?transaction=script&amp;key=mjtd%7Clu6t210anh%2Crn%3Do5-labwu&amp;itk=true&amp;v=5.3.0_RC5&amp;ipkg=controls1&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt; 
-  &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://mapstraction.com/mapstraction-js/mapstraction.js&quot;&gt;&lt;/script&gt;
+	&lt;script src=&quot;http://openlayers.org/api/OpenLayers.js&quot;&gt;&lt;/script&gt;
+  &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://github.com/mapstraction/mxn/raw/master/source/mxn.js?(google, yahoo, microsoft, openlayers)&quot;&gt;&lt;/script&gt;
   &lt;script type=&quot;text/javascript&quot;&gt;
 
   {{ INSERT_JAVASCRIPT_HERE }}
@@ -24,19 +24,14 @@
 &lt;/head&gt;
 &lt;body onload=&quot;initialize()&quot; style=&quot;font-family: Arial;border: 0 none;&quot;&gt;
   &lt;div id=&quot;google&quot; class=&quot;mapstraction&quot;&gt;&lt;/div&gt;
-  &lt;div id=&quot;multimap&quot; class=&quot;mapstraction&quot;  style=&quot;display:none&quot;&gt;&lt;/div&gt;
+  &lt;div id=&quot;openlayers&quot; class=&quot;mapstraction&quot;  style=&quot;display:none&quot;&gt;&lt;/div&gt;
   &lt;div id=&quot;yahoo&quot; class=&quot;mapstraction&quot; style=&quot;display:none&quot;&gt;&lt;/div&gt;
   &lt;div id=&quot;microsoft&quot; class=&quot;mapstraction&quot; style=&quot;display:none&quot;&gt;&lt;/div&gt;
-  &lt;div id=&quot;freearth&quot; class=&quot;mapstraction&quot; style=&quot;display:none&quot;&gt;&lt;/div&gt;
-  &lt;div id=&quot;mapquest&quot; class=&quot;mapstraction&quot; style=&quot;display:none&quot;&gt;&lt;/div&gt;
-  &lt;div id=&quot;openstreetmap&quot; class=&quot;mapstraction&quot; style=&quot;display:none&quot;&gt;&lt;/div&gt;
-  &lt;div style=&quot;margin-left: 150px; height: 100%; width: 300px;&quot;&gt;&lt;div id=&quot;mapquest&quot; class=&quot;mapstraction&quot; style=&quot;display:none;height: 100%; width: 100%;&quot;&gt;&lt;/div&gt;&lt;/div&gt;
   &lt;form action=&quot;get&quot;&gt;
     &lt;input type=&quot;radio&quot; name=&quot;api&quot; value=&quot;google&quot; CHECKED onClick=&quot;mapstraction.swap('google','google')&quot;&gt; Google&lt;br&gt;
     &lt;input type=&quot;radio&quot; name=&quot;api&quot; value=&quot;yahoo&quot; onClick=&quot;mapstraction.swap('yahoo','yahoo')&quot;&gt; Yahoo&lt;br&gt;
     &lt;input type=&quot;radio&quot; name=&quot;api&quot; value=&quot;microsoft&quot; onClick=&quot;mapstraction.swap('microsoft','microsoft')&quot;&gt; Microsoft&lt;br&gt;        
-    &lt;input type=&quot;radio&quot; name=&quot;api&quot; value=&quot;openstreetmap&quot; onClick=&quot;mapstraction.swap('openstreetmap','openstreetmap')&quot;&gt; OpenStreetMap&lt;br/&gt; 
-    &lt;input type=&quot;radio&quot; name=&quot;api&quot; value=&quot;mapquest&quot; onClick=&quot;mapstraction.swap('mapquest','mapquest')&quot;&gt; MapQuest&lt;br/&gt; 
+    &lt;input type=&quot;radio&quot; name=&quot;api&quot; value=&quot;mapquest&quot; onClick=&quot;mapstraction.swap('openlayers','openlayers')&quot;&gt; OpenLayers&lt;br/&gt; 
   &lt;/form&gt;    
 &lt;/body&gt;
 &lt;/html&gt;
\ No newline at end of file</diff>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-swap.html</filename>
    </modified>
    <modified>
      <diff>@@ -11,7 +11,7 @@
   &lt;meta http-equiv=&quot;content-type&quot; content=&quot;text/html; charset=utf-8&quot;/&gt;
   &lt;title&gt;Mapstraction API Sample&lt;/title&gt;
   &lt;script src=&quot;http://maps.google.com/maps?file=api&amp;amp;v=2&amp;amp;sensor=false&amp;amp;key={{ key }}&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
-  &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://mapstraction.com/mapstraction-js/mapstraction.js&quot;&gt;&lt;/script&gt;
+  &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://github.com/mapstraction/mxn/raw/master/source/mxn.js?(google)&quot;&gt;&lt;/script&gt;
   &lt;script type=&quot;text/javascript&quot;&gt;
 
   {{ INSERT_JAVASCRIPT_HERE }}</diff>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-tiles.html</filename>
    </modified>
    <modified>
      <diff>@@ -11,7 +11,7 @@
     &lt;meta http-equiv=&quot;content-type&quot; content=&quot;text/html; charset=utf-8&quot;/&gt;
     &lt;title&gt;Mapstraction API Sample&lt;/title&gt;
     &lt;script type=&quot;text/javascript&quot; src=&quot;http://api.maps.yahoo.com/ajaxymap?v=3.8&amp;appid=MapstractionDemo&quot;&gt;&lt;/script&gt;
-    &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://mapstraction.com/mapstraction-js/mapstraction.js&quot;&gt;&lt;/script&gt;
+    &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot; src=&quot;http://github.com/mapstraction/mxn/raw/master/source/mxn.js?(yahoo)&quot;&gt;&lt;/script&gt;
     &lt;script type=&quot;text/javascript&quot;&gt;
 
     {{ INSERT_JAVASCRIPT_HERE }}</diff>
      <filename>samples/boilerplateHTML/mapstraction/mapstraction-yahoo.html</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,5 @@
 var mapstraction;
 function initialize() {
-    mapstraction = new Mapstraction('map_canvas','yahoo');
-    mapstraction.setCenterAndZoom(new LatLonPoint(37.75,-122.44), 8);
+    mapstraction = new mxn.Mapstraction('map_canvas','yahoo');
+    mapstraction.setCenterAndZoom(new mxn.LatLonPoint(37.75,-122.44), 8);
 }</diff>
      <filename>samples/js/mapstraction/mapstraction-addmap.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,6 @@
 function initialize() {
-    var mapstraction = new Mapstraction('map_canvas','google');
-    var myPoint = new LatLonPoint(37.404196,-122.008194);
+    var mapstraction = new mxn.Mapstraction('map_canvas','google');
+    var myPoint = new mxn.LatLonPoint(37.404196,-122.008194);
     mapstraction.setCenterAndZoom(myPoint, 9);
 
 /* args = {</diff>
      <filename>samples/js/mapstraction/mapstraction-controls.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,12 +1,12 @@
 var marker;
 var mapstraction;
 function initialize() {
-    mapstraction = new Mapstraction('map_canvas','google');
-    mapstraction.setCenterAndZoom(new LatLonPoint(37.404196,-122.008194), 7);
+    mapstraction = new mxn.Mapstraction('map_canvas','google');
+    mapstraction.setCenterAndZoom(new mxn.LatLonPoint(37.404196,-122.008194), 7);
 
     mapstraction.addEventListener('click', 
     function(p) { 
-        marker = new Marker(p);
+        marker = new mxn.Marker(p);
         text = &quot;&lt;p&gt;Lat: &quot; + p.lat + &quot; Lon: &quot; + p.lon + &quot;&lt;/p&gt;&quot;;
         marker.setLabel(text);
         marker.setInfoBubble(text);</diff>
      <filename>samples/js/mapstraction/mapstraction-events.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,8 +1,8 @@
 var mapstraction;
 function initialize()
 {
-    mapstraction = new Mapstraction('map_canvas', 'google');
-    var myPoint = new LatLonPoint(51.387745, -0.50914);
+    mapstraction = new mxn.Mapstraction('map_canvas', 'google');
+    var myPoint = new mxn.LatLonPoint(51.387745, -0.50914);
     mapstraction.setCenterAndZoom(myPoint, 14);
     addMarkers( 100 ); 
 
@@ -48,8 +48,8 @@ function addMarkers( count ) {
     var sw = bounds.getSouthWest();
     var ne = bounds.getNorthEast();
     while ( count-- ) {
-        var ll = new LatLonPoint( sw.lat + ( ( ne.lat - sw.lat ) * Math.random() ), sw.lon + ( ( ne.lon - sw.lon ) * Math.random() ) );
-        var marker = new Marker(ll);
+        var ll = new mxn.LatLonPoint( sw.lat + ( ( ne.lat - sw.lat ) * Math.random() ), sw.lon + ( ( ne.lon - sw.lon ) * Math.random() ) );
+        var marker = new mxn.Marker(ll);
 
         var number = Math.round( 86400000 * Math.random() );
         var d = new Date();</diff>
      <filename>samples/js/mapstraction/mapstraction-filters.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,7 @@
 function initialize() {
-    var mapstraction = new Mapstraction('map_canvas','openlayers');
+    var mapstraction = new mxn.Mapstraction('map_canvas','openlayers');
 
-    var myPoint = new LatLonPoint(37.4041960114344,-122.008194923401);
+    var myPoint = new mxn.LatLonPoint(37.4041960114344,-122.008194923401);
     mapstraction.setCenterAndZoom(myPoint, 3);
     mapstraction.addControls({zoom: 'large'});
     mapstraction.addOverlay(&quot;http://api.flickr.com/services/feeds/groups_pool.gne?id=322338@N20&amp;format=rss_200&amp;georss=1&quot;);</diff>
      <filename>samples/js/mapstraction/mapstraction-georss.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,9 +1,9 @@
 function initialize() {
     // initialise the map with your choice of API
-    var mapstraction = new Mapstraction('map_canvas','google');
+    var mapstraction = new mxn.Mapstraction('map_canvas','google');
 
     // create a lat/lon object
-    var myPoint = new LatLonPoint(37.404196,-122.008194);
+    var myPoint = new mxn.LatLonPoint(37.404196,-122.008194);
 
     // display the map centered on a latitude and longitude (Google zoom levels)
     mapstraction.setCenterAndZoom(myPoint, 9);
@@ -14,11 +14,11 @@ function initialize() {
         map_type: true 
     });
     // create a marker positioned at a lat/lon 
-    my_marker = new Marker(myPoint);
+    my_marker = new mxn.Marker(myPoint);
 
     my_marker.setIcon('http://mapstraction.com/icon.gif');
 
-    mapstraction.addMarker( new Marker( new LatLonPoint(37.75,-122.44)));
+    mapstraction.addMarker( new mxn.Marker( new mxn.LatLonPoint(37.75,-122.44)));
 
     // add a label to the marker
     my_marker.setLabel(&quot;&lt;blink&gt;Hello!&lt;/blink&gt;&quot;);</diff>
      <filename>samples/js/mapstraction/mapstraction-google.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,8 +1,8 @@
 var mapstraction;
 function initialize() {
-    mapstraction = new Mapstraction('map_canvas','google');
+    mapstraction = new mxn.Mapstraction('map_canvas','google');
 
-    var myPoint = new LatLonPoint(37.4041960114344,-122.008194923401);
+    var myPoint = new mxn.LatLonPoint(37.4041960114344,-122.008194923401);
     mapstraction.setCenterAndZoom(myPoint, 3);
     mapstraction.addControls({zoom: 'large'});
 </diff>
      <filename>samples/js/mapstraction/mapstraction-json.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,7 @@
 function initialize() {
-    var mapstraction = new Mapstraction('map_canvas','google');
+    var mapstraction = new mxn.Mapstraction('map_canvas','google');
 
-    var myPoint = new LatLonPoint(37.4041960114344,-122.008194923401);
+    var myPoint = new mxn.LatLonPoint(37.4041960114344,-122.008194923401);
     mapstraction.setCenterAndZoom(myPoint, 4);
     mapstraction.addControls({zoom: 'large'});
     mapstraction.addOverlay(&quot;http://maker.geocommons.com/maps/5059/overlays/0.kml&quot;);</diff>
      <filename>samples/js/mapstraction/mapstraction-kml.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,13 +1,13 @@
 var mapstraction;
 function initialize() {
-    mapstraction = new Mapstraction('map_canvas','google');
-    mapstraction.addMarker( new Marker( new LatLonPoint(37.75,-122.44)));
+    mapstraction = new mxn.Mapstraction('map_canvas','google');
+    mapstraction.addMarker( new mxn.Marker( new mxn.LatLonPoint(37.75,-122.44)));
     advancedMarker();
     mapstraction.autoCenterAndZoom();
 }
 
 function advancedMarker() {
-    mapstraction.addMarkerWithData(new Marker( new LatLonPoint(47.4004,153.1435)),{
+    mapstraction.addMarkerWithData(new mxn.Marker( new mxn.LatLonPoint(47.4004,153.1435)),{
         infoBubble : &quot;Advanced Marker&quot;,
         label : &quot;tooltip&quot;,
         date : &quot;new Date()&quot;,</diff>
      <filename>samples/js/mapstraction/mapstraction-marker.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,9 +1,9 @@
 function initialize() {
     // initialise the map with your choice of API
-    var mapstraction = new Mapstraction('map_canvas','microsoft');
+    var mapstraction = new mxn.Mapstraction('map_canvas','microsoft');
 
     // create a lat/lon object
-    var myPoint = new LatLonPoint(37.404196,-122.008194);
+    var myPoint = new mxn.LatLonPoint(37.404196,-122.008194);
 
     // display the map centered on a latitude and longitude (Google zoom levels)
     mapstraction.setCenterAndZoom(myPoint, 9);
@@ -14,11 +14,11 @@ function initialize() {
         map_type: true 
     });
     // create a marker positioned at a lat/lon 
-    my_marker = new Marker(myPoint);
+    my_marker = new mxn.Marker(myPoint);
 
     my_marker.setIcon('http://mapstraction.com/icon.gif');
 
-    mapstraction.addMarker( new Marker( new LatLonPoint(37.75,-122.44)));
+    mapstraction.addMarker( new mxn.Marker( new mxn.LatLonPoint(37.75,-122.44)));
 
     // add a label to the marker
     my_marker.setLabel(&quot;&lt;blink&gt;Hello!&lt;/blink&gt;&quot;);</diff>
      <filename>samples/js/mapstraction/mapstraction-microsoft.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,9 +1,9 @@
 function initialize() {
     // initialise the map with your choice of API
-    var mapstraction = new Mapstraction('map_canvas','openlayers');
+    var mapstraction = new mxn.Mapstraction('map_canvas','openlayers');
 
     // create a lat/lon object
-    var myPoint = new LatLonPoint(37.404196,-122.008194);
+    var myPoint = new mxn.LatLonPoint(37.404196,-122.008194);
 
     // display the map centered on a latitude and longitude (Google zoom levels)
     mapstraction.setCenterAndZoom(myPoint, 9);
@@ -14,11 +14,11 @@ function initialize() {
         map_type: true 
     });
     // create a marker positioned at a lat/lon 
-    my_marker = new Marker(myPoint);
+    my_marker = new mxn.Marker(myPoint);
 
     my_marker.setIcon('http://mapstraction.com/icon.gif');
 
-    mapstraction.addMarker( new Marker( new LatLonPoint(37.75,-122.44)));
+    mapstraction.addMarker( new mxn.Marker( new mxn.LatLonPoint(37.75,-122.44)));
 
     // add a label to the marker
     my_marker.setLabel(&quot;&lt;blink&gt;Hello!&lt;/blink&gt;&quot;);</diff>
      <filename>samples/js/mapstraction/mapstraction-openlayers.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,9 +1,12 @@
 function initialize() {
     // initialise the map with your choice of API
-    var mapstraction = new Mapstraction('map_canvas','openstreetmap');
+    var mapstraction = new mxn.Mapstraction('map_canvas','google');
 
     // create a lat/lon object
-    var myPoint = new LatLonPoint(37.404196,-122.008194);
+    var myPoint = new mxn.LatLonPoint(37.404196,-122.008194);
+    
+    // Add OpenStreetMap base layer
+    mapstraction.addTileLayer(&quot;http://tile.openstreetmap.org/{Z}/{X}/{Y}.png&quot;, 1.0, &quot;OSM&quot;, 1, 19, false);
 
     // display the map centered on a latitude and longitude (Google zoom levels)
     mapstraction.setCenterAndZoom(myPoint, 9);
@@ -14,11 +17,11 @@ function initialize() {
         map_type: true 
     });
     // create a marker positioned at a lat/lon 
-    my_marker = new Marker(myPoint);
+    my_marker = new mxn.Marker(myPoint);
 
     my_marker.setIcon('http://mapstraction.com/icon.gif');
 
-    mapstraction.addMarker( new Marker( new LatLonPoint(37.75,-122.44)));
+    mapstraction.addMarker( new mxn.Marker( new mxn.LatLonPoint(37.75,-122.44)));
 
     // add a label to the marker
     my_marker.setLabel(&quot;&lt;blink&gt;Hello!&lt;/blink&gt;&quot;);</diff>
      <filename>samples/js/mapstraction/mapstraction-osm.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,9 +1,9 @@
 function initialize() {
-    var mapstraction = new Mapstraction('map_canvas','yahoo');
+    var mapstraction = new mxn.Mapstraction('map_canvas','google');
 
-    var myPoint = new LatLonPoint(18.47, -69.9);
+    var myPoint = new mxn.LatLonPoint(18.47, -69.9);
     mapstraction.setCenterAndZoom(myPoint, 11);
-    mapstraction.setMapType(Mapstraction.SATELLITE);
+    mapstraction.setMapType(mxn.Mapstraction.SATELLITE);
     mapstraction.addImageOverlay(&quot;over&quot;,&quot;http://mapstraction.com/images/santodomingo.png&quot;,50,-70.01544, 18.39777, -69.80567, 18.563517);
     mapstraction.addSmallControls();    
 }
\ No newline at end of file</diff>
      <filename>samples/js/mapstraction/mapstraction-overlay.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,14 +1,13 @@
 function poly(map) {
 
-    map.setCenterAndZoom(new LatLonPoint(37.78,-122.395033836365), 12);
-    map.setMapType(Mapstraction.ROAD);
+    map.setCenterAndZoom(new mxn.LatLonPoint(37.78,-122.395033836365), 12);
     
     // create a polygon object
-    var myPoly = new Polyline([new LatLonPoint(37.7945928242851,-122.395033836365), new LatLonPoint(37.7938467508748,-122.393960952759), new LatLonPoint(37.7945928242851,-122.39275932312), new LatLonPoint(37.789505810689,-122.387609481812), new LatLonPoint(37.7782792282611,-122.387351989746), new LatLonPoint(37.7768545853105,-122.390570640564), new LatLonPoint(37.7690524823224,-122.397179603577), new LatLonPoint(37.7668813159428,-122.394347190857), new LatLonPoint(37.7658635597592,-122.407650947571), new LatLonPoint(37.7689167862912,-122.408037185669), new LatLonPoint(37.7765493011063,-122.417650222778), new LatLonPoint(37.7945928242851,-122.395033836365)]);
+    var myPoly = new mxn.Polyline([new mxn.LatLonPoint(37.7945928242851,-122.395033836365), new mxn.LatLonPoint(37.7938467508748,-122.393960952759), new mxn.LatLonPoint(37.7945928242851,-122.39275932312), new mxn.LatLonPoint(37.789505810689,-122.387609481812), new mxn.LatLonPoint(37.7782792282611,-122.387351989746), new mxn.LatLonPoint(37.7768545853105,-122.390570640564), new mxn.LatLonPoint(37.7690524823224,-122.397179603577), new mxn.LatLonPoint(37.7668813159428,-122.394347190857), new mxn.LatLonPoint(37.7658635597592,-122.407650947571), new mxn.LatLonPoint(37.7689167862912,-122.408037185669), new mxn.LatLonPoint(37.7765493011063,-122.417650222778), new mxn.LatLonPoint(37.7945928242851,-122.395033836365)]);
     map.addPolyline(myPoly);
 }
 
 function initialize() {
-    var gmapstraction = new Mapstraction('map_canvas','openlayers');
+    var gmapstraction = new mxn.Mapstraction('map_canvas','openlayers');
     poly(gmapstraction);    
 }
\ No newline at end of file</diff>
      <filename>samples/js/mapstraction/mapstraction-polylines.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,6 @@
 function initialize() {
-    var mapstraction = new Mapstraction('map_canvas','google');
-    mapstraction.setCenterAndZoom(new LatLonPoint(37.404196,-122.008194), 9);
+    var mapstraction = new mxn.Mapstraction('map_canvas','google');
+    mapstraction.setCenterAndZoom(new mxn.LatLonPoint(37.404196,-122.008194), 9);
 
     // Use Google's Traffic Overlay
     var trafficOptions = {incidents:true};</diff>
      <filename>samples/js/mapstraction/mapstraction-provider_specific.js</filename>
    </modified>
    <modified>
      <diff>@@ -4,11 +4,11 @@ function initialize()
     // hide the right-hand filter handle
     $('handle2').hide();
     
-    mapstraction = new Mapstraction('map_canvas', 'google');
+    mapstraction = new mxn.Mapstraction('map_canvas', 'google');
     mapstraction.enableScrollWheelZoom(); 
-    myPoint = new LatLonPoint(52.250873, 0.110292);
+    myPoint = new mxn.LatLonPoint(52.250873, 0.110292);
     mapstraction.setCenterAndZoom(myPoint, 12);
-    centerRadius = new Radius(myPoint, 20);
+    centerRadius = new mxn.Radius(myPoint, 20);
     addMarkers(50); 
     addSlider();
     sliderChanged(1);
@@ -19,9 +19,9 @@ function addMarkers(count) {
     var sw = bounds.getSouthWest();
     var ne = bounds.getNorthEast();
     while ( count-- ) {
-        var ll = new LatLonPoint( sw.lat + ( ( ne.lat - sw.lat ) * Math.random() ), sw.lon + ( ( ne.lon - sw.lon ) * Math.random() ) );
-        var marker = new Marker(ll);
-        var distance = mxn.fn.KMToMiles(marker.location.distance(myPoint));
+        var ll = new mxn.LatLonPoint( sw.lat + ( ( ne.lat - sw.lat ) * Math.random() ), sw.lon + ( ( ne.lon - sw.lon ) * Math.random() ) );
+        var marker = new mxn.Marker(ll);
+        var distance = mxn.util.KMToMiles(marker.location.distance(myPoint));
         var el = document.createElement('strong');
         el.appendChild( document.createTextNode('Distance: ' + distance.toFixed(2) + ' Mile(s)'));
         marker.setInfoBubble(el);
@@ -44,7 +44,7 @@ function addSlider() {
 function sliderChanged(radius) {
     mapstraction.removeAllPolylines();
     mapstraction.removeAllFilters();
-    mapstraction.addPolygon(centerRadius.getPolyline(mxn.fn.milesToKM(radius), '#00F'));
+    mapstraction.addPolyline(centerRadius.getPolyline(mxn.util.milesToKM(radius), '#00F'));
     mapstraction.addFilter('distance', 'le', radius);
     var selectedCount = mapstraction.doFilter();
     var tw = document.getElementById( 'timeWindow' );</diff>
      <filename>samples/js/mapstraction/mapstraction-radius.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,9 +1,9 @@
 function initialize() {
     // initialise the map with your choice of API
-    var mapstraction = new Mapstraction('map_canvas','google');
+    var mapstraction = new mxn.Mapstraction('map_canvas','google');
 
     // create a lat/lon object
-    var myPoint = new LatLonPoint(37.404196,-122.008194);
+    var myPoint = new mxn.LatLonPoint(37.404196,-122.008194);
 
     // display the map centered on a latitude and longitude (Google zoom levels)
     mapstraction.setCenterAndZoom(myPoint, 9);
@@ -14,11 +14,11 @@ function initialize() {
         map_type: true 
     });
     // create a marker positioned at a lat/lon 
-    my_marker = new Marker(myPoint);
+    my_marker = new mxn.Marker(myPoint);
 
     my_marker.setIcon('http://mapstraction.com/icon.gif');
 
-    mapstraction.addMarker( new Marker( new LatLonPoint(37.75,-122.44)));
+    mapstraction.addMarker( new mxn.Marker( new mxn.LatLonPoint(37.75,-122.44)));
 
     // add a label to the marker
     my_marker.setLabel(&quot;&lt;blink&gt;Hello!&lt;/blink&gt;&quot;);</diff>
      <filename>samples/js/mapstraction/mapstraction-simple.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,9 +1,9 @@
 var mapstraction;
 function initialize() {
-      mapstraction = new Mapstraction('google','google');
-      var myPoint = new LatLonPoint(38.8971, -77.070857);
+      mapstraction = new mxn.Mapstraction('google','google');
+      var myPoint = new mxn.LatLonPoint(38.8971, -77.070857);
       mapstraction.setCenterAndZoom(myPoint, 13);
-      my_marker = new Marker(myPoint);
+      my_marker = new mxn.Marker(myPoint);
       var text = &quot;Swapping with Mapstraction&quot;;
       my_marker.setInfoBubble(text);
       mapstraction.addMarker(my_marker);</diff>
      <filename>samples/js/mapstraction/mapstraction-swap.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,16 +1,17 @@
 var mapstraction;
-var maptiles = [ &quot;http://oakland-1950s.s3.amazonaws.com/{Z}-r{Y}-c{X}.jpg&quot;,
-&quot;http://oakland-1912.s3.amazonaws.com/{Z}-r{Y}-c{X}.jpg&quot;,
-&quot;http://oakland-1877.s3.amazonaws.com/{Z}-r{Y}-c{X}.jpg&quot;];
+var maptiles = [ [&quot;http://oakland-1950s.s3.amazonaws.com/{Z}-r{Y}-c{X}.jpg&quot;, &quot;Oakland 1950&quot;],
+[&quot;http://oakland-1912.s3.amazonaws.com/{Z}-r{Y}-c{X}.jpg&quot;, &quot;Oakland 1912&quot;],
+[&quot;http://oakland-1877.s3.amazonaws.com/{Z}-r{Y}-c{X}.jpg&quot;, &quot;Oakland 1877&quot;]];
 function initialize() {
-    mapstraction = new Mapstraction('map_canvas','google');
-    var myPoint = new LatLonPoint(37.804656, -122.263606);
+    mapstraction = new mxn.Mapstraction('map_canvas','google');
+    var myPoint = new mxn.LatLonPoint(37.804656, -122.263606);
 
     // display the map centered on a latitude and longitude (Google zoom levels)
-    mapstraction.setCenterAndZoom(myPoint, 11);
-    mapstraction.setMapType(Mapstraction.SATELLITE);
+    mapstraction.setCenterAndZoom(myPoint, 12);
+    mapstraction.setMapType(mxn.Mapstraction.SATELLITE);
     mapstraction.addSmallControls();
+    mapstraction.addMapTypeControls();
     for(var t=0;t&lt;maptiles.length;t++) {
-        mapstraction.addTileLayer(maptiles[t], 0.6);
+        mapstraction.addTileLayer(maptiles[t][0], 0.6, maptiles[t][1]);
     }
 }</diff>
      <filename>samples/js/mapstraction/mapstraction-tiles.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,9 +1,9 @@
 function initialize() {
     // initialise the map with your choice of API
-    var mapstraction = new Mapstraction('map_canvas','yahoo');
+    var mapstraction = new mxn.Mapstraction('map_canvas','yahoo');
 
     // create a lat/lon object
-    var myPoint = new LatLonPoint(37.404196,-122.008194);
+    var myPoint = new mxn.LatLonPoint(37.404196,-122.008194);
 
     // display the map centered on a latitude and longitude (Google zoom levels)
     mapstraction.setCenterAndZoom(myPoint, 9);
@@ -14,11 +14,11 @@ function initialize() {
         map_type: true 
     });
     // create a marker positioned at a lat/lon 
-    my_marker = new Marker(myPoint);
+    my_marker = new mxn.Marker(myPoint);
 
     my_marker.setIcon('http://mapstraction.com/icon.gif');
 
-    mapstraction.addMarker( new Marker( new LatLonPoint(37.75,-122.44)));
+    mapstraction.addMarker( new mxn.Marker( new mxn.LatLonPoint(37.75,-122.44)));
 
     // add a label to the marker
     my_marker.setLabel(&quot;&lt;blink&gt;Hello!&lt;/blink&gt;&quot;);</diff>
      <filename>samples/js/mapstraction/mapstraction-yahoo.js</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>206fd1a39d7d25870129f54be2dafe88c86ef6de</id>
    </parent>
  </parents>
  <author>
    <name>Andrew Turner</name>
    <email>andrew@highearthorbit.com</email>
  </author>
  <url>http://github.com/mapstraction/sandbox/commit/20b76294c20a645da79a87f49141b356825613ac</url>
  <id>20b76294c20a645da79a87f49141b356825613ac</id>
  <committed-date>2009-10-03T11:12:45-07:00</committed-date>
  <authored-date>2009-10-03T11:12:45-07:00</authored-date>
  <message>Moved most examples over to Mapstraction v2 support</message>
  <tree>cde18cf0d40d4a42a85d17bb87ddc742f2d4f1c2</tree>
  <committer>
    <name>Andrew Turner</name>
    <email>andrew@highearthorbit.com</email>
  </committer>
</commit>
