Merge pull request openlayers#2007 from fredj/tilejson-jsonp

Use goog.net.Jsonp instead of goog.net.jsloader
dasakigr · Apr 22, 2014 · 16d7999 · 16d7999
2 parents 3ffed43 + 1d688ad
commit 16d7999
Showing 1 changed file with 5 additions and 25 deletions.
diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js
@@ -9,7 +9,7 @@ goog.provide('ol.source.TileJSON');
 goog.provide('ol.tilejson');
 
 goog.require('goog.asserts');
-goog.require('goog.net.jsloader');
+goog.require('goog.net.Jsonp');
 goog.require('ol.Attribution');
 goog.require('ol.TileRange');
 goog.require('ol.TileUrlFunction');
@@ -20,22 +20,6 @@ goog.require('ol.source.TileImage');
 goog.require('ol.tilegrid.XYZ');
 
 
-/**
- * @private
- * @type {Array.<TileJSON>}
- */
-ol.tilejson.grids_ = [];
-
-
-/**
- * @param {TileJSON} tileJSON Tile JSON.
- */
-var grid = function(tileJSON) {
-  ol.tilejson.grids_.push(tileJSON);
-};
-goog.exportSymbol('grid', grid);
-
-
 
 /**
  * @constructor
@@ -52,22 +36,18 @@ ol.source.TileJSON = function(options) {
     tileLoadFunction: options.tileLoadFunction
   });
 
-  /**
-   * @private
-   * @type {!goog.async.Deferred}
-   */
-  this.deferred_ = goog.net.jsloader.load(options.url, {cleanupWhenDone: true});
-  this.deferred_.addCallback(this.handleTileJSONResponse, this);
+  var request = new goog.net.Jsonp(options.url);
+  request.send(undefined, goog.bind(this.handleTileJSONResponse, this));
 
 };
 goog.inherits(ol.source.TileJSON, ol.source.TileImage);
 
 
 /**
  * @protected
+ * @param {TileJSON} tileJSON Tile JSON.
  */
-ol.source.TileJSON.prototype.handleTileJSONResponse = function() {
-  var tileJSON = ol.tilejson.grids_.pop();
+ol.source.TileJSON.prototype.handleTileJSONResponse = function(tileJSON) {
 
   var epsg4326Projection = ol.proj.get('EPSG:4326');