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

Rename _ol_style_IconOrigin_ to IconOrigin

Browse Source
This commit is contained in:
Frederic Junod
2017-12-18 10:56:08 +01:00
parent 424ea22131
commit e4446d4cb3
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ 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 _ol_style_IconOrigin_ from '../style/IconOrigin.js';
import IconOrigin from '../style/IconOrigin.js';
import _ol_style_Stroke_ from '../style/Stroke.js';
import _ol_style_Style_ from '../style/Style.js';
import _ol_style_Text_ from '../style/Text.js';
@@ -201,7 +201,7 @@ KML.createStyleDefaults_ = function() {
*/
KML.DEFAULT_IMAGE_STYLE_ = new _ol_style_Icon_({
anchor: KML.DEFAULT_IMAGE_STYLE_ANCHOR_,
anchorOrigin: _ol_style_IconOrigin_.BOTTOM_LEFT,
anchorOrigin: IconOrigin.BOTTOM_LEFT,
anchorXUnits: KML.DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS_,
anchorYUnits: KML.DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS_,
crossOrigin: 'anonymous',
@@ -509,15 +509,15 @@ KML.readVec2_ = function(node) {
var origin;
if (xunits !== 'insetPixels') {
if (yunits !== 'insetPixels') {
origin = _ol_style_IconOrigin_.BOTTOM_LEFT;
origin = IconOrigin.BOTTOM_LEFT;
} else {
origin = _ol_style_IconOrigin_.TOP_LEFT;
origin = IconOrigin.TOP_LEFT;
}
} else {
if (yunits !== 'insetPixels') {
origin = _ol_style_IconOrigin_.BOTTOM_RIGHT;
origin = IconOrigin.BOTTOM_RIGHT;
} else {
origin = _ol_style_IconOrigin_.TOP_RIGHT;
origin = IconOrigin.TOP_RIGHT;
}
}
return {
@@ -579,7 +579,7 @@ KML.IconStyleParser_ = function(node, objectStack) {
src = KML.DEFAULT_IMAGE_STYLE_SRC_;
}
var anchor, anchorXUnits, anchorYUnits;
var anchorOrigin = _ol_style_IconOrigin_.BOTTOM_LEFT;
var anchorOrigin = IconOrigin.BOTTOM_LEFT;
var hotSpot = /** @type {ol.KMLVec2_|undefined} */
(object['hotSpot']);
if (hotSpot) {
@@ -640,7 +640,7 @@ KML.IconStyleParser_ = function(node, objectStack) {
anchorYUnits: anchorYUnits,
crossOrigin: 'anonymous', // FIXME should this be configurable?
offset: offset,
offsetOrigin: _ol_style_IconOrigin_.BOTTOM_LEFT,
offsetOrigin: IconOrigin.BOTTOM_LEFT,
rotation: rotation,
scale: scale,
size: size,