Changeset 6494

Timestamp:

03/12/08 08:49:47 (9 months ago)

Author:

crschmidt

Message:

Apply patch from rdewit to fix parsing of hotSpot values on Icon objects
in KML styles. This fixes issues reported with the location of icons when
using KML styling. r=me (Closes #1426)

Files:

• trunk/openlayers/lib/OpenLayers/Format/KML.js (modified) (4 diffs)

trunk/openlayers/lib/OpenLayers/Format/KML.js

@@ -344 +344 @@
-                    break;
-                case "iconstyle":
+                    // set scale
+                    var scale = parseFloat(this.parseProperty(styleTypeNode, 
+                                                          "*", "scale") || 1);
+  
+                    // set default width and height of icon
+                    var width = 32 * scale;
+                    var height = 32 * scale;
+
-                    var iconNode = this.getElementsByTagNameNS(styleTypeNode, 
-                                               "*", 
-                                               "Icon")[0];
-
-                    // set default width and height of icon
-                    style["graphicWidth"] = 32;
-                    style["graphicHeight"] = 32;
-
-                    if (iconNode) {
-                        var href = this.parseProperty(iconNode, "*", "href");
-                        if (href) {                                                   
+
+                            var w = this.parseProperty(iconNode, "*", "w");
+                            var h = this.parseProperty(iconNode, "*", "h");
+
+                            // Settings for Google specific icons that are 64x64
+                            // We set the width and height to 64 and halve the
+                            // scale to prevent icons from being too big
+                            var google = "http://maps.google.com/mapfiles/kml";
+                            if (OpenLayers.String.startsWith(
+                                                 href, google) && !w && !h) {
+                                w = 64;
+                                h = 64;
+                                scale = scale / 2;
+                            }
+                                
+                            // if only dimension is defined, make sure the
+                            // other one has the same value
+                            w = w || h;
+                            h = h || w;
+
+                            if (w) {
+                                width = parseInt(w) * scale;
+                            }
+
+                            if (h) {
+                                height = parseInt(h) * scale;
+                            }
-
-                            // support for internal icons 
@@ -380 +410 @@
-                            }
-
-
-                            var w = this.parseProperty(iconNode, "*", "w");
-                            if (w) {
-                                style["graphicWidth"] = parseInt(w);
-                            }
-
-                            var h = this.parseProperty(iconNode, "*", "h");
-                            if (h) {
-                                style["graphicHeight"] = parseInt(h);
-                            }
-
-                            style["graphicOpacity"] = 1; // fully opaque
-                            style["externalGraphic"] = href;
@@ -403 +422 @@
-                                               "hotSpot")[0];
-                    if (hotSpotNode) {
-hotSpotNode.getAttribute("x"
-hotSpotNode.getAttribute("y"
+parseFloat(hotSpotNode.getAttribute("x")
+parseFloat(hotSpotNode.getAttribute("y")
-
-                        var xUnits = hotSpotNode.getAttribute("xunits");
-                        if (xUnits == "pixels") {
-parseInt(x)
+-x * scale
-                        }
-                        else if (xUnits == "insetPixels") {
-
-
+
-                        }
-                        else if (xUnits == "fraction") {
-
-
+
-                        }
-
-                        var yUnits = hotSpotNode.getAttribute("yunits");
-                        if (yUnits == "pixels") {
-parseInt(y)
+-height + (y * scale) + 1
-                        }
-                        else if (yUnits == "insetPixels") {
-
-
+
-                        }
-                        else if (yUnits == "fraction") {
-
-
+
-                        }
-                    }
+
+                    style["graphicWidth"] = width;
+                    style["graphicHeight"] = height;
-                    break;
+
-                case "balloonstyle":
-                    var balloonStyle = OpenLayers.Util.getXmlNodeValue(
@@ -530 +549 @@
-                                                       "Style")[0];
-                if (inlineStyleNode) {
-s
+inlineS
-                    if (inlineStyle) {
-                        feature.style = OpenLayers.Util.extend({},