Mapstraction - Oct 2009 - r39 committed - Resolving merge conflicts with the Github branch

Revision: 39
Author: ajturner
Date: Sat Oct  3 09:29:54 2009
Log: Resolving merge conflicts with the Github branch
http://code.google.com/p/mapstraction/source/detail?r=39

Modified:
  /trunk/source/mxn.openlayers.core.js
  /trunk/tests/index.htm

======================================--- /trunk/source/mxn.openlayers.core.js
Sat Oct  3 09:29:49 2009
+++ /trunk/source/mxn.openlayers.core.js	Sat Oct  3 09:29:54 2009
@@ -106,10 +106,19 @@
                  map.controls[i-1].deactivate();
                  map.removeControl(map.controls[i-1]);
              }
+<<<<<<< HEAD:source/mxn.openlayers.core.js
+======+            // FIXME - can pan & zoom be separate?
+            if ( args.pan             )      {
+                map.addControl(new OpenLayers.Control.PanZoomBar());
+            }
+            else {  }
+>>>>>>>  
80fba19b934f55dab382526d9bbd43e9dc43c3e6:source/mxn.openlayers.core.js
              if ( args.zoom == ''large'' )      {
                  map.addControl(new OpenLayers.Control.PanZoomBar());
              }
              else if ( args.zoom == ''small'' ) {
+<<<<<<< HEAD:source/mxn.openlayers.core.js
                  map.addControl(new OpenLayers.Control.ZoomPanel());
                  if ( args.pan) {
                      map.addControl(new OpenLayers.Control.PanPanel());
@@ -119,6 +128,12 @@
                  if ( args.pan){
                      map.addControl(new OpenLayers.Control.PanPanel());
                  }
+======+                map.addControl(new OpenLayers.Control.ZoomBox());
+            }
+            else {
+                map.addControl(new OpenLayers.Control.ZoomBox());
+>>>>>>>  
80fba19b934f55dab382526d9bbd43e9dc43c3e6:source/mxn.openlayers.core.js
              }
              if ( args.overview ) {
                  map.addControl(new OpenLayers.Control.OverviewMap());
======================================--- /trunk/tests/index.htm	Sat Oct  3
09:29:49 2009
+++ /trunk/tests/index.htm	Sat Oct  3 09:29:54 2009
@@ -32,15 +32,14 @@


  	//WhenDomReady(function(){
-	  var m;
  	window.onload = function() {

  		var actionElm = document.getElementById(''actions'');
  		var infoElm = document.getElementById(''info'');
  		var eventsElm = document.getElementById(''events'');

-		m = new mxn.Mapstraction(''map'',
''google'');
-
+		var m = new mxn.Mapstraction(''map'',
''google'');
+
  		m.endPan.addHandler(function(sEvtName, oEvtSource, oEvtArgs){
  			var center = oEvtSource.getCenter();
  			eventsElm.innerHTML += ''Map pan: ('' +
center.lat.toFixed(5) + '',''+
center.lon.toFixed(5) +'')<br/>'';
@@ -171,7 +170,6 @@
                    m.swap(''map'',
''openlayers'');
                }
         },
-
  			{ desc: ''Done.'', action: function(){} }
  		];