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

Remove goog.isDef from controls (-278 B)

Browse Source
This commit is contained in:
Tim Schaub
2015-09-18 18:28:47 +09:00
parent 007194a18f
commit a096ec5bf7
11 changed files with 88 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/control/overviewmapcontrol.js
+23 -25
View File
@@ -8,6 +8,7 @@ goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('goog.math.Size');
goog.require('goog.style');
goog.require('ol');
goog.require('ol.Collection');
goog.require('ol.Map');
goog.require('ol.MapEventType');
@@ -34,33 +35,31 @@ goog.require('ol.extent');
*/
ol.control.OverviewMap = function(opt_options) {
var options = goog.isDef(opt_options) ? opt_options : {};
var options = opt_options ? opt_options : {};
/**
* @type {boolean}
* @private
*/
this.collapsed_ = goog.isDef(options.collapsed) ? options.collapsed : true;
this.collapsed_ = ol.isDef(options.collapsed) ?
/** @type {boolean} */ (options.collapsed) : true;
/**
* @private
* @type {boolean}
*/
this.collapsible_ = goog.isDef(options.collapsible) ?
options.collapsible : true;
this.collapsible_ = ol.isDef(options.collapsible) ?
/** @type {boolean} */ (options.collapsible) : true;
if (!this.collapsible_) {
this.collapsed_ = false;
}
var className = goog.isDef(options.className) ?
options.className : 'ol-overviewmap';
var className = options.className ? options.className : 'ol-overviewmap';
var tipLabel = goog.isDef(options.tipLabel) ?
options.tipLabel : 'Overview map';
var tipLabel = options.tipLabel ? options.tipLabel : 'Overview map';
var collapseLabel = goog.isDef(options.collapseLabel) ?
options.collapseLabel : '\u00AB';
var collapseLabel = options.collapseLabel ? options.collapseLabel : '\u00AB';
/**
* @private
@@ -70,7 +69,7 @@ ol.control.OverviewMap = function(opt_options) {
goog.dom.createDom(goog.dom.TagName.SPAN, {}, collapseLabel) :
collapseLabel);
var label = goog.isDef(options.label) ? options.label : '\u00BB';
var label = options.label ? options.label : '\u00BB';
/**
* @private
@@ -103,7 +102,7 @@ ol.control.OverviewMap = function(opt_options) {
});
var ovmap = this.ovmap_;
if (goog.isDef(options.layers)) {
if (options.layers) {
options.layers.forEach(
/**
* @param {ol.layer.Layer} layer Layer.
@@ -133,8 +132,7 @@ ol.control.OverviewMap = function(opt_options) {
var element = goog.dom.createDom(goog.dom.TagName.DIV,
cssClasses, ovmapDiv, button);
var render = goog.isDef(options.render) ?
options.render : ol.control.OverviewMap.render;
var render = options.render ? options.render : ol.control.OverviewMap.render;
goog.base(this, {
element: element,
@@ -271,14 +269,14 @@ ol.control.OverviewMap.prototype.validateExtent_ = function() {
goog.asserts.assertArray(mapSize, 'mapSize should be an array');
var view = map.getView();
goog.asserts.assert(goog.isDef(view), 'view should be defined');
goog.asserts.assert(view, 'view should be defined');
var extent = view.calculateExtent(mapSize);
var ovmapSize = ovmap.getSize();
goog.asserts.assertArray(ovmapSize, 'ovmapSize should be an array');
var ovview = ovmap.getView();
goog.asserts.assert(goog.isDef(ovview), 'ovview should be defined');
goog.asserts.assert(ovview, 'ovview should be defined');
var ovextent = ovview.calculateExtent(ovmapSize);
var topLeftPixel =
@@ -320,14 +318,14 @@ ol.control.OverviewMap.prototype.resetExtent_ = function() {
goog.asserts.assertArray(mapSize, 'mapSize should be an array');
var view = map.getView();
goog.asserts.assert(goog.isDef(view), 'view should be defined');
goog.asserts.assert(view, 'view should be defined');
var extent = view.calculateExtent(mapSize);
var ovmapSize = ovmap.getSize();
goog.asserts.assertArray(ovmapSize, 'ovmapSize should be an array');
var ovview = ovmap.getView();
goog.asserts.assert(goog.isDef(ovview), 'ovview should be defined');
goog.asserts.assert(ovview, 'ovview should be defined');
// get how many times the current map overview could hold different
// box sizes using the min and max ratio, pick the step in the middle used
@@ -350,10 +348,10 @@ ol.control.OverviewMap.prototype.recenter_ = function() {
var ovmap = this.ovmap_;
var view = map.getView();
goog.asserts.assert(goog.isDef(view), 'view should be defined');
goog.asserts.assert(view, 'view should be defined');
var ovview = ovmap.getView();
goog.asserts.assert(goog.isDef(ovview), 'ovview should be defined');
goog.asserts.assert(ovview, 'ovview should be defined');
ovview.setCenter(view.getCenter());
};
@@ -375,16 +373,16 @@ ol.control.OverviewMap.prototype.updateBox_ = function() {
goog.asserts.assertArray(mapSize, 'mapSize should be an array');
var view = map.getView();
goog.asserts.assert(goog.isDef(view), 'view should be defined');
goog.asserts.assert(view, 'view should be defined');
var ovview = ovmap.getView();
goog.asserts.assert(goog.isDef(ovview), 'ovview should be defined');
goog.asserts.assert(ovview, 'ovview should be defined');
var ovmapSize = ovmap.getSize();
goog.asserts.assertArray(ovmapSize, 'ovmapSize should be an array');
var rotation = view.getRotation();
goog.asserts.assert(goog.isDef(rotation), 'rotation should be defined');
goog.asserts.assert(ol.isDef(rotation), 'rotation should be defined');
var overlay = this.boxOverlay_;
var box = this.boxOverlay_.getElement();
@@ -419,11 +417,11 @@ ol.control.OverviewMap.prototype.calculateCoordinateRotate_ = function(
var map = this.getMap();
var view = map.getView();
goog.asserts.assert(goog.isDef(view), 'view should be defined');
goog.asserts.assert(view, 'view should be defined');
var currentCenter = view.getCenter();
if (goog.isDef(currentCenter)) {
if (currentCenter) {
coordinateRotate = [
coordinate[0] - currentCenter[0],
coordinate[1] - currentCenter[1]