codesite-noreply at google.com
2009-Oct-03 16:34 UTC
[Mapstraction] [mapstraction] r40 committed - Resolving merge conflicts with the Github branch
Revision: 40
Author: ajturner
Date: Sat Oct 3 09:29:58 2009
Log: Resolving merge conflicts with the Github branch
http://code.google.com/p/mapstraction/source/detail?r=40
Modified:
/trunk/source/mxn.openlayers.core.js
======================================--- /trunk/source/mxn.openlayers.core.js
Sat Oct 3 09:29:54 2009
+++ /trunk/source/mxn.openlayers.core.js Sat Oct 3 09:29:58 2009
@@ -106,19 +106,10 @@
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());
@@ -128,12 +119,6 @@
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());