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

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

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",

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))
);
}
// -->

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",

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'},

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>

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>

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} );

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(){

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);

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 + ")" );

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);

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");

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"];

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':

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));

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,9 +24,15 @@
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});
map.addLayer(l);
map.setBaseLayer(l);
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);
}
// -->
</script>

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",

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);

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);

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());