Changeset 5794

Timestamp:

01/17/08 01:55:12 (11 months ago)

Author:

rdewit

Message:

Code cleanups

Files:

• sandbox/rdewit/kml/lib/OpenLayers/Format/KML.js (modified) (24 diffs)

sandbox/rdewit/kml/lib/OpenLayers/Format/KML.js

@@ -66 +66 @@
-    /**
-     * Property: gmlns
-"*"
+this.internalns
-     *     
-     */
@@ -86 +86 @@
-
-    /**
-loadedKML
+fetched
-     * {Object} Storage of KML URLs that have been fetched before
-     *     in order to prevent reloading them.
-     */
-loadedKML
+fetched
-
-    /**
@@ -101 +101 @@
-     */
-    initialize: function(options) {
+        OpenLayers.Format.GML.prototype.initialize.apply(this, [options]);
+
-        // compile regular expressions once instead of every time they are used
-        this.regExes = {
@@ -106 +108 @@
-            removeSpace: (/\s*/g),
-            splitSpace: (/\s+/),
-
+
+
+
+
-        };
-        OpenLayers.Format.GML.prototype.initialize.apply(this, [options]);
-
-    },
@@ -122 +126 @@
-     * {Array(<OpenLayers.Feature.Vector>)} List of features.
-     */
-
-
+
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
@@ -133 +136 @@
-        // Should not be in Format/KML.js.
-        var serviceException = this.getElementsByTagNameNS(data, 
-"*"
+this.internalns
-                               "ServiceException")[0];
-        if (serviceException) {
@@ -141 +144 @@
-                message  += code + "\n";
-            }
-
+
+
-            alert(message);
-            return false;
@@ -148 +152 @@
-        
-        var urlNodes = this.getElementsByTagNameNS(data,
-'*'
+this.internalns
-                                                       "Url");
-        var numurls = urlNodes.length;
@@ -154 +158 @@
-        for(var i=0; i<numurls; i++) {
-            var hrefNode = this.getElementsByTagNameNS(urlNodes[i], 
-"*"
+this.internalns
-                                   "href")[0];
-            //console.info(url);
@@ -160 +164 @@
-                var href = OpenLayers.Util.getXmlNodeValue(hrefNode);
-
-loadedKML
+fetched
-                    continue;
-                }
-
-                //console.info(href);
-
+
+
-                    href = OpenLayers.ProxyHost + escape(href);
-                }
-
-
+
+
+
-                if (request && request.transport) {
-
+, true
-                }
-            } 
@@ -177 +183 @@
-
-        var linkNodes = this.getElementsByTagNameNS(data,
-'*'
+this.internalns
-                                                       "Link");
-        var numlinks = linkNodes.length;
@@ -183 +189 @@
-        for(var i=0; i<numlinks; i++) {
-            var hrefNode = this.getElementsByTagNameNS(linkNodes[i], 
-"*"
+this.internalns
-                                   "href")[0];
-            //console.info(link);
@@ -189 +195 @@
-                var href = OpenLayers.Util.getXmlNodeValue(hrefNode);
-
-loadedKML
+fetched
-                    continue;
-                }
-
-
+
+
-                    href = OpenLayers.ProxyHost + escape(href);
-                }
-
-
+
+
+
-                if (request && request.transport) {
-
+, true
-                }
-            } 
@@ -206 +214 @@
-        //
-        // Parse internal Style information
-read
+parse
-
-
@@ -221 +229 @@
-            //var feature = this.parseFeature(featureNodes[i]);
-            var featureNode = featureNodes[i];
-
+
+
-
-             //console.info(feature);
-            if(feature) {
-                // give feature default style
-
+
+
-                 
-                if (feature.attributes.styleUrl) {
-                    //console.info(styleUrl, feature.style, this.getStyle(styleUrl));
-                    var newStyle = this.getStyle(feature.attributes.styleUrl);
-
-                    if (newStyle) {
-
+
+
-                    }
-                    //console.info(feature.style);
@@ -241 +251 @@
-                // processed as well: add a styleUrl attribute to the feature.
-                var styleNode = this.getElementsByTagNameNS(featureNode,
-'*'
+this.internalns
-                                                       "Style")[0];
-                if (styleNode) {
@@ -247 +257 @@
-                    //console.info(style.name, style);
-                    if (style) {
-
+
+
-                    }
-                }
@@ -264 +275 @@
-
-        // Reverse drawing order of features (this seems to be standard in KML)
-
+!recursion && 
-            this.features.reverse();
-        }
@@ -281 +292 @@
-
-    getStyle: function(styleUrl) {
-
-
-
-
-
-
+
+
+
+
+
+
+
-            var href = baseUrl;
+
-            if (OpenLayers.String.startsWith(styleUrl, "http")) {
-                href = OpenLayers.ProxyHost + escape(baseUrl);
-            }
-                    
-
+
+
-            if (request && request.transport) {
-loadedKML
+fetched
-                var data = request.transport.responseText;
-                if(typeof data == "string") {
-
+
+
-                }
-                if (data) {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        var style = this.styles[styleUrl];
-        //console.info(style);
-
-        return style;
-    },
-    
-
-
+
+
-        if (!data) {
-            return null;
-        }
-
-
-
-
-
+
+
+
-
-        // Parse Styles
-        var styleNodes = this.getElementsByTagNameNS(data,
-'*'
+this.internalns
-                                                       "Style");
-
@@ -350 +359 @@
-        // To do the select or "highlight" bit, we'd need to change lots more
-        var styleMapNodes = this.getElementsByTagNameNS(data,
-'*'
+this.internalns
-                                                       "StyleMap");
-
@@ -357 +366 @@
-        for(var i=0; i<numNodes; i++) {
-            var node = styleMapNodes[i];
-"*", "Pair");
-//console.info(pairs
+this.internalns, 
+                "Pair"
-
-            var id = node.getAttribute("id");
@@ -364 +373 @@
-                pair = pairs[j];
-        
-
-
-
-
+
+
+
+
+
+
+
-
-                if (key == "normal") {
-
+
+
-                }
-
@@ -382 +395 @@
-        //console.info("before", this.styles);
-        OpenLayers.Util.extend(this.styles, styles);
+
-        //console.info("after", this.styles);
-    },
-
-    parseStyle: function(node) {
-        
-        var styleObject = {};
-
-        /**
-         * Constant: OpenLayers.Feature.Vector.style
-         * OpenLayers features can have a number of style attributes. The 'default' 
-         *     style will typically be used if no other style is specified.
-         *
-         * Default style properties:
-         *
-         *  - fillColor: "#ee9900",
-         *  - fillOpacity: 0.4, 
-         *  - hoverFillColor: "white",
-         *  - hoverFillOpacity: 0.8,
-         *  - strokeColor: "#ee9900",
-         *  - strokeOpacity: 1,
-         *  - strokeWidth: 1,
-         *  - strokeLinecap: "round",
-         *  - hoverStrokeColor: "red",
-         *  - hoverStrokeOpacity: 1,
-         *  - hoverStrokeWidth: 0.2,
-         *  - pointRadius: 6,
-         *  - hoverPointRadius: 1,
-         *  - hoverPointUnit: "%",
-         *  - pointerEvents: "visiblePainted"
-         *
-         * Other style properties that have no default values:
-         *
-         *  - externalGraphic,
-         *  - graphicWidth,
-         *  - graphicHeight,
-         *  - graphicOpacity
-         *  - graphicXOffset
-         *  - graphicYOffset
-         */ 
-
-        var style = {};
-        
@@ -432 +410 @@
-            styleTypeNode = this.getElementsByTagNameNS(node, 
-                                                   this.internalns, type)[0];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
+
+
+
-                        }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (!style["strokeColor"]) {
-            style["strokeColor"] = style["fillColor"];
-        }
-
-
-
-
-
-
-
-
+
+
+
-        return style;
-    },