Merge pull request #3170 from fredj/coding-style

Coding style
This commit is contained in:
Frédéric Junod
2015-01-26 13:39:02 +01:00
4 changed files with 12 additions and 8 deletions
+7
View File
@@ -6523,6 +6523,13 @@ olx.ViewState;
olx.ViewState.prototype.center; olx.ViewState.prototype.center;
/**
* @type {ol.proj.Projection}
* @api
*/
olx.ViewState.prototype.projection;
/** /**
* @type {number} * @type {number}
* @api * @api
+2 -4
View File
@@ -108,8 +108,7 @@ ol.interaction.PinchZoom.handleDragEvent_ = function(mapBrowserEvent) {
* @this {ol.interaction.PinchZoom} * @this {ol.interaction.PinchZoom}
* @private * @private
*/ */
ol.interaction.PinchZoom.handleUpEvent_ = ol.interaction.PinchZoom.handleUpEvent_ = function(mapBrowserEvent) {
function(mapBrowserEvent) {
if (this.targetPointers.length < 2) { if (this.targetPointers.length < 2) {
var map = mapBrowserEvent.map; var map = mapBrowserEvent.map;
var view = map.getView(); var view = map.getView();
@@ -134,8 +133,7 @@ ol.interaction.PinchZoom.handleUpEvent_ =
* @this {ol.interaction.PinchZoom} * @this {ol.interaction.PinchZoom}
* @private * @private
*/ */
ol.interaction.PinchZoom.handleDownEvent_ = ol.interaction.PinchZoom.handleDownEvent_ = function(mapBrowserEvent) {
function(mapBrowserEvent) {
if (this.targetPointers.length >= 2) { if (this.targetPointers.length >= 2) {
var map = mapBrowserEvent.map; var map = mapBrowserEvent.map;
this.anchor_ = null; this.anchor_ = null;
+2 -4
View File
@@ -944,13 +944,11 @@ ol.Map.prototype.handlePostRender = function() {
if (!goog.isNull(frameState)) { if (!goog.isNull(frameState)) {
var hints = frameState.viewHints; var hints = frameState.viewHints;
if (hints[ol.ViewHint.ANIMATING]) { if (hints[ol.ViewHint.ANIMATING]) {
maxTotalLoading = this.loadTilesWhileAnimating_ === true ? maxTotalLoading = this.loadTilesWhileAnimating_ ? 8 : 0;
8 : 0;
maxNewLoads = 2; maxNewLoads = 2;
} }
if (hints[ol.ViewHint.INTERACTING]) { if (hints[ol.ViewHint.INTERACTING]) {
maxTotalLoading = this.loadTilesWhileInteracting_ === true ? maxTotalLoading = this.loadTilesWhileInteracting_ ? 8 : 0;
8 : 0;
maxNewLoads = 2; maxNewLoads = 2;
} }
tileSourceCount = goog.object.getCount(frameState.wantedTiles); tileSourceCount = goog.object.getCount(frameState.wantedTiles);
+1
View File
@@ -115,6 +115,7 @@ ol.View = function(opt_options) {
/** /**
* @private * @private
* @const
* @type {ol.proj.Projection} * @type {ol.proj.Projection}
*/ */
this.projection_ = ol.proj.createProjection(options.projection, 'EPSG:3857'); this.projection_ = ol.proj.createProjection(options.projection, 'EPSG:3857');