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

Rename _ol_style_IconAnchorUnits_ to IconAnchorUnits

Browse Source
This commit is contained in:
Frederic Junod
2017-12-18 10:58:16 +01:00
parent e4446d4cb3
commit bbd8a3f6ae
3 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ol/format/KML.js
View File

@@ -22,7 +22,7 @@ import _ol_math_ from '../math.js';
import {get as getProjection} from '../proj.js';
import _ol_style_Fill_ from '../style/Fill.js';
import _ol_style_Icon_ from '../style/Icon.js';
import _ol_style_IconAnchorUnits_ from '../style/IconAnchorUnits.js';
import IconAnchorUnits from '../style/IconAnchorUnits.js';
import IconOrigin from '../style/IconOrigin.js';
import _ol_style_Stroke_ from '../style/Stroke.js';
import _ol_style_Style_ from '../style/Style.js';
@@ -161,16 +161,14 @@ KML.createStyleDefaults_ = function() {
* @type {ol.style.IconAnchorUnits}
* @private
*/
KML.DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS_ =
_ol_style_IconAnchorUnits_.PIXELS;
KML.DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS_ = IconAnchorUnits.PIXELS;
/**
* @const
* @type {ol.style.IconAnchorUnits}
* @private
*/
KML.DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS_ =
_ol_style_IconAnchorUnits_.PIXELS;
KML.DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS_ = IconAnchorUnits.PIXELS;
/**
* @const
@@ -280,9 +278,9 @@ KML.createStyleDefaults_ = function() {
* @private
*/
KML.ICON_ANCHOR_UNITS_MAP_ = {
'fraction': _ol_style_IconAnchorUnits_.FRACTION,
'pixels': _ol_style_IconAnchorUnits_.PIXELS,
'insetPixels': _ol_style_IconAnchorUnits_.PIXELS
'fraction': IconAnchorUnits.FRACTION,
'pixels': IconAnchorUnits.PIXELS,
'insetPixels': IconAnchorUnits.PIXELS
};
@@ -593,8 +591,8 @@ KML.IconStyleParser_ = function(node, objectStack) {
anchorYUnits = KML.DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS_;
} else if (/^http:\/\/maps\.(?:google|gstatic)\.com\//.test(src)) {
anchor = [0.5, 0];
anchorXUnits = _ol_style_IconAnchorUnits_.FRACTION;
anchorYUnits = _ol_style_IconAnchorUnits_.FRACTION;
anchorXUnits = IconAnchorUnits.FRACTION;
anchorYUnits = IconAnchorUnits.FRACTION;
}
var offset;
@@ -2279,9 +2277,9 @@ KML.writeIconStyle_ = function(node, style, objectStack) {
if (anchor && (anchor[0] !== size[0] / 2 || anchor[1] !== size[1] / 2)) {
var /** @type {ol.KMLVec2_} */ hotSpot = {
x: anchor[0],
xunits: _ol_style_IconAnchorUnits_.PIXELS,
xunits: IconAnchorUnits.PIXELS,
y: size[1] - anchor[1],
yunits: _ol_style_IconAnchorUnits_.PIXELS
yunits: IconAnchorUnits.PIXELS
};
properties['hotSpot'] = hotSpot;
}