ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Create a function -- OpenLayers.Util.getElement -- which replaces "$". This

Browse Source 
should be used in all library code. This patch replaces all uses of "$()" in
existing code. The primary reason for this is to avoid conflicts with libraries
(like Prototype) which might redefine this function differently.


git-svn-id: http://svn.openlayers.org/trunk/openlayers@2541 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2007-03-08 20:14:03 +00:00
parent be1ef0ef47
commit c66f1ce360
37 changed files with 117 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/baseLayers.html
View File

@@ -29,7 +29,7 @@
40.428314208984375);
function init(){
map = new OpenLayers.Map( $('map') );
map = new OpenLayers.Map( 'map' );
var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0",

8
examples/canvas.html
View File

@@ -32,18 +32,18 @@
if (click) {
canvas.drawLine(click, this.getLonLatFromPixel(e.xy));
click = null;
$('status').innerHTML = "";
OpenLayers.Util.getElement('status').innerHTML = "";
}
else {
click = this.getLonLatFromPixel(e.xy);
$('status').innerHTML = "Point 1 stored: "+click+". <a href='#' onclick='click=null;return false'>Reset</a>";
OpenLayers.Util.getElement('status').innerHTML = "Point 1 stored: "+click+". <a href='#' onclick='click=null;return false'>Reset</a>";
}
});
}
function drawIt() {
canvas.drawLine(
new OpenLayers.LonLat(parseFloat($('lon1').value), parseFloat($('lat1').value)),
new OpenLayers.LonLat(parseFloat($('lon2').value), parseFloat($('lat2').value))
new OpenLayers.LonLat(parseFloat(OpenLayers.Util.getElement('lon1').value), parseFloat(OpenLayers.Util.getElement('lat1').value)),
new OpenLayers.LonLat(parseFloat(OpenLayers.Util.getElement('lon2').value), parseFloat(OpenLayers.Util.getElement('lat2').value))
);
}
// -->

2
examples/controls.html
View File

@@ -17,7 +17,7 @@
map.addControl(new OpenLayers.Control.MouseToolbar());
map.addControl(new OpenLayers.Control.LayerSwitcher({'ascending':false}));
map.addControl(new OpenLayers.Control.Permalink());
map.addControl(new OpenLayers.Control.Permalink($('permalink')));
map.addControl(new OpenLayers.Control.Permalink('permalink'));
map.addControl(new OpenLayers.Control.MousePosition());
map.addControl(new OpenLayers.Control.OverviewMap());
var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",

2
examples/freemap.html
View File

@@ -24,7 +24,7 @@
var map, layer;
function init(){
map = new OpenLayers.Map( $('map') );
map = new OpenLayers.Map( 'map' );
var basemap = new OpenLayers.Layer.WMS( "Boston",
"http://boston.freemap.in/cgi-bin/mapserv?",
{map: '/www/freemap.in/boston/map/gmaps.map', layers: 'border,water,roads,rapid_transit,buildings', format: 'png', 'transparent': 'off'},

5
examples/georss.html
View File

@@ -22,11 +22,12 @@
map.addControl(new OpenLayers.Control.LayerSwitcher());
}
function addUrl() {
var value = $('url').value;
var urlObj = OpenLayers.Util.getElement('url');
var value = urlObj.value;
var parts = value.split("/");
var newl = new OpenLayers.Layer.GeoRSS( parts[parts.length-1], value);
map.addLayer(newl);
$("url").value = "";
urlObj.value = "";
}
// -->
</script>

6
examples/getfeatureinfo.html
View File

@@ -22,10 +22,10 @@ ul, li { padding-left: 0px; margin-left: 0px; }
var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://world.freemap.in/cgi-bin/mapserv?map=/www/freemap.in/world/map/factbook.map", {'layers': 'factbook'} );
map.addLayer(wms);
map.addControl(new OpenLayers.Control.Permalink($('permalink')));
map.addControl(new OpenLayers.Control.Permalink('permalink'));
map.zoomToMaxExtent();
map.events.register('click', map, function (e) {
$('nodeList').innerHTML = "Loading... please wait...";
OpenLayers.Util.getElement('nodeList').innerHTML = "Loading... please wait...";
var url = wms.getFullRequestString({
REQUEST: "GetFeatureInfo",
EXCEPTIONS: "application/vnd.ogc.se_xml",
@@ -40,7 +40,7 @@ ul, li { padding-left: 0px; margin-left: 0px; }
Event.stop(e);
});
function setHTML(response) {
$('nodeList').innerHTML = response.responseText;
OpenLayers.Util.getElement('nodeList').innerHTML = response.responseText;
}
</script>
</body>

2
examples/google.html
View File

@@ -22,7 +22,7 @@
var map, layer;
function init(){
map = new OpenLayers.Map( $('map') ,
map = new OpenLayers.Map( 'map' ,
{ controls: [new OpenLayers.Control.MouseDefaults()] , 'numZoomLevels':20});
var satellite = new OpenLayers.Layer.Google( "Google Satellite" , {type: G_SATELLITE_MAP, 'maxZoomLevel':18} );

4
examples/layer-opacity.html
View File

@@ -40,10 +40,10 @@
var maxOpacity = 0.9;
var minOpacity = 0.1;
function changeOpacity(byOpacity) {
var newOpacity = (parseFloat($('opacity').value) + byOpacity).toFixed(1);
var newOpacity = (parseFloat(OpenLayers.Util.getElement('opacity').value) + byOpacity).toFixed(1);
newOpacity = Math.min(maxOpacity,
Math.max(minOpacity, newOpacity));
$('opacity').value = newOpacity;
OpenLayers.Util.getElement('opacity').value = newOpacity;
shade.setOpacity(newOpacity);
}
function init(){

2
examples/lite.html
View File

@@ -16,7 +16,7 @@
var map, layer;
function init(){
map = new OpenLayers.Map( $('map') );
map = new OpenLayers.Map( 'map' );
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);

2
examples/lonlatfrompx.html
View File

@@ -25,7 +25,7 @@
map.addLayers([ol_wms]);
OpenLayers.Event.observe($('map'),"click",mapclicked.bindAsEventListener(map));
OpenLayers.Event.observe(OpenLayers.Util.getElem('map'),"click",mapclicked.bindAsEventListener(map));
function mapclicked(e){
var lonlat = map.getLonLatFromPixel(e.xy);
alert("Lat: " + lonlat.lat + " (Pixel.x:" + e.xy.x + ")" + "\n" + "Lon: " + lonlat.lon + " (Pixel.y:" + e.xy.y + ")" );

2
examples/mapserver.html
View File

@@ -16,7 +16,7 @@
var map, layer;
function init(){
map = new OpenLayers.Map( $('map') );
map = new OpenLayers.Map( 'map' );
layer = new OpenLayers.Layer.MapServer( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);

2
examples/mm.html
View File

@@ -22,7 +22,7 @@
var map, mmlayer, layer;
function init(){
map = new OpenLayers.Map( $('map') ,
map = new OpenLayers.Map( 'map' ,
{controls:[new OpenLayers.Control.MouseDefaults()]});
mmlayer = new OpenLayers.Layer.MultiMap( "MultiMap");

2
examples/multiserver.html
View File

@@ -16,7 +16,7 @@
var map, layer;
function init(){
map = new OpenLayers.Map( $('map') );
map = new OpenLayers.Map( 'map' );
var urlArray = ["http://labs.metacarta.com/wms-c/Basic.py",
"http://monitor.metacarta.com/wms-c/Basic.py"];

2
examples/mvs.html
View File

@@ -64,7 +64,7 @@ function runMVS() {
safeArgs.marker = theArgs.marker; // TODO: Make this "safe".
// -----
var theMVS = new OpenLayers.Map($('map'), {controls: [], maxResolution: 'auto'});
var theMVS = new OpenLayers.Map('map', {controls: [], maxResolution: 'auto'});
for(var i = 0; i < safeArgs.controls.length; i++) {
switch(safeArgs.controls[i]) {
case 'panzoombar':

2
examples/openstreetmap.html
View File

@@ -14,7 +14,7 @@
var map, layer;
function init(){
map = new OpenLayers.Map( $('map') );
map = new OpenLayers.Map( 'map' );
layer = new OpenLayers.Layer.WMS( "OpenStreetMap WMS",
"http://tile.openstreetmap.org/ruby/wmsmod.rbx?" );
layer.setTileSize(new OpenLayers.Size(256,128));

10
examples/tms.html
View File

@@ -16,7 +16,7 @@
var map, layer;
function init(){
map = new OpenLayers.Map( $('map'), {maxResolution:1.40625/2} );
map = new OpenLayers.Map( 'map', {maxResolution:1.40625/2} );
layer = new OpenLayers.Layer.TMS( "TMS",
"http://labs.metacarta.com/wms-c/Basic.py/", {layername: 'basic', type:'png'} );
map.addLayer(layer);
@@ -24,7 +24,13 @@
map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
}
function addTMS() {
l=new OpenLayers.Layer.TMS($('layer').value, $('url').value, {layername: $('layer').value, type:$('type').value});
l = new OpenLayers.Layer.TMS(
OpenLayers.Util.getElement('layer').value,
OpenLayers.Util.getElement('url').value,
{
'layername': OpenLayers.Util.getElement('layer').value,
'type': OpenLayers.Util.getElement('type').value
});
map.addLayer(l);
map.setBaseLayer(l);
}

2
examples/ve.html
View File

@@ -21,7 +21,7 @@
var map, velayer, layer;
function init(){
map = new OpenLayers.Map( $('map') ,
map = new OpenLayers.Map( 'map' ,
{controls:[new OpenLayers.Control.MouseDefaults()]});
velayer = new OpenLayers.Layer.VirtualEarth( "VE",

2
examples/wms.html
View File

@@ -16,7 +16,7 @@
var map, layer;
function init(){
map = new OpenLayers.Map( $('map') );
map = new OpenLayers.Map( 'map' );
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);

2
examples/wmst.html
View File

@@ -21,7 +21,7 @@ var map,ia_wms;
"http://wms.jpl.nasa.gov/wms.cgi",
{layers: "modis,global_mosaic"});
ia_wms = new OpenLayers.Layer.WMS("Nexrad","http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi?",{layers:"nexrad-n0r-wmst",transparent:true,format:'image/png',time:document.getElementById('time').value});
ia_wms = new OpenLayers.Layer.WMS("Nexrad","http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi?",{layers:"nexrad-n0r-wmst",transparent:true,format:'image/png',time:OpenLayers.Util.getElement('time').value});
jpl_wms.setVisibility(false);

2
examples/zoomLevels.html
View File

@@ -32,7 +32,7 @@
controls: [new OpenLayers.Control.MouseDefaults()]
};
map = new OpenLayers.Map( $('map') , options);
map = new OpenLayers.Map( 'map' , options);
map.addControl(new OpenLayers.Control.PanZoomBar());

16
lib/OpenLayers/BaseTypes.js
View File

@@ -694,42 +694,42 @@ OpenLayers.Bounds.oppositeQuadrant = function(quadrant) {
OpenLayers.Element = {
visible: function(element) {
return $(element).style.display != 'none';
return OpenLayers.Util.getElement(element).style.display != 'none';
},
toggle: function() {
for (var i = 0; i < arguments.length; i++) {
var element = $(arguments[i]);
var element = OpenLayers.Util.getElement(arguments[i]);
OpenLayers.Element[OpenLayers.Element.visible(element) ? 'hide' : 'show'](element);
}
},
hide: function() {
for (var i = 0; i < arguments.length; i++) {
var element = $(arguments[i]);
var element = OpenLayers.Util.getElement(arguments[i]);
element.style.display = 'none';
}
},
show: function() {
for (var i = 0; i < arguments.length; i++) {
var element = $(arguments[i]);
var element = OpenLayers.Util.getElement(arguments[i]);
element.style.display = '';
}
},
remove: function(element) {
element = $(element);
element = OpenLayers.Util.getElement(element);
element.parentNode.removeChild(element);
},
getHeight: function(element) {
element = $(element);
element = OpenLayers.Util.getElement(element);
return element.offsetHeight;
},
getDimensions: function(element) {
element = $(element);
element = OpenLayers.Util.getElement(element);
if (OpenLayers.Element.getStyle(element, 'display') != 'none')
return {width: element.offsetWidth, height: element.offsetHeight};
@@ -750,7 +750,7 @@ OpenLayers.Element = {
},
getStyle: function(element, style) {
element = $(element);
element = OpenLayers.Util.getElement(element);
var value = element.style[style.camelize()];
if (!value) {
if (document.defaultView && document.defaultView.getComputedStyle) {

2
lib/OpenLayers/Control/Permalink.js
View File

@@ -26,7 +26,7 @@ OpenLayers.Control.Permalink.prototype =
*/
initialize: function(element, base) {
OpenLayers.Control.prototype.initialize.apply(this, arguments);
this.element = element;
this.element = OpenLayers.Util.getElement(element);
if (base) {
this.base = base;
}

2
lib/OpenLayers/Control/Scale.js
View File

@@ -22,7 +22,7 @@ OpenLayers.Control.Scale.prototype =
*/
initialize: function(element) {
OpenLayers.Control.prototype.initialize.apply(this, arguments);
this.element = element;
this.element = OpenLayers.Util.getElement(element);
},
/**

4
lib/OpenLayers/Events.js
View File

@@ -76,7 +76,7 @@ OpenLayers.Event = {
},
observe: function(elementParam, name, observer, useCapture) {
var element = $(elementParam);
var element = OpenLayers.Util.getElement(elementParam);
useCapture = useCapture || false;
if (name == 'keypress' &&
@@ -88,7 +88,7 @@ OpenLayers.Event = {
},
stopObserving: function(elementParam, name, observer, useCapture) {
var element = $(elementParam);
var element = OpenLayers.Util.getElement(elementParam);
useCapture = useCapture || false;
if (name == 'keypress' &&

2
lib/OpenLayers/Layer/Yahoo.js
View File

@@ -68,7 +68,7 @@ OpenLayers.Layer.Yahoo.prototype =
* @private
*/
fixYahooEventPane: function() {
var yahooEventPane = $("ygddfdiv");
var yahooEventPane = OpenLayers.Util.getElement("ygddfdiv");
if (yahooEventPane != null) {
if (yahooEventPane.parentNode != null)
yahooEventPane.parentNode.removeChild(yahooEventPane);

2
lib/OpenLayers/Map.js
View File

@@ -135,7 +135,7 @@ OpenLayers.Map.prototype = {
*/
initialize: function (div, options) {
this.div = div = $(div);
this.div = div = OpenLayers.Util.getElement(div);
// the viewPortDiv is the outermost div we modify
var id = div.id + "_OpenLayers_ViewPort";

24
lib/OpenLayers/Util.js
View File

@@ -8,24 +8,30 @@
*/
OpenLayers.Util = new Object();
/* from Prototype.js */
if ($ == null) {
var $ = function () {
/**
* This is the old $() from prototype
*/
OpenLayers.Util.getElement = function() {
var elements = new Array();
for (var i = 0; i < arguments.length; i++) {
var element = arguments[i];
if (typeof element == 'string')
if (typeof element == 'string') {
element = document.getElementById(element);
if (arguments.length == 1)
}
if (arguments.length == 1) {
return element;
}
elements.push(element);
}
return elements;
}
};
/**
* Maintain $() from prototype
*/
if ($ == null) {
var $ = OpenLayers.Util.getElement;
}
/* from Prototype.js */

5
lib/Rico/Color.js
View File

@@ -110,7 +110,10 @@ shortHexCode.charAt(i));
*/
OpenLayers.Rico.Color.createColorFromBackground = function(elem) {
var actualColor = RicoUtil.getElementsComputedStyle($(elem), "backgroundColor", "background-color");
var actualColor =
RicoUtil.getElementsComputedStyle(OpenLayers.Util.getElement(elem),
"backgroundColor",
"background-color");
if ( actualColor == "transparent" && elem.parentNode )
return OpenLayers.Rico.Color.createColorFromBackground(elem.parentNode);

2
lib/Rico/Corner.js
View File

@@ -18,7 +18,7 @@ OpenLayers.Rico = new Object();
OpenLayers.Rico.Corner = {
round: function(e, options) {
var e = $(e);
e = OpenLayers.Util.getElement(e);
this._setOptions(options);
var color = this.options.color;

4
tests/test_Control_LayerSwitcher.html
View File

@@ -68,13 +68,13 @@
map.addControl(control);
var wmsInput = $("input_" + layer.name);
var wmsInput = OpenLayers.Util.getElement("input_" + layer.name);
t.ok(wmsInput != null, "correctly makes an input for wms layer");
t.eq(wmsInput.type, "radio", "wms correctly made a radio button");
t.eq(wmsInput.name, "baseLayers", "wms correctly named");
t.eq(wmsInput.value, layer.name, "wms correctly valued");
var markersInput = $("input_" + markers.name);
var markersInput = OpenLayers.Util.getElement("input_" + markers.name);
t.ok(markersInput != null, "correctly makes an input for markers layer");
t.eq(markersInput.type, "checkbox", "wms correctly made a radio button");
t.eq(markersInput.name, markers.name, "wms correctly named");

20
tests/test_Control_Permalink.html
View File

@@ -12,39 +12,41 @@
function test_02_Control_Permalink_updateLinks (t) {
t.plan( 2 );
control = new OpenLayers.Control.Permalink($('permalink'));
control = new OpenLayers.Control.Permalink('permalink');
t.ok( control instanceof OpenLayers.Control.Permalink, "new OpenLayers.Control returns object" );
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
map.addLayer(layer);
if (!map.getCenter()) map.zoomToMaxExtent();
map.addControl(control);
map.pan(5, 0);
var pm = OpenLayers.Util.getElement('permalink');
if (/MSIE/.test(navigator.userAgent)) {
t.eq($('permalink').href, "?lat=0&lon=1.75781&zoom=2&layers=B", "Panning sets permalink");
t.eq(pm.href, "?lat=0&lon=1.75781&zoom=2&layers=B", "Panning sets permalink");
} else {
t.eq($('permalink').href, location+"?lat=0&lon=1.75781&zoom=2&layers=B", "Panning sets permalink");
t.eq(pm.href, location+"?lat=0&lon=1.75781&zoom=2&layers=B", "Panning sets permalink");
}
}
function test_03_Control_Permalink_updateLinksBase (t) {
t.plan( 2 );
control = new OpenLayers.Control.Permalink($('permalink'), "./edit.html" );
control = new OpenLayers.Control.Permalink('permalink', "./edit.html" );
t.ok( control instanceof OpenLayers.Control.Permalink, "new OpenLayers.Control returns object" );
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
map.addLayer(layer);
if (!map.getCenter()) map.zoomToMaxExtent();
map.addControl(control);
map.pan(5, 0);
$('edit_permalink').href = './edit.html?lat=0&lon=1.75781&zoom=2&layers=B';
t.eq($('permalink').href, $('edit_permalink').href, "Panning sets permalink with base");
var edit_pm = OpenLayers.Util.getElement('edit_permalink');
edit_pm.href = './edit.html?lat=0&lon=1.75781&zoom=2&layers=B';
t.eq(OpenLayers.Util.getElement('permalink').href, edit_pm.href, "Panning sets permalink with base");
}
function test_04_Control_Permalink_noElement (t) {
t.plan( 2 );
control = new OpenLayers.Control.Permalink( );
t.ok( control instanceof OpenLayers.Control.Permalink, "new OpenLayers.Control returns object" );
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
map.addControl(control);
t.eq(map.controls[3].div.firstChild.nodeName, "A", "Permalink control creates div with 'a' inside." );
}

13
tests/test_Control_Scale.html
View File

@@ -12,25 +12,26 @@
function test_02_Control_Scale_updateScale (t) {
t.plan( 4 );
control = new OpenLayers.Control.Scale($('scale'));
control = new OpenLayers.Control.Scale('scale');
t.ok( control instanceof OpenLayers.Control.Scale, "new OpenLayers.Control returns object" );
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
map.addLayer(layer);
map.zoomTo(0);
map.addControl(control);
t.eq($('scale').innerHTML, "Scale = 1 : 443M", "Scale set by default." );
var scaleElem = OpenLayers.Util.getElement('scale');
t.eq(scaleElem.innerHTML, "Scale = 1 : 443M", "Scale set by default." );
map.zoomIn();
t.eq($('scale').innerHTML, "Scale = 1 : 221M", "Zooming in changes scale" );
t.eq(scaleElem.innerHTML, "Scale = 1 : 221M", "Zooming in changes scale" );
map.baseLayer.resolutions = [OpenLayers.Util.getResolutionFromScale(110)];
map.zoomTo(0);
t.eq($('scale').innerHTML, "Scale = 1 : 110", "Scale of 100 isn't rounded" );
t.eq(scaleElem.innerHTML, "Scale = 1 : 110", "Scale of 100 isn't rounded" );
}
function test_03_Control_Scale_internalScale (t) {
t.plan(2);
control = new OpenLayers.Control.Scale();
t.ok( control instanceof OpenLayers.Control.Scale, "new OpenLayers.Control returns object" );
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
map.addLayer(layer);
map.zoomTo(0);

8
tests/test_Events.html
View File

@@ -7,7 +7,7 @@
var a;
function test_01_Events_constructor (t) {
var mapDiv = $('map');
var mapDiv = OpenLayers.Util.getElement('map');
var obj = {result: 0};
var eventTypes = ["doThingA", "doThingB", "doThingC"];
var browserTypes = OpenLayers.Events.prototype.BROWSER_EVENTS;
@@ -44,7 +44,7 @@
t.plan( 18 );
var mapDiv = $('map');
var mapDiv = OpenLayers.Util.getElement('map');
var obj = {result: 0};
var eventTypes = ["doThingA", "doThingB", "doThingC"];
@@ -127,7 +127,7 @@
t.plan( 2 );
var mapDiv = $('map');
var mapDiv = OpenLayers.Util.getElement('map');
var obj = {result: 0};
var eventTypes = ["doThingA", "doThingB", "doThingC"];
@@ -154,7 +154,7 @@
t.plan( 6 );
var mapDiv = $('map');
var mapDiv = OpenLayers.Util.getElement('map');
var obj = {result: 0};
var eventTypes = ["doThingA", "doThingB", "doThingC"];

2
tests/test_Layer_Grid.html
View File

@@ -32,7 +32,7 @@
function test_02_Layer_Grid_inittiles (t) {
t.plan( 2 );
var map = new OpenLayers.Map($('map'));
var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS(name, url, params);
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);

2
tests/test_Layer_KaMap.html
View File

@@ -26,7 +26,7 @@
function test_02_Layer_KaMap_inittiles (t) {
t.plan( 2 );
var map = new OpenLayers.Map($('map'));
var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);

4
tests/test_Layer_WMS.html
View File

@@ -31,7 +31,7 @@
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
layer = new OpenLayers.Layer.WMS(name, url, params);
var map = new OpenLayers.Map($('map'));
var map = new OpenLayers.Map('map');
map.addLayer(layer);
var pixel = new OpenLayers.Pixel(5,6);
var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel);
@@ -66,7 +66,7 @@
function test_03_Layer_WMS_inittiles (t) {
t.plan( 2 );
var map = new OpenLayers.Map($('map'));
var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS(name, url, params);
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);

24
tests/test_Map.html
View File

@@ -7,7 +7,7 @@
function test_01_Map_constructor (t) {
t.plan( 9 );
map = new OpenLayers.Map('map'); // no longer need to call $(), constructor does it
map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"});
@@ -31,7 +31,7 @@
}
function test_02_Map_center(t) {
t.plan(3);
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"});
@@ -44,7 +44,7 @@
}
function test_03_Map_add_layers(t) {
t.plan(6);
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
var layer1 = new OpenLayers.Layer.WMS("Layer 1",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"});
@@ -63,14 +63,14 @@
}
function test_04_Map_options(t) {
t.plan(3);
map = new OpenLayers.Map($('map'), {numZoomLevels: 6, maxResolution: 3.14159, theme: 'foo'});
map = new OpenLayers.Map('map', {numZoomLevels: 6, maxResolution: 3.14159, theme: 'foo'});
t.eq( map.numZoomLevels, 6, "map.numZoomLevels set correctly via options hashtable" );
t.eq( map.maxResolution, 3.14159, "map.maxResolution set correctly via options hashtable" );
t.eq( map.theme, 'foo', "map theme set correctly." );
}
function test_05_Map_center(t) {
t.plan(4);
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"} );
@@ -159,7 +159,7 @@
function 08_Map_px_lonlat_translation (t) {
t.plan( 6 );
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"});
@@ -190,7 +190,7 @@
*/
function test_09_Map_isValidLonLat(t) {
t.plan( 3 );
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer',
"http://octo.metacarta.com/cgi-bin/mapserv",
{map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'},
@@ -204,7 +204,7 @@
function test_10_Map_getLayer(t) {
t.plan( 2 );
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer',
"http://octo.metacarta.com/cgi-bin/mapserv",
{map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'},
@@ -237,7 +237,7 @@
function test_10_Map_setBaseLayer(t) {
t.plan( 4 );
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
var wmslayer = new OpenLayers.Layer.WMS('Test Layer',
"http://octo.metacarta.com/cgi-bin/mapserv",
@@ -267,7 +267,7 @@
function test_12_Map_moveLayer (t) {
t.plan(10);
var ct = 0;
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
var wmslayer = new OpenLayers.Layer.WMS('Test Layer',
"http://octo.metacarta.com/cgi-bin/mapserv",
{map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'},
@@ -305,7 +305,7 @@
function test_08_Map_setCenter(t) {
t.plan(1);
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"},
@@ -319,7 +319,7 @@
function test_99_Map_destroy (t) {
t.plan( 2 );
map = new OpenLayers.Map($('map'));
map = new OpenLayers.Map('map');
map.destroy();
t.eq( map.layers, null, "map.layers is null after destroy" );
t.eq( map.controls, null, "map.controls is null after destroy" );