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

Use new ol.style in ol.render.canvas.Immediate

Browse Source
This commit is contained in:
Éric Lemoine
2013-11-20 14:45:47 +01:00
parent fd0ef8f238
commit e535a8360f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/render/canvas/canvasimmediate.js
+6 -6
View File
@@ -7,9 +7,9 @@ goog.require('goog.asserts');
goog.require('ol.color'); goog.require('ol.color');
goog.require('ol.extent'); goog.require('ol.extent');
goog.require('ol.render.IRender'); goog.require('ol.render.IRender');
goog.require('ol.style.fill'); goog.require('ol.style.Fill');
goog.require('ol.style.stroke'); goog.require('ol.style.Stroke');
goog.require('ol.style.text'); goog.require('ol.style.Text');
@@ -311,13 +311,13 @@ ol.render.canvas.Immediate.prototype.setFillStrokeStyle =
function(fillStyle, strokeStyle) { function(fillStyle, strokeStyle) {
var context = this.context_; var context = this.context_;
var state = this.state_; var state = this.state_;
if (!ol.style.fill.equals(state.fillStyle, fillStyle)) { if (!ol.style.Fill.equals(state.fillStyle, fillStyle)) {
if (goog.isDefAndNotNull(fillStyle)) { if (goog.isDefAndNotNull(fillStyle)) {
context.fillStyle = ol.color.asString(fillStyle.color); context.fillStyle = ol.color.asString(fillStyle.color);
} }
state.fillStyle = fillStyle; state.fillStyle = fillStyle;
} }
if (!ol.style.stroke.equals(state.strokeStyle, strokeStyle)) { if (!ol.style.Stroke.equals(state.strokeStyle, strokeStyle)) {
if (goog.isDefAndNotNull(strokeStyle)) { if (goog.isDefAndNotNull(strokeStyle)) {
context.strokeStyle = ol.color.asString(strokeStyle.color); context.strokeStyle = ol.color.asString(strokeStyle.color);
context.lineWidth = goog.isDef(strokeStyle.width) ? strokeStyle.width : 1; context.lineWidth = goog.isDef(strokeStyle.width) ? strokeStyle.width : 1;
@@ -341,7 +341,7 @@ ol.render.canvas.Immediate.prototype.setImageStyle = function(imageStyle) {
ol.render.canvas.Immediate.prototype.setTextStyle = function(textStyle) { ol.render.canvas.Immediate.prototype.setTextStyle = function(textStyle) {
var context = this.context_; var context = this.context_;
var state = this.state_; var state = this.state_;
if (!ol.style.text.equals(state.textStyle, textStyle)) { if (!ol.style.Text.equals(state.textStyle, textStyle)) {
if (goog.isDefAndNotNull(textStyle)) { if (goog.isDefAndNotNull(textStyle)) {
context.font = goog.isDef(textStyle.font) ? context.font = goog.isDef(textStyle.font) ?
textStyle.font : '10px sans-serif'; textStyle.font : '10px sans-serif';