diff --git a/lib/OpenLayers/Feature/MetaCarta.js b/lib/OpenLayers/Feature/MetaCarta.js index dcfdfba0a7..3b5246f766 100644 --- a/lib/OpenLayers/Feature/MetaCarta.js +++ b/lib/OpenLayers/Feature/MetaCarta.js @@ -31,25 +31,25 @@ OpenLayers.Feature.MetaCarta.prototype= { initialize: function(fNode) { this.listeners = new Object(); - var docpt = OpenLayers.getNodes(fNode, "docpoint")[0]; + var docpt = OpenLayers.Util.getNodes(fNode, "docpoint")[0]; this.fid = docpt.getAttribute('fid'); this.id = this.fid; - var node = OpenLayers.getNodes(docpt, "position")[0]; - node = OpenLayers.getNodes(node, "gml:Point")[0]; + var node = OpenLayers.Util.getNodes(docpt, "position")[0]; + node = OpenLayers.Util.getNodes(node, "gml:Point")[0]; this.srsName = node.getAttribute('srsName'); - var temp = OpenLayers.getTagText(node, "gml:coordinates"); + var temp = OpenLayers.Util.getTagText(node, "gml:coordinates"); this._latlon = ol.LatLon.fromString(temp); - this.title = OpenLayers.getTagText(docpt, "title"); - this.location = OpenLayers.getTagText(docpt, "locationName"); - this.docurl = OpenLayers.getTagText(docpt, "documentUrl"); - this.extract = OpenLayers.getTagText(docpt, "extract"); - this.geoExtract = OpenLayers.getTagText(docpt, "geoextract"); - this.relevance = OpenLayers.getTagText(docpt, "relevance"); - this.geoRelevance = OpenLayers.getTagText(docpt, "georelevance"); + this.title = OpenLayers.Util.getTagText(docpt, "title"); + this.location = OpenLayers.Util.getTagText(docpt, "locationName"); + this.docurl = OpenLayers.Util.getTagText(docpt, "documentUrl"); + this.extract = OpenLayers.Util.getTagText(docpt, "extract"); + this.geoExtract = OpenLayers.Util.getTagText(docpt, "geoextract"); + this.relevance = OpenLayers.Util.getTagText(docpt, "relevance"); + this.geoRelevance = OpenLayers.Util.getTagText(docpt, "georelevance"); - this.markerImage = OpenLayers.getTagText(docpt, "markerImage"); + this.markerImage = OpenLayers.Util.getTagText(docpt, "markerImage"); this.size = new ol.Size(20, 25); // TODO: Fix this hard coded value. }, @@ -158,65 +158,4 @@ OpenLayers.Feature.MetaCarta.prototype= { }; -/** -* @param {Array} nodes -* @param {str} tagName -* -* @return {Array} -*/ -OpenLayers._getNodes=function(nodes, tagName) { - var retArray = new Array(); - for (var i=0;i 0)) - { - if (!index) { - index=0; - } - if (result[index].childNodes.length > 1) { - return result.childNodes[1].nodeValue; - } - else if (result[index].childNodes.length == 1) { - return result[index].firstChild.nodeValue; - } - } else { - return ""; - } -}; diff --git a/lib/OpenLayers/Tile/WFS.js b/lib/OpenLayers/Tile/WFS.js index 2605a84498..74b7491411 100644 --- a/lib/OpenLayers/Tile/WFS.js +++ b/lib/OpenLayers/Tile/WFS.js @@ -79,7 +79,7 @@ OpenLayers.Tile.WFS.prototype = doc = OpenLayers.parseXMLString(request.responseText); } - var resultFeatures = OpenLayers.getNodes(doc, "gml:featureMember"); + var resultFeatures = OpenLayers.Util.getNodes(doc, "gml:featureMember"); // ol.Log.info(this.grid.name + " found " + // resultFeatures.length + " features"); diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js index b54445d2d1..14d03a8207 100644 --- a/lib/OpenLayers/Util.js +++ b/lib/OpenLayers/Util.js @@ -684,3 +684,69 @@ OpenLayers.Util.applyDefaults = function (to, from) { } return to; }; + + + +/** These could/should be made namespace aware? +* +* @param {} p +* @param {str} tagName +* +* @return {Array} +*/ +OpenLayers.Util.getNodes=function(p, tagName) { + var nodes = Try.these( + function () { + return OpenLayers.Util._getNodes(p.documentElement.childNodes, + tagName); + }, + function () { + return OpenLayers.Util._getNodes(p.childNodes, tagName); + } + ); + return nodes; +}; + +/** +* @param {Array} nodes +* @param {str} tagName +* +* @return {Array} +*/ +OpenLayers.Util._getNodes=function(nodes, tagName) { + var retArray = new Array(); + for (var i=0;i 0)) + { + if (!index) { + index=0; + } + if (result[index].childNodes.length > 1) { + return result.childNodes[1].nodeValue; + } + else if (result[index].childNodes.length == 1) { + return result[index].firstChild.nodeValue; + } + } else { + return ""; + } +}; \ No newline at end of file