From f855bc1562bff37b5fd01d363b7875f85c08c853 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 8 Jan 2018 15:47:37 -0700 Subject: [PATCH] Rename _ol_source_Stamen_ to Stamen --- examples/color-manipulation.js | 4 ++-- examples/d3.js | 4 ++-- examples/earthquake-clusters.js | 4 ++-- examples/earthquake-custom-symbol.js | 4 ++-- examples/flight-animation.js | 4 ++-- examples/heatmap-earthquakes.js | 4 ++-- examples/icon-negative.js | 4 ++-- examples/kml-earthquakes.js | 4 ++-- examples/kml-timezones.js | 4 ++-- examples/stamen.js | 6 +++--- examples/wms-time.js | 4 ++-- src/ol/source/Stamen.js | 18 +++++++++--------- test/spec/ol/source/stamen.test.js | 6 +++--- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/examples/color-manipulation.js b/examples/color-manipulation.js index 3c362dd864..b86fc42806 100644 --- a/examples/color-manipulation.js +++ b/examples/color-manipulation.js @@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import ImageLayer from '../src/ol/layer/Image.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({ - sources: [new _ol_source_Stamen_({ + sources: [new Stamen({ layer: 'watercolor', transition: 0 })], diff --git a/examples/d3.js b/examples/d3.js index 55cbfac29a..c0096cb8e8 100644 --- a/examples/d3.js +++ b/examples/d3.js @@ -6,13 +6,13 @@ import ImageLayer from '../src/ol/layer/Image.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat, toLonLat} from '../src/ol/proj.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({ layers: [ new TileLayer({ - source: new _ol_source_Stamen_({ + source: new Stamen({ layer: 'watercolor' }) }) diff --git a/examples/earthquake-clusters.js b/examples/earthquake-clusters.js index 80ccf7e029..6b08b056e0 100644 --- a/examples/earthquake-clusters.js +++ b/examples/earthquake-clusters.js @@ -7,7 +7,7 @@ import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.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 _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js'; @@ -135,7 +135,7 @@ vector = new VectorLayer({ }); var raster = new TileLayer({ - source: new _ol_source_Stamen_({ + source: new Stamen({ layer: 'toner' }) }); diff --git a/examples/earthquake-custom-symbol.js b/examples/earthquake-custom-symbol.js index 02fa0aeae6..6375c0a526 100644 --- a/examples/earthquake-custom-symbol.js +++ b/examples/earthquake-custom-symbol.js @@ -5,7 +5,7 @@ import Polygon from '../src/ol/geom/Polygon.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.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 _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Icon_ from '../src/ol/style/Icon.js'; @@ -63,7 +63,7 @@ var vector = new VectorLayer({ }); var raster = new TileLayer({ - source: new _ol_source_Stamen_({ + source: new Stamen({ layer: 'toner' }) }); diff --git a/examples/flight-animation.js b/examples/flight-animation.js index 09d4243886..fdad2f77bd 100644 --- a/examples/flight-animation.js +++ b/examples/flight-animation.js @@ -5,7 +5,7 @@ import View from '../src/ol/View.js'; import LineString from '../src/ol/geom/LineString.js'; import TileLayer from '../src/ol/layer/Tile.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 _ol_style_Stroke_ from '../src/ol/style/Stroke.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({ layers: [ new TileLayer({ - source: new _ol_source_Stamen_({ + source: new Stamen({ layer: 'toner' }) }) diff --git a/examples/heatmap-earthquakes.js b/examples/heatmap-earthquakes.js index 0b04dff1c3..6645652d6a 100644 --- a/examples/heatmap-earthquakes.js +++ b/examples/heatmap-earthquakes.js @@ -3,7 +3,7 @@ import View from '../src/ol/View.js'; import KML from '../src/ol/format/KML.js'; import HeatmapLayer from '../src/ol/layer/Heatmap.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'; var blur = document.getElementById('blur'); @@ -30,7 +30,7 @@ vector.getSource().on('addfeature', function(event) { }); var raster = new TileLayer({ - source: new _ol_source_Stamen_({ + source: new Stamen({ layer: 'toner' }) }); diff --git a/examples/icon-negative.js b/examples/icon-negative.js index 09d9ddd409..ed82c9a723 100644 --- a/examples/icon-negative.js +++ b/examples/icon-negative.js @@ -5,7 +5,7 @@ import Point from '../src/ol/geom/Point.js'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; import TileLayer from '../src/ol/layer/Tile.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 _ol_style_Icon_ from '../src/ol/style/Icon.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({ layers: [ new TileLayer({ - source: new _ol_source_Stamen_({layer: 'watercolor'}) + source: new Stamen({layer: 'watercolor'}) }), new VectorLayer({ style: function(feature) { diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js index 103f6e7201..f696525a85 100644 --- a/examples/kml-earthquakes.js +++ b/examples/kml-earthquakes.js @@ -3,7 +3,7 @@ import View from '../src/ol/View.js'; import KML from '../src/ol/format/KML.js'; import TileLayer from '../src/ol/layer/Tile.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 _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js'; @@ -49,7 +49,7 @@ var vector = new VectorLayer({ }); var raster = new TileLayer({ - source: new _ol_source_Stamen_({ + source: new Stamen({ layer: 'toner' }) }); diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js index 29ef2e70bf..54ea073ebc 100644 --- a/examples/kml-timezones.js +++ b/examples/kml-timezones.js @@ -3,7 +3,7 @@ import View from '../src/ol/View.js'; import KML from '../src/ol/format/KML.js'; import TileLayer from '../src/ol/layer/Tile.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 _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; @@ -56,7 +56,7 @@ var vector = new VectorLayer({ }); var raster = new TileLayer({ - source: new _ol_source_Stamen_({ + source: new Stamen({ layer: 'toner' }) }); diff --git a/examples/stamen.js b/examples/stamen.js index 4015de5623..0a44ab490a 100644 --- a/examples/stamen.js +++ b/examples/stamen.js @@ -2,18 +2,18 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.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({ layers: [ new TileLayer({ - source: new _ol_source_Stamen_({ + source: new Stamen({ layer: 'watercolor' }) }), new TileLayer({ - source: new _ol_source_Stamen_({ + source: new Stamen({ layer: 'terrain-labels' }) }) diff --git a/examples/wms-time.js b/examples/wms-time.js index 56552a0bde..543e8f93c8 100644 --- a/examples/wms-time.js +++ b/examples/wms-time.js @@ -3,7 +3,7 @@ import View from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import TileLayer from '../src/ol/layer/Tile.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'; function threeHoursAgo() { @@ -17,7 +17,7 @@ var animationId = null; var layers = [ new TileLayer({ - source: new _ol_source_Stamen_({ + source: new Stamen({ layer: 'terrain' }) }), diff --git a/src/ol/source/Stamen.js b/src/ol/source/Stamen.js index a7436c8391..c1c249bfa8 100644 --- a/src/ol/source/Stamen.js +++ b/src/ol/source/Stamen.js @@ -14,19 +14,19 @@ import XYZ from '../source/XYZ.js'; * @param {olx.source.StamenOptions} options Stamen options. * @api */ -var _ol_source_Stamen_ = function(options) { +var Stamen = function(options) { var i = options.layer.indexOf('-'); 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 : 'https://stamen-tiles-{a-d}.a.ssl.fastly.net/' + options.layer + '/{z}/{x}/{y}.' + layerConfig.extension; XYZ.call(this, { - attributions: _ol_source_Stamen_.ATTRIBUTIONS, + attributions: Stamen.ATTRIBUTIONS, cacheSize: options.cacheSize, crossOrigin: 'anonymous', 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 * @type {Array.} */ -_ol_source_Stamen_.ATTRIBUTIONS = [ +Stamen.ATTRIBUTIONS = [ 'Map tiles by Stamen Design, ' + 'under CC BY' + ' 3.0.', @@ -56,7 +56,7 @@ _ol_source_Stamen_.ATTRIBUTIONS = [ /** * @type {Object.} */ -_ol_source_Stamen_.LayerConfig = { +Stamen.LayerConfig = { 'terrain': { extension: 'jpg', opaque: true @@ -106,7 +106,7 @@ _ol_source_Stamen_.LayerConfig = { /** * @type {Object.} */ -_ol_source_Stamen_.ProviderConfig = { +Stamen.ProviderConfig = { 'terrain': { minZoom: 4, maxZoom: 18 @@ -120,4 +120,4 @@ _ol_source_Stamen_.ProviderConfig = { maxZoom: 16 } }; -export default _ol_source_Stamen_; +export default Stamen; diff --git a/test/spec/ol/source/stamen.test.js b/test/spec/ol/source/stamen.test.js index 6b74c20072..a401d48370 100644 --- a/test/spec/ol/source/stamen.test.js +++ b/test/spec/ol/source/stamen.test.js @@ -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() { @@ -6,7 +6,7 @@ describe('ol.source.Stamen', function() { describe('constructor', function() { it('can be constructed with a custom minZoom', function() { - var source = new _ol_source_Stamen_({ + var source = new Stamen({ layer: 'watercolor', minZoom: 10 }); @@ -14,7 +14,7 @@ describe('ol.source.Stamen', function() { }); it('can be constructed with a custom maxZoom', function() { - var source = new _ol_source_Stamen_({ + var source = new Stamen({ layer: 'watercolor', maxZoom: 8 });