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

Rename _ol_source_Stamen_ to Stamen

Browse Source
This commit is contained in:
Tim Schaub
2018-01-08 15:47:37 -07:00
parent 5f62d2ecfe
commit f855bc1562
13 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/color-manipulation.js
View File

@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js'; import View from '../src/ol/View.js';
import ImageLayer from '../src/ol/layer/Image.js'; import ImageLayer from '../src/ol/layer/Image.js';
import RasterSource from '../src/ol/source/Raster.js'; import RasterSource from '../src/ol/source/Raster.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import Stamen from '../src/ol/source/Stamen.js';
/** /**
@@ -101,7 +101,7 @@ function xyz2rgb(x) {
} }
var raster = new RasterSource({ var raster = new RasterSource({
sources: [new _ol_source_Stamen_({ sources: [new Stamen({
layer: 'watercolor', layer: 'watercolor',
transition: 0 transition: 0
})], })],

4
examples/d3.js vendored
View File

@@ -6,13 +6,13 @@ import ImageLayer from '../src/ol/layer/Image.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import {fromLonLat, toLonLat} from '../src/ol/proj.js'; import {fromLonLat, toLonLat} from '../src/ol/proj.js';
import ImageCanvasSource from '../src/ol/source/ImageCanvas.js'; import ImageCanvasSource from '../src/ol/source/ImageCanvas.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import Stamen from '../src/ol/source/Stamen.js';
var map = new Map({ var map = new Map({
layers: [ layers: [
new TileLayer({ new TileLayer({
source: new _ol_source_Stamen_({ source: new Stamen({
layer: 'watercolor' layer: 'watercolor'
}) })
}) })

4
examples/earthquake-clusters.js
View File

@@ -7,7 +7,7 @@ import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import Cluster from '../src/ol/source/Cluster.js'; import Cluster from '../src/ol/source/Cluster.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import Stamen from '../src/ol/source/Stamen.js';
import VectorSource from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -135,7 +135,7 @@ vector = new VectorLayer({
}); });
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_Stamen_({ source: new Stamen({
layer: 'toner' layer: 'toner'
}) })
}); });

4
examples/earthquake-custom-symbol.js
View File

@@ -5,7 +5,7 @@ import Polygon from '../src/ol/geom/Polygon.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_render_ from '../src/ol/render.js'; import _ol_render_ from '../src/ol/render.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import Stamen from '../src/ol/source/Stamen.js';
import VectorSource from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../src/ol/style/Icon.js';
@@ -63,7 +63,7 @@ var vector = new VectorLayer({
}); });
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_Stamen_({ source: new Stamen({
layer: 'toner' layer: 'toner'
}) })
}); });

4
examples/flight-animation.js
View File

@@ -5,7 +5,7 @@ import View from '../src/ol/View.js';
import LineString from '../src/ol/geom/LineString.js'; import LineString from '../src/ol/geom/LineString.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import Stamen from '../src/ol/source/Stamen.js';
import VectorSource from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -13,7 +13,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
var map = new Map({ var map = new Map({
layers: [ layers: [
new TileLayer({ new TileLayer({
source: new _ol_source_Stamen_({ source: new Stamen({
layer: 'toner' layer: 'toner'
}) })
}) })

4
examples/heatmap-earthquakes.js
View File

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
import KML from '../src/ol/format/KML.js'; import KML from '../src/ol/format/KML.js';
import HeatmapLayer from '../src/ol/layer/Heatmap.js'; import HeatmapLayer from '../src/ol/layer/Heatmap.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import Stamen from '../src/ol/source/Stamen.js';
import VectorSource from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var blur = document.getElementById('blur'); var blur = document.getElementById('blur');
@@ -30,7 +30,7 @@ vector.getSource().on('addfeature', function(event) {
}); });
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_Stamen_({ source: new Stamen({
layer: 'toner' layer: 'toner'
}) })
}); });

4
examples/icon-negative.js
View File

@@ -5,7 +5,7 @@ import Point from '../src/ol/geom/Point.js';
import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import Stamen from '../src/ol/source/Stamen.js';
import VectorSource from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -29,7 +29,7 @@ iconFeature.set('style', createStyle('data/icon.png', undefined));
var map = new Map({ var map = new Map({
layers: [ layers: [
new TileLayer({ new TileLayer({
source: new _ol_source_Stamen_({layer: 'watercolor'}) source: new Stamen({layer: 'watercolor'})
}), }),
new VectorLayer({ new VectorLayer({
style: function(feature) { style: function(feature) {

4
examples/kml-earthquakes.js
View File

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
import KML from '../src/ol/format/KML.js'; import KML from '../src/ol/format/KML.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import Stamen from '../src/ol/source/Stamen.js';
import VectorSource from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -49,7 +49,7 @@ var vector = new VectorLayer({
}); });
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_Stamen_({ source: new Stamen({
layer: 'toner' layer: 'toner'
}) })
}); });

4
examples/kml-timezones.js
View File

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
import KML from '../src/ol/format/KML.js'; import KML from '../src/ol/format/KML.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import Stamen from '../src/ol/source/Stamen.js';
import VectorSource from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -56,7 +56,7 @@ var vector = new VectorLayer({
}); });
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_Stamen_({ source: new Stamen({
layer: 'toner' layer: 'toner'
}) })
}); });

6
examples/stamen.js
View File

@@ -2,18 +2,18 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js'; import View from '../src/ol/View.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import {fromLonLat} from '../src/ol/proj.js'; import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import Stamen from '../src/ol/source/Stamen.js';
var map = new Map({ var map = new Map({
layers: [ layers: [
new TileLayer({ new TileLayer({
source: new _ol_source_Stamen_({ source: new Stamen({
layer: 'watercolor' layer: 'watercolor'
}) })
}), }),
new TileLayer({ new TileLayer({
source: new _ol_source_Stamen_({ source: new Stamen({
layer: 'terrain-labels' layer: 'terrain-labels'
}) })
}) })

4
examples/wms-time.js
View File

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
import * as _ol_extent_ from '../src/ol/extent.js'; import * as _ol_extent_ from '../src/ol/extent.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import {transformExtent} from '../src/ol/proj.js'; import {transformExtent} from '../src/ol/proj.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import Stamen from '../src/ol/source/Stamen.js';
import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js';
function threeHoursAgo() { function threeHoursAgo() {
@@ -17,7 +17,7 @@ var animationId = null;
var layers = [ var layers = [
new TileLayer({ new TileLayer({
source: new _ol_source_Stamen_({ source: new Stamen({
layer: 'terrain' layer: 'terrain'
}) })
}), }),

18
src/ol/source/Stamen.js
View File

@@ -14,19 +14,19 @@ import XYZ from '../source/XYZ.js';
* @param {olx.source.StamenOptions} options Stamen options. * @param {olx.source.StamenOptions} options Stamen options.
* @api * @api
*/ */
var _ol_source_Stamen_ = function(options) { var Stamen = function(options) {
var i = options.layer.indexOf('-'); var i = options.layer.indexOf('-');
var provider = i == -1 ? options.layer : options.layer.slice(0, i); var provider = i == -1 ? options.layer : options.layer.slice(0, i);
var providerConfig = _ol_source_Stamen_.ProviderConfig[provider]; var providerConfig = Stamen.ProviderConfig[provider];
var layerConfig = _ol_source_Stamen_.LayerConfig[options.layer]; var layerConfig = Stamen.LayerConfig[options.layer];
var url = options.url !== undefined ? options.url : var url = options.url !== undefined ? options.url :
'https://stamen-tiles-{a-d}.a.ssl.fastly.net/' + options.layer + 'https://stamen-tiles-{a-d}.a.ssl.fastly.net/' + options.layer +
'/{z}/{x}/{y}.' + layerConfig.extension; '/{z}/{x}/{y}.' + layerConfig.extension;
XYZ.call(this, { XYZ.call(this, {
attributions: _ol_source_Stamen_.ATTRIBUTIONS, attributions: Stamen.ATTRIBUTIONS,
cacheSize: options.cacheSize, cacheSize: options.cacheSize,
crossOrigin: 'anonymous', crossOrigin: 'anonymous',
maxZoom: options.maxZoom != undefined ? options.maxZoom : providerConfig.maxZoom, maxZoom: options.maxZoom != undefined ? options.maxZoom : providerConfig.maxZoom,
@@ -39,14 +39,14 @@ var _ol_source_Stamen_ = function(options) {
}); });
}; };
inherits(_ol_source_Stamen_, XYZ); inherits(Stamen, XYZ);
/** /**
* @const * @const
* @type {Array.<string>} * @type {Array.<string>}
*/ */
_ol_source_Stamen_.ATTRIBUTIONS = [ Stamen.ATTRIBUTIONS = [
'Map tiles by <a href="https://stamen.com/">Stamen Design</a>, ' + 'Map tiles by <a href="https://stamen.com/">Stamen Design</a>, ' +
'under <a href="https://creativecommons.org/licenses/by/3.0/">CC BY' + 'under <a href="https://creativecommons.org/licenses/by/3.0/">CC BY' +
' 3.0</a>.', ' 3.0</a>.',
@@ -56,7 +56,7 @@ _ol_source_Stamen_.ATTRIBUTIONS = [
/** /**
* @type {Object.<string, {extension: string, opaque: boolean}>} * @type {Object.<string, {extension: string, opaque: boolean}>}
*/ */
_ol_source_Stamen_.LayerConfig = { Stamen.LayerConfig = {
'terrain': { 'terrain': {
extension: 'jpg', extension: 'jpg',
opaque: true opaque: true
@@ -106,7 +106,7 @@ _ol_source_Stamen_.LayerConfig = {
/** /**
* @type {Object.<string, {minZoom: number, maxZoom: number}>} * @type {Object.<string, {minZoom: number, maxZoom: number}>}
*/ */
_ol_source_Stamen_.ProviderConfig = { Stamen.ProviderConfig = {
'terrain': { 'terrain': {
minZoom: 4, minZoom: 4,
maxZoom: 18 maxZoom: 18
@@ -120,4 +120,4 @@ _ol_source_Stamen_.ProviderConfig = {
maxZoom: 16 maxZoom: 16
} }
}; };
export default _ol_source_Stamen_; export default Stamen;

6
test/spec/ol/source/stamen.test.js
View File

@@ -1,4 +1,4 @@
import _ol_source_Stamen_ from '../../../../src/ol/source/Stamen.js'; import Stamen from '../../../../src/ol/source/Stamen.js';
describe('ol.source.Stamen', function() { describe('ol.source.Stamen', function() {
@@ -6,7 +6,7 @@ describe('ol.source.Stamen', function() {
describe('constructor', function() { describe('constructor', function() {
it('can be constructed with a custom minZoom', function() { it('can be constructed with a custom minZoom', function() {
var source = new _ol_source_Stamen_({ var source = new Stamen({
layer: 'watercolor', layer: 'watercolor',
minZoom: 10 minZoom: 10
}); });
@@ -14,7 +14,7 @@ describe('ol.source.Stamen', function() {
}); });
it('can be constructed with a custom maxZoom', function() { it('can be constructed with a custom maxZoom', function() {
var source = new _ol_source_Stamen_({ var source = new Stamen({
layer: 'watercolor', layer: 'watercolor',
maxZoom: 8 maxZoom: 8
}); });