Merge pull request #1638 from elemoine/featureoverlay

Rename ol.render.FeaturesOverlay to ol.FeatureOverlay
This commit is contained in:
Éric Lemoine
2014-02-06 18:00:09 +01:00
11 changed files with 46 additions and 46 deletions

View File

@@ -1,9 +1,9 @@
goog.require('ol.FeatureOverlay');
goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.layer.Image');
goog.require('ol.layer.Tile');
goog.require('ol.render.FeaturesOverlay');
goog.require('ol.source.GeoJSON');
goog.require('ol.source.ImageVector');
goog.require('ol.source.MapQuest');
@@ -57,7 +57,7 @@ var highlightStyleArray = [new ol.style.Style({
})
})];
var featuresOverlay = new ol.render.FeaturesOverlay({
var featureOverlay = new ol.FeatureOverlay({
map: map,
styleFunction: function(feature, resolution) {
return highlightStyleArray;
@@ -80,10 +80,10 @@ var displayFeatureInfo = function(pixel) {
if (feature !== highlight) {
if (highlight) {
featuresOverlay.removeFeature(highlight);
featureOverlay.removeFeature(highlight);
}
if (feature) {
featuresOverlay.addFeature(feature);
featureOverlay.addFeature(feature);
}
highlight = feature;
}

View File

@@ -1,3 +1,4 @@
goog.require('ol.FeatureOverlay');
goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
@@ -5,7 +6,6 @@ goog.require('ol.interaction');
goog.require('ol.interaction.Select');
goog.require('ol.layer.Tile');
goog.require('ol.layer.Vector');
goog.require('ol.render.FeaturesOverlay');
goog.require('ol.source.GeoJSON');
goog.require('ol.source.MapQuest');
goog.require('ol.style.Fill');
@@ -42,7 +42,7 @@ var vector = new ol.layer.Vector({
});
var select = new ol.interaction.Select({
featuresOverlay: new ol.render.FeaturesOverlay({
featureOverlay: new ol.FeatureOverlay({
styleFunction: function(feature, layer) {
return selectedStyle;
}

View File

@@ -35,7 +35,7 @@
<div id="docs">
<p>See the <a href="vector-layer.js" target="_blank">vector-layer.js source</a> to see how this is done.</p>
</div>
<div id="tags">vector, geojson, style, features overlay</div>
<div id="tags">vector, geojson, style, feature overlay</div>
</div>
<div class="span4 offset4">
<div id="info" class="alert alert-success">

View File

@@ -1,9 +1,9 @@
goog.require('ol.FeatureOverlay');
goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.layer.Tile');
goog.require('ol.layer.Vector');
goog.require('ol.render.FeaturesOverlay');
goog.require('ol.source.GeoJSON');
goog.require('ol.source.MapQuest');
goog.require('ol.style.Fill');
@@ -63,7 +63,7 @@ var map = new ol.Map({
var highlightStyleCache = {};
var featuresOverlay = new ol.render.FeaturesOverlay({
var featureOverlay = new ol.FeatureOverlay({
map: map,
styleFunction: function(feature, resolution) {
var text = resolution < 5000 ? feature.get('name') : '';
@@ -109,10 +109,10 @@ var displayFeatureInfo = function(pixel) {
if (feature !== highlight) {
if (highlight) {
featuresOverlay.removeFeature(highlight);
featureOverlay.removeFeature(highlight);
}
if (feature) {
featuresOverlay.addFeature(feature);
featureOverlay.addFeature(feature);
}
highlight = feature;
}