Merge pull request #43 from tschaub/undeprecated
Move deprecated methods from main lib. To use deprecated methods and classes in your application, add the deprecated.js script to your build profile.
This commit is contained in:
Tim Schaub
@@ -11,3 +11,4 @@
|
||||
Firebug
|
||||
OpenLayers.js
|
||||
OpenLayers/Lang
|
||||
deprecated.js
|
||||
|
||||
@@ -16,14 +16,6 @@
|
||||
background-color:white;
|
||||
}
|
||||
|
||||
.olControlPanel .olControlMouseDefaultsItemActive {
|
||||
background-color: blue;
|
||||
background-image: url("../theme/default/img/pan_on.png");
|
||||
}
|
||||
.olControlPanel .olControlMouseDefaultsItemInactive {
|
||||
background-color: orange;
|
||||
background-image: url("../theme/default/img/pan_off.png");
|
||||
}
|
||||
.olControlPanel .olControlDrawFeatureItemActive {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
@@ -75,8 +67,6 @@
|
||||
{title:"Zoom box: Selecting it you can zoom on an area by clicking and dragging."});
|
||||
var panel = new OpenLayers.Control.Panel({defaultControl: zb});
|
||||
panel.addControls([
|
||||
new OpenLayers.Control.MouseDefaults(
|
||||
{title:'You can use the default mouse configuration'}),
|
||||
zb,
|
||||
new OpenLayers.Control.DrawFeature(vlayer, OpenLayers.Handler.Path,
|
||||
{title:'Draw a feature'}),
|
||||
|
||||
@@ -40,9 +40,7 @@
|
||||
</p>
|
||||
<div id="map" class="smallmap"></div>
|
||||
<div id="docs">
|
||||
An untiled layer will only request a single image at a time.
|
||||
This is equivalent to using the deprecated
|
||||
OpenLayers.Layer.WMS.Untiled class, which will be removed at 3.0.
|
||||
An untiled (with singleTile: true) layer will only request a single image at a time.
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
/* Map with raster coordinates (pixels) from Zoomify image */
|
||||
var options = {
|
||||
controls: [],
|
||||
maxExtent: new OpenLayers.Bounds(0, 0, zoomify_width, zoomify_height),
|
||||
maxResolution: Math.pow(2, zoomify.numberOfTiers-1 ),
|
||||
numZoomLevels: zoomify.numberOfTiers,
|
||||
@@ -33,11 +32,6 @@
|
||||
map = new OpenLayers.Map("map", options);
|
||||
map.addLayer(zoomify);
|
||||
|
||||
map.addControl(new OpenLayers.Control.MousePosition());
|
||||
map.addControl(new OpenLayers.Control.PanZoomBar());
|
||||
map.addControl(new OpenLayers.Control.MouseDefaults());
|
||||
map.addControl(new OpenLayers.Control.KeyboardDefaults());
|
||||
|
||||
map.setBaseLayer(zoomify);
|
||||
map.zoomToMaxExtent();
|
||||
};
|
||||
|
||||
@@ -109,7 +109,6 @@
|
||||
"OpenLayers/Kinetic.js",
|
||||
"Rico/Corner.js",
|
||||
"Rico/Color.js",
|
||||
"OpenLayers/Ajax.js",
|
||||
"OpenLayers/Events.js",
|
||||
"OpenLayers/Request.js",
|
||||
"OpenLayers/Request/XMLHttpRequest.js",
|
||||
@@ -136,7 +135,6 @@
|
||||
"OpenLayers/Layer/Grid.js",
|
||||
"OpenLayers/Layer/MapGuide.js",
|
||||
"OpenLayers/Layer/MapServer.js",
|
||||
"OpenLayers/Layer/MapServer/Untiled.js",
|
||||
"OpenLayers/Layer/KaMap.js",
|
||||
"OpenLayers/Layer/KaMapCache.js",
|
||||
"OpenLayers/Layer/MultiMap.js",
|
||||
@@ -145,8 +143,6 @@
|
||||
"OpenLayers/Layer/WorldWind.js",
|
||||
"OpenLayers/Layer/ArcGIS93Rest.js",
|
||||
"OpenLayers/Layer/WMS.js",
|
||||
"OpenLayers/Layer/WMS/Untiled.js",
|
||||
"OpenLayers/Layer/WMS/Post.js",
|
||||
"OpenLayers/Layer/WMTS.js",
|
||||
"OpenLayers/Layer/ArcIMS.js",
|
||||
"OpenLayers/Layer/GeoRSS.js",
|
||||
@@ -186,7 +182,6 @@
|
||||
"OpenLayers/Control/Navigation.js",
|
||||
"OpenLayers/Control/PinchZoom.js",
|
||||
"OpenLayers/Control/TouchNavigation.js",
|
||||
"OpenLayers/Control/MouseDefaults.js",
|
||||
"OpenLayers/Control/MousePosition.js",
|
||||
"OpenLayers/Control/OverviewMap.js",
|
||||
"OpenLayers/Control/KeyboardDefaults.js",
|
||||
@@ -344,7 +339,6 @@
|
||||
"OpenLayers/Format/OGCExceptionReport.js",
|
||||
"OpenLayers/Layer/WFS.js",
|
||||
"OpenLayers/Control/GetFeature.js",
|
||||
"OpenLayers/Control/MouseToolbar.js",
|
||||
"OpenLayers/Control/NavToolbar.js",
|
||||
"OpenLayers/Control/PanPanel.js",
|
||||
"OpenLayers/Control/Pan.js",
|
||||
|
||||
@@ -1,679 +0,0 @@
|
||||
/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
|
||||
* full list of contributors). Published under the Clear BSD license.
|
||||
* See http://svn.openlayers.org/trunk/openlayers/license.txt for the
|
||||
* full text of the license. */
|
||||
|
||||
/**
|
||||
* @requires OpenLayers/Request/XMLHttpRequest.js
|
||||
* @requires OpenLayers/Console.js
|
||||
* @requires OpenLayers/Lang.js
|
||||
*/
|
||||
|
||||
OpenLayers.ProxyHost = "";
|
||||
//OpenLayers.ProxyHost = "examples/proxy.cgi?url=";
|
||||
|
||||
/**
|
||||
* Ajax reader for OpenLayers
|
||||
*
|
||||
* @uri url to do remote XML http get
|
||||
* @param {String} 'get' format params (x=y&a=b...)
|
||||
* @who object to handle callbacks for this request
|
||||
* @complete the function to be called on success
|
||||
* @failure the function to be called on failure
|
||||
*
|
||||
* example usage from a caller:
|
||||
*
|
||||
* caps: function(request) {
|
||||
* -blah-
|
||||
* },
|
||||
*
|
||||
* OpenLayers.loadURL(url,params,this,caps);
|
||||
*
|
||||
* Notice the above example does not provide an error handler; a default empty
|
||||
* handler is provided which merely logs the error if a failure handler is not
|
||||
* supplied
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* Function: OpenLayers.nullHandler
|
||||
* @param {} request
|
||||
*/
|
||||
OpenLayers.nullHandler = function(request) {
|
||||
OpenLayers.Console.userError(OpenLayers.i18n("unhandledRequest", {'statusText':request.statusText}));
|
||||
};
|
||||
|
||||
/**
|
||||
* APIFunction: OpenLayers.loadURL
|
||||
* Background load a document.
|
||||
* *Deprecated*. Use <OpenLayers.Request.GET> method instead.
|
||||
*
|
||||
* Parameters:
|
||||
* uri - {String} URI of source doc
|
||||
* params - {String} or {Object} GET params. Either a string in the form
|
||||
* "?hello=world&foo=bar" (do not forget the leading question mark)
|
||||
* or an object in the form {'hello': 'world', 'foo': 'bar}
|
||||
* caller - {Object} object which gets callbacks
|
||||
* onComplete - {Function} Optional callback for success. The callback
|
||||
* will be called with this set to caller and will receive the request
|
||||
* object as an argument. Note that if you do not specify an onComplete
|
||||
* function, <OpenLayers.nullHandler> will be called (which pops up a
|
||||
* user friendly error message dialog).
|
||||
* onFailure - {Function} Optional callback for failure. In the event of
|
||||
* a failure, the callback will be called with this set to caller and will
|
||||
* receive the request object as an argument. Note that if you do not
|
||||
* specify an onComplete function, <OpenLayers.nullHandler> will be called
|
||||
* (which pops up a user friendly error message dialog).
|
||||
*
|
||||
* Returns:
|
||||
* {<OpenLayers.Request.XMLHttpRequest>} The request object. To abort loading,
|
||||
* call request.abort().
|
||||
*/
|
||||
OpenLayers.loadURL = function(uri, params, caller,
|
||||
onComplete, onFailure) {
|
||||
|
||||
if(typeof params == 'string') {
|
||||
params = OpenLayers.Util.getParameters(params);
|
||||
}
|
||||
var success = (onComplete) ? onComplete : OpenLayers.nullHandler;
|
||||
var failure = (onFailure) ? onFailure : OpenLayers.nullHandler;
|
||||
|
||||
return OpenLayers.Request.GET({
|
||||
url: uri, params: params,
|
||||
success: success, failure: failure, scope: caller
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Function: OpenLayers.parseXMLString
|
||||
* Parse XML into a doc structure
|
||||
*
|
||||
* Parameters:
|
||||
* text - {String}
|
||||
*
|
||||
* Returns:
|
||||
* {?} Parsed AJAX Responsev
|
||||
*/
|
||||
OpenLayers.parseXMLString = function(text) {
|
||||
|
||||
//MS sucks, if the server is bad it dies
|
||||
var index = text.indexOf('<');
|
||||
if (index > 0) {
|
||||
text = text.substring(index);
|
||||
}
|
||||
|
||||
var ajaxResponse = OpenLayers.Util.Try(
|
||||
function() {
|
||||
var xmldom = new ActiveXObject('Microsoft.XMLDOM');
|
||||
xmldom.loadXML(text);
|
||||
return xmldom;
|
||||
},
|
||||
function() {
|
||||
return new DOMParser().parseFromString(text, 'text/xml');
|
||||
},
|
||||
function() {
|
||||
var req = new XMLHttpRequest();
|
||||
req.open("GET", "data:" + "text/xml" +
|
||||
";charset=utf-8," + encodeURIComponent(text), false);
|
||||
if (req.overrideMimeType) {
|
||||
req.overrideMimeType("text/xml");
|
||||
}
|
||||
req.send(null);
|
||||
return req.responseXML;
|
||||
}
|
||||
);
|
||||
|
||||
return ajaxResponse;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Namespace: OpenLayers.Ajax
|
||||
*/
|
||||
OpenLayers.Ajax = {
|
||||
|
||||
/**
|
||||
* Method: emptyFunction
|
||||
*/
|
||||
emptyFunction: function () {},
|
||||
|
||||
/**
|
||||
* Method: getTransport
|
||||
*
|
||||
* Returns:
|
||||
* {Object} Transport mechanism for whichever browser we're in, or false if
|
||||
* none available.
|
||||
*/
|
||||
getTransport: function() {
|
||||
return OpenLayers.Util.Try(
|
||||
function() {return new XMLHttpRequest();},
|
||||
function() {return new ActiveXObject('Msxml2.XMLHTTP');},
|
||||
function() {return new ActiveXObject('Microsoft.XMLHTTP');}
|
||||
) || false;
|
||||
},
|
||||
|
||||
/**
|
||||
* Property: activeRequestCount
|
||||
* {Integer}
|
||||
*/
|
||||
activeRequestCount: 0
|
||||
};
|
||||
|
||||
/**
|
||||
* Namespace: OpenLayers.Ajax.Responders
|
||||
* {Object}
|
||||
*/
|
||||
OpenLayers.Ajax.Responders = {
|
||||
|
||||
/**
|
||||
* Property: responders
|
||||
* {Array}
|
||||
*/
|
||||
responders: [],
|
||||
|
||||
/**
|
||||
* Method: register
|
||||
*
|
||||
* Parameters:
|
||||
* responderToAdd - {?}
|
||||
*/
|
||||
register: function(responderToAdd) {
|
||||
for (var i = 0; i < this.responders.length; i++){
|
||||
if (responderToAdd == this.responders[i]){
|
||||
return;
|
||||
}
|
||||
}
|
||||
this.responders.push(responderToAdd);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: unregister
|
||||
*
|
||||
* Parameters:
|
||||
* responderToRemove - {?}
|
||||
*/
|
||||
unregister: function(responderToRemove) {
|
||||
OpenLayers.Util.removeItem(this.reponders, responderToRemove);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: dispatch
|
||||
*
|
||||
* Parameters:
|
||||
* callback - {?}
|
||||
* request - {?}
|
||||
* transport - {?}
|
||||
*/
|
||||
dispatch: function(callback, request, transport) {
|
||||
var responder;
|
||||
for (var i = 0; i < this.responders.length; i++) {
|
||||
responder = this.responders[i];
|
||||
|
||||
if (responder[callback] &&
|
||||
typeof responder[callback] == 'function') {
|
||||
try {
|
||||
responder[callback].apply(responder,
|
||||
[request, transport]);
|
||||
} catch (e) {}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
OpenLayers.Ajax.Responders.register({
|
||||
/**
|
||||
* Function: onCreate
|
||||
*/
|
||||
onCreate: function() {
|
||||
OpenLayers.Ajax.activeRequestCount++;
|
||||
},
|
||||
|
||||
/**
|
||||
* Function: onComplete
|
||||
*/
|
||||
onComplete: function() {
|
||||
OpenLayers.Ajax.activeRequestCount--;
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* Class: OpenLayers.Ajax.Base
|
||||
*/
|
||||
OpenLayers.Ajax.Base = OpenLayers.Class({
|
||||
|
||||
/**
|
||||
* Constructor: OpenLayers.Ajax.Base
|
||||
*
|
||||
* Parameters:
|
||||
* options - {Object}
|
||||
*/
|
||||
initialize: function(options) {
|
||||
this.options = {
|
||||
method: 'post',
|
||||
asynchronous: true,
|
||||
contentType: 'application/xml',
|
||||
parameters: ''
|
||||
};
|
||||
OpenLayers.Util.extend(this.options, options || {});
|
||||
|
||||
this.options.method = this.options.method.toLowerCase();
|
||||
|
||||
if (typeof this.options.parameters == 'string') {
|
||||
this.options.parameters =
|
||||
OpenLayers.Util.getParameters(this.options.parameters);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* Class: OpenLayers.Ajax.Request
|
||||
* *Deprecated*. Use <OpenLayers.Request> method instead.
|
||||
*
|
||||
* Inherit:
|
||||
* - <OpenLayers.Ajax.Base>
|
||||
*/
|
||||
OpenLayers.Ajax.Request = OpenLayers.Class(OpenLayers.Ajax.Base, {
|
||||
|
||||
/**
|
||||
* Property: _complete
|
||||
*
|
||||
* {Boolean}
|
||||
*/
|
||||
_complete: false,
|
||||
|
||||
/**
|
||||
* Constructor: OpenLayers.Ajax.Request
|
||||
*
|
||||
* Parameters:
|
||||
* url - {String}
|
||||
* options - {Object}
|
||||
*/
|
||||
initialize: function(url, options) {
|
||||
OpenLayers.Ajax.Base.prototype.initialize.apply(this, [options]);
|
||||
|
||||
if (OpenLayers.ProxyHost && OpenLayers.String.startsWith(url, "http")) {
|
||||
url = OpenLayers.ProxyHost + encodeURIComponent(url);
|
||||
}
|
||||
|
||||
this.transport = OpenLayers.Ajax.getTransport();
|
||||
this.request(url);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: request
|
||||
*
|
||||
* Parameters:
|
||||
* url - {String}
|
||||
*/
|
||||
request: function(url) {
|
||||
this.url = url;
|
||||
this.method = this.options.method;
|
||||
var params = OpenLayers.Util.extend({}, this.options.parameters);
|
||||
|
||||
if (this.method != 'get' && this.method != 'post') {
|
||||
// simulate other verbs over post
|
||||
params['_method'] = this.method;
|
||||
this.method = 'post';
|
||||
}
|
||||
|
||||
this.parameters = params;
|
||||
|
||||
if (params = OpenLayers.Util.getParameterString(params)) {
|
||||
// when GET, append parameters to URL
|
||||
if (this.method == 'get') {
|
||||
this.url += ((this.url.indexOf('?') > -1) ? '&' : '?') + params;
|
||||
} else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
|
||||
params += '&_=';
|
||||
}
|
||||
}
|
||||
try {
|
||||
var response = new OpenLayers.Ajax.Response(this);
|
||||
if (this.options.onCreate) {
|
||||
this.options.onCreate(response);
|
||||
}
|
||||
|
||||
OpenLayers.Ajax.Responders.dispatch('onCreate',
|
||||
this,
|
||||
response);
|
||||
|
||||
this.transport.open(this.method.toUpperCase(),
|
||||
this.url,
|
||||
this.options.asynchronous);
|
||||
|
||||
if (this.options.asynchronous) {
|
||||
window.setTimeout(
|
||||
OpenLayers.Function.bind(this.respondToReadyState, this, 1),
|
||||
10);
|
||||
}
|
||||
|
||||
this.transport.onreadystatechange =
|
||||
OpenLayers.Function.bind(this.onStateChange, this);
|
||||
this.setRequestHeaders();
|
||||
|
||||
this.body = this.method == 'post' ?
|
||||
(this.options.postBody || params) : null;
|
||||
this.transport.send(this.body);
|
||||
|
||||
// Force Firefox to handle ready state 4 for synchronous requests
|
||||
if (!this.options.asynchronous &&
|
||||
this.transport.overrideMimeType) {
|
||||
this.onStateChange();
|
||||
}
|
||||
} catch (e) {
|
||||
this.dispatchException(e);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: onStateChange
|
||||
*/
|
||||
onStateChange: function() {
|
||||
var readyState = this.transport.readyState;
|
||||
if (readyState > 1 && !((readyState == 4) && this._complete)) {
|
||||
this.respondToReadyState(this.transport.readyState);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: setRequestHeaders
|
||||
*/
|
||||
setRequestHeaders: function() {
|
||||
var headers = {
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
'Accept': 'text/javascript, text/html, application/xml, text/xml, */*',
|
||||
'OpenLayers': true
|
||||
};
|
||||
|
||||
if (this.method == 'post') {
|
||||
headers['Content-type'] = this.options.contentType +
|
||||
(this.options.encoding ? '; charset=' + this.options.encoding : '');
|
||||
|
||||
/* Force "Connection: close" for older Mozilla browsers to work
|
||||
* around a bug where XMLHttpRequest sends an incorrect
|
||||
* Content-length header. See Mozilla Bugzilla #246651.
|
||||
*/
|
||||
if (this.transport.overrideMimeType &&
|
||||
(navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005) {
|
||||
headers['Connection'] = 'close';
|
||||
}
|
||||
}
|
||||
// user-defined headers
|
||||
if (typeof this.options.requestHeaders == 'object') {
|
||||
var extras = this.options.requestHeaders;
|
||||
|
||||
if (typeof extras.push == 'function') {
|
||||
for (var i = 0, length = extras.length; i < length; i += 2) {
|
||||
headers[extras[i]] = extras[i+1];
|
||||
}
|
||||
} else {
|
||||
for (var i in extras) {
|
||||
headers[i] = extras[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (var name in headers) {
|
||||
this.transport.setRequestHeader(name, headers[name]);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: success
|
||||
*
|
||||
* Returns:
|
||||
* {Boolean} -
|
||||
*/
|
||||
success: function() {
|
||||
var status = this.getStatus();
|
||||
return !status || (status >=200 && status < 300);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: getStatus
|
||||
*
|
||||
* Returns:
|
||||
* {Integer} - Status
|
||||
*/
|
||||
getStatus: function() {
|
||||
try {
|
||||
return this.transport.status || 0;
|
||||
} catch (e) {
|
||||
return 0;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: respondToReadyState
|
||||
*
|
||||
* Parameters:
|
||||
* readyState - {?}
|
||||
*/
|
||||
respondToReadyState: function(readyState) {
|
||||
var state = OpenLayers.Ajax.Request.Events[readyState];
|
||||
var response = new OpenLayers.Ajax.Response(this);
|
||||
|
||||
if (state == 'Complete') {
|
||||
try {
|
||||
this._complete = true;
|
||||
(this.options['on' + response.status] ||
|
||||
this.options['on' + (this.success() ? 'Success' : 'Failure')] ||
|
||||
OpenLayers.Ajax.emptyFunction)(response);
|
||||
} catch (e) {
|
||||
this.dispatchException(e);
|
||||
}
|
||||
|
||||
var contentType = response.getHeader('Content-type');
|
||||
}
|
||||
|
||||
try {
|
||||
(this.options['on' + state] ||
|
||||
OpenLayers.Ajax.emptyFunction)(response);
|
||||
OpenLayers.Ajax.Responders.dispatch('on' + state,
|
||||
this,
|
||||
response);
|
||||
} catch (e) {
|
||||
this.dispatchException(e);
|
||||
}
|
||||
|
||||
if (state == 'Complete') {
|
||||
// avoid memory leak in MSIE: clean up
|
||||
this.transport.onreadystatechange = OpenLayers.Ajax.emptyFunction;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: getHeader
|
||||
*
|
||||
* Parameters:
|
||||
* name - {String} Header name
|
||||
*
|
||||
* Returns:
|
||||
* {?} - response header for the given name
|
||||
*/
|
||||
getHeader: function(name) {
|
||||
try {
|
||||
return this.transport.getResponseHeader(name);
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: dispatchException
|
||||
* If the optional onException function is set, execute it
|
||||
* and then dispatch the call to any other listener registered
|
||||
* for onException.
|
||||
*
|
||||
* If no optional onException function is set, we suspect that
|
||||
* the user may have also not used
|
||||
* OpenLayers.Ajax.Responders.register to register a listener
|
||||
* for the onException call. To make sure that something
|
||||
* gets done with this exception, only dispatch the call if there
|
||||
* are listeners.
|
||||
*
|
||||
* If you explicitly want to swallow exceptions, set
|
||||
* request.options.onException to an empty function (function(){})
|
||||
* or register an empty function with <OpenLayers.Ajax.Responders>
|
||||
* for onException.
|
||||
*
|
||||
* Parameters:
|
||||
* exception - {?}
|
||||
*/
|
||||
dispatchException: function(exception) {
|
||||
var handler = this.options.onException;
|
||||
if(handler) {
|
||||
// call options.onException and alert any other listeners
|
||||
handler(this, exception);
|
||||
OpenLayers.Ajax.Responders.dispatch('onException', this, exception);
|
||||
} else {
|
||||
// check if there are any other listeners
|
||||
var listener = false;
|
||||
var responders = OpenLayers.Ajax.Responders.responders;
|
||||
for (var i = 0; i < responders.length; i++) {
|
||||
if(responders[i].onException) {
|
||||
listener = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(listener) {
|
||||
// call all listeners
|
||||
OpenLayers.Ajax.Responders.dispatch('onException', this, exception);
|
||||
} else {
|
||||
// let the exception through
|
||||
throw exception;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* Property: Events
|
||||
* {Array(String)}
|
||||
*/
|
||||
OpenLayers.Ajax.Request.Events =
|
||||
['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
|
||||
|
||||
/**
|
||||
* Class: OpenLayers.Ajax.Response
|
||||
*/
|
||||
OpenLayers.Ajax.Response = OpenLayers.Class({
|
||||
|
||||
/**
|
||||
* Property: status
|
||||
*
|
||||
* {Integer}
|
||||
*/
|
||||
status: 0,
|
||||
|
||||
|
||||
/**
|
||||
* Property: statusText
|
||||
*
|
||||
* {String}
|
||||
*/
|
||||
statusText: '',
|
||||
|
||||
/**
|
||||
* Constructor: OpenLayers.Ajax.Response
|
||||
*
|
||||
* Parameters:
|
||||
* request - {Object}
|
||||
*/
|
||||
initialize: function(request) {
|
||||
this.request = request;
|
||||
var transport = this.transport = request.transport,
|
||||
readyState = this.readyState = transport.readyState;
|
||||
|
||||
if ((readyState > 2 &&
|
||||
!(!!(window.attachEvent && !window.opera))) ||
|
||||
readyState == 4) {
|
||||
this.status = this.getStatus();
|
||||
this.statusText = this.getStatusText();
|
||||
this.responseText = transport.responseText == null ?
|
||||
'' : String(transport.responseText);
|
||||
}
|
||||
|
||||
if(readyState == 4) {
|
||||
var xml = transport.responseXML;
|
||||
this.responseXML = xml === undefined ? null : xml;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: getStatus
|
||||
*/
|
||||
getStatus: OpenLayers.Ajax.Request.prototype.getStatus,
|
||||
|
||||
/**
|
||||
* Method: getStatustext
|
||||
*
|
||||
* Returns:
|
||||
* {String} - statusText
|
||||
*/
|
||||
getStatusText: function() {
|
||||
try {
|
||||
return this.transport.statusText || '';
|
||||
} catch (e) {
|
||||
return '';
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: getHeader
|
||||
*/
|
||||
getHeader: OpenLayers.Ajax.Request.prototype.getHeader,
|
||||
|
||||
/**
|
||||
* Method: getResponseHeader
|
||||
*
|
||||
* Returns:
|
||||
* {?} - response header for given name
|
||||
*/
|
||||
getResponseHeader: function(name) {
|
||||
return this.transport.getResponseHeader(name);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
* Function: getElementsByTagNameNS
|
||||
*
|
||||
* Parameters:
|
||||
* parentnode - {?}
|
||||
* nsuri - {?}
|
||||
* nsprefix - {?}
|
||||
* tagname - {?}
|
||||
*
|
||||
* Returns:
|
||||
* {?}
|
||||
*/
|
||||
OpenLayers.Ajax.getElementsByTagNameNS = function(parentnode, nsuri,
|
||||
nsprefix, tagname) {
|
||||
var elem = null;
|
||||
if (parentnode.getElementsByTagNameNS) {
|
||||
elem = parentnode.getElementsByTagNameNS(nsuri, tagname);
|
||||
} else {
|
||||
elem = parentnode.getElementsByTagName(nsprefix + ':' + tagname);
|
||||
}
|
||||
return elem;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Function: serializeXMLToString
|
||||
* Wrapper function around XMLSerializer, which doesn't exist/work in
|
||||
* IE/Safari. We need to come up with a way to serialize in those browser:
|
||||
* for now, these browsers will just fail. #535, #536
|
||||
*
|
||||
* Parameters:
|
||||
* xmldom {XMLNode} xml dom to serialize
|
||||
*
|
||||
* Returns:
|
||||
* {?}
|
||||
*/
|
||||
OpenLayers.Ajax.serializeXMLToString = function(xmldom) {
|
||||
var serializer = new XMLSerializer();
|
||||
var data = serializer.serializeToString(xmldom);
|
||||
return data;
|
||||
};
|
||||
@@ -198,75 +198,6 @@ OpenLayers.String = {
|
||||
|
||||
};
|
||||
|
||||
if (!String.prototype.startsWith) {
|
||||
/**
|
||||
* APIMethod: String.startsWith
|
||||
* *Deprecated*. Whether or not a string starts with another string.
|
||||
*
|
||||
* Parameters:
|
||||
* sStart - {String} The string we're testing for.
|
||||
*
|
||||
* Returns:
|
||||
* {Boolean} Whether or not this string starts with the string passed in.
|
||||
*/
|
||||
String.prototype.startsWith = function(sStart) {
|
||||
OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
|
||||
{'newMethod':'OpenLayers.String.startsWith'}));
|
||||
return OpenLayers.String.startsWith(this, sStart);
|
||||
};
|
||||
}
|
||||
|
||||
if (!String.prototype.contains) {
|
||||
/**
|
||||
* APIMethod: String.contains
|
||||
* *Deprecated*. Whether or not a string contains another string.
|
||||
*
|
||||
* Parameters:
|
||||
* str - {String} The string that we're testing for.
|
||||
*
|
||||
* Returns:
|
||||
* {Boolean} Whether or not this string contains with the string passed in.
|
||||
*/
|
||||
String.prototype.contains = function(str) {
|
||||
OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
|
||||
{'newMethod':'OpenLayers.String.contains'}));
|
||||
return OpenLayers.String.contains(this, str);
|
||||
};
|
||||
}
|
||||
|
||||
if (!String.prototype.trim) {
|
||||
/**
|
||||
* APIMethod: String.trim
|
||||
* *Deprecated*. Removes leading and trailing whitespace characters from a string.
|
||||
*
|
||||
* Returns:
|
||||
* {String} A trimmed version of the string - all leading and
|
||||
* trailing spaces removed
|
||||
*/
|
||||
String.prototype.trim = function() {
|
||||
OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
|
||||
{'newMethod':'OpenLayers.String.trim'}));
|
||||
return OpenLayers.String.trim(this);
|
||||
};
|
||||
}
|
||||
|
||||
if (!String.prototype.camelize) {
|
||||
/**
|
||||
* APIMethod: String.camelize
|
||||
* *Deprecated*. Camel-case a hyphenated string.
|
||||
* Ex. "chicken-head" becomes "chickenHead", and
|
||||
* "-chicken-head" becomes "ChickenHead".
|
||||
*
|
||||
* Returns:
|
||||
* {String} The string, camelized
|
||||
*/
|
||||
String.prototype.camelize = function() {
|
||||
OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
|
||||
{'newMethod':'OpenLayers.String.camelize'}));
|
||||
return OpenLayers.String.camelize(this);
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Namespace: OpenLayers.Number
|
||||
* Contains convenience functions for manipulating numbers.
|
||||
@@ -360,26 +291,6 @@ OpenLayers.Number = {
|
||||
}
|
||||
};
|
||||
|
||||
if (!Number.prototype.limitSigDigs) {
|
||||
/**
|
||||
* APIMethod: Number.limitSigDigs
|
||||
* *Deprecated*. Limit the number of significant digits on an integer. Does *not*
|
||||
* work with floats!
|
||||
*
|
||||
* Parameters:
|
||||
* sig - {Integer}
|
||||
*
|
||||
* Returns:
|
||||
* {Integer} The number, rounded to the specified number of significant digits.
|
||||
* If null, 0, or negative value passed in, returns 0
|
||||
*/
|
||||
Number.prototype.limitSigDigs = function(sig) {
|
||||
OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
|
||||
{'newMethod':'OpenLayers.Number.limitSigDigs'}));
|
||||
return OpenLayers.Number.limitSigDigs(this, sig);
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Namespace: OpenLayers.Function
|
||||
* Contains convenience functions for function manipulation.
|
||||
@@ -471,47 +382,6 @@ OpenLayers.Function = {
|
||||
|
||||
};
|
||||
|
||||
if (!Function.prototype.bind) {
|
||||
/**
|
||||
* APIMethod: Function.bind
|
||||
* *Deprecated*. Bind a function to an object.
|
||||
* Method to easily create closures with 'this' altered.
|
||||
*
|
||||
* Parameters:
|
||||
* object - {Object} the this parameter
|
||||
*
|
||||
* Returns:
|
||||
* {Function} A closure with 'this' altered to the first
|
||||
* argument.
|
||||
*/
|
||||
Function.prototype.bind = function() {
|
||||
OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
|
||||
{'newMethod':'OpenLayers.Function.bind'}));
|
||||
// new function takes the same arguments with this function up front
|
||||
Array.prototype.unshift.apply(arguments, [this]);
|
||||
return OpenLayers.Function.bind.apply(null, arguments);
|
||||
};
|
||||
}
|
||||
|
||||
if (!Function.prototype.bindAsEventListener) {
|
||||
/**
|
||||
* APIMethod: Function.bindAsEventListener
|
||||
* *Deprecated*. Bind a function to an object, and configure it to receive the
|
||||
* event object as first parameter when called.
|
||||
*
|
||||
* Parameters:
|
||||
* object - {Object} A reference to this.
|
||||
*
|
||||
* Returns:
|
||||
* {Function}
|
||||
*/
|
||||
Function.prototype.bindAsEventListener = function(object) {
|
||||
OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
|
||||
{'newMethod':'OpenLayers.Function.bindAsEventListener'}));
|
||||
return OpenLayers.Function.bindAsEventListener(this, object);
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Namespace: OpenLayers.Array
|
||||
* Contains convenience functions for array manipulation.
|
||||
|
||||
@@ -49,48 +49,6 @@ OpenLayers.Class = function() {
|
||||
return C;
|
||||
};
|
||||
|
||||
/**
|
||||
* Property: isPrototype
|
||||
* *Deprecated*. This is no longer needed and will be removed at 3.0.
|
||||
*/
|
||||
OpenLayers.Class.isPrototype = function () {};
|
||||
|
||||
/**
|
||||
* APIFunction: OpenLayers.create
|
||||
* *Deprecated*. Old method to create an OpenLayers style class. Use the
|
||||
* <OpenLayers.Class> constructor instead.
|
||||
*
|
||||
* Returns:
|
||||
* An OpenLayers class
|
||||
*/
|
||||
OpenLayers.Class.create = function() {
|
||||
return function() {
|
||||
if (arguments && arguments[0] != OpenLayers.Class.isPrototype) {
|
||||
this.initialize.apply(this, arguments);
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
* APIFunction: inherit
|
||||
* *Deprecated*. Old method to inherit from one or more OpenLayers style
|
||||
* classes. Use the <OpenLayers.Class> constructor instead.
|
||||
*
|
||||
* Parameters:
|
||||
* class - One or more classes can be provided as arguments
|
||||
*
|
||||
* Returns:
|
||||
* An object prototype
|
||||
*/
|
||||
OpenLayers.Class.inherit = function (P) {
|
||||
var C = function() {
|
||||
P.call(this);
|
||||
};
|
||||
var newArgs = [C].concat(Array.prototype.slice.call(arguments));
|
||||
OpenLayers.inherit.apply(null, newArgs);
|
||||
return C.prototype;
|
||||
};
|
||||
|
||||
/**
|
||||
* Function: OpenLayers.inherit
|
||||
*
|
||||
|
||||
@@ -36,50 +36,9 @@ OpenLayers.Element = {
|
||||
toggle: function() {
|
||||
for (var i=0, len=arguments.length; i<len; i++) {
|
||||
var element = OpenLayers.Util.getElement(arguments[i]);
|
||||
var display = OpenLayers.Element.visible(element) ? 'hide'
|
||||
: 'show';
|
||||
OpenLayers.Element[display](element);
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* APIFunction: hide
|
||||
* *Deprecated*. Hide element(s) passed in
|
||||
*
|
||||
* Parameters:
|
||||
* element - {DOMElement} Actually user can pass any number of elements
|
||||
*/
|
||||
hide: function() {
|
||||
OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated", {
|
||||
newMethod: "element.style.display = 'none';"
|
||||
}));
|
||||
|
||||
for (var i=0, len=arguments.length; i<len; i++) {
|
||||
var element = OpenLayers.Util.getElement(arguments[i]);
|
||||
if (element) {
|
||||
element.style.display = 'none';
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* APIFunction: show
|
||||
* *Deprecated*. Show element(s) passed in
|
||||
*
|
||||
* Parameters:
|
||||
* element - {DOMElement} Actually user can pass any number of elements
|
||||
*/
|
||||
show: function() {
|
||||
OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated", {
|
||||
newMethod: "element.style.display = '';"
|
||||
}));
|
||||
|
||||
for (var i=0, len=arguments.length; i<len; i++) {
|
||||
var element = OpenLayers.Util.getElement(arguments[i]);
|
||||
if (element) {
|
||||
element.style.display = '';
|
||||
}
|
||||
var display = OpenLayers.Element.visible(element) ? 'none'
|
||||
: '';
|
||||
element.style.display = display;
|
||||
}
|
||||
},
|
||||
|
||||
@@ -109,40 +68,6 @@ OpenLayers.Element = {
|
||||
return element.offsetHeight;
|
||||
},
|
||||
|
||||
/**
|
||||
* APIFunction: getDimensions
|
||||
* *Deprecated*. Returns dimensions of the element passed in.
|
||||
*
|
||||
* Parameters:
|
||||
* element - {DOMElement}
|
||||
*
|
||||
* Returns:
|
||||
* {Object} Object with 'width' and 'height' properties which are the
|
||||
* dimensions of the element passed in.
|
||||
*/
|
||||
getDimensions: function(element) {
|
||||
element = OpenLayers.Util.getElement(element);
|
||||
if (OpenLayers.Element.getStyle(element, 'display') != 'none') {
|
||||
return {width: element.offsetWidth, height: element.offsetHeight};
|
||||
}
|
||||
|
||||
// All *Width and *Height properties give 0 on elements with display none,
|
||||
// so enable the element temporarily
|
||||
var els = element.style;
|
||||
var originalVisibility = els.visibility;
|
||||
var originalPosition = els.position;
|
||||
var originalDisplay = els.display;
|
||||
els.visibility = 'hidden';
|
||||
els.position = 'absolute';
|
||||
els.display = '';
|
||||
var originalWidth = element.clientWidth;
|
||||
var originalHeight = element.clientHeight;
|
||||
els.display = originalDisplay;
|
||||
els.position = originalPosition;
|
||||
els.visibility = originalVisibility;
|
||||
return {width: originalWidth, height: originalHeight};
|
||||
},
|
||||
|
||||
/**
|
||||
* Function: hasClass
|
||||
* Tests if an element has the given CSS class name.
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
* > var map = new OpenLayers.Map('map', { controls: [] });
|
||||
* >
|
||||
* > map.addControl(new OpenLayers.Control.PanZoomBar());
|
||||
* > 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'));
|
||||
|
||||
@@ -1,368 +0,0 @@
|
||||
/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
|
||||
* full list of contributors). Published under the Clear BSD license.
|
||||
* See http://svn.openlayers.org/trunk/openlayers/license.txt for the
|
||||
* full text of the license. */
|
||||
|
||||
/**
|
||||
* @requires OpenLayers/Control.js
|
||||
*/
|
||||
|
||||
/**
|
||||
* Class: OpenLayers.Control.MouseDefaults
|
||||
* This class is DEPRECATED in 2.4 and will be removed by 3.0.
|
||||
* If you need this functionality, use <OpenLayers.Control.Navigation>
|
||||
* instead!!!
|
||||
*
|
||||
* This class is DEPRECATED in 2.4 and will be removed by 3.0.
|
||||
* If you need this functionality, use Control.Navigation instead!!!
|
||||
*
|
||||
* Inherits from:
|
||||
* - <OpenLayers.Control>
|
||||
*/
|
||||
OpenLayers.Control.MouseDefaults = OpenLayers.Class(OpenLayers.Control, {
|
||||
|
||||
/** WARNING WARNING WARNING!!!
|
||||
This class is DEPRECATED in 2.4 and will be removed by 3.0.
|
||||
If you need this functionality, use Control.Navigation instead!!! */
|
||||
|
||||
/**
|
||||
* Property: performedDrag
|
||||
* {Boolean}
|
||||
*/
|
||||
performedDrag: false,
|
||||
|
||||
/**
|
||||
* Property: wheelObserver
|
||||
* {Function}
|
||||
*/
|
||||
wheelObserver: null,
|
||||
|
||||
/**
|
||||
* Constructor: OpenLayers.Control.MouseDefaults
|
||||
*/
|
||||
initialize: function() {
|
||||
OpenLayers.Control.prototype.initialize.apply(this, arguments);
|
||||
},
|
||||
|
||||
/**
|
||||
* APIMethod: destroy
|
||||
*/
|
||||
destroy: function() {
|
||||
|
||||
if (this.handler) {
|
||||
this.handler.destroy();
|
||||
}
|
||||
this.handler = null;
|
||||
|
||||
this.map.events.un({
|
||||
"click": this.defaultClick,
|
||||
"dblclick": this.defaultDblClick,
|
||||
"mousedown": this.defaultMouseDown,
|
||||
"mouseup": this.defaultMouseUp,
|
||||
"mousemove": this.defaultMouseMove,
|
||||
"mouseout": this.defaultMouseOut,
|
||||
scope: this
|
||||
});
|
||||
|
||||
//unregister mousewheel events specifically on the window and document
|
||||
OpenLayers.Event.stopObserving(window, "DOMMouseScroll",
|
||||
this.wheelObserver);
|
||||
OpenLayers.Event.stopObserving(window, "mousewheel",
|
||||
this.wheelObserver);
|
||||
OpenLayers.Event.stopObserving(document, "mousewheel",
|
||||
this.wheelObserver);
|
||||
this.wheelObserver = null;
|
||||
|
||||
OpenLayers.Control.prototype.destroy.apply(this, arguments);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: draw
|
||||
*/
|
||||
draw: function() {
|
||||
this.map.events.on({
|
||||
"click": this.defaultClick,
|
||||
"dblclick": this.defaultDblClick,
|
||||
"mousedown": this.defaultMouseDown,
|
||||
"mouseup": this.defaultMouseUp,
|
||||
"mousemove": this.defaultMouseMove,
|
||||
"mouseout": this.defaultMouseOut,
|
||||
scope: this
|
||||
});
|
||||
|
||||
this.registerWheelEvents();
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: registerWheelEvents
|
||||
*/
|
||||
registerWheelEvents: function() {
|
||||
|
||||
this.wheelObserver = OpenLayers.Function.bindAsEventListener(
|
||||
this.onWheelEvent, this
|
||||
);
|
||||
|
||||
//register mousewheel events specifically on the window and document
|
||||
OpenLayers.Event.observe(window, "DOMMouseScroll", this.wheelObserver);
|
||||
OpenLayers.Event.observe(window, "mousewheel", this.wheelObserver);
|
||||
OpenLayers.Event.observe(document, "mousewheel", this.wheelObserver);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultClick
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*
|
||||
* Returns:
|
||||
* {Boolean}
|
||||
*/
|
||||
defaultClick: function (evt) {
|
||||
if (!OpenLayers.Event.isLeftClick(evt)) {
|
||||
return;
|
||||
}
|
||||
var notAfterDrag = !this.performedDrag;
|
||||
this.performedDrag = false;
|
||||
return notAfterDrag;
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultDblClick
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
defaultDblClick: function (evt) {
|
||||
var newCenter = this.map.getLonLatFromViewPortPx( evt.xy );
|
||||
this.map.setCenter(newCenter, this.map.zoom + 1);
|
||||
OpenLayers.Event.stop(evt);
|
||||
return false;
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultMouseDown
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
defaultMouseDown: function (evt) {
|
||||
if (!OpenLayers.Event.isLeftClick(evt)) {
|
||||
return;
|
||||
}
|
||||
this.mouseDragStart = evt.xy.clone();
|
||||
this.performedDrag = false;
|
||||
if (evt.shiftKey) {
|
||||
this.map.div.style.cursor = "crosshair";
|
||||
this.zoomBox = OpenLayers.Util.createDiv('zoomBox',
|
||||
this.mouseDragStart,
|
||||
null,
|
||||
null,
|
||||
"absolute",
|
||||
"2px solid red");
|
||||
this.zoomBox.style.backgroundColor = "white";
|
||||
this.zoomBox.style.filter = "alpha(opacity=50)"; // IE
|
||||
this.zoomBox.style.opacity = "0.50";
|
||||
this.zoomBox.style.fontSize = "1px";
|
||||
this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
|
||||
this.map.eventsDiv.appendChild(this.zoomBox);
|
||||
}
|
||||
document.onselectstart = OpenLayers.Function.False;
|
||||
OpenLayers.Event.stop(evt);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultMouseMove
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
defaultMouseMove: function (evt) {
|
||||
// record the mouse position, used in onWheelEvent
|
||||
this.mousePosition = evt.xy.clone();
|
||||
|
||||
if (this.mouseDragStart != null) {
|
||||
if (this.zoomBox) {
|
||||
var deltaX = Math.abs(this.mouseDragStart.x - evt.xy.x);
|
||||
var deltaY = Math.abs(this.mouseDragStart.y - evt.xy.y);
|
||||
this.zoomBox.style.width = Math.max(1, deltaX) + "px";
|
||||
this.zoomBox.style.height = Math.max(1, deltaY) + "px";
|
||||
if (evt.xy.x < this.mouseDragStart.x) {
|
||||
this.zoomBox.style.left = evt.xy.x+"px";
|
||||
}
|
||||
if (evt.xy.y < this.mouseDragStart.y) {
|
||||
this.zoomBox.style.top = evt.xy.y+"px";
|
||||
}
|
||||
} else {
|
||||
var deltaX = this.mouseDragStart.x - evt.xy.x;
|
||||
var deltaY = this.mouseDragStart.y - evt.xy.y;
|
||||
var size = this.map.getSize();
|
||||
var newXY = new OpenLayers.Pixel(size.w / 2 + deltaX,
|
||||
size.h / 2 + deltaY);
|
||||
var newCenter = this.map.getLonLatFromViewPortPx( newXY );
|
||||
this.map.setCenter(newCenter, null, true);
|
||||
this.mouseDragStart = evt.xy.clone();
|
||||
this.map.div.style.cursor = "move";
|
||||
}
|
||||
this.performedDrag = true;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultMouseUp
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {<OpenLayers.Event>}
|
||||
*/
|
||||
defaultMouseUp: function (evt) {
|
||||
if (!OpenLayers.Event.isLeftClick(evt)) {
|
||||
return;
|
||||
}
|
||||
if (this.zoomBox) {
|
||||
this.zoomBoxEnd(evt);
|
||||
} else {
|
||||
if (this.performedDrag) {
|
||||
this.map.setCenter(this.map.center);
|
||||
}
|
||||
}
|
||||
document.onselectstart=null;
|
||||
this.mouseDragStart = null;
|
||||
this.map.div.style.cursor = "";
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultMouseOut
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
defaultMouseOut: function (evt) {
|
||||
if (this.mouseDragStart != null &&
|
||||
OpenLayers.Util.mouseLeft(evt, this.map.eventsDiv)) {
|
||||
if (this.zoomBox) {
|
||||
this.removeZoomBox();
|
||||
}
|
||||
this.mouseDragStart = null;
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* Method: defaultWheelUp
|
||||
* User spun scroll wheel up
|
||||
*
|
||||
*/
|
||||
defaultWheelUp: function(evt) {
|
||||
if (this.map.getZoom() <= this.map.getNumZoomLevels()) {
|
||||
this.map.setCenter(this.map.getLonLatFromPixel(evt.xy),
|
||||
this.map.getZoom() + 1);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultWheelDown
|
||||
* User spun scroll wheel down
|
||||
*/
|
||||
defaultWheelDown: function(evt) {
|
||||
if (this.map.getZoom() > 0) {
|
||||
this.map.setCenter(this.map.getLonLatFromPixel(evt.xy),
|
||||
this.map.getZoom() - 1);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: zoomBoxEnd
|
||||
* Zoombox function.
|
||||
*/
|
||||
zoomBoxEnd: function(evt) {
|
||||
if (this.mouseDragStart != null) {
|
||||
if (Math.abs(this.mouseDragStart.x - evt.xy.x) > 5 ||
|
||||
Math.abs(this.mouseDragStart.y - evt.xy.y) > 5) {
|
||||
var start = this.map.getLonLatFromViewPortPx( this.mouseDragStart );
|
||||
var end = this.map.getLonLatFromViewPortPx( evt.xy );
|
||||
var top = Math.max(start.lat, end.lat);
|
||||
var bottom = Math.min(start.lat, end.lat);
|
||||
var left = Math.min(start.lon, end.lon);
|
||||
var right = Math.max(start.lon, end.lon);
|
||||
var bounds = new OpenLayers.Bounds(left, bottom, right, top);
|
||||
this.map.zoomToExtent(bounds);
|
||||
} else {
|
||||
var end = this.map.getLonLatFromViewPortPx( evt.xy );
|
||||
this.map.setCenter(new OpenLayers.LonLat(
|
||||
(end.lon),
|
||||
(end.lat)
|
||||
), this.map.getZoom() + 1);
|
||||
}
|
||||
this.removeZoomBox();
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: removeZoomBox
|
||||
* Remove the zoombox from the screen and nullify our reference to it.
|
||||
*/
|
||||
removeZoomBox: function() {
|
||||
this.map.eventsDiv.removeChild(this.zoomBox);
|
||||
this.zoomBox = null;
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* Mouse ScrollWheel code thanks to http://adomas.org/javascript-mouse-wheel/
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* Method: onWheelEvent
|
||||
* Catch the wheel event and handle it xbrowserly
|
||||
*
|
||||
* Parameters:
|
||||
* e - {Event}
|
||||
*/
|
||||
onWheelEvent: function(e){
|
||||
|
||||
// first determine whether or not the wheeling was inside the map
|
||||
var inMap = false;
|
||||
var elem = OpenLayers.Event.element(e);
|
||||
while(elem != null) {
|
||||
if (this.map && elem == this.map.div) {
|
||||
inMap = true;
|
||||
break;
|
||||
}
|
||||
elem = elem.parentNode;
|
||||
}
|
||||
|
||||
if (inMap) {
|
||||
|
||||
var delta = 0;
|
||||
if (!e) {
|
||||
e = window.event;
|
||||
}
|
||||
if (e.wheelDelta) {
|
||||
delta = e.wheelDelta/120;
|
||||
if (window.opera && window.opera.version() < 9.2) {
|
||||
delta = -delta;
|
||||
}
|
||||
} else if (e.detail) {
|
||||
delta = -e.detail / 3;
|
||||
}
|
||||
if (delta) {
|
||||
// add the mouse position to the event because mozilla has a bug
|
||||
// with clientX and clientY (see https://bugzilla.mozilla.org/show_bug.cgi?id=352179)
|
||||
// getLonLatFromViewPortPx(e) returns wrong values
|
||||
e.xy = this.mousePosition;
|
||||
|
||||
if (delta < 0) {
|
||||
this.defaultWheelDown(e);
|
||||
} else {
|
||||
this.defaultWheelUp(e);
|
||||
}
|
||||
}
|
||||
|
||||
//only wheel the map, not the window
|
||||
OpenLayers.Event.stop(e);
|
||||
}
|
||||
},
|
||||
|
||||
CLASS_NAME: "OpenLayers.Control.MouseDefaults"
|
||||
});
|
||||
@@ -1,406 +0,0 @@
|
||||
/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
|
||||
* full list of contributors). Published under the Clear BSD license.
|
||||
* See http://svn.openlayers.org/trunk/openlayers/license.txt for the
|
||||
* full text of the license. */
|
||||
|
||||
|
||||
/**
|
||||
* @requires OpenLayers/Control.js
|
||||
* @requires OpenLayers/Control/MouseDefaults.js
|
||||
*/
|
||||
|
||||
/**
|
||||
* Class: OpenLayers.Control.MouseToolbar
|
||||
* This class is DEPRECATED in 2.4 and will be removed by 3.0.
|
||||
* If you need this functionality, use <OpenLayers.Control.NavToolbar>
|
||||
* instead!!!
|
||||
*/
|
||||
OpenLayers.Control.MouseToolbar = OpenLayers.Class(
|
||||
OpenLayers.Control.MouseDefaults, {
|
||||
|
||||
/**
|
||||
* Property: mode
|
||||
*/
|
||||
mode: null,
|
||||
/**
|
||||
* Property: buttons
|
||||
*/
|
||||
buttons: null,
|
||||
|
||||
/**
|
||||
* APIProperty: direction
|
||||
* {String} 'vertical' or 'horizontal'
|
||||
*/
|
||||
direction: "vertical",
|
||||
|
||||
/**
|
||||
* Property: buttonClicked
|
||||
* {String}
|
||||
*/
|
||||
buttonClicked: null,
|
||||
|
||||
/**
|
||||
* Constructor: OpenLayers.Control.MouseToolbar
|
||||
*
|
||||
* Parameters:
|
||||
* position - {<OpenLayers.Pixel>}
|
||||
* direction - {String}
|
||||
*/
|
||||
initialize: function(position, direction) {
|
||||
OpenLayers.Control.prototype.initialize.apply(this, arguments);
|
||||
this.position = new OpenLayers.Pixel(OpenLayers.Control.MouseToolbar.X,
|
||||
OpenLayers.Control.MouseToolbar.Y);
|
||||
if (position) {
|
||||
this.position = position;
|
||||
}
|
||||
if (direction) {
|
||||
this.direction = direction;
|
||||
}
|
||||
this.measureDivs = [];
|
||||
},
|
||||
|
||||
/**
|
||||
* APIMethod: destroy
|
||||
*/
|
||||
destroy: function() {
|
||||
for( var btnId in this.buttons) {
|
||||
var btn = this.buttons[btnId];
|
||||
btn.map = null;
|
||||
btn.events.destroy();
|
||||
}
|
||||
OpenLayers.Control.MouseDefaults.prototype.destroy.apply(this,
|
||||
arguments);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: draw
|
||||
*/
|
||||
draw: function() {
|
||||
OpenLayers.Control.prototype.draw.apply(this, arguments);
|
||||
OpenLayers.Control.MouseDefaults.prototype.draw.apply(this, arguments);
|
||||
this.buttons = {};
|
||||
var sz = new OpenLayers.Size(28,28);
|
||||
var centered = new OpenLayers.Pixel(OpenLayers.Control.MouseToolbar.X,0);
|
||||
this._addButton("zoombox", "drag-rectangle-off.png", "drag-rectangle-on.png", centered, sz, "Shift->Drag to zoom to area");
|
||||
centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0));
|
||||
this._addButton("pan", "panning-hand-off.png", "panning-hand-on.png", centered, sz, "Drag the map to pan.");
|
||||
centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0));
|
||||
this.switchModeTo("pan");
|
||||
|
||||
return this.div;
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: _addButton
|
||||
*/
|
||||
_addButton:function(id, img, activeImg, xy, sz, title) {
|
||||
var imgLocation = OpenLayers.Util.getImagesLocation() + img;
|
||||
var activeImgLocation = OpenLayers.Util.getImagesLocation() + activeImg;
|
||||
// var btn = new ol.AlphaImage("_"+id, imgLocation, xy, sz);
|
||||
var btn = OpenLayers.Util.createAlphaImageDiv(
|
||||
"OpenLayers_Control_MouseToolbar_" + id,
|
||||
xy, sz, imgLocation, "absolute");
|
||||
|
||||
//we want to add the outer div
|
||||
this.div.appendChild(btn);
|
||||
btn.imgLocation = imgLocation;
|
||||
btn.activeImgLocation = activeImgLocation;
|
||||
|
||||
btn.events = new OpenLayers.Events(this, btn, null, true);
|
||||
btn.events.on({
|
||||
"mousedown": this.buttonDown,
|
||||
"mouseup": this.buttonUp,
|
||||
"dblclick": OpenLayers.Event.stop,
|
||||
scope: this
|
||||
});
|
||||
btn.action = id;
|
||||
btn.title = title;
|
||||
btn.alt = title;
|
||||
btn.map = this.map;
|
||||
|
||||
//we want to remember/reference the outer div
|
||||
this.buttons[id] = btn;
|
||||
return btn;
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: buttonDown
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
buttonDown: function(evt) {
|
||||
if (!OpenLayers.Event.isLeftClick(evt)) {
|
||||
return;
|
||||
}
|
||||
this.buttonClicked = evt.element.action;
|
||||
OpenLayers.Event.stop(evt);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: buttonUp
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
buttonUp: function(evt) {
|
||||
if (!OpenLayers.Event.isLeftClick(evt)) {
|
||||
return;
|
||||
}
|
||||
if (this.buttonClicked != null) {
|
||||
if (this.buttonClicked == evt.element.action) {
|
||||
this.switchModeTo(evt.element.action);
|
||||
}
|
||||
OpenLayers.Event.stop(evt);
|
||||
this.buttonClicked = null;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultDblClick
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
defaultDblClick: function (evt) {
|
||||
this.switchModeTo("pan");
|
||||
this.performedDrag = false;
|
||||
var newCenter = this.map.getLonLatFromViewPortPx( evt.xy );
|
||||
this.map.setCenter(newCenter, this.map.zoom + 1);
|
||||
OpenLayers.Event.stop(evt);
|
||||
return false;
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultMouseDown
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
defaultMouseDown: function (evt) {
|
||||
if (!OpenLayers.Event.isLeftClick(evt)) {
|
||||
return;
|
||||
}
|
||||
this.mouseDragStart = evt.xy.clone();
|
||||
this.performedDrag = false;
|
||||
this.startViaKeyboard = false;
|
||||
if (evt.shiftKey && this.mode !="zoombox") {
|
||||
this.switchModeTo("zoombox");
|
||||
this.startViaKeyboard = true;
|
||||
} else if (evt.altKey && this.mode !="measure") {
|
||||
this.switchModeTo("measure");
|
||||
} else if (!this.mode) {
|
||||
this.switchModeTo("pan");
|
||||
}
|
||||
|
||||
switch (this.mode) {
|
||||
case "zoombox":
|
||||
this.map.div.style.cursor = "crosshair";
|
||||
this.zoomBox = OpenLayers.Util.createDiv('zoomBox',
|
||||
this.mouseDragStart,
|
||||
null,
|
||||
null,
|
||||
"absolute",
|
||||
"2px solid red");
|
||||
this.zoomBox.style.backgroundColor = "white";
|
||||
this.zoomBox.style.filter = "alpha(opacity=50)"; // IE
|
||||
this.zoomBox.style.opacity = "0.50";
|
||||
this.zoomBox.style.fontSize = "1px";
|
||||
this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
|
||||
this.map.eventsDiv.appendChild(this.zoomBox);
|
||||
this.performedDrag = true;
|
||||
break;
|
||||
case "measure":
|
||||
var distance = "";
|
||||
if (this.measureStart) {
|
||||
var measureEnd = this.map.getLonLatFromViewPortPx(this.mouseDragStart);
|
||||
distance = OpenLayers.Util.distVincenty(this.measureStart, measureEnd);
|
||||
distance = Math.round(distance * 100) / 100;
|
||||
distance = distance + "km";
|
||||
this.measureStartBox = this.measureBox;
|
||||
}
|
||||
this.measureStart = this.map.getLonLatFromViewPortPx(this.mouseDragStart);;
|
||||
this.measureBox = OpenLayers.Util.createDiv(null,
|
||||
this.mouseDragStart.add(
|
||||
-2-parseInt(this.map.layerContainerDiv.style.left),
|
||||
-2-parseInt(this.map.layerContainerDiv.style.top)),
|
||||
null,
|
||||
null,
|
||||
"absolute");
|
||||
this.measureBox.style.width="4px";
|
||||
this.measureBox.style.height="4px";
|
||||
this.measureBox.style.fontSize = "1px";
|
||||
this.measureBox.style.backgroundColor="red";
|
||||
this.measureBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
|
||||
this.map.layerContainerDiv.appendChild(this.measureBox);
|
||||
if (distance) {
|
||||
this.measureBoxDistance = OpenLayers.Util.createDiv(null,
|
||||
this.mouseDragStart.add(
|
||||
-2-parseInt(this.map.layerContainerDiv.style.left),
|
||||
2-parseInt(this.map.layerContainerDiv.style.top)),
|
||||
null,
|
||||
null,
|
||||
"absolute");
|
||||
|
||||
this.measureBoxDistance.innerHTML = distance;
|
||||
this.measureBoxDistance.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
|
||||
this.map.layerContainerDiv.appendChild(this.measureBoxDistance);
|
||||
this.measureDivs.push(this.measureBoxDistance);
|
||||
}
|
||||
this.measureBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
|
||||
this.map.layerContainerDiv.appendChild(this.measureBox);
|
||||
this.measureDivs.push(this.measureBox);
|
||||
break;
|
||||
default:
|
||||
this.map.div.style.cursor = "move";
|
||||
break;
|
||||
}
|
||||
document.onselectstart = OpenLayers.Function.False;
|
||||
OpenLayers.Event.stop(evt);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: switchModeTo
|
||||
*
|
||||
* Parameters:
|
||||
* mode - {String}
|
||||
*/
|
||||
switchModeTo: function(mode) {
|
||||
if (mode != this.mode) {
|
||||
|
||||
|
||||
if (this.mode && this.buttons[this.mode]) {
|
||||
OpenLayers.Util.modifyAlphaImageDiv(this.buttons[this.mode], null, null, null, this.buttons[this.mode].imgLocation);
|
||||
}
|
||||
if (this.mode == "measure" && mode != "measure") {
|
||||
for(var i=0, len=this.measureDivs.length; i<len; i++) {
|
||||
if (this.measureDivs[i]) {
|
||||
this.map.layerContainerDiv.removeChild(this.measureDivs[i]);
|
||||
}
|
||||
}
|
||||
this.measureDivs = [];
|
||||
this.measureStart = null;
|
||||
}
|
||||
this.mode = mode;
|
||||
if (this.buttons[mode]) {
|
||||
OpenLayers.Util.modifyAlphaImageDiv(this.buttons[mode], null, null, null, this.buttons[mode].activeImgLocation);
|
||||
}
|
||||
switch (this.mode) {
|
||||
case "zoombox":
|
||||
this.map.div.style.cursor = "crosshair";
|
||||
break;
|
||||
default:
|
||||
this.map.div.style.cursor = "";
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: leaveMode
|
||||
*/
|
||||
leaveMode: function() {
|
||||
this.switchModeTo("pan");
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultMouseMove
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
defaultMouseMove: function (evt) {
|
||||
if (this.mouseDragStart != null) {
|
||||
switch (this.mode) {
|
||||
case "zoombox":
|
||||
var deltaX = Math.abs(this.mouseDragStart.x - evt.xy.x);
|
||||
var deltaY = Math.abs(this.mouseDragStart.y - evt.xy.y);
|
||||
this.zoomBox.style.width = Math.max(1, deltaX) + "px";
|
||||
this.zoomBox.style.height = Math.max(1, deltaY) + "px";
|
||||
if (evt.xy.x < this.mouseDragStart.x) {
|
||||
this.zoomBox.style.left = evt.xy.x+"px";
|
||||
}
|
||||
if (evt.xy.y < this.mouseDragStart.y) {
|
||||
this.zoomBox.style.top = evt.xy.y+"px";
|
||||
}
|
||||
break;
|
||||
default:
|
||||
var deltaX = this.mouseDragStart.x - evt.xy.x;
|
||||
var deltaY = this.mouseDragStart.y - evt.xy.y;
|
||||
var size = this.map.getSize();
|
||||
var newXY = new OpenLayers.Pixel(size.w / 2 + deltaX,
|
||||
size.h / 2 + deltaY);
|
||||
var newCenter = this.map.getLonLatFromViewPortPx( newXY );
|
||||
this.map.setCenter(newCenter, null, true);
|
||||
this.mouseDragStart = evt.xy.clone();
|
||||
}
|
||||
this.performedDrag = true;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultMouseUp
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
defaultMouseUp: function (evt) {
|
||||
if (!OpenLayers.Event.isLeftClick(evt)) {
|
||||
return;
|
||||
}
|
||||
switch (this.mode) {
|
||||
case "zoombox":
|
||||
this.zoomBoxEnd(evt);
|
||||
if (this.startViaKeyboard) {
|
||||
this.leaveMode();
|
||||
}
|
||||
break;
|
||||
case "pan":
|
||||
if (this.performedDrag) {
|
||||
this.map.setCenter(this.map.center);
|
||||
}
|
||||
}
|
||||
document.onselectstart = null;
|
||||
this.mouseDragStart = null;
|
||||
this.map.div.style.cursor = "default";
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultMouseOut
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
defaultMouseOut: function (evt) {
|
||||
if (this.mouseDragStart != null
|
||||
&& OpenLayers.Util.mouseLeft(evt, this.map.eventsDiv)) {
|
||||
if (this.zoomBox) {
|
||||
this.removeZoomBox();
|
||||
if (this.startViaKeyboard) {
|
||||
this.leaveMode();
|
||||
}
|
||||
}
|
||||
this.mouseDragStart = null;
|
||||
this.map.div.style.cursor = "default";
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: defaultClick
|
||||
*
|
||||
* Parameters:
|
||||
* evt - {Event}
|
||||
*/
|
||||
defaultClick: function (evt) {
|
||||
if (this.performedDrag) {
|
||||
this.performedDrag = false;
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
CLASS_NAME: "OpenLayers.Control.MouseToolbar"
|
||||
});
|
||||
|
||||
OpenLayers.Control.MouseToolbar.X = 6;
|
||||
OpenLayers.Control.MouseToolbar.Y = 300;
|
||||
@@ -129,7 +129,7 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
var geometry = new OpenLayers.Geometry.Point(location[1], location[0]);
|
||||
|
||||
} else if (line.length > 0) {
|
||||
var coords = OpenLayers.String.trim(this.concatChildValues(line[0])).split(/\s+/);
|
||||
var coords = OpenLayers.String.trim(this.getChildValue(line[0])).split(/\s+/);
|
||||
var components = [];
|
||||
var point;
|
||||
for (var i=0, len=coords.length; i<len; i+=2) {
|
||||
@@ -138,7 +138,7 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
}
|
||||
geometry = new OpenLayers.Geometry.LineString(components);
|
||||
} else if (polygon.length > 0) {
|
||||
var coords = OpenLayers.String.trim(this.concatChildValues(polygon[0])).split(/\s+/);
|
||||
var coords = OpenLayers.String.trim(this.getChildValue(polygon[0])).split(/\s+/);
|
||||
var components = [];
|
||||
var point;
|
||||
for (var i=0, len=coords.length; i<len; i+=2) {
|
||||
@@ -193,17 +193,17 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
var geometry = this.createGeometryFromItem(item);
|
||||
|
||||
/* Provide defaults for title and description */
|
||||
var title = this.getChildValue(item, "*", "title", this.featureTitle);
|
||||
var title = this._getChildValue(item, "*", "title", this.featureTitle);
|
||||
|
||||
/* First try RSS descriptions, then Atom summaries */
|
||||
var description = this.getChildValue(
|
||||
var description = this._getChildValue(
|
||||
item, "*", "description",
|
||||
this.getChildValue(item, "*", "content",
|
||||
this.getChildValue(item, "*", "summary", this.featureDescription)));
|
||||
this._getChildValue(item, "*", "content",
|
||||
this._getChildValue(item, "*", "summary", this.featureDescription)));
|
||||
|
||||
/* If no link URL is found in the first child node, try the
|
||||
href attribute */
|
||||
var link = this.getChildValue(item, "*", "link");
|
||||
var link = this._getChildValue(item, "*", "link");
|
||||
if(!link) {
|
||||
try {
|
||||
link = this.getElementsByTagNameNS(item, "*", "link")[0].getAttribute("href");
|
||||
@@ -212,7 +212,7 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
}
|
||||
}
|
||||
|
||||
var id = this.getChildValue(item, "*", "id", null);
|
||||
var id = this._getChildValue(item, "*", "id", null);
|
||||
|
||||
var data = {
|
||||
"title": title,
|
||||
@@ -225,7 +225,7 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: getChildValue
|
||||
* Method: _getChildValue
|
||||
*
|
||||
* Parameters:
|
||||
* node - {DOMElement}
|
||||
@@ -237,12 +237,12 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
* {String} The value of the first child with the given tag name. Returns
|
||||
* default value or empty string if none found.
|
||||
*/
|
||||
getChildValue: function(node, nsuri, name, def) {
|
||||
_getChildValue: function(node, nsuri, name, def) {
|
||||
var value;
|
||||
var eles = this.getElementsByTagNameNS(node, nsuri, name);
|
||||
if(eles && eles[0] && eles[0].firstChild
|
||||
&& eles[0].firstChild.nodeValue) {
|
||||
value = OpenLayers.Format.XML.prototype.getChildValue(eles[0]);
|
||||
value = this.getChildValue(eles[0]);
|
||||
} else {
|
||||
value = (def == undefined) ? "" : def;
|
||||
}
|
||||
|
||||
@@ -379,40 +379,6 @@ OpenLayers.Format.XML = OpenLayers.Class(OpenLayers.Format, {
|
||||
return value;
|
||||
},
|
||||
|
||||
/**
|
||||
* APIMethod: concatChildValues
|
||||
* *Deprecated*. Use <getChildValue> instead.
|
||||
*
|
||||
* Concatenate the value of all child nodes if any exist, or return an
|
||||
* optional default string. Returns an empty string if no children
|
||||
* exist and no default value is supplied. Not optimized for large
|
||||
* numbers of child nodes.
|
||||
*
|
||||
* Parameters:
|
||||
* node - {DOMElement} The element used to look for child values.
|
||||
* def - {String} Optional string to return in the event that no
|
||||
* child exist.
|
||||
*
|
||||
* Returns:
|
||||
* {String} The concatenated value of all child nodes of the given node.
|
||||
*/
|
||||
concatChildValues: function(node, def) {
|
||||
var value = "";
|
||||
var child = node.firstChild;
|
||||
var childValue;
|
||||
while(child) {
|
||||
childValue = child.nodeValue;
|
||||
if(childValue) {
|
||||
value += childValue;
|
||||
}
|
||||
child = child.nextSibling;
|
||||
}
|
||||
if(value == "" && def != undefined) {
|
||||
value = def;
|
||||
}
|
||||
return value;
|
||||
},
|
||||
|
||||
/**
|
||||
* APIMethod: isSimpleContent
|
||||
* Test if the given node has only simple content (i.e. no child element
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
|
||||
* full list of contributors). Published under the Clear BSD license.
|
||||
* See http://svn.openlayers.org/trunk/openlayers/license.txt for the
|
||||
* full text of the license. */
|
||||
|
||||
|
||||
/**
|
||||
* @requires OpenLayers/Layer/MapServer.js
|
||||
* @requires OpenLayers/Console.js
|
||||
*/
|
||||
|
||||
/**
|
||||
* Class: OpenLayers.Layer.MapServer.Untiled
|
||||
* *Deprecated*. To be removed in 3.0. Instead use OpenLayers.Layer.MapServer
|
||||
* and pass the option 'singleTile' as true.
|
||||
*
|
||||
* Inherits from:
|
||||
* - <OpenLayers.Layer.MapServer>
|
||||
*/
|
||||
OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class(OpenLayers.Layer.MapServer, {
|
||||
|
||||
/**
|
||||
* APIProperty: singleTile
|
||||
* {singleTile} Always true for untiled.
|
||||
*/
|
||||
singleTile: true,
|
||||
|
||||
/**
|
||||
* Constructor: OpenLayers.Layer.MapServer.Untiled
|
||||
*
|
||||
* Parameters:
|
||||
* name - {String}
|
||||
* url - {String}
|
||||
* params - {Object}
|
||||
* options - {Object}
|
||||
*/
|
||||
initialize: function(name, url, params, options) {
|
||||
OpenLayers.Layer.MapServer.prototype.initialize.apply(this, arguments);
|
||||
|
||||
var msg = "The OpenLayers.Layer.MapServer.Untiled class is deprecated and " +
|
||||
"will be removed in 3.0. Instead, you should use the " +
|
||||
"normal OpenLayers.Layer.MapServer class, passing it the option " +
|
||||
"'singleTile' as true.";
|
||||
OpenLayers.Console.warn(msg);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: clone
|
||||
* Create a clone of this layer
|
||||
*
|
||||
* Returns:
|
||||
* {<OpenLayers.Layer.MapServer.Untiled>} An exact clone of this layer
|
||||
*/
|
||||
clone: function (obj) {
|
||||
|
||||
if (obj == null) {
|
||||
obj = new OpenLayers.Layer.MapServer.Untiled(this.name,
|
||||
this.url,
|
||||
this.params,
|
||||
this.getOptions());
|
||||
}
|
||||
|
||||
//get all additions from superclasses
|
||||
obj = OpenLayers.Layer.MapServer.prototype.clone.apply(this, [obj]);
|
||||
|
||||
// copy/set any non-init, non-simple values here
|
||||
|
||||
return obj;
|
||||
},
|
||||
|
||||
CLASS_NAME: "OpenLayers.Layer.MapServer.Untiled"
|
||||
});
|
||||
@@ -1,103 +0,0 @@
|
||||
/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
|
||||
* full list of contributors). Published under the Clear BSD license.
|
||||
* See http://svn.openlayers.org/trunk/openlayers/license.txt for the
|
||||
* full text of the license. */
|
||||
|
||||
|
||||
/**
|
||||
* @requires OpenLayers/Layer/WMS.js
|
||||
* @requires OpenLayers/Tile/Image/IFrame.js
|
||||
*/
|
||||
|
||||
/**
|
||||
* Class: OpenLayers.Layer.WMS.Post
|
||||
* Instances of OpenLayers.Layer.WMS.Post are used to retrieve data from OGC
|
||||
* Web Mapping Services via HTTP-POST (application/x-www-form-urlencoded).
|
||||
* Create a new WMS layer with the <OpenLayers.Layer.WMS.Post> constructor.
|
||||
*
|
||||
* *Deprecated*. Instead of this layer, use <OpenLayers.Layer.WMS> with
|
||||
* <OpenLayers.Tile.Image.maxGetUrlLength> configured in the layer's
|
||||
* <OpenLayers.Layer.WMS.tileOptions>.
|
||||
*
|
||||
* Inherits from:
|
||||
* - <OpenLayers.Layer.WMS>
|
||||
*/
|
||||
OpenLayers.Layer.WMS.Post = OpenLayers.Class(OpenLayers.Layer.WMS, {
|
||||
|
||||
/**
|
||||
* APIProperty: unsupportedBrowsers
|
||||
* {Array} Array with browsers, which should use the HTTP-GET protocol
|
||||
* instead of HTTP-POST for fetching tiles from a WMS .
|
||||
* Defaults to ["mozilla", "firefox", "opera"], because Opera is not able
|
||||
* to show transparent images in IFrames and Firefox/Mozilla has some ugly
|
||||
* effects of viewport-shaking when panning the map. Both browsers, Opera
|
||||
* and Firefox/Mozilla, have no problem with long urls, which is the reason
|
||||
* for using POST instead of GET. The strings to pass to this array are
|
||||
* the ones returned by <OpenLayers.BROWSER_NAME>.
|
||||
*/
|
||||
unsupportedBrowsers: ["mozilla", "firefox", "opera"],
|
||||
|
||||
/**
|
||||
* Property: SUPPORTED_TRANSITIONS
|
||||
* {Array}
|
||||
* no supported transitions for this type of layer, because it is not
|
||||
* possible to modify the initialized tiles (iframes)
|
||||
*/
|
||||
SUPPORTED_TRANSITIONS: [],
|
||||
|
||||
/**
|
||||
* Property: usePost
|
||||
* {Boolean}
|
||||
*/
|
||||
usePost: null,
|
||||
|
||||
/**
|
||||
* Constructor: OpenLayers.Layer.WMS.Post
|
||||
* Creates a new WMS layer object.
|
||||
*
|
||||
* Example:
|
||||
* (code)
|
||||
* var wms = new OpenLayers.Layer.WMS.Post(
|
||||
* "NASA Global Mosaic",
|
||||
* "http://wms.jpl.nasa.gov/wms.cgi",
|
||||
* {layers: "modis, global_mosaic"});
|
||||
* (end)
|
||||
*
|
||||
* Parameters:
|
||||
* name - {String} A name for the layer
|
||||
* url - {String} Base url for the WMS
|
||||
* (e.g. http://wms.jpl.nasa.gov/wms.cgi)
|
||||
* params - {Object} An object with key/value pairs representing the
|
||||
* GetMap query string parameters and parameter values.
|
||||
* options - {Object} Hashtable of extra options to tag onto the layer.
|
||||
*/
|
||||
initialize: function(name, url, params, options) {
|
||||
var newArguments = [];
|
||||
newArguments.push(name, url, params, options);
|
||||
OpenLayers.Layer.WMS.prototype.initialize.apply(this, newArguments);
|
||||
|
||||
this.usePost = OpenLayers.Util.indexOf(
|
||||
this.unsupportedBrowsers, OpenLayers.BROWSER_NAME) == -1;
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: addTile
|
||||
* addTile creates a tile, initializes it and adds it as iframe to the
|
||||
* layer div.
|
||||
*
|
||||
* Parameters:
|
||||
* bounds - {<OpenLayers.Bounds>}
|
||||
* position - {<OpenLayers.Pixel>}
|
||||
*
|
||||
* Returns:
|
||||
* {<OpenLayers.Tile.Image.IFrame>} The added OpenLayers.Tile.Image.IFrame
|
||||
*/
|
||||
addTile: function(bounds,position) {
|
||||
return new OpenLayers.Tile.Image(
|
||||
this, position, bounds, null, this.tileSize, {
|
||||
maxGetUrlLength: this.usePost ? 0 : null
|
||||
});
|
||||
},
|
||||
|
||||
CLASS_NAME: 'OpenLayers.Layer.WMS.Post'
|
||||
});
|
||||
@@ -1,72 +0,0 @@
|
||||
/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
|
||||
* full list of contributors). Published under the Clear BSD license.
|
||||
* See http://svn.openlayers.org/trunk/openlayers/license.txt for the
|
||||
* full text of the license. */
|
||||
|
||||
|
||||
/**
|
||||
* @requires OpenLayers/Layer/WMS.js
|
||||
* @requires OpenLayers/Console.js
|
||||
*/
|
||||
|
||||
/**
|
||||
* Class: OpenLayers.Layer.WMS.Untiled
|
||||
* *Deprecated*. To be removed in 3.0. Instead use OpenLayers.Layer.WMS and
|
||||
* pass the option 'singleTile' as true.
|
||||
*
|
||||
* Inherits from:
|
||||
* - <OpenLayers.Layer.WMS>
|
||||
*/
|
||||
OpenLayers.Layer.WMS.Untiled = OpenLayers.Class(OpenLayers.Layer.WMS, {
|
||||
|
||||
/**
|
||||
* APIProperty: singleTile
|
||||
* {singleTile} Always true for untiled.
|
||||
*/
|
||||
singleTile: true,
|
||||
|
||||
/**
|
||||
* Constructor: OpenLayers.Layer.WMS.Untiled
|
||||
*
|
||||
* Parameters:
|
||||
* name - {String}
|
||||
* url - {String}
|
||||
* params - {Object}
|
||||
* options - {Object}
|
||||
*/
|
||||
initialize: function(name, url, params, options) {
|
||||
OpenLayers.Layer.WMS.prototype.initialize.apply(this, arguments);
|
||||
|
||||
var msg = "The OpenLayers.Layer.WMS.Untiled class is deprecated and " +
|
||||
"will be removed in 3.0. Instead, you should use the " +
|
||||
"normal OpenLayers.Layer.WMS class, passing it the option " +
|
||||
"'singleTile' as true.";
|
||||
OpenLayers.Console.warn(msg);
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: clone
|
||||
* Create a clone of this layer
|
||||
*
|
||||
* Returns:
|
||||
* {<OpenLayers.Layer.WMS.Untiled>} An exact clone of this layer
|
||||
*/
|
||||
clone: function (obj) {
|
||||
|
||||
if (obj == null) {
|
||||
obj = new OpenLayers.Layer.WMS.Untiled(this.name,
|
||||
this.url,
|
||||
this.params,
|
||||
this.getOptions());
|
||||
}
|
||||
|
||||
//get all additions from superclasses
|
||||
obj = OpenLayers.Layer.WMS.prototype.clone.apply(this, [obj]);
|
||||
|
||||
// copy/set any non-init, non-simple values here
|
||||
|
||||
return obj;
|
||||
},
|
||||
|
||||
CLASS_NAME: "OpenLayers.Layer.WMS.Untiled"
|
||||
});
|
||||
@@ -7,6 +7,12 @@
|
||||
* @requires OpenLayers/Events.js
|
||||
*/
|
||||
|
||||
/**
|
||||
* TODO: deprecate me
|
||||
* Use OpenLayers.Request.proxy instead.
|
||||
*/
|
||||
OpenLayers.ProxyHost = "";
|
||||
|
||||
/**
|
||||
* Namespace: OpenLayers.Request
|
||||
* The OpenLayers.Request namespace contains convenience methods for working
|
||||
|
||||
1971
lib/deprecated.js
Normal file
1971
lib/deprecated.js
Normal file
File diff suppressed because it is too large
Load Diff
@@ -2,8 +2,6 @@
|
||||
<head>
|
||||
<script src="../OLLoader.js"></script>
|
||||
<script type="text/javascript">
|
||||
// remove this next line at 3.0
|
||||
var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
|
||||
|
||||
function test_Class(t) {
|
||||
t.plan(1);
|
||||
@@ -181,134 +179,6 @@
|
||||
t.eq(c.a, 'foobar', 'constructor at the root is called');
|
||||
}
|
||||
|
||||
// Remove this at 3.0
|
||||
function test_Class_backwards(t) {
|
||||
t.plan(4);
|
||||
// test that a new style class supports old style inheritance
|
||||
var NewClass = OpenLayers.Class({
|
||||
newProp: "new",
|
||||
initialize: function() {
|
||||
t.ok(false, "the base class is never instantiated");
|
||||
},
|
||||
toString: function() {
|
||||
return "new style";
|
||||
}
|
||||
});
|
||||
|
||||
var OldClass = OpenLayers.Class.create();
|
||||
OldClass.prototype = OpenLayers.Class.inherit(NewClass, {
|
||||
oldProp: "old",
|
||||
initialize: function() {
|
||||
t.ok(true, "only the child class constructor is called");
|
||||
}
|
||||
});
|
||||
|
||||
var oldObj = new OldClass();
|
||||
t.eq(oldObj.oldProp, "old",
|
||||
"old style classes can still be instantiated");
|
||||
t.eq(oldObj.newProp, "new",
|
||||
"old style inheritance of properties works with new style base");
|
||||
t.eq(oldObj.toString(), "new style",
|
||||
"toString inheritance works with backwards style");
|
||||
|
||||
}
|
||||
|
||||
// Remove this at 3.0
|
||||
function test_Class_create (t) {
|
||||
t.plan( 3 );
|
||||
var cls = OpenLayers.Class.create();
|
||||
cls.prototype = {
|
||||
initialize: function () {
|
||||
if (isMozilla)
|
||||
t.ok(this instanceof cls,
|
||||
"initialize is called on the right class");
|
||||
else
|
||||
t.ok(true, "initialize is called");
|
||||
}
|
||||
};
|
||||
var obj = new cls();
|
||||
t.eq(typeof obj, "object", "obj is an object");
|
||||
if (isMozilla)
|
||||
t.ok(obj instanceof cls,
|
||||
"object is of the right class");
|
||||
else
|
||||
t.ok(true, "this test doesn't work in IE");
|
||||
}
|
||||
|
||||
// Remove this at 3.0
|
||||
function test_Class_inherit (t) {
|
||||
t.plan( 20 );
|
||||
var A = OpenLayers.Class.create();
|
||||
var initA = 0;
|
||||
A.prototype = {
|
||||
count: 0,
|
||||
mixed: false,
|
||||
initialize: function () {
|
||||
initA++;
|
||||
this.count++;
|
||||
}
|
||||
};
|
||||
|
||||
var B = OpenLayers.Class.create();
|
||||
var initB = 0;
|
||||
B.prototype = OpenLayers.Class.inherit( A, {
|
||||
initialize: function () {
|
||||
A.prototype.initialize.apply(this, arguments);
|
||||
initB++;
|
||||
this.count++;
|
||||
}
|
||||
});
|
||||
|
||||
var mixin = OpenLayers.Class.create()
|
||||
mixin.prototype = {
|
||||
mixed: true
|
||||
};
|
||||
|
||||
t.eq( initA, 0, "class A not inited" );
|
||||
t.eq( initB, 0, "class B not inited" );
|
||||
|
||||
var objA = new A();
|
||||
t.eq( objA.count, 1, "object A init" );
|
||||
t.eq( initA, 1, "class A init" );
|
||||
if (isMozilla)
|
||||
t.ok( objA instanceof A, "obj A isa A" );
|
||||
else
|
||||
t.ok( true, "IE sucks" );
|
||||
|
||||
var objB = new B();
|
||||
t.eq( initA, 2, "class A init" );
|
||||
t.eq( initB, 1, "class B init" );
|
||||
t.eq( objB.count, 2, "object B init twice" );
|
||||
if (isMozilla) {
|
||||
t.ok( objB instanceof A, "obj B isa A" );
|
||||
t.ok( objB instanceof B, "obj B isa B" );
|
||||
} else {
|
||||
t.ok( true, "IE sucks" );
|
||||
t.ok( true, "IE sucks" );
|
||||
}
|
||||
|
||||
var C = OpenLayers.Class.create();
|
||||
C.prototype = OpenLayers.Class.inherit( B, mixin, {count: 0} );
|
||||
t.eq( initA, 2, "class A init unchanged" );
|
||||
t.eq( initB, 1, "class B init unchanged" );
|
||||
|
||||
var objC = new C();
|
||||
t.eq( initA, 3, "class A init changed" );
|
||||
t.eq( initB, 2, "class B init changed" );
|
||||
t.eq( objC.count, 2, "object C init changed" );
|
||||
if (isMozilla) {
|
||||
t.ok( objC instanceof A, "obj C isa A" );
|
||||
t.ok( objC instanceof B, "obj C isa B" );
|
||||
t.ok( objC instanceof C, "obj C isa C" );
|
||||
t.ok( !(objC instanceof mixin), "obj C isn'ta mixin" );
|
||||
} else {
|
||||
t.ok( true, "IE sucks" );
|
||||
t.ok( true, "IE sucks" );
|
||||
t.ok( true, "IE sucks" );
|
||||
t.ok( true, "IE sucks" );
|
||||
}
|
||||
t.eq( objC.mixed, true, "class C has mixin properties" );
|
||||
}
|
||||
|
||||
function test_Class_isInstanceOf(t) {
|
||||
t.plan(7);
|
||||
|
||||
@@ -45,48 +45,6 @@
|
||||
t.eq(elem2.style.display, "none", "shown element toggled to hidden");
|
||||
}
|
||||
|
||||
function test_Element_hide(t) {
|
||||
t.plan(2);
|
||||
|
||||
var elem1 = {
|
||||
style: {
|
||||
'display': "none"
|
||||
}
|
||||
};
|
||||
|
||||
var elem2 = {
|
||||
style: {
|
||||
'display': ""
|
||||
}
|
||||
};
|
||||
|
||||
OpenLayers.Element.hide(elem1, elem2, "do-not-exists");
|
||||
|
||||
t.eq(elem1.style.display, "none", "hidden element stays hidden");
|
||||
t.eq(elem2.style.display, "none", "shown element hidden");
|
||||
}
|
||||
|
||||
function test_Element_show(t) {
|
||||
t.plan(2);
|
||||
|
||||
var elem1 = {
|
||||
style: {
|
||||
'display': "none"
|
||||
}
|
||||
};
|
||||
|
||||
var elem2 = {
|
||||
style: {
|
||||
'display': ""
|
||||
}
|
||||
};
|
||||
|
||||
OpenLayers.Element.show(elem1, "do-not-exists", elem2);
|
||||
|
||||
t.eq(elem1.style.display, "", "hidden element shown");
|
||||
t.eq(elem2.style.display, "", "shown element stays shown");
|
||||
}
|
||||
|
||||
function test_Element_remove(t) {
|
||||
t.plan(1);
|
||||
|
||||
|
||||
@@ -196,9 +196,9 @@
|
||||
{ controls: [] , 'numZoomLevels':20});
|
||||
|
||||
var satellite = new OpenLayers.Layer.Google( "Google Satellite" , {type: G_SATELLITE_MAP, 'maxZoomLevel':18} );
|
||||
var layer = new OpenLayers.Layer.WMS.Untiled( "OpenLayers WMS",
|
||||
var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
|
||||
"http://labs.metacarta.com/wms/vmap0", {layers: 'basic', 'transparent':true},
|
||||
{isBaseLayer: false} );
|
||||
{isBaseLayer: false, singleTile: true} );
|
||||
|
||||
map.addLayers([satellite, layer]);
|
||||
map.setCenter(new OpenLayers.LonLat(10.205188,48.857593), 5);
|
||||
|
||||
@@ -146,9 +146,9 @@
|
||||
{ controls: [] , 'numZoomLevels':20});
|
||||
|
||||
var satellite = new OpenLayers.Layer.Google( "Google Satellite" , {type: google.maps.MapTypeId.SATELLITE, 'maxZoomLevel':18} );
|
||||
var layer = new OpenLayers.Layer.WMS.Untiled( "OpenLayers WMS",
|
||||
var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
|
||||
"http://labs.metacarta.com/wms/vmap0", {layers: 'basic', 'transparent':true},
|
||||
{isBaseLayer: false} );
|
||||
{isBaseLayer: false, singleTile: true} );
|
||||
|
||||
map.addLayers([satellite, layer]);
|
||||
map.setCenter(new OpenLayers.LonLat(10.205188,48.857593), 5);
|
||||
|
||||
@@ -290,174 +290,6 @@
|
||||
t.ok( layer.grid == null, "grid set to null");
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
// Untiled tests
|
||||
|
||||
var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
|
||||
var layer;
|
||||
|
||||
var name = 'Test Layer';
|
||||
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
var params = { map: '/mapdata/vmap_wms.map',
|
||||
layers: 'basic'};
|
||||
|
||||
function test_Layer_MapServer_Untiled_constructor (t) {
|
||||
t.plan( 4 );
|
||||
|
||||
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
|
||||
t.ok( layer instanceof OpenLayers.Layer.MapServer.Untiled, "new OpenLayers.Layer.MapServer returns object" );
|
||||
t.eq( layer.url, "http://labs.metacarta.com/cgi-bin/mapserv", "layer.url is correct (HTTPRequest inited)" );
|
||||
|
||||
t.eq( layer.params.mode, "map", "default mode param correctly copied");
|
||||
t.eq( layer.params.map_imagetype, "png", "default imagetype correctly copied");
|
||||
|
||||
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_clone (t) {
|
||||
t.plan(3);
|
||||
|
||||
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
var map = new OpenLayers.Map('map', {});
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
|
||||
map.addLayer(layer);
|
||||
|
||||
var clone = layer.clone();
|
||||
layer.tile = [[1,2],[3,4]];
|
||||
|
||||
t.ok( clone.tile != layer.tile, "clone does not copy tile");
|
||||
|
||||
layer.ratio += 1;
|
||||
|
||||
t.eq( clone.ratio, 1.5, "changing layer.ratio does not change clone.ratio -- a fresh copy was made, not just copied reference");
|
||||
|
||||
t.eq( clone.alpha, layer.alpha, "alpha copied correctly");
|
||||
|
||||
layer.tile = null;
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_isBaseLayer(t) {
|
||||
t.plan(3);
|
||||
|
||||
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
|
||||
t.ok( layer.isBaseLayer, "baselayer is true by default");
|
||||
|
||||
var newParams = OpenLayers.Util.extend({}, params);
|
||||
newParams.transparent = "true";
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, newParams);
|
||||
t.ok( !layer.isBaseLayer, "baselayer is false when transparent is set to true");
|
||||
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params, {isBaseLayer: false});
|
||||
t.ok( !layer.isBaseLayer, "baselayer is false when option is set to false" );
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_mergeNewParams (t) {
|
||||
t.plan( 5 );
|
||||
|
||||
var map = new OpenLayers.Map("map");
|
||||
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
|
||||
|
||||
var newParams = { layers: 'sooper',
|
||||
chickpeas: 'image/png'};
|
||||
|
||||
map.addLayer(layer);
|
||||
map.zoomToMaxExtent();
|
||||
t.ok( !layer.grid[0][0].url.match("chickpeas"), "chickpeas is not in URL of first tile in grid" );
|
||||
|
||||
layer.mergeNewParams(newParams);
|
||||
|
||||
t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
|
||||
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
|
||||
t.ok( layer.grid[0][0].url.match("chickpeas"), "chickpeas is in URL of first tile in grid" );
|
||||
|
||||
newParams.chickpeas = 151;
|
||||
|
||||
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_getFullRequestString (t) {
|
||||
|
||||
|
||||
t.plan( 1 );
|
||||
var map = new OpenLayers.Map('map');
|
||||
tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
tParams = { layers: 'basic',
|
||||
format: 'png'};
|
||||
var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams);
|
||||
map.addLayer(tLayer);
|
||||
str = tLayer.getFullRequestString();
|
||||
var tParams = {
|
||||
layers: 'basic',
|
||||
format: 'png',
|
||||
mode: 'map',
|
||||
map_imagetype: 'png'
|
||||
};
|
||||
|
||||
var sStr = tUrl + "?" + OpenLayers.Util.getParameterString(tParams);
|
||||
sStr = sStr.replace(/,/g, "+");
|
||||
|
||||
t.eq(str, sStr , "getFullRequestString() works");
|
||||
map.destroy();
|
||||
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_setOpacity (t) {
|
||||
t.plan( 4 );
|
||||
|
||||
var map = new OpenLayers.Map('map');
|
||||
map.projection = "xx";
|
||||
tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
tParams = { layers: 'basic',
|
||||
format: 'image/png'};
|
||||
tOptions = { 'opacity': '0.5' };
|
||||
var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams, tOptions);
|
||||
map.addLayer(tLayer);
|
||||
map.zoomToMaxExtent();
|
||||
t.eq(tLayer.opacity, "0.5", "Opacity is set correctly");
|
||||
t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.5, "Opacity on tile is correct");
|
||||
tLayer.setOpacity("0.6");
|
||||
t.eq(tLayer.opacity, "0.6", "setOpacity works properly");
|
||||
t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.6, "Opacity on tile is changed correctly");
|
||||
map.destroy();
|
||||
|
||||
}
|
||||
|
||||
// DEPRECATED -- REMOVE IN 3.0
|
||||
function test_Layer_Untiled_MapServer(t) {
|
||||
t.plan(1);
|
||||
|
||||
var layer = new OpenLayers.Layer.MapServer.Untiled();
|
||||
|
||||
var clone = layer.clone();
|
||||
|
||||
t.ok(clone.singleTile, "regression test: clone works. this is for #1013");
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_destroy (t) {
|
||||
|
||||
t.plan( 1 );
|
||||
|
||||
var map = new OpenLayers.Map('map');
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
|
||||
map.addLayer(layer);
|
||||
|
||||
map.setCenter(new OpenLayers.LonLat(0,0), 5);
|
||||
|
||||
//grab a reference to one of the tiles
|
||||
var tile = layer.tile;
|
||||
|
||||
layer.destroy();
|
||||
|
||||
// checks to make sure superclass (grid) destroy() was called
|
||||
|
||||
t.ok( layer.tile == null, "tile set to null");
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
</script>
|
||||
</head>
|
||||
|
||||
@@ -445,19 +445,6 @@
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
// DEPRECATED -- REMOVE IN 3.0
|
||||
function test_Layer_Untiled_WMS(t) {
|
||||
t.plan(1);
|
||||
|
||||
var layer = new OpenLayers.Layer.WMS.Untiled();
|
||||
|
||||
var clone = layer.clone();
|
||||
|
||||
t.ok(clone.singleTile, "regression test: clone works. this is for #1013");
|
||||
}
|
||||
|
||||
function test_Layer_WMS_destroy (t) {
|
||||
|
||||
t.plan( 1 );
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<script src="OLLoader.js"></script>
|
||||
<script src="../OLLoader.js"></script>
|
||||
<script src="../../lib/deprecated.js"></script>
|
||||
<script type="text/javascript">
|
||||
|
||||
function test_Ajax_loadUrl(t) {
|
||||
142
tests/deprecated/BaseTypes/Class.html
Normal file
142
tests/deprecated/BaseTypes/Class.html
Normal file
@@ -0,0 +1,142 @@
|
||||
<html>
|
||||
<head>
|
||||
<script src="../../OLLoader.js"></script>
|
||||
<script src="../../../lib/deprecated.js"></script>
|
||||
<script type="text/javascript">
|
||||
// remove this next line at 3.0
|
||||
var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
|
||||
|
||||
// Remove this at 3.0
|
||||
function test_Class_backwards(t) {
|
||||
t.plan(4);
|
||||
// test that a new style class supports old style inheritance
|
||||
var NewClass = OpenLayers.Class({
|
||||
newProp: "new",
|
||||
initialize: function() {
|
||||
t.ok(false, "the base class is never instantiated");
|
||||
},
|
||||
toString: function() {
|
||||
return "new style";
|
||||
}
|
||||
});
|
||||
|
||||
var OldClass = OpenLayers.Class.create();
|
||||
OldClass.prototype = OpenLayers.Class.inherit(NewClass, {
|
||||
oldProp: "old",
|
||||
initialize: function() {
|
||||
t.ok(true, "only the child class constructor is called");
|
||||
}
|
||||
});
|
||||
|
||||
var oldObj = new OldClass();
|
||||
t.eq(oldObj.oldProp, "old",
|
||||
"old style classes can still be instantiated");
|
||||
t.eq(oldObj.newProp, "new",
|
||||
"old style inheritance of properties works with new style base");
|
||||
t.eq(oldObj.toString(), "new style",
|
||||
"toString inheritance works with backwards style");
|
||||
|
||||
}
|
||||
|
||||
// Remove this at 3.0
|
||||
function test_Class_create (t) {
|
||||
t.plan( 3 );
|
||||
var cls = OpenLayers.Class.create();
|
||||
cls.prototype = {
|
||||
initialize: function () {
|
||||
if (isMozilla)
|
||||
t.ok(this instanceof cls,
|
||||
"initialize is called on the right class");
|
||||
else
|
||||
t.ok(true, "initialize is called");
|
||||
}
|
||||
};
|
||||
var obj = new cls();
|
||||
t.eq(typeof obj, "object", "obj is an object");
|
||||
if (isMozilla)
|
||||
t.ok(obj instanceof cls,
|
||||
"object is of the right class");
|
||||
else
|
||||
t.ok(true, "this test doesn't work in IE");
|
||||
}
|
||||
|
||||
// Remove this at 3.0
|
||||
function test_Class_inherit (t) {
|
||||
t.plan( 20 );
|
||||
var A = OpenLayers.Class.create();
|
||||
var initA = 0;
|
||||
A.prototype = {
|
||||
count: 0,
|
||||
mixed: false,
|
||||
initialize: function () {
|
||||
initA++;
|
||||
this.count++;
|
||||
}
|
||||
};
|
||||
|
||||
var B = OpenLayers.Class.create();
|
||||
var initB = 0;
|
||||
B.prototype = OpenLayers.Class.inherit( A, {
|
||||
initialize: function () {
|
||||
A.prototype.initialize.apply(this, arguments);
|
||||
initB++;
|
||||
this.count++;
|
||||
}
|
||||
});
|
||||
|
||||
var mixin = OpenLayers.Class.create()
|
||||
mixin.prototype = {
|
||||
mixed: true
|
||||
};
|
||||
|
||||
t.eq( initA, 0, "class A not inited" );
|
||||
t.eq( initB, 0, "class B not inited" );
|
||||
|
||||
var objA = new A();
|
||||
t.eq( objA.count, 1, "object A init" );
|
||||
t.eq( initA, 1, "class A init" );
|
||||
if (isMozilla)
|
||||
t.ok( objA instanceof A, "obj A isa A" );
|
||||
else
|
||||
t.ok( true, "IE sucks" );
|
||||
|
||||
var objB = new B();
|
||||
t.eq( initA, 2, "class A init" );
|
||||
t.eq( initB, 1, "class B init" );
|
||||
t.eq( objB.count, 2, "object B init twice" );
|
||||
if (isMozilla) {
|
||||
t.ok( objB instanceof A, "obj B isa A" );
|
||||
t.ok( objB instanceof B, "obj B isa B" );
|
||||
} else {
|
||||
t.ok( true, "IE sucks" );
|
||||
t.ok( true, "IE sucks" );
|
||||
}
|
||||
|
||||
var C = OpenLayers.Class.create();
|
||||
C.prototype = OpenLayers.Class.inherit( B, mixin, {count: 0} );
|
||||
t.eq( initA, 2, "class A init unchanged" );
|
||||
t.eq( initB, 1, "class B init unchanged" );
|
||||
|
||||
var objC = new C();
|
||||
t.eq( initA, 3, "class A init changed" );
|
||||
t.eq( initB, 2, "class B init changed" );
|
||||
t.eq( objC.count, 2, "object C init changed" );
|
||||
if (isMozilla) {
|
||||
t.ok( objC instanceof A, "obj C isa A" );
|
||||
t.ok( objC instanceof B, "obj C isa B" );
|
||||
t.ok( objC instanceof C, "obj C isa C" );
|
||||
t.ok( !(objC instanceof mixin), "obj C isn'ta mixin" );
|
||||
} else {
|
||||
t.ok( true, "IE sucks" );
|
||||
t.ok( true, "IE sucks" );
|
||||
t.ok( true, "IE sucks" );
|
||||
t.ok( true, "IE sucks" );
|
||||
}
|
||||
t.eq( objC.mixed, true, "class C has mixin properties" );
|
||||
}
|
||||
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
</body>
|
||||
</html>
|
||||
56
tests/deprecated/BaseTypes/Element.html
Normal file
56
tests/deprecated/BaseTypes/Element.html
Normal file
@@ -0,0 +1,56 @@
|
||||
<html>
|
||||
<head>
|
||||
<script src="../../OLLoader.js"></script>
|
||||
<script src="../../../lib/deprecated.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
function test_Element_hide(t) {
|
||||
t.plan(2);
|
||||
|
||||
var elem1 = {
|
||||
style: {
|
||||
'display': "none"
|
||||
}
|
||||
};
|
||||
|
||||
var elem2 = {
|
||||
style: {
|
||||
'display': ""
|
||||
}
|
||||
};
|
||||
|
||||
OpenLayers.Element.hide(elem1, elem2, "do-not-exists");
|
||||
|
||||
t.eq(elem1.style.display, "none", "hidden element stays hidden");
|
||||
t.eq(elem2.style.display, "none", "shown element hidden");
|
||||
}
|
||||
|
||||
function test_Element_show(t) {
|
||||
t.plan(2);
|
||||
|
||||
var elem1 = {
|
||||
style: {
|
||||
'display': "none"
|
||||
}
|
||||
};
|
||||
|
||||
var elem2 = {
|
||||
style: {
|
||||
'display': ""
|
||||
}
|
||||
};
|
||||
|
||||
OpenLayers.Element.show(elem1, "do-not-exists", elem2);
|
||||
|
||||
t.eq(elem1.style.display, "", "hidden element shown");
|
||||
t.eq(elem2.style.display, "", "shown element stays shown");
|
||||
}
|
||||
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="elemID" style="width:50px; height:100px; background-color:red">test</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<script src="../OLLoader.js"></script>
|
||||
<script src="../../OLLoader.js"></script>
|
||||
<script src="../../../lib/deprecated.js"></script>
|
||||
<script type="text/javascript">
|
||||
var map;
|
||||
function test_Control_MouseToolbar_constructor (t) {
|
||||
179
tests/deprecated/Layer/MapServer/Untiled.html
Normal file
179
tests/deprecated/Layer/MapServer/Untiled.html
Normal file
@@ -0,0 +1,179 @@
|
||||
<html>
|
||||
<head>
|
||||
|
||||
<script src="../../../OLLoader.js"></script>
|
||||
<script src="../../../../lib/deprecated.js"></script>
|
||||
<script type="text/javascript">
|
||||
|
||||
var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
|
||||
var layer;
|
||||
|
||||
var name = 'Test Layer';
|
||||
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
var params = { map: '/mapdata/vmap_wms.map',
|
||||
layers: 'basic'};
|
||||
|
||||
function test_Layer_MapServer_Untiled_constructor (t) {
|
||||
t.plan( 4 );
|
||||
|
||||
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
|
||||
t.ok( layer instanceof OpenLayers.Layer.MapServer.Untiled, "new OpenLayers.Layer.MapServer returns object" );
|
||||
t.eq( layer.url, "http://labs.metacarta.com/cgi-bin/mapserv", "layer.url is correct (HTTPRequest inited)" );
|
||||
|
||||
t.eq( layer.params.mode, "map", "default mode param correctly copied");
|
||||
t.eq( layer.params.map_imagetype, "png", "default imagetype correctly copied");
|
||||
|
||||
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_clone (t) {
|
||||
t.plan(3);
|
||||
|
||||
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
var map = new OpenLayers.Map('map', {});
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
|
||||
map.addLayer(layer);
|
||||
|
||||
var clone = layer.clone();
|
||||
layer.tile = [[1,2],[3,4]];
|
||||
|
||||
t.ok( clone.tile != layer.tile, "clone does not copy tile");
|
||||
|
||||
layer.ratio += 1;
|
||||
|
||||
t.eq( clone.ratio, 1.5, "changing layer.ratio does not change clone.ratio -- a fresh copy was made, not just copied reference");
|
||||
|
||||
t.eq( clone.alpha, layer.alpha, "alpha copied correctly");
|
||||
|
||||
layer.tile = null;
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_isBaseLayer(t) {
|
||||
t.plan(3);
|
||||
|
||||
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
|
||||
t.ok( layer.isBaseLayer, "baselayer is true by default");
|
||||
|
||||
var newParams = OpenLayers.Util.extend({}, params);
|
||||
newParams.transparent = "true";
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, newParams);
|
||||
t.ok( !layer.isBaseLayer, "baselayer is false when transparent is set to true");
|
||||
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params, {isBaseLayer: false});
|
||||
t.ok( !layer.isBaseLayer, "baselayer is false when option is set to false" );
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_mergeNewParams (t) {
|
||||
t.plan( 5 );
|
||||
|
||||
var map = new OpenLayers.Map("map");
|
||||
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
|
||||
|
||||
var newParams = { layers: 'sooper',
|
||||
chickpeas: 'image/png'};
|
||||
|
||||
map.addLayer(layer);
|
||||
map.zoomToMaxExtent();
|
||||
t.ok( !layer.grid[0][0].url.match("chickpeas"), "chickpeas is not in URL of first tile in grid" );
|
||||
|
||||
layer.mergeNewParams(newParams);
|
||||
|
||||
t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
|
||||
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
|
||||
t.ok( layer.grid[0][0].url.match("chickpeas"), "chickpeas is in URL of first tile in grid" );
|
||||
|
||||
newParams.chickpeas = 151;
|
||||
|
||||
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_getFullRequestString (t) {
|
||||
|
||||
|
||||
t.plan( 1 );
|
||||
var map = new OpenLayers.Map('map');
|
||||
tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
tParams = { layers: 'basic',
|
||||
format: 'png'};
|
||||
var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams);
|
||||
map.addLayer(tLayer);
|
||||
str = tLayer.getFullRequestString();
|
||||
var tParams = {
|
||||
layers: 'basic',
|
||||
format: 'png',
|
||||
mode: 'map',
|
||||
map_imagetype: 'png'
|
||||
};
|
||||
|
||||
var sStr = tUrl + "?" + OpenLayers.Util.getParameterString(tParams);
|
||||
sStr = sStr.replace(/,/g, "+");
|
||||
|
||||
t.eq(str, sStr , "getFullRequestString() works");
|
||||
map.destroy();
|
||||
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_setOpacity (t) {
|
||||
t.plan( 4 );
|
||||
|
||||
var map = new OpenLayers.Map('map');
|
||||
map.projection = "xx";
|
||||
tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
|
||||
tParams = { layers: 'basic',
|
||||
format: 'image/png'};
|
||||
tOptions = { 'opacity': '0.5' };
|
||||
var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams, tOptions);
|
||||
map.addLayer(tLayer);
|
||||
map.zoomToMaxExtent();
|
||||
t.eq(tLayer.opacity, "0.5", "Opacity is set correctly");
|
||||
t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.5, "Opacity on tile is correct");
|
||||
tLayer.setOpacity("0.6");
|
||||
t.eq(tLayer.opacity, "0.6", "setOpacity works properly");
|
||||
t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.6, "Opacity on tile is changed correctly");
|
||||
map.destroy();
|
||||
|
||||
}
|
||||
|
||||
// DEPRECATED -- REMOVE IN 3.0
|
||||
function test_Layer_Untiled_MapServer(t) {
|
||||
t.plan(1);
|
||||
|
||||
var layer = new OpenLayers.Layer.MapServer.Untiled();
|
||||
|
||||
var clone = layer.clone();
|
||||
|
||||
t.ok(clone.singleTile, "regression test: clone works. this is for #1013");
|
||||
}
|
||||
|
||||
function test_Layer_MapServer_Untiled_destroy (t) {
|
||||
|
||||
t.plan( 1 );
|
||||
|
||||
var map = new OpenLayers.Map('map');
|
||||
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
|
||||
map.addLayer(layer);
|
||||
|
||||
map.setCenter(new OpenLayers.LonLat(0,0), 5);
|
||||
|
||||
//grab a reference to one of the tiles
|
||||
var tile = layer.tile;
|
||||
|
||||
layer.destroy();
|
||||
|
||||
// checks to make sure superclass (grid) destroy() was called
|
||||
|
||||
t.ok( layer.tile == null, "tile set to null");
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="map" style="width:500px;height:550px"></div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,6 +1,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<script src="../../OLLoader.js"></script>
|
||||
<script src="../../../OLLoader.js"></script>
|
||||
<script src="../../../../lib/deprecated.js"></script>
|
||||
<script type="text/javascript">
|
||||
var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
|
||||
var isOpera = (navigator.userAgent.indexOf("Opera") != -1);
|
||||
@@ -1,5 +1,4 @@
|
||||
<ul id="testlist">
|
||||
<li>Ajax.html</li>
|
||||
<li>BaseTypes.html</li>
|
||||
<li>BaseTypes/Bounds.html</li>
|
||||
<li>BaseTypes/Class.html</li>
|
||||
@@ -25,7 +24,6 @@
|
||||
<li>Control/Measure.html</li>
|
||||
<li>Control/ModifyFeature.html</li>
|
||||
<li>Control/MousePosition.html</li>
|
||||
<li>Control/MouseToolbar.html</li>
|
||||
<li>Control/Navigation.html</li>
|
||||
<li>Control/NavigationHistory.html</li>
|
||||
<li>Control/NavToolbar.html</li>
|
||||
@@ -171,7 +169,6 @@
|
||||
<li>Layer/Vector/RootContainer.html</li>
|
||||
<li>Layer/WFS.html</li>
|
||||
<li>Layer/WMS.html</li>
|
||||
<li>Layer/WMS/Post.html</li>
|
||||
<li>Layer/WMTS.html</li>
|
||||
<li>Layer/WrapDateLine.html</li>
|
||||
<li>Layer/XYZ.html</li>
|
||||
@@ -229,4 +226,10 @@
|
||||
<li>Tween.html</li>
|
||||
<li>Kinetic.html</li>
|
||||
<li>Util.html</li>
|
||||
<li>deprecated/Ajax.html</li>
|
||||
<li>deprecated/BaseTypes/Class.html</li>
|
||||
<li>deprecated/BaseTypes/Element.html</li>
|
||||
<li>deprecated/Control/MouseToolbar.html</li>
|
||||
<li>deprecated/Layer/MapServer/Untiled.html</li>
|
||||
<li>deprecated/Layer/WMS/Post.html</li>
|
||||
</ul>
|
||||
|
||||
Reference in New Issue
Block a user