ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dedicated module for icon anchor units enum

Browse Source
This commit is contained in:
Tim Schaub
2016-12-27 10:26:11 -07:00
parent cbe82913b4
commit 02edf0ab24
5 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ol/format/kml.js
View File

@@ -27,6 +27,7 @@ goog.require('ol.math');
goog.require('ol.proj');
goog.require('ol.style.Fill');
goog.require('ol.style.Icon');
goog.require('ol.style.IconAnchorUnits');
goog.require('ol.style.IconOrigin');
goog.require('ol.style.Stroke');
goog.require('ol.style.Style');
@@ -170,19 +171,19 @@ ol.format.KML.createStyleDefaults_ = function() {
/**
* @const
* @type {ol.style.Icon.AnchorUnits}
* @type {ol.style.IconAnchorUnits}
* @private
*/
ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS_ =
ol.style.Icon.AnchorUnits.PIXELS;
ol.style.IconAnchorUnits.PIXELS;
/**
* @const
* @type {ol.style.Icon.AnchorUnits}
* @type {ol.style.IconAnchorUnits}
* @private
*/
ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS_ =
ol.style.Icon.AnchorUnits.PIXELS;
ol.style.IconAnchorUnits.PIXELS;
/**
* @const
@@ -288,12 +289,12 @@ ol.format.KML.createStyleDefaults_ = function() {
/**
* @const
* @type {Object.<string, ol.style.Icon.AnchorUnits>}
* @type {Object.<string, ol.style.IconAnchorUnits>}
* @private
*/
ol.format.KML.ICON_ANCHOR_UNITS_MAP_ = {
'fraction': ol.style.Icon.AnchorUnits.FRACTION,
'pixels': ol.style.Icon.AnchorUnits.PIXELS
'fraction': ol.style.IconAnchorUnits.FRACTION,
'pixels': ol.style.IconAnchorUnits.PIXELS
};
@@ -586,8 +587,8 @@ ol.format.KML.IconStyleParser_ = function(node, objectStack) {
anchorYUnits = ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS_;
} else if (/^http:\/\/maps\.(?:google|gstatic)\.com\//.test(src)) {
anchor = [0.5, 0];
anchorXUnits = ol.style.Icon.AnchorUnits.FRACTION;
anchorYUnits = ol.style.Icon.AnchorUnits.FRACTION;
anchorXUnits = ol.style.IconAnchorUnits.FRACTION;
anchorYUnits = ol.style.IconAnchorUnits.FRACTION;
}
var offset;
@@ -2412,9 +2413,9 @@ ol.format.KML.writeIconStyle_ = function(node, style, objectStack) {
if (anchor && anchor[0] !== 0 && anchor[1] !== size[1]) {
var /** @type {ol.KMLVec2_} */ hotSpot = {
x: anchor[0],
xunits: ol.style.Icon.AnchorUnits.PIXELS,
xunits: ol.style.IconAnchorUnits.PIXELS,
y: size[1] - anchor[1],
yunits: ol.style.Icon.AnchorUnits.PIXELS
yunits: ol.style.IconAnchorUnits.PIXELS
};
properties['hotSpot'] = hotSpot;
}