Changeset 5795

Timestamp:

01/17/08 02:20:49 (1 year ago)

Author:

rdewit

Message:

Some more cleaning up.

Files:

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

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

@@ -150 +150 @@
-        }
-
+
+        // Fetch external links <NetworkLink> and <Link>
+        this.fetchLinks(data);
+
+        // Parse internal Style information
+        this.parseStyles(data);
+
+        // Parse placemarks (features)
+        this.parseFeatures(data);
+
+        // Reverse drawing order of features (this seems to be standard in KML)
+        if (!recursion && this.reverseFeatures) {
+            this.features.reverse();
+        }
+
+        return this.features;
+    },
+
+    fetchLinks: function(data) {
-        
-        var urlNodes = this.getElementsByTagNameNS(data,
-                                                       this.internalns,
-Url
+NetworkLink
-        var numurls = urlNodes.length;
-        var urls = new Array(numurls);
@@ -160 +179 @@
-                                   this.internalns, 
-                                   "href")[0];
-            //console.info(url);
-            if(hrefNode) {
-                var href = OpenLayers.Util.getXmlNodeValue(hrefNode);
@@ -168 +186 @@
-                }
-
-                //console.info(href);
-                if (OpenLayers.ProxyHost 
-                        && OpenLayers.String.startsWith(href, "http")) {
@@ -191 +208 @@
-                                   this.internalns, 
-                                   "href")[0];
-            //console.info(link);
-            if(hrefNode) {
-                var href = OpenLayers.Util.getXmlNodeValue(hrefNode);
@@ -211 +227 @@
-            } 
-        }
-
-        //
-        // Parse internal Style information
-        this.parseStyles(data);
-
-
-        // Loop through all Placemark nodes and parse them.
-        // This will create a list of features
-        var featureNodes = this.getElementsByTagNameNS(data,
-                                                       this.internalns,
-                                                       "Placemark");
-        var numFeatures = featureNodes.length;
-        var features = new Array(numFeatures);
-        //console.info("read, numfeatures: " + numFeatures);
-
-        for(var i=0; i<numFeatures; i++) {
-            //var feature = this.parseFeature(featureNodes[i]);
-            var featureNode = featureNodes[i];
-            var feature = OpenLayers.Format.GML.prototype.parseFeature.apply(
-                              this,[featureNode]) ;
-
-             //console.info(feature);
-            if(feature) {
-                // give feature default style
-                feature.style = OpenLayers.Util.extend({}, 
-                                    OpenLayers.Feature.Vector.style["default"]);
-                 
-                if (feature.attributes.styleUrl) {
-                    var newStyle = this.getStyle(feature.attributes.styleUrl);
-
-                    if (newStyle) {
-                        feature.style = OpenLayers.Util.extend(feature.style, 
-                                            newStyle);
-                    }
-                    //console.info(feature.style);
-                }
-
-                // Make sure that <Style> nodes within a placemark are 
-                // processed as well: add a styleUrl attribute to the feature.
-                var styleNode = this.getElementsByTagNameNS(featureNode,
-                                                       this.internalns,
-                                                       "Style")[0];
-                if (styleNode) {
-                    var style = this.parseStyle(styleNode);
-                    //console.info(style.name, style);
-                    if (style) {
-                        feature.style = OpenLayers.Util.extend(feature.style, 
-                                            style);
-                    }
-                }
-
-                // add feature to list of features
-                features[i] = feature;
-            } else {
-                throw "Bad Placemark: " + i;
-            }
-        }
-
-
-        // add new features to existing feature list
-        this.features = this.features.concat(features);
-
-
-        // Reverse drawing order of features (this seems to be standard in KML)
-        if (!recursion && this.reverseFeatures) {
-            this.features.reverse();
-        }
-
-
-        //this.applyStyles();
-
-        //console.info(this.styles);
-        //console.info("*** RETURN FEATURES ***");
-        //console.debug(this.styles);
-        return this.features;
-
-        //this.timer = setTimeout(this.read(), 200);
-        //return this.read();
-    },
-
@@ -327 +265 @@
-    
-
-
-    parseStyles: function(data, baseUrl) {
-
-
-
-
-
-
-
-
-
+
-        var styleNodes = this.getElementsByTagNameNS(data,
-                                                       this.internalns,
@@ -344 +273 @@
-        var numNodes = styleNodes.length;
-        var styles = {};
-        //console.info("numStyles: " + numStyles);
-        for(var i=0; i<numNodes; i++) {
-            var style = this.parseStyle(styleNodes[i]);
@@ -355 +283 @@
-        }
-
-
+ afterwards
-        // Only the default or "normal" part of the StyleMap is processed now
-        // To do the select or "highlight" bit, we'd need to change lots more
@@ -371 +299 @@
-            var id = node.getAttribute("id");
-            for (var j=0; j<pairs.length; j++) {
-
+var 
-        
-                // Use the shortcut in the SLD format to quickly retrieve the 
-                // value of a node. Maybe it's good to have a method in Util 
-                // to do this
-
+var 
-                          this.internalns, "key");
-
+var 
-                          this.internalns, "styleUrl");
-
@@ -393 +321 @@
-        }
-
-        //console.info("before", this.styles);
-        OpenLayers.Util.extend(this.styles, styles);
-
-        //console.info("after", this.styles);
-    },
-
@@ -415 +341 @@
-
-            // only deal with first geometry of this type
-            //console.info(styleTypeNode);
-            switch (type.toLowerCase()) {
-                case "linestyle":
-
+var 
-                                               this.internalns, 
-                                               "color")[0];
@@ -438 +363 @@
-                    }
-                    
-
+var 
-                                               this.internalns,
-                                               "width")[0];
@@ -447 +372 @@
-
-                case "polystyle":
-
+var 
-                                               this.internalns, 
-                                               "color")[0];
@@ -456 +381 @@
-                                          this.regExes.kmlColor);
-
-                        console.info(matches);
-                        // transparency
-                        var alpha = matches[1];
@@ -470 +394 @@
-                    break;
-                case "iconstyle":
-
+var 
-                                               this.internalns, 
-                                               "Icon")[0];
@@ -479 +403 @@
-
-                    if (iconNode) {
-
+var 
-                                               this.internalns, 
-                                               "href")[0];
@@ -493 +417 @@
-                            // list and request the appropriate icon from the 
-                            // google maps website
-
+var 
-                            if (matches)  {
-                                var palette = matches[1];
@@ -512 +436 @@
-
-                                var pos = posY * 8 + posX;
-
+var 
-                                     + palette + "/icon" + pos + file_extension;
-                                //console.info(x,y, pos, href);
-                            }
-
@@ -521 +444 @@
-                                                   this.internalns, 
-                                                   "w")[0];
-
+var 
-
-                            var hNode = this.getElementsByTagNameNS(iconNode, 
-                                                   this.internalns, 
-                                                   "h")[0];
-
+var 
-
-                            if (w) {
@@ -544 +467 @@
-
-                    // hotSpots define the offset for an Icon
-
+var 
-                                               this.internalns, 
-                                               "hotSpot")[0];
@@ -576 +499 @@
-                                                          * parseFloat(y);
-                        }
-                        //console.info(x, xUnits, y, yUnits, style["graphicXOffset"], 
-                        //  style["graphicYOffset"]);
-                    }
-                    break;
-                case "balloonstyle":
-
+
+
-                    if (balloonStyle) {
-                        style["balloonStyle"] = balloonStyle.replace(
-
-
+
-                    }
-                    break;
@@ -603 +524 @@
-        return style;
-    },
+
+    parseFeatures: function(data) {
+        // Loop through all Placemark nodes and parse them.
+        // This will create a list of features
+        var featureNodes = this.getElementsByTagNameNS(data,
+                                                       this.internalns,
+                                                       "Placemark");
+        var numFeatures = featureNodes.length;
+        var features = new Array(numFeatures);
+
+        for(var i=0; i<numFeatures; i++) {
+            //var feature = this.parseFeature(featureNodes[i]);
+            var featureNode = featureNodes[i];
+            var feature = OpenLayers.Format.GML.prototype.parseFeature.apply(
+                              this,[featureNode]) ;
+
+            if(feature) {
+                // give feature default style
+                feature.style = OpenLayers.Util.extend({}, 
+                                    OpenLayers.Feature.Vector.style["default"]);
+                 
+                if (feature.attributes.styleUrl) {
+                    var newStyle = this.getStyle(feature.attributes.styleUrl);
+
+                    if (newStyle) {
+                        feature.style = OpenLayers.Util.extend(feature.style, 
+                                            newStyle);
+                    }
+                }
+
+                // Make sure that <Style> nodes within a placemark are 
+                // processed as well: add a styleUrl attribute to the feature.
+                var styleNode = this.getElementsByTagNameNS(featureNode,
+                                                       this.internalns,
+                                                       "Style")[0];
+                if (styleNode) {
+                    var style = this.parseStyle(styleNode);
+                    if (style) {
+                        feature.style = OpenLayers.Util.extend(feature.style, 
+                                            style);
+                    }
+                }
+
+                // add feature to list of features
+                features[i] = feature;
+            } else {
+                throw "Bad Placemark: " + i;
+            }
+        }
+
+
+        // add new features to existing feature list
+        this.features = this.features.concat(features);
+    },
+
+
-        
-    /**
@@ -622 +599 @@
-            if(child.nodeType == 1) {
-                grandchildren = child.childNodes;
-            //console.info(child, child.nodeType);
-            //console.info(grandchildren.length);
-                if(grandchildren.length == 1 || grandchildren.length == 3) {
-                    var grandchild;