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

Merge remote-tracking branch 'openlayers/master' into vector-api

Browse Source
This commit is contained in:
Tom Payne
2014-01-09 11:42:14 +01:00
parent b13256735e 73fcff641e
commit 7ce7bb2187
27 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/brightness-contrast.js
+2 -2
View File
@@ -3,7 +3,7 @@ goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.layer.Tile');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
function setResetBrightnessButtonHTML() {
@@ -23,7 +23,7 @@ if (!ol.BrowserFeature.HAS_WEBGL) {
info.style.display = '';
} else {
var layer = new ol.layer.Tile({
source: new ol.source.MapQuestOpenAerial()
source: new ol.source.MapQuest({layer: 'sat'})
});
var map = new ol.Map({
examples/drag-rotate-and-zoom.js
+2 -2
View File
@@ -4,7 +4,7 @@ goog.require('ol.View2D');
goog.require('ol.interaction');
goog.require('ol.interaction.DragRotateAndZoom');
goog.require('ol.layer.Tile');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
var map = new ol.Map({
@@ -13,7 +13,7 @@ var map = new ol.Map({
]),
layers: [
new ol.layer.Tile({
source: new ol.source.MapQuestOpenAerial()
source: new ol.source.MapQuest({layer: 'sat'})
})
],
renderers: ol.RendererHints.createFromQueryData(),
examples/draw-features.js
+2 -2
View File
@@ -5,7 +5,7 @@ goog.require('ol.interaction');
goog.require('ol.interaction.Draw');
goog.require('ol.layer.Tile');
goog.require('ol.layer.Vector');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
goog.require('ol.source.Vector');
goog.require('ol.style.Circle');
goog.require('ol.style.Fill');
@@ -13,7 +13,7 @@ goog.require('ol.style.Stroke');
goog.require('ol.style.Style');
var raster = new ol.layer.Tile({
source: new ol.source.MapQuestOpenAerial()
source: new ol.source.MapQuest({layer: 'sat'})
});
var styleArray = [new ol.style.Style({
examples/dynamic-data.js
+2 -2
View File
@@ -3,7 +3,7 @@ goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.geom.MultiPoint');
goog.require('ol.layer.Tile');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
goog.require('ol.style.Circle');
goog.require('ol.style.Fill');
goog.require('ol.style.Stroke');
@@ -12,7 +12,7 @@ goog.require('ol.style.Stroke');
var map = new ol.Map({
layers: [
new ol.layer.Tile({
source: new ol.source.MapQuestOpenAerial()
source: new ol.source.MapQuest({layer: 'sat'})
})
],
renderer: ol.RendererHint.CANVAS,
examples/layer-group.js
+2 -2
View File
@@ -5,13 +5,13 @@ goog.require('ol.dom.Input');
goog.require('ol.layer.Group');
goog.require('ol.layer.Tile');
goog.require('ol.proj');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
goog.require('ol.source.TileJSON');
var map = new ol.Map({
layers: [
new ol.layer.Tile({
source: new ol.source.MapQuestOpenAerial()
source: new ol.source.MapQuest({layer: 'sat'})
}), new ol.layer.Group({
layers: [
new ol.layer.Tile({
examples/mapquest.html
+6
View File
@@ -25,6 +25,11 @@
<div class="row-fluid">
<div class="span12">
<div id="map" class="map"></div>
<select id="layer-select">
<option value="Aerial">Aerial</option>
<option value="AerialWithLabels">Aerial with labels</option>
<option value="Road" selected>Road</option>
</select>
</div>
</div>
@@ -43,6 +48,7 @@
</div>
<script src="jquery.min.js" type="text/javascript"></script>
<script src="loader.js?id=mapquest" type="text/javascript"></script>
<script src="../resources/example-behaviour.js" type="text/javascript"></script>
examples/mapquest.js
+37 -7
View File
@@ -1,22 +1,52 @@
goog.require('ol.Map');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.layer.Group');
goog.require('ol.layer.Tile');
goog.require('ol.proj');
goog.require('ol.source.MapQuestOSM');
goog.require('ol.source.MapQuest');
var layers = [
new ol.layer.Tile({
style: 'Road',
source: new ol.source.MapQuest({layer: 'osm'})
}),
new ol.layer.Tile({
style: 'Aerial',
visible: false,
source: new ol.source.MapQuest({layer: 'sat'})
}),
new ol.layer.Group({
style: 'AerialWithLabels',
visible: false,
layers: [
new ol.layer.Tile({
source: new ol.source.MapQuest({layer: 'sat'})
}),
new ol.layer.Tile({
source: new ol.source.MapQuest({layer: 'hyb'})
})
]
})
];
var map = new ol.Map({
layers: [
new ol.layer.Tile({
source: new ol.source.MapQuestOSM()
})
],
layers: layers,
renderers: ol.RendererHints.createFromQueryData(),
target: 'map',
view: new ol.View2D({
center: ol.proj.transform(
[139.6917, 35.689506], 'EPSG:4326', 'EPSG:3857'),
[-73.979378, 40.702222], 'EPSG:4326', 'EPSG:3857'),
zoom: 9
})
});
$('#layer-select').change(function() {
var style = $(this).find(':selected').val();
var i, ii;
for (i = 0, ii = layers.length; i < ii; ++i) {
layers[i].set('visible', (layers[i].get('style') == style));
}
});
$('#layer-select').trigger('change');
examples/overlay.js
+2 -2
View File
@@ -6,11 +6,11 @@ goog.require('ol.View2D');
goog.require('ol.coordinate');
goog.require('ol.layer.Tile');
goog.require('ol.proj');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
var layer = new ol.layer.Tile({
source: new ol.source.MapQuestOpenAerial()
source: new ol.source.MapQuest({layer: 'sat'})
});
var map = new ol.Map({
examples/semi-transparent-layer.js
+2 -2
View File
@@ -3,14 +3,14 @@ goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.layer.Tile');
goog.require('ol.proj');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
goog.require('ol.source.TileJSON');
var map = new ol.Map({
layers: [
new ol.layer.Tile({
source: new ol.source.MapQuestOpenAerial()
source: new ol.source.MapQuest({layer: 'sat'})
}),
new ol.layer.Tile({
source: new ol.source.TileJSON({
examples/side-by-side.js
+2 -2
View File
@@ -3,13 +3,13 @@ goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.layer.Tile');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
var domMap = new ol.Map({
layers: [
new ol.layer.Tile({
source: new ol.source.MapQuestOpenAerial()
source: new ol.source.MapQuest({layer: 'sat'})
})
],
renderer: ol.RendererHint.DOM,
examples/vector-layer.js
+2 -2
View File
@@ -5,7 +5,7 @@ goog.require('ol.layer.Tile');
goog.require('ol.layer.Vector');
goog.require('ol.render.FeaturesOverlay');
goog.require('ol.source.GeoJSON');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
goog.require('ol.style.Fill');
goog.require('ol.style.Stroke');
goog.require('ol.style.Style');
@@ -33,7 +33,7 @@ var vectorLayer = new ol.layer.Vector({
var map = new ol.Map({
layers: [
new ol.layer.Tile({
source: new ol.source.MapQuestOpenAerial()
source: new ol.source.MapQuest({layer: 'sat'})
}),
vectorLayer
],
examples/wms-image.js
+2 -2
View File
@@ -4,12 +4,12 @@ goog.require('ol.View2D');
goog.require('ol.layer.Image');
goog.require('ol.layer.Tile');
goog.require('ol.source.ImageWMS');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
var layers = [
new ol.layer.Tile({
source: new ol.source.MapQuestOpenAerial()
source: new ol.source.MapQuest({layer: 'sat'})
}),
new ol.layer.Image({
source: new ol.source.ImageWMS({
examples/wms-tiled.js
+2 -2
View File
@@ -2,13 +2,13 @@ goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.layer.Tile');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
goog.require('ol.source.TileWMS');
var layers = [
new ol.layer.Tile({
source: new ol.source.MapQuestOpenAerial()
source: new ol.source.MapQuest({layer: 'sat'})
}),
new ol.layer.Tile({
source: new ol.source.TileWMS({
examples/zoomslider.js
+2 -2
View File
@@ -2,7 +2,7 @@ goog.require('ol.Map');
goog.require('ol.View2D');
goog.require('ol.control.ZoomSlider');
goog.require('ol.layer.Tile');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.MapQuest');
/**
@@ -14,7 +14,7 @@ goog.require('ol.source.MapQuestOpenAerial');
var createMap = function(divId) {
var source, layer, map, zoomslider, resolutions;
source = new ol.source.MapQuestOpenAerial();
source = new ol.source.MapQuest({layer: 'sat'});
layer = new ol.layer.Tile({
source: source
});