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

Merge pull request #5587 from ahocevar/kml-faster-init

Browse Source 
Lazily create KML style defaults
This commit is contained in:
Andreas Hocevar
2016-08-03 09:19:39 +02:00
committed by GitHub
parent 8719b79b5e 3630a043fe
commit 01baf48870
1 changed files with 122 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/kmlformat.js
+122 -126
View File
@@ -67,7 +67,8 @@ ol.format.KML = function(opt_options) {
* @type {Array.<ol.style.Style>} * @type {Array.<ol.style.Style>}
*/ */
this.defaultStyle_ = options.defaultStyle ? this.defaultStyle_ = options.defaultStyle ?
options.defaultStyle : ol.format.KML.DEFAULT_STYLE_ARRAY_; options.defaultStyle :
(ol.format.KML.DEFAULT_STYLE_ARRAY_ || ol.format.KML.createStyleDefaults_());
/** /**
* @private * @private
@@ -142,147 +143,142 @@ ol.format.KML.SCHEMA_LOCATION_ = 'http://www.opengis.net/kml/2.2 ' +
/** /**
* @const * @return {Array.<ol.style.Style>} Default style.
* @type {ol.Color}
* @private * @private
*/ */
ol.format.KML.DEFAULT_COLOR_ = [255, 255, 255, 1]; ol.format.KML.createStyleDefaults_ = function() {
/**
* @const
* @type {ol.Color}
* @private
*/
ol.format.KML.DEFAULT_COLOR_ = [255, 255, 255, 1];
/**
* @const
* @type {ol.style.Fill}
* @private
*/
ol.format.KML.DEFAULT_FILL_STYLE_ = new ol.style.Fill({
color: ol.format.KML.DEFAULT_COLOR_
});
/** /**
* @const * @const
* @type {ol.style.Fill} * @type {ol.Size}
* @private * @private
*/ */
ol.format.KML.DEFAULT_FILL_STYLE_ = new ol.style.Fill({ ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_ = [20, 2]; // FIXME maybe [8, 32] ?
color: ol.format.KML.DEFAULT_COLOR_
});
/**
* @const
* @type {ol.style.IconAnchorUnits}
* @private
*/
ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS_ =
ol.style.IconAnchorUnits.PIXELS;
/** /**
* @const * @const
* @type {ol.Size} * @type {ol.style.IconAnchorUnits}
* @private * @private
*/ */
ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_ = [20, 2]; // FIXME maybe [8, 32] ? ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS_ =
ol.style.IconAnchorUnits.PIXELS;
/**
* @const
* @type {ol.Size}
* @private
*/
ol.format.KML.DEFAULT_IMAGE_STYLE_SIZE_ = [64, 64];
/** /**
* @const * @const
* @type {ol.style.IconAnchorUnits} * @type {string}
* @private * @private
*/ */
ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS_ = ol.format.KML.DEFAULT_IMAGE_STYLE_SRC_ =
ol.style.IconAnchorUnits.PIXELS; 'https://maps.google.com/mapfiles/kml/pushpin/ylw-pushpin.png';
/**
* @const
* @type {number}
* @private
*/
ol.format.KML.DEFAULT_IMAGE_SCALE_MULTIPLIER_ = 0.5;
/** /**
* @const * @const
* @type {ol.style.IconAnchorUnits} * @type {ol.style.Image}
* @private * @private
*/ */
ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS_ = ol.format.KML.DEFAULT_IMAGE_STYLE_ = new ol.style.Icon({
ol.style.IconAnchorUnits.PIXELS; anchor: ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_,
anchorOrigin: ol.style.IconOrigin.BOTTOM_LEFT,
anchorXUnits: ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS_,
anchorYUnits: ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS_,
crossOrigin: 'anonymous',
rotation: 0,
scale: ol.format.KML.DEFAULT_IMAGE_SCALE_MULTIPLIER_,
size: ol.format.KML.DEFAULT_IMAGE_STYLE_SIZE_,
src: ol.format.KML.DEFAULT_IMAGE_STYLE_SRC_
});
/**
* @const
* @type {ol.style.Stroke}
* @private
*/
ol.format.KML.DEFAULT_STROKE_STYLE_ = new ol.style.Stroke({
color: ol.format.KML.DEFAULT_COLOR_,
width: 1
});
/** /**
* @const * @const
* @type {ol.Size} * @type {ol.style.Stroke}
* @private * @private
*/ */
ol.format.KML.DEFAULT_IMAGE_STYLE_SIZE_ = [64, 64]; ol.format.KML.DEFAULT_TEXT_STROKE_STYLE_ = new ol.style.Stroke({
color: [51, 51, 51, 1],
width: 2
});
/**
* @const
* @type {ol.style.Text}
* @private
*/
ol.format.KML.DEFAULT_TEXT_STYLE_ = new ol.style.Text({
font: 'bold 16px Helvetica',
fill: ol.format.KML.DEFAULT_FILL_STYLE_,
stroke: ol.format.KML.DEFAULT_TEXT_STROKE_STYLE_,
scale: 0.8
});
/** /**
* @const * @const
* @type {string} * @type {ol.style.Style}
* @private * @private
*/ */
ol.format.KML.DEFAULT_IMAGE_STYLE_SRC_ = ol.format.KML.DEFAULT_STYLE_ = new ol.style.Style({
'https://maps.google.com/mapfiles/kml/pushpin/ylw-pushpin.png'; fill: ol.format.KML.DEFAULT_FILL_STYLE_,
image: ol.format.KML.DEFAULT_IMAGE_STYLE_,
text: ol.format.KML.DEFAULT_TEXT_STYLE_,
stroke: ol.format.KML.DEFAULT_STROKE_STYLE_,
zIndex: 0
});
/**
* @const
* @type {Array.<ol.style.Style>}
* @private
*/
ol.format.KML.DEFAULT_STYLE_ARRAY_ = [ol.format.KML.DEFAULT_STYLE_];
/** return ol.format.KML.DEFAULT_STYLE_ARRAY_;
* @const };
* @type {number}
* @private
*/
ol.format.KML.DEFAULT_IMAGE_SCALE_MULTIPLIER_ = 0.5;
/**
* @const
* @type {ol.style.Image}
* @private
*/
ol.format.KML.DEFAULT_IMAGE_STYLE_ = new ol.style.Icon({
anchor: ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_,
anchorOrigin: ol.style.IconOrigin.BOTTOM_LEFT,
anchorXUnits: ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_X_UNITS_,
anchorYUnits: ol.format.KML.DEFAULT_IMAGE_STYLE_ANCHOR_Y_UNITS_,
crossOrigin: 'anonymous',
rotation: 0,
scale: ol.format.KML.DEFAULT_IMAGE_SCALE_MULTIPLIER_,
size: ol.format.KML.DEFAULT_IMAGE_STYLE_SIZE_,
src: ol.format.KML.DEFAULT_IMAGE_STYLE_SRC_
});
/**
* @const
* @type {ol.style.Stroke}
* @private
*/
ol.format.KML.DEFAULT_STROKE_STYLE_ = new ol.style.Stroke({
color: ol.format.KML.DEFAULT_COLOR_,
width: 1
});
/**
* @const
* @type {ol.style.Stroke}
* @private
*/
ol.format.KML.DEFAULT_TEXT_STROKE_STYLE_ = new ol.style.Stroke({
color: [51, 51, 51, 1],
width: 2
});
/**
* @const
* @type {ol.style.Text}
* @private
*/
ol.format.KML.DEFAULT_TEXT_STYLE_ = new ol.style.Text({
font: 'bold 16px Helvetica',
fill: ol.format.KML.DEFAULT_FILL_STYLE_,
stroke: ol.format.KML.DEFAULT_TEXT_STROKE_STYLE_,
scale: 0.8
});
/**
* @const
* @type {ol.style.Style}
* @private
*/
ol.format.KML.DEFAULT_STYLE_ = new ol.style.Style({
fill: ol.format.KML.DEFAULT_FILL_STYLE_,
image: ol.format.KML.DEFAULT_IMAGE_STYLE_,
text: ol.format.KML.DEFAULT_TEXT_STYLE_,
stroke: ol.format.KML.DEFAULT_STROKE_STYLE_,
zIndex: 0
});
/**
* @const
* @type {Array.<ol.style.Style>}
* @private
*/
ol.format.KML.DEFAULT_STYLE_ARRAY_ = [ol.format.KML.DEFAULT_STYLE_];
/** /**