Compare commits
5 Commits
release-2.
...
release-2.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c24f78db5c | ||
|
|
ee7b50c436 | ||
|
|
07fd731e7f | ||
|
|
d25037210a | ||
|
|
0b0d04b637 |
@@ -19,7 +19,7 @@
|
|||||||
var layer = new OpenLayers.Layer.Vector("WFS", {
|
var layer = new OpenLayers.Layer.Vector("WFS", {
|
||||||
strategies: [new OpenLayers.Strategy.BBOX()],
|
strategies: [new OpenLayers.Strategy.BBOX()],
|
||||||
protocol: new OpenLayers.Protocol.WFS({
|
protocol: new OpenLayers.Protocol.WFS({
|
||||||
url: "http://publicus.opengeo.org/geoserver/wfs",
|
url: "http://demo.opengeo.org/geoserver/wfs",
|
||||||
featureType: "tasmania_roads",
|
featureType: "tasmania_roads",
|
||||||
featureNS: "http://www.openplans.org/topp"
|
featureNS: "http://www.openplans.org/topp"
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
"http://t1.hypercube.telascience.org/cgi-bin/landsat7",
|
"http://t1.hypercube.telascience.org/cgi-bin/landsat7",
|
||||||
{layers: "landsat7"});
|
{layers: "landsat7"});
|
||||||
|
|
||||||
ia_wms = new OpenLayers.Layer.WMS("Nexrad","http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi?",{layers:"nexrad-n0r-wmst",transparent:true,format:'image/png',time:"2005-08-29T13:00:00Z"});
|
ia_wms = new OpenLayers.Layer.WMS("Nexrad","http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi?",{layers:"nexrad-n0r-wmst",transparent:true,format:'image/png',time:"2005-08-29T13:00:00Z"});
|
||||||
|
|
||||||
jpl_wms.setVisibility(false);
|
jpl_wms.setVisibility(false);
|
||||||
|
|
||||||
|
|||||||
@@ -296,4 +296,4 @@
|
|||||||
/**
|
/**
|
||||||
* Constant: VERSION_NUMBER
|
* Constant: VERSION_NUMBER
|
||||||
*/
|
*/
|
||||||
OpenLayers.VERSION_NUMBER="$Revision$";
|
OpenLayers.VERSION_NUMBER="OpenLayers 2.8 -- $Revision$";
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ OpenLayers.String = {
|
|||||||
* Used to find tokens in a string.
|
* Used to find tokens in a string.
|
||||||
* Examples: ${a}, ${a.b.c}, ${a-b}, ${5}
|
* Examples: ${a}, ${a.b.c}, ${a-b}, ${5}
|
||||||
*/
|
*/
|
||||||
tokenRegEx: /\${([\w.]+?)}/g,
|
tokenRegEx: /\$\{([\w.]+?)\}/g,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Property: OpenLayers.String.numberRegEx
|
* Property: OpenLayers.String.numberRegEx
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
* {Object} The scope to use with the onBeforeSelect, onSelect, onUnselect
|
* {Object} The scope to use with the onBeforeSelect, onSelect, onUnselect
|
||||||
* callbacks. If null the scope will be this control.
|
* callbacks. If null the scope will be this control.
|
||||||
*/
|
*/
|
||||||
scope: this,
|
scope: null,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: geometryTypes
|
* APIProperty: geometryTypes
|
||||||
@@ -178,6 +178,10 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
OpenLayers.Control.prototype.EVENT_TYPES
|
OpenLayers.Control.prototype.EVENT_TYPES
|
||||||
);
|
);
|
||||||
OpenLayers.Control.prototype.initialize.apply(this, [options]);
|
OpenLayers.Control.prototype.initialize.apply(this, [options]);
|
||||||
|
|
||||||
|
if(this.scope === null) {
|
||||||
|
this.scope = this;
|
||||||
|
}
|
||||||
if(layers instanceof Array) {
|
if(layers instanceof Array) {
|
||||||
this.layers = layers;
|
this.layers = layers;
|
||||||
this.layer = new OpenLayers.Layer.Vector.RootContainer(
|
this.layer = new OpenLayers.Layer.Vector.RootContainer(
|
||||||
|
|||||||
@@ -557,8 +557,8 @@ OpenLayers.Format.ArcXML = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
var keys = this.fontStyleKeys;
|
var keys = this.fontStyleKeys;
|
||||||
for (var i = 0, len = keys.length; i < len; i++) {
|
for (var i = 0, len = keys.length; i < len; i++) {
|
||||||
var key = keys[i];
|
var key = keys[i];
|
||||||
if (symbol[key]) {
|
if (exact.symbol[key]) {
|
||||||
selem.setAttribute(key, renderer[key]);
|
selem.setAttribute(key, exact.symbol[key]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
eelem.appendChild(selem);
|
eelem.appendChild(selem);
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ OpenLayers.Format.WMSGetFeatureInfo = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
var attributes = {};
|
var attributes = {};
|
||||||
if (node.nodeType == 1) {
|
if (node.nodeType == 1) {
|
||||||
var children = node.childNodes;
|
var children = node.childNodes;
|
||||||
n = children.length
|
n = children.length;
|
||||||
for (var i = 0; i < n; ++i) {
|
for (var i = 0; i < n; ++i) {
|
||||||
var child = children[i];
|
var child = children[i];
|
||||||
if (child.nodeType == 1) {
|
if (child.nodeType == 1) {
|
||||||
|
|||||||
@@ -412,7 +412,7 @@ OpenLayers.Layer.ArcIMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
|||||||
|
|
||||||
if (!arcxml.iserror()) {
|
if (!arcxml.iserror()) {
|
||||||
// if the arcxml is not an error, call the callback with the features parsed
|
// if the arcxml is not an error, call the callback with the features parsed
|
||||||
callback.call(scope, arcxml.features);
|
callback.call(scope, response.features);
|
||||||
} else {
|
} else {
|
||||||
// if the arcxml is an error, return null features selected
|
// if the arcxml is an error, return null features selected
|
||||||
callback.call(scope, null);
|
callback.call(scope, null);
|
||||||
|
|||||||
@@ -213,7 +213,7 @@ OpenLayers.Layer.Google = OpenLayers.Class(
|
|||||||
*/
|
*/
|
||||||
onMapResize: function() {
|
onMapResize: function() {
|
||||||
// workaround for resizing of invisible or not yet fully loaded layers
|
// workaround for resizing of invisible or not yet fully loaded layers
|
||||||
// where GMap2.checkResize() does not work. We need to load all tiles
|
// where GMap2.checkResize() does not work. We need to load the GMap
|
||||||
// for the old div size, then checkResize(), and then call
|
// for the old div size, then checkResize(), and then call
|
||||||
// layer.moveTo() to trigger GMap.setCenter() (which will finish
|
// layer.moveTo() to trigger GMap.setCenter() (which will finish
|
||||||
// the GMap initialization).
|
// the GMap initialization).
|
||||||
@@ -222,7 +222,7 @@ OpenLayers.Layer.Google = OpenLayers.Class(
|
|||||||
} else {
|
} else {
|
||||||
if(!this._resized) {
|
if(!this._resized) {
|
||||||
var layer = this;
|
var layer = this;
|
||||||
var handle = GEvent.addListener(this.mapObject, "tilesloaded", function() {
|
var handle = GEvent.addListener(this.mapObject, "load", function() {
|
||||||
GEvent.removeListener(handle);
|
GEvent.removeListener(handle);
|
||||||
delete layer._resized;
|
delete layer._resized;
|
||||||
layer.mapObject.checkResize();
|
layer.mapObject.checkResize();
|
||||||
|
|||||||
@@ -53,8 +53,12 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
if (!document.namespaces.olv) {
|
if (!document.namespaces.olv) {
|
||||||
document.namespaces.add("olv", this.xmlns);
|
document.namespaces.add("olv", this.xmlns);
|
||||||
var style = document.createStyleSheet();
|
var style = document.createStyleSheet();
|
||||||
style.addRule('olv\\:*', "behavior: url(#default#VML); " +
|
var shapes = ['shape','rect', 'oval', 'fill', 'stroke', 'imagedata', 'group','textbox'];
|
||||||
"position: absolute; display: inline-block;");
|
for (var i = 0, len = shapes.length; i < len; i++) {
|
||||||
|
|
||||||
|
style.addRule('olv\\:' + shapes[i], "behavior: url(#default#VML); " +
|
||||||
|
"position: absolute; display: inline-block;");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
OpenLayers.Renderer.Elements.prototype.initialize.apply(this,
|
OpenLayers.Renderer.Elements.prototype.initialize.apply(this,
|
||||||
@@ -111,14 +115,14 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
|
|
||||||
|
|
||||||
var org = left + " " + top;
|
var org = left + " " + top;
|
||||||
this.root.setAttribute("coordorigin", org);
|
this.root.coordorigin = org;
|
||||||
var roots = [this.root, this.vectorRoot, this.textRoot];
|
var roots = [this.root, this.vectorRoot, this.textRoot];
|
||||||
var root;
|
var root;
|
||||||
for(var i=0, len=roots.length; i<len; ++i) {
|
for(var i=0, len=roots.length; i<len; ++i) {
|
||||||
root = roots[i];
|
root = roots[i];
|
||||||
|
|
||||||
var size = this.size.w + " " + this.size.h;
|
var size = this.size.w + " " + this.size.h;
|
||||||
root.setAttribute("coordsize", size);
|
root.coordsize = size;
|
||||||
|
|
||||||
}
|
}
|
||||||
// flip the VML display Y axis upside down so it
|
// flip the VML display Y axis upside down so it
|
||||||
@@ -240,11 +244,10 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
options.isStroked = false;
|
options.isStroked = false;
|
||||||
} else if (this.isComplexSymbol(style.graphicName)) {
|
} else if (this.isComplexSymbol(style.graphicName)) {
|
||||||
var cache = this.importSymbol(style.graphicName);
|
var cache = this.importSymbol(style.graphicName);
|
||||||
node.setAttribute("path", cache.path);
|
node.path = cache.path;
|
||||||
node.setAttribute("coordorigin", cache.left + "," +
|
node.coordorigin = cache.left + "," + cache.bottom;
|
||||||
cache.bottom);
|
|
||||||
var size = cache.size;
|
var size = cache.size;
|
||||||
node.setAttribute("coordsize", size + "," + size);
|
node.coordsize = size + "," + size;
|
||||||
this.drawCircle(node, geometry, style.pointRadius);
|
this.drawCircle(node, geometry, style.pointRadius);
|
||||||
node.style.flip = "y";
|
node.style.flip = "y";
|
||||||
} else {
|
} else {
|
||||||
@@ -254,9 +257,9 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
|
|
||||||
// fill
|
// fill
|
||||||
if (options.isFilled) {
|
if (options.isFilled) {
|
||||||
node.setAttribute("fillcolor", style.fillColor);
|
node.fillcolor = style.fillColor;
|
||||||
} else {
|
} else {
|
||||||
node.setAttribute("filled", "false");
|
node.filled = "false";
|
||||||
}
|
}
|
||||||
var fills = node.getElementsByTagName("fill");
|
var fills = node.getElementsByTagName("fill");
|
||||||
var fill = (fills.length == 0) ? null : fills[0];
|
var fill = (fills.length == 0) ? null : fills[0];
|
||||||
@@ -268,18 +271,18 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
if (!fill) {
|
if (!fill) {
|
||||||
fill = this.createNode('olv:fill', node.id + "_fill");
|
fill = this.createNode('olv:fill', node.id + "_fill");
|
||||||
}
|
}
|
||||||
fill.setAttribute("opacity", style.fillOpacity);
|
fill.opacity = style.fillOpacity;
|
||||||
|
|
||||||
if (node._geometryClass == "OpenLayers.Geometry.Point" &&
|
if (node._geometryClass == "OpenLayers.Geometry.Point" &&
|
||||||
style.externalGraphic) {
|
style.externalGraphic) {
|
||||||
|
|
||||||
// override fillOpacity
|
// override fillOpacity
|
||||||
if (style.graphicOpacity) {
|
if (style.graphicOpacity) {
|
||||||
fill.setAttribute("opacity", style.graphicOpacity);
|
fill.opacity = style.graphicOpacity;
|
||||||
}
|
}
|
||||||
|
|
||||||
fill.setAttribute("src", style.externalGraphic);
|
fill.src = style.externalGraphic;
|
||||||
fill.setAttribute("type", "frame");
|
fill.type = "frame";
|
||||||
|
|
||||||
if (!(style.graphicWidth && style.graphicHeight)) {
|
if (!(style.graphicWidth && style.graphicHeight)) {
|
||||||
fill.aspect = "atmost";
|
fill.aspect = "atmost";
|
||||||
@@ -298,7 +301,7 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
// the graphic as imagedata element. We cannot just remove
|
// the graphic as imagedata element. We cannot just remove
|
||||||
// the fill, because this is part of the hack described
|
// the fill, because this is part of the hack described
|
||||||
// in graphicRotate
|
// in graphicRotate
|
||||||
fill.setAttribute("opacity", 0);
|
fill.opacity = 0;
|
||||||
} else {
|
} else {
|
||||||
node.style.rotation = style.rotation;
|
node.style.rotation = style.rotation;
|
||||||
}
|
}
|
||||||
@@ -306,10 +309,10 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
|
|
||||||
// stroke
|
// stroke
|
||||||
if (options.isStroked) {
|
if (options.isStroked) {
|
||||||
node.setAttribute("strokecolor", style.strokeColor);
|
node.strokecolor = style.strokeColor;
|
||||||
node.setAttribute("strokeweight", style.strokeWidth + "px");
|
node.strokeweight = style.strokeWidth + "px";
|
||||||
} else {
|
} else {
|
||||||
node.setAttribute("stroked", "false");
|
node.stroked = false;
|
||||||
}
|
}
|
||||||
var strokes = node.getElementsByTagName("stroke");
|
var strokes = node.getElementsByTagName("stroke");
|
||||||
var stroke = (strokes.length == 0) ? null : strokes[0];
|
var stroke = (strokes.length == 0) ? null : strokes[0];
|
||||||
@@ -322,9 +325,9 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
stroke = this.createNode('olv:stroke', node.id + "_stroke");
|
stroke = this.createNode('olv:stroke', node.id + "_stroke");
|
||||||
node.appendChild(stroke);
|
node.appendChild(stroke);
|
||||||
}
|
}
|
||||||
stroke.setAttribute("opacity", style.strokeOpacity);
|
stroke.opacity = style.strokeOpacity;
|
||||||
stroke.setAttribute("endcap", !style.strokeLinecap || style.strokeLinecap == 'butt' ? 'flat' : style.strokeLinecap);
|
stroke.endcap = !style.strokeLinecap || style.strokeLinecap == 'butt' ? 'flat' : style.strokeLinecap;
|
||||||
stroke.setAttribute("dashstyle", this.dashStyle(style));
|
stroke.dashstyle = this.dashStyle(style);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (style.cursor != "inherit" && style.cursor != null) {
|
if (style.cursor != "inherit" && style.cursor != null) {
|
||||||
@@ -453,12 +456,12 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
var fillColor = node._style.fillColor;
|
var fillColor = node._style.fillColor;
|
||||||
var strokeColor = node._style.strokeColor;
|
var strokeColor = node._style.strokeColor;
|
||||||
if (fillColor == "none" &&
|
if (fillColor == "none" &&
|
||||||
node.getAttribute("fillcolor") != fillColor) {
|
node.fillcolor != fillColor) {
|
||||||
node.setAttribute("fillcolor", fillColor);
|
node.fillcolor = fillColor;
|
||||||
}
|
}
|
||||||
if (strokeColor == "none" &&
|
if (strokeColor == "none" &&
|
||||||
node.getAttribute("strokecolor") != strokeColor) {
|
node.strokecolor != strokeColor) {
|
||||||
node.setAttribute("strokecolor", strokeColor);
|
node.strokecolor = strokeColor;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -544,12 +547,12 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
createNode: function(type, id) {
|
createNode: function(type, id) {
|
||||||
var node = document.createElement(type);
|
var node = document.createElement(type);
|
||||||
if (id) {
|
if (id) {
|
||||||
node.setAttribute('id', id);
|
node.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
// IE hack to make elements unselectable, to prevent 'blue flash'
|
// IE hack to make elements unselectable, to prevent 'blue flash'
|
||||||
// while dragging vectors; #1410
|
// while dragging vectors; #1410
|
||||||
node.setAttribute('unselectable', 'on', 0);
|
node.unselectable = 'on';
|
||||||
node.onselectstart = function() { return(false); };
|
node.onselectstart = function() { return(false); };
|
||||||
|
|
||||||
return node;
|
return node;
|
||||||
@@ -816,7 +819,10 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
textbox.style.fontWeight = style.fontWeight;
|
textbox.style.fontWeight = style.fontWeight;
|
||||||
}
|
}
|
||||||
textbox.style.whiteSpace = "nowrap";
|
textbox.style.whiteSpace = "nowrap";
|
||||||
textbox.inset = "0px,0px,0px,0px";
|
// fun with IE: IE7 in standards compliant mode does not display any
|
||||||
|
// text with a left inset of 0. So we set this to 1px and subtract one
|
||||||
|
// pixel later when we set label.style.left
|
||||||
|
textbox.inset = "1px,0px,0px,0px";
|
||||||
|
|
||||||
if(!label.parentNode) {
|
if(!label.parentNode) {
|
||||||
label.appendChild(textbox);
|
label.appendChild(textbox);
|
||||||
@@ -828,7 +834,7 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(0,1)]);
|
(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(0,1)]);
|
||||||
var yshift = textbox.clientHeight *
|
var yshift = textbox.clientHeight *
|
||||||
(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(1,1)]);
|
(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(1,1)]);
|
||||||
label.style.left = parseInt(label.style.left)-xshift+"px";
|
label.style.left = parseInt(label.style.left)-xshift-1+"px";
|
||||||
label.style.top = parseInt(label.style.top)+yshift+"px";
|
label.style.top = parseInt(label.style.top)+yshift+"px";
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ OpenLayers.Style = OpenLayers.Class({
|
|||||||
var defaults = this.defaultStyle;
|
var defaults = this.defaultStyle;
|
||||||
OpenLayers.Util.applyDefaults(symbolizer, {
|
OpenLayers.Util.applyDefaults(symbolizer, {
|
||||||
pointRadius: defaults.pointRadius
|
pointRadius: defaults.pointRadius
|
||||||
})
|
});
|
||||||
if(symbolizer.stroke === true || symbolizer.graphic === true) {
|
if(symbolizer.stroke === true || symbolizer.graphic === true) {
|
||||||
OpenLayers.Util.applyDefaults(symbolizer, {
|
OpenLayers.Util.applyDefaults(symbolizer, {
|
||||||
strokeWidth: defaults.strokeWidth,
|
strokeWidth: defaults.strokeWidth,
|
||||||
|
|||||||
@@ -1282,36 +1282,13 @@ OpenLayers.Util.isEquivalentUrl = function(url1, url2, options) {
|
|||||||
var urlObj1 = OpenLayers.Util.createUrlObject(url1, options);
|
var urlObj1 = OpenLayers.Util.createUrlObject(url1, options);
|
||||||
var urlObj2 = OpenLayers.Util.createUrlObject(url2, options);
|
var urlObj2 = OpenLayers.Util.createUrlObject(url2, options);
|
||||||
|
|
||||||
//compare all keys (host, port, etc)
|
//compare all keys except for "args" (treated below)
|
||||||
for(var key in urlObj1) {
|
for(var key in urlObj1) {
|
||||||
if (options.test) {
|
if(key !== "args") {
|
||||||
OpenLayers.Console.userError(key + "\n1:" + urlObj1[key] + "\n2:" + urlObj2[key]);
|
if(urlObj1[key] != urlObj2[key]) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
var val1 = urlObj1[key];
|
|
||||||
var val2 = urlObj2[key];
|
|
||||||
|
|
||||||
switch(key) {
|
|
||||||
case "args":
|
|
||||||
//do nothing, they'll be treated below
|
|
||||||
break;
|
|
||||||
case "host":
|
|
||||||
case "port":
|
|
||||||
case "protocol":
|
|
||||||
if ((val1 == "") || (val2 == "")) {
|
|
||||||
//these will be blank for relative urls, so no need to
|
|
||||||
// compare them here -- call break.
|
|
||||||
//
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
// otherwise continue with default compare
|
|
||||||
//
|
|
||||||
default:
|
|
||||||
if ( (key != "args") && (urlObj1[key] != urlObj2[key]) ) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// compare search args - irrespective of order
|
// compare search args - irrespective of order
|
||||||
@@ -1350,7 +1327,7 @@ OpenLayers.Util.createUrlObject = function(url, options) {
|
|||||||
if(!(/^\w+:\/\//).test(url)) {
|
if(!(/^\w+:\/\//).test(url)) {
|
||||||
var loc = window.location;
|
var loc = window.location;
|
||||||
var port = loc.port ? ":" + loc.port : "";
|
var port = loc.port ? ":" + loc.port : "";
|
||||||
var fullUrl = loc.protocol + "//" + loc.host + port;
|
var fullUrl = loc.protocol + "//" + loc.host.split(":").shift() + port;
|
||||||
if(url.indexOf("/") === 0) {
|
if(url.indexOf("/") === 0) {
|
||||||
// full pathname
|
// full pathname
|
||||||
url = fullUrl + url;
|
url = fullUrl + url;
|
||||||
@@ -1371,27 +1348,23 @@ OpenLayers.Util.createUrlObject = function(url, options) {
|
|||||||
|
|
||||||
var urlObject = {};
|
var urlObject = {};
|
||||||
|
|
||||||
//host (without port)
|
//host (without port)
|
||||||
// if we don't have a host (which is the case with URLs starting with "/"
|
urlObject.host = a.host.split(":").shift();
|
||||||
// in IE), take the window location's host to match other browsers that
|
|
||||||
// fill in the window's location host automatically
|
|
||||||
urlObject.host = a.host || window.location.host;
|
|
||||||
var port = a.port;
|
|
||||||
if (port.length > 0) {
|
|
||||||
var newHostLength = urlObject.host.length - (port.length);
|
|
||||||
urlObject.host = urlObject.host.substring(0, newHostLength);
|
|
||||||
}
|
|
||||||
|
|
||||||
//protocol
|
//protocol
|
||||||
urlObject.protocol = a.protocol;
|
urlObject.protocol = a.protocol;
|
||||||
|
|
||||||
//port
|
//port (get uniform browser behavior with port 80 here)
|
||||||
urlObject.port = ((port == "80") && (options.ignorePort80)) ? "" : port;
|
if(options.ignorePort80) {
|
||||||
|
urlObject.port = (a.port == "80" || a.port == "0") ? "" : a.port;
|
||||||
//hash
|
} else {
|
||||||
urlObject.hash = (options.ignoreHash) ? "" : a.hash;
|
urlObject.port = (a.port == "" || a.port == "0") ? "80" : a.port;
|
||||||
|
}
|
||||||
|
|
||||||
|
//hash
|
||||||
|
urlObject.hash = (options.ignoreHash || a.hash === "#") ? "" : a.hash;
|
||||||
|
|
||||||
//args
|
//args
|
||||||
var queryString = a.search;
|
var queryString = a.search;
|
||||||
if (!queryString) {
|
if (!queryString) {
|
||||||
var qMark = url.indexOf("?");
|
var qMark = url.indexOf("?");
|
||||||
@@ -1399,65 +1372,9 @@ OpenLayers.Util.createUrlObject = function(url, options) {
|
|||||||
}
|
}
|
||||||
urlObject.args = OpenLayers.Util.getParameters(queryString);
|
urlObject.args = OpenLayers.Util.getParameters(queryString);
|
||||||
|
|
||||||
//pathname (this part allows for relative <-> absolute comparison)
|
//pathname (uniform browser behavior with leading "/")
|
||||||
if ( ((urlObject.protocol == "file:") && (url.indexOf("file:") != -1)) ||
|
urlObject.pathname = (a.pathname.charAt(0) == "/") ? a.pathname : "/" + a.pathname;
|
||||||
((urlObject.protocol != "file:") && (urlObject.host != "")) ) {
|
|
||||||
|
|
||||||
urlObject.pathname = a.pathname;
|
|
||||||
|
|
||||||
//Test to see if the pathname includes the arguments (Opera)
|
|
||||||
var qIndex = urlObject.pathname.indexOf("?");
|
|
||||||
if (qIndex != -1) {
|
|
||||||
urlObject.pathname = urlObject.pathname.substring(0, qIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
var relStr = OpenLayers.Util.removeTail(url);
|
|
||||||
|
|
||||||
var backs = 0;
|
|
||||||
do {
|
|
||||||
var index = relStr.indexOf("../");
|
|
||||||
|
|
||||||
if (index == 0) {
|
|
||||||
backs++;
|
|
||||||
relStr = relStr.substr(3);
|
|
||||||
} else if (index >= 0) {
|
|
||||||
var prevChunk = relStr.substr(0,index - 1);
|
|
||||||
|
|
||||||
var slash = prevChunk.indexOf("/");
|
|
||||||
prevChunk = (slash != -1) ? prevChunk.substr(0, slash +1)
|
|
||||||
: "";
|
|
||||||
|
|
||||||
var postChunk = relStr.substr(index + 3);
|
|
||||||
relStr = prevChunk + postChunk;
|
|
||||||
}
|
|
||||||
} while(index != -1);
|
|
||||||
|
|
||||||
var windowAnchor = document.createElement("a");
|
|
||||||
var windowUrl = window.location.href;
|
|
||||||
if (options.ignoreCase) {
|
|
||||||
windowUrl = windowUrl.toLowerCase();
|
|
||||||
}
|
|
||||||
windowAnchor.href = windowUrl;
|
|
||||||
|
|
||||||
//set protocol of window
|
|
||||||
urlObject.protocol = windowAnchor.protocol;
|
|
||||||
|
|
||||||
var splitter = (windowAnchor.pathname.indexOf("/") != -1) ? "/" : "\\";
|
|
||||||
var dirs = windowAnchor.pathname.split(splitter);
|
|
||||||
dirs.pop(); //remove filename
|
|
||||||
while ((backs > 0) && (dirs.length > 0)) {
|
|
||||||
dirs.pop();
|
|
||||||
backs--;
|
|
||||||
}
|
|
||||||
relStr = dirs.join("/") + "/"+ relStr;
|
|
||||||
urlObject.pathname = relStr;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((urlObject.protocol == "file:") || (urlObject.protocol == "")) {
|
|
||||||
urlObject.host = "localhost";
|
|
||||||
}
|
|
||||||
|
|
||||||
return urlObject;
|
return urlObject;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
5
news.txt
5
news.txt
@@ -1,3 +1,8 @@
|
|||||||
|
OpenLayers 2.8:
|
||||||
|
r9043
|
||||||
|
Released 06/22/09
|
||||||
|
http://trac.openlayers.org/wiki/Release/2.8/Notes
|
||||||
|
|
||||||
OpenLayers 2.7:
|
OpenLayers 2.7:
|
||||||
r8063
|
r8063
|
||||||
Released 09/29/08
|
Released 09/29/08
|
||||||
|
|||||||
@@ -68,7 +68,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function test_Control_SelectFeature_clickFeature(t) {
|
function test_Control_SelectFeature_clickFeature(t) {
|
||||||
t.plan(4);
|
t.plan(6);
|
||||||
// mock up layer
|
// mock up layer
|
||||||
var layer = {
|
var layer = {
|
||||||
selectedFeatures: [],
|
selectedFeatures: [],
|
||||||
@@ -100,6 +100,7 @@
|
|||||||
"onSelect called with proper feature (" + feature.index + ")");
|
"onSelect called with proper feature (" + feature.index + ")");
|
||||||
t.eq(feature.tested, feature.test,
|
t.eq(feature.tested, feature.test,
|
||||||
"onSelect called only once for feature (" + feature.index + ")");
|
"onSelect called only once for feature (" + feature.index + ")");
|
||||||
|
t.ok(this == control, "onSelect called in the scope of the control if control.scope is not provided");
|
||||||
}
|
}
|
||||||
|
|
||||||
// test that onUnselect gets called properly
|
// test that onUnselect gets called properly
|
||||||
@@ -109,9 +110,10 @@
|
|||||||
"onUnselect called with proper feature (" + feature.index + ")");
|
"onUnselect called with proper feature (" + feature.index + ")");
|
||||||
t.eq(feature.tested, feature.test,
|
t.eq(feature.tested, feature.test,
|
||||||
"onUnselect called only once for feature (" + feature.index + ")");
|
"onUnselect called only once for feature (" + feature.index + ")");
|
||||||
|
t.ok(this == control, "onUnselect called in the scope of the control if control.scope is not provided");
|
||||||
}
|
}
|
||||||
|
|
||||||
// mock up first click on first feature (runs 2 tests from onSelect)
|
// mock up first click on first feature (runs 3 tests from onSelect)
|
||||||
var feature = features[0];
|
var feature = features[0];
|
||||||
feature.index = 0;
|
feature.index = 0;
|
||||||
feature.test = 1;
|
feature.test = 1;
|
||||||
@@ -121,7 +123,7 @@
|
|||||||
control.toggle = false;
|
control.toggle = false;
|
||||||
control.clickFeature(feature);
|
control.clickFeature(feature);
|
||||||
|
|
||||||
// mock up second click on first feature (runs 2 tests from onUnselect)
|
// mock up second click on first feature (runs 3 tests from onUnselect)
|
||||||
control.toggle = true;
|
control.toggle = true;
|
||||||
feature.test = 2;
|
feature.test = 2;
|
||||||
control.clickFeature(feature);
|
control.clickFeature(feature);
|
||||||
|
|||||||
110
tests/Util.html
110
tests/Util.html
@@ -680,6 +680,116 @@
|
|||||||
t.ok(OpenLayers.Util.isEquivalentUrl(url1, url2), "absolute and relative path without host works for "+url2)
|
t.ok(OpenLayers.Util.isEquivalentUrl(url1, url2), "absolute and relative path without host works for "+url2)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function test_createUrlObject(t) {
|
||||||
|
|
||||||
|
var cases = [{
|
||||||
|
url: "http://example.com/",
|
||||||
|
exp: {
|
||||||
|
protocol: "http:",
|
||||||
|
host: "example.com",
|
||||||
|
port: "80",
|
||||||
|
pathname: "/",
|
||||||
|
args: {},
|
||||||
|
hash: ""
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
url: "http://example.com:80/",
|
||||||
|
opt: {ignorePort80: true},
|
||||||
|
exp: {
|
||||||
|
protocol: "http:",
|
||||||
|
host: "example.com",
|
||||||
|
port: "",
|
||||||
|
pathname: "/",
|
||||||
|
args: {},
|
||||||
|
hash: ""
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
url: "http://example.com/",
|
||||||
|
opt: {ignorePort80: true},
|
||||||
|
exp: {
|
||||||
|
protocol: "http:",
|
||||||
|
host: "example.com",
|
||||||
|
port: "",
|
||||||
|
pathname: "/",
|
||||||
|
args: {},
|
||||||
|
hash: ""
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
url: "http://example.com:88/",
|
||||||
|
exp: {
|
||||||
|
protocol: "http:",
|
||||||
|
host: "example.com",
|
||||||
|
port: "88",
|
||||||
|
pathname: "/",
|
||||||
|
args: {},
|
||||||
|
hash: ""
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
url: "http://example.com:88/foo#bar",
|
||||||
|
exp: {
|
||||||
|
protocol: "http:",
|
||||||
|
host: "example.com",
|
||||||
|
port: "88",
|
||||||
|
pathname: "/foo",
|
||||||
|
args: {},
|
||||||
|
hash: "#bar"
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
url: "http://example.com:88/?foo=bar",
|
||||||
|
exp: {
|
||||||
|
protocol: "http:",
|
||||||
|
host: "example.com",
|
||||||
|
port: "88",
|
||||||
|
pathname: "/",
|
||||||
|
args: {foo: "bar"},
|
||||||
|
hash: ""
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
url: "http://example.com/bogus/../bogus/../path",
|
||||||
|
exp: {
|
||||||
|
protocol: "http:",
|
||||||
|
host: "example.com",
|
||||||
|
port: "80",
|
||||||
|
pathname: "/path",
|
||||||
|
args: {},
|
||||||
|
hash: ""
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
url: "/relative#foo",
|
||||||
|
exp: {
|
||||||
|
protocol: window.location.protocol,
|
||||||
|
host: window.location.hostname,
|
||||||
|
port: window.location.port || "80",
|
||||||
|
pathname: "/relative",
|
||||||
|
args: {},
|
||||||
|
hash: "#foo"
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
url: "../foo",
|
||||||
|
exp: {
|
||||||
|
protocol: window.location.protocol,
|
||||||
|
host: window.location.hostname,
|
||||||
|
port: window.location.port || "80",
|
||||||
|
pathname: (function() {
|
||||||
|
var parts = window.location.pathname.split("/");
|
||||||
|
return parts.slice(0, parts.length -2).join("/") + "/foo";
|
||||||
|
})(),
|
||||||
|
args: {},
|
||||||
|
hash: ""
|
||||||
|
}
|
||||||
|
}];
|
||||||
|
|
||||||
|
t.plan(cases.length);
|
||||||
|
|
||||||
|
var c, obj;
|
||||||
|
for(var i=0; i<cases.length; ++i) {
|
||||||
|
c = cases[i];
|
||||||
|
obj = OpenLayers.Util.createUrlObject(c.url, c.opt);
|
||||||
|
t.eq(obj, c.exp, i + ": '" + c.url + "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
function test_Util_createUniqueIDSeq(t) {
|
function test_Util_createUniqueIDSeq(t) {
|
||||||
t.plan(1);
|
t.plan(1);
|
||||||
|
|
||||||
|
|||||||
103
tests/manual/arcims-2117.html
Normal file
103
tests/manual/arcims-2117.html
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
<head>
|
||||||
|
<title>ArcIMS Test Ticket #2117</title>
|
||||||
|
<link rel="stylesheet" href="../theme/default/style.css" type="text/css" />
|
||||||
|
<link rel="stylesheet" href="../../examples/style.css" type="text/css" />
|
||||||
|
<script src="../../lib/OpenLayers.js"></script>
|
||||||
|
<script type="text/javascript">
|
||||||
|
var lon = 0;
|
||||||
|
var lat = 0;
|
||||||
|
var zoom = 1;
|
||||||
|
var map, layer;
|
||||||
|
|
||||||
|
function init(){
|
||||||
|
OpenLayers.ProxyHost = "../../examples/proxy.cgi?url=";
|
||||||
|
|
||||||
|
map = new OpenLayers.Map( 'map' );
|
||||||
|
|
||||||
|
var options = {
|
||||||
|
serviceName: "OpenLayers_Sample",
|
||||||
|
async: true,
|
||||||
|
layers: [{
|
||||||
|
id:1,
|
||||||
|
visible:'true',
|
||||||
|
/*query:{
|
||||||
|
where: '1=1',
|
||||||
|
spatialfilter: true
|
||||||
|
},*/
|
||||||
|
renderer:{
|
||||||
|
type: 'valuemaplabel',
|
||||||
|
lookupfield: 'FIPS_ID',
|
||||||
|
labelfield: 'FIPS_CNTRY',
|
||||||
|
exacts:[{
|
||||||
|
value: '227',
|
||||||
|
symbol: {
|
||||||
|
type: 'text',
|
||||||
|
antialiasing: 'true',
|
||||||
|
interval: 6,
|
||||||
|
blockout: '255,255,255',
|
||||||
|
font: 'Arial',
|
||||||
|
fontcolor: '0,0,0',
|
||||||
|
fontsize: 11,
|
||||||
|
transparency: 0.7
|
||||||
|
}
|
||||||
|
},{
|
||||||
|
value: '150',
|
||||||
|
symbol: {
|
||||||
|
type: 'text',
|
||||||
|
antialiasing: 'true',
|
||||||
|
interval: 6,
|
||||||
|
blockout: '255,255,255',
|
||||||
|
font: 'Arial',
|
||||||
|
fontcolor: '0,0,0',
|
||||||
|
fontsize: 11,
|
||||||
|
transparency: 0.7
|
||||||
|
}
|
||||||
|
},{
|
||||||
|
value: '75',
|
||||||
|
symbol: {
|
||||||
|
type: 'text',
|
||||||
|
antialiasing: 'true',
|
||||||
|
interval: 6,
|
||||||
|
blockout: '255,255,255',
|
||||||
|
font: 'Arial',
|
||||||
|
fontcolor: '0,0,0',
|
||||||
|
fontsize: 11,
|
||||||
|
transparency: 0.7
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
};
|
||||||
|
|
||||||
|
layer = new OpenLayers.Layer.ArcIMS( "Global Sample Map",
|
||||||
|
"http://sample.avencia.com/servlet/com.esri.esrimap.Esrimap", options );
|
||||||
|
map.addLayer(layer);
|
||||||
|
|
||||||
|
map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
|
||||||
|
map.addControl( new OpenLayers.Control.LayerSwitcher() );
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body onload="init()">
|
||||||
|
<h1 id="title">ArcIMS Test Ticket #2117</h1>
|
||||||
|
|
||||||
|
<div id="tags">
|
||||||
|
</div>
|
||||||
|
<p id="shortdesc">
|
||||||
|
<a href="http://trac.openlayers.org/ticket/2117">Testing ticket #2117</a>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div id="map" class="smallmap"></div>
|
||||||
|
|
||||||
|
<div id="docs">
|
||||||
|
This is an example of a bug in the ArcXML format writer.
|
||||||
|
If you don't see a map, it's broken.
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user