Remove vector code from files
This commit is contained in:
@@ -9,11 +9,9 @@ goog.require('goog.style');
|
||||
goog.require('ol.css');
|
||||
goog.require('ol.layer.Image');
|
||||
goog.require('ol.layer.Tile');
|
||||
goog.require('ol.layer.Vector');
|
||||
goog.require('ol.renderer.Map');
|
||||
goog.require('ol.renderer.canvas.ImageLayer');
|
||||
goog.require('ol.renderer.canvas.TileLayer');
|
||||
goog.require('ol.renderer.canvas.VectorLayer2');
|
||||
goog.require('ol.source.State');
|
||||
|
||||
|
||||
@@ -62,8 +60,6 @@ ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) {
|
||||
return new ol.renderer.canvas.ImageLayer(this, layer);
|
||||
} else if (layer instanceof ol.layer.Tile) {
|
||||
return new ol.renderer.canvas.TileLayer(this, layer);
|
||||
} else if (layer instanceof ol.layer.Vector) {
|
||||
return new ol.renderer.canvas.VectorLayer2(this, layer);
|
||||
} else {
|
||||
goog.asserts.fail();
|
||||
return null;
|
||||
|
||||
@@ -42,26 +42,6 @@ ol.renderer.Layer = function(mapRenderer, layer) {
|
||||
goog.inherits(ol.renderer.Layer, goog.Disposable);
|
||||
|
||||
|
||||
/**
|
||||
* @param {ol.Pixel} pixel Pixel coordinate relative to the map viewport.
|
||||
* @param {function(string, ol.layer.Layer)} success Callback for
|
||||
* successful queries. The passed arguments are the resulting feature
|
||||
* information and the layer.
|
||||
* @param {function()=} opt_error Callback for unsuccessful queries.
|
||||
*/
|
||||
ol.renderer.Layer.prototype.getFeatureInfoForPixel =
|
||||
function(pixel, success, opt_error) {
|
||||
var layer = this.getLayer();
|
||||
var source = layer.getSource();
|
||||
if (goog.isFunction(source.getFeatureInfoForPixel)) {
|
||||
var callback = function(layerFeatureInfo) {
|
||||
success(layerFeatureInfo, layer);
|
||||
};
|
||||
source.getFeatureInfoForPixel(pixel, this.getMap(), callback, opt_error);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @protected
|
||||
* @return {ol.layer.Layer} Layer.
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
goog.provide('ol.renderer.Map');
|
||||
|
||||
goog.require('goog.Disposable');
|
||||
goog.require('goog.array');
|
||||
goog.require('goog.asserts');
|
||||
goog.require('goog.dispose');
|
||||
goog.require('goog.functions');
|
||||
@@ -98,78 +97,6 @@ ol.renderer.Map.prototype.disposeInternal = function() {
|
||||
ol.renderer.Map.prototype.getCanvas = goog.functions.NULL;
|
||||
|
||||
|
||||
/**
|
||||
* @param {ol.Pixel} pixel Pixel coordinate relative to the map viewport.
|
||||
* @param {Array.<ol.layer.Layer>} layers Layers to query.
|
||||
* @param {function(Array.<Array.<string|undefined>>)} success Callback for
|
||||
* successful queries. The passed argument is the resulting feature
|
||||
* information. Layers that are able to provide attribute data will put
|
||||
* ol.Feature instances, other layers will put a string which can either
|
||||
* be plain text or markup.
|
||||
* @param {function()=} opt_error Callback for unsuccessful
|
||||
* queries.
|
||||
*/
|
||||
ol.renderer.Map.prototype.getFeatureInfoForPixel =
|
||||
function(pixel, layers, success, opt_error) {
|
||||
var numLayers = layers.length;
|
||||
var featureInfo = new Array(numLayers);
|
||||
var callbackCount = 0;
|
||||
var callback = function(layerFeatureInfo, layer) {
|
||||
featureInfo[goog.array.indexOf(layers, layer)] = layerFeatureInfo;
|
||||
--callbackCount;
|
||||
if (callbackCount <= 0) {
|
||||
success(featureInfo);
|
||||
}
|
||||
};
|
||||
|
||||
var layer, layerRenderer;
|
||||
for (var i = 0; i < numLayers; ++i) {
|
||||
layer = layers[i];
|
||||
layerRenderer = this.getLayerRenderer(layer);
|
||||
if (goog.isFunction(layerRenderer.getFeatureInfoForPixel)) {
|
||||
++callbackCount;
|
||||
layerRenderer.getFeatureInfoForPixel(pixel, callback, opt_error);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @param {ol.Pixel} pixel Pixel coordinate relative to the map viewport.
|
||||
* @param {Array.<ol.layer.Layer>} layers Layers to query.
|
||||
* @param {function(Array.<Array.<ol.Feature|undefined>>)} success Callback for
|
||||
* successful queries. The passed argument is the resulting feature
|
||||
* information. Layers that are able to provide attribute data will put
|
||||
* ol.Feature instances, other layers will put a string which can either
|
||||
* be plain text or markup.
|
||||
* @param {function()=} opt_error Callback for unsuccessful
|
||||
* queries.
|
||||
*/
|
||||
ol.renderer.Map.prototype.getFeaturesForPixel =
|
||||
function(pixel, layers, success, opt_error) {
|
||||
var numLayers = layers.length;
|
||||
var features = new Array(numLayers);
|
||||
var callbackCount = 0;
|
||||
var callback = function(layerFeatures, layer) {
|
||||
features[goog.array.indexOf(layers, layer)] = layerFeatures;
|
||||
--callbackCount;
|
||||
if (callbackCount <= 0) {
|
||||
success(features);
|
||||
}
|
||||
};
|
||||
|
||||
var layer, layerRenderer;
|
||||
for (var i = 0; i < numLayers; ++i) {
|
||||
layer = layers[i];
|
||||
layerRenderer = this.getLayerRenderer(layer);
|
||||
if (goog.isFunction(layerRenderer.getFeaturesForPixel)) {
|
||||
++callbackCount;
|
||||
layerRenderer.getFeaturesForPixel(pixel, callback, opt_error);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @param {ol.layer.Layer} layer Layer.
|
||||
* @protected
|
||||
|
||||
Reference in New Issue
Block a user