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

Defines in a namespace that can be required

Browse Source 
For consistency, all defines are in the ol namespace.  If they are to be moved to another namespace, they need to be requireable.
This commit is contained in:
Tim Schaub
2014-04-30 09:14:10 -06:00
parent e4e3b2229a
commit 24498fa9d0
12 changed files with 88 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ol/source/imagewmssource.js
View File

@@ -6,6 +6,7 @@ goog.require('goog.asserts');
goog.require('goog.object');
goog.require('goog.string');
goog.require('goog.uri.utils');
goog.require('ol');
goog.require('ol.Image');
goog.require('ol.extent');
goog.require('ol.proj');
@@ -150,7 +151,7 @@ ol.source.ImageWMS.prototype.getGetFeatureInfoUrl =
var baseParams = {
'SERVICE': 'WMS',
'VERSION': ol.source.wms.DEFAULT_VERSION,
'VERSION': ol.DEFAULT_WMS_VERSION,
'REQUEST': 'GetFeatureInfo',
'FORMAT': 'image/png',
'TRANSPARENT': true,
@@ -208,7 +209,7 @@ ol.source.ImageWMS.prototype.getImage =
var params = {
'SERVICE': 'WMS',
'VERSION': ol.source.wms.DEFAULT_VERSION,
'VERSION': ol.DEFAULT_WMS_VERSION,
'REQUEST': 'GetMap',
'FORMAT': 'image/png',
'TRANSPARENT': true
@@ -355,6 +356,6 @@ ol.source.ImageWMS.prototype.updateParams = function(params) {
*/
ol.source.ImageWMS.prototype.updateV13_ = function() {
var version =
goog.object.get(this.params_, 'VERSION', ol.source.wms.DEFAULT_VERSION);
goog.object.get(this.params_, 'VERSION', ol.DEFAULT_WMS_VERSION);
this.v13_ = goog.string.compareVersions(version, '1.3') >= 0;
};

7
src/ol/source/tilewmssource.js
View File

@@ -10,6 +10,7 @@ goog.require('goog.math');
goog.require('goog.object');
goog.require('goog.string');
goog.require('goog.uri.utils');
goog.require('ol');
goog.require('ol.TileCoord');
goog.require('ol.TileUrlFunction');
goog.require('ol.extent');
@@ -165,7 +166,7 @@ ol.source.TileWMS.prototype.getGetFeatureInfoUrl =
var baseParams = {
'SERVICE': 'WMS',
'VERSION': ol.source.wms.DEFAULT_VERSION,
'VERSION': ol.DEFAULT_WMS_VERSION,
'REQUEST': 'GetFeatureInfo',
'FORMAT': 'image/png',
'TRANSPARENT': true,
@@ -373,7 +374,7 @@ ol.source.TileWMS.prototype.tileUrlFunction_ =
var baseParams = {
'SERVICE': 'WMS',
'VERSION': ol.source.wms.DEFAULT_VERSION,
'VERSION': ol.DEFAULT_WMS_VERSION,
'REQUEST': 'GetMap',
'FORMAT': 'image/png',
'TRANSPARENT': true
@@ -405,6 +406,6 @@ ol.source.TileWMS.prototype.updateParams = function(params) {
*/
ol.source.TileWMS.prototype.updateV13_ = function() {
var version =
goog.object.get(this.params_, 'VERSION', ol.source.wms.DEFAULT_VERSION);
goog.object.get(this.params_, 'VERSION', ol.DEFAULT_WMS_VERSION);
this.v13_ = goog.string.compareVersions(version, '1.3') >= 0;
};

6
src/ol/source/wmssource.js
View File

@@ -2,12 +2,6 @@ goog.provide('ol.source.wms');
goog.provide('ol.source.wms.ServerType');
/**
* @define {string} WMS default version.
*/
ol.source.wms.DEFAULT_VERSION = '1.3.0';
/**
* @enum {string}
*/