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

Merge pull request #748 from twpayne/rename-projection-to-proj

Browse Source 
Rename ol.projection to ol.proj
This commit is contained in:
Tom Payne
2013-05-31 04:34:22 -07:00
parent e9adc06bee 46553c719c
commit 075f4aadc7
50 changed files with 345 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
examples/animation.js
View File

@@ -4,22 +4,16 @@ goog.require('ol.View2D');
goog.require('ol.animation');
goog.require('ol.easing');
goog.require('ol.layer.TileLayer');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.OSM');
var london = ol.projection.transform(
[-0.12755, 51.507222], 'EPSG:4326', 'EPSG:3857');
var moscow = ol.projection.transform(
[37.6178, 55.7517], 'EPSG:4326', 'EPSG:3857');
var istanbul = ol.projection.transform(
[28.9744, 41.0128], 'EPSG:4326', 'EPSG:3857');
var rome = ol.projection.transform(
[12.5, 41.9], 'EPSG:4326', 'EPSG:3857');
var bern = ol.projection.transform(
[7.4458, 46.95], 'EPSG:4326', 'EPSG:3857');
var madrid = ol.projection.transform(
[-3.683333, 40.4], 'EPSG:4326', 'EPSG:3857');
var london = ol.proj.transform([-0.12755, 51.507222], 'EPSG:4326', 'EPSG:3857');
var moscow = ol.proj.transform([37.6178, 55.7517], 'EPSG:4326', 'EPSG:3857');
var istanbul = ol.proj.transform([28.9744, 41.0128], 'EPSG:4326', 'EPSG:3857');
var rome = ol.proj.transform([12.5, 41.9], 'EPSG:4326', 'EPSG:3857');
var bern = ol.proj.transform([7.4458, 46.95], 'EPSG:4326', 'EPSG:3857');
var madrid = ol.proj.transform([-3.683333, 40.4], 'EPSG:4326', 'EPSG:3857');
var view = new ol.View2D({
// the view's initial state

4
examples/bing-maps.js
View File

@@ -2,7 +2,7 @@ goog.require('ol.Map');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.BingMaps');
@@ -23,7 +23,7 @@ var map = new ol.Map({
renderers: ol.RendererHints.createFromQueryData(),
target: 'map',
view: new ol.View2D({
center: ol.projection.transform([-123.1, 49.25], 'EPSG:4326', 'EPSG:3857'),
center: ol.proj.transform([-123.1, 49.25], 'EPSG:4326', 'EPSG:3857'),
zoom: 8
})
});

4
examples/canvas-tiles.js
View File

@@ -2,7 +2,7 @@ goog.require('ol.Map');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.DebugTileSource');
goog.require('ol.source.OSM');
goog.require('ol.tilegrid.XYZ');
@@ -25,7 +25,7 @@ var map = new ol.Map({
renderers: ol.RendererHints.createFromQueryData(),
target: 'map',
view: new ol.View2D({
center: ol.projection.transform(
center: ol.proj.transform(
[-0.1275, 51.507222], 'EPSG:4326', 'EPSG:3857'),
zoom: 10
})

4
examples/gml.js
View File

@@ -4,7 +4,7 @@ goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.layer.Vector');
goog.require('ol.parser.ogc.GML_v3');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.Vector');
goog.require('ol.style.Polygon');
@@ -17,7 +17,7 @@ var raster = new ol.layer.TileLayer({
var vector = new ol.layer.Vector({
source: new ol.source.Vector({
projection: ol.projection.get('EPSG:4326')
projection: ol.proj.get('EPSG:4326')
}),
style: new ol.style.Style({rules: [
new ol.style.Rule({

4
examples/gpx.js
View File

@@ -4,7 +4,7 @@ goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.layer.Vector');
goog.require('ol.parser.GPX');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.OSM');
goog.require('ol.source.Vector');
@@ -14,7 +14,7 @@ var raster = new ol.layer.TileLayer({
var vector = new ol.layer.Vector({
source: new ol.source.Vector({
projection: ol.projection.get('EPSG:4326')
projection: ol.proj.get('EPSG:4326')
})
});

5
examples/hue-saturation.js
View File

@@ -2,7 +2,7 @@ goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.BingMaps');
@@ -18,8 +18,7 @@ var map = new ol.Map({
renderer: ol.RendererHint.WEBGL,
target: 'map',
view: new ol.View2D({
center: ol.projection.transform(
[-9.375, 51.483333], 'EPSG:4326', 'EPSG:3857'),
center: ol.proj.transform([-9.375, 51.483333], 'EPSG:4326', 'EPSG:3857'),
zoom: 15
})
});

4
examples/kml.js
View File

@@ -4,7 +4,7 @@ goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.layer.Vector');
goog.require('ol.parser.KML');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.TiledWMS');
goog.require('ol.source.Vector');
@@ -20,7 +20,7 @@ var raster = new ol.layer.TileLayer({
})
});
var epsg4326 = ol.projection.get('EPSG:4326');
var epsg4326 = ol.proj.get('EPSG:4326');
var vector = new ol.layer.Vector({
source: new ol.source.Vector({

4
examples/mapquest.js
View File

@@ -2,7 +2,7 @@ goog.require('ol.Map');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.MapQuestOSM');
@@ -15,7 +15,7 @@ var map = new ol.Map({
renderers: ol.RendererHints.createFromQueryData(),
target: 'map',
view: new ol.View2D({
center: ol.projection.transform(
center: ol.proj.transform(
[139.6917, 35.689506], 'EPSG:4326', 'EPSG:3857'),
zoom: 9
})

6
examples/overlay.js
View File

@@ -4,7 +4,7 @@ goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.coordinate');
goog.require('ol.layer.TileLayer');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.MapQuestOpenAerial');
@@ -25,7 +25,7 @@ var map = new ol.Map({
// Vienna label
var vienna = new ol.Overlay({
map: map,
position: ol.projection.transform(
position: ol.proj.transform(
[16.3725, 48.208889], 'EPSG:4326', 'EPSG:3857'),
element: document.getElementById('vienna')
});
@@ -38,7 +38,7 @@ var popup = new ol.Overlay({
map.on('click', function(evt) {
var element = popup.getElement();
var coordinate = evt.getCoordinate();
var hdms = ol.coordinate.toStringHDMS(ol.projection.transform(
var hdms = ol.coordinate.toStringHDMS(ol.proj.transform(
coordinate, 'EPSG:3857', 'EPSG:4326'));
$(element).popover('destroy');

5
examples/semi-transparent-layer.js
View File

@@ -2,7 +2,7 @@ goog.require('ol.Map');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.TileJSON');
@@ -22,8 +22,7 @@ var map = new ol.Map({
renderers: ol.RendererHints.createFromQueryData(),
target: 'map',
view: new ol.View2D({
center: ol.projection.transform(
[-77.93255, 37.9555], 'EPSG:4326', 'EPSG:3857'),
center: ol.proj.transform([-77.93255, 37.9555], 'EPSG:4326', 'EPSG:3857'),
zoom: 5
})
});

4
examples/stamen.js
View File

@@ -2,7 +2,7 @@ goog.require('ol.Map');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.Stamen');
@@ -22,7 +22,7 @@ var map = new ol.Map({
renderers: ol.RendererHints.createFromQueryData(),
target: 'map',
view: new ol.View2D({
center: ol.projection.transform(
center: ol.proj.transform(
[-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'),
zoom: 12
})

6
examples/style-rules.js
View File

@@ -6,7 +6,7 @@ goog.require('ol.control.defaults');
goog.require('ol.filter.Filter');
goog.require('ol.layer.Vector');
goog.require('ol.parser.GeoJSON');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.Vector');
goog.require('ol.style.Line');
goog.require('ol.style.Rule');
@@ -48,7 +48,7 @@ var style = new ol.style.Style({rules: [
var vector = new ol.layer.Vector({
style: style,
source: new ol.source.Vector({
projection: ol.projection.get('EPSG:3857')
projection: ol.proj.get('EPSG:3857')
})
});
@@ -115,7 +115,7 @@ vector.parseFeatures({
'coordinates': [[10000000, -10000000], [-10000000, -10000000]]
}
}]
}, new ol.parser.GeoJSON(), ol.projection.get('EPSG:3857'));
}, new ol.parser.GeoJSON(), ol.proj.get('EPSG:3857'));
var map = new ol.Map({

4
examples/vector-layer.js
View File

@@ -4,7 +4,7 @@ goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.layer.Vector');
goog.require('ol.parser.GeoJSON');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.MapQuestOpenAerial');
goog.require('ol.source.Vector');
goog.require('ol.style.Polygon');
@@ -18,7 +18,7 @@ var raster = new ol.layer.TileLayer({
var vector = new ol.layer.Vector({
source: new ol.source.Vector({
projection: ol.projection.get('EPSG:4326')
projection: ol.proj.get('EPSG:4326')
}),
style: new ol.style.Style({rules: [
new ol.style.Rule({

4
examples/wms-custom-proj.js
View File

@@ -6,11 +6,11 @@ goog.require('ol.control.ScaleLine');
goog.require('ol.control.ScaleLineUnits');
goog.require('ol.control.defaults');
goog.require('ol.layer.TileLayer');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.TiledWMS');
var projection = ol.projection.configureProj4jsProjection({
var projection = ol.proj.configureProj4jsProjection({
code: 'EPSG:21781',
extent: [485869.5728, 837076.5648, 76443.1884, 299941.7864]
});

4
examples/wms-single-image-custom-proj.js
View File

@@ -3,11 +3,11 @@ goog.require('ol.Map');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.layer.ImageLayer');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.SingleImageWMS');
var projection = ol.projection.configureProj4jsProjection({
var projection = ol.proj.configureProj4jsProjection({
code: 'EPSG:21781',
extent: [485869.5728, 837076.5648, 76443.1884, 299941.7864]
});

4
examples/wmts-capabilities.js
View File

@@ -1,7 +1,7 @@
goog.require('ol.parser.ogc.WMTSCapabilities');
goog.require('ol.projection.addCommonProjections');
goog.require('ol.proj.addCommonProjections');
ol.projection.addCommonProjections();
ol.proj.addCommonProjections();
Proj4js.defs['EPSG:31256'] = '+proj=tmerc +lat_0=0 ' +
'+lon_0=16.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +ellps=bessel ' +
'+towgs84=577.326,90.129,463.919,5.137,1.474,5.297,2.4232 ' +

4
examples/wmts.js
View File

@@ -3,13 +3,13 @@ goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.extent');
goog.require('ol.layer.TileLayer');
goog.require('ol.projection');
goog.require('ol.proj');
goog.require('ol.source.OSM');
goog.require('ol.source.WMTS');
goog.require('ol.tilegrid.WMTS');
var projection = ol.projection.get('EPSG:900913');
var projection = ol.proj.get('EPSG:900913');
var projectionExtent = projection.getExtent();
var size = ol.extent.getWidth(projectionExtent) / 256;
var resolutions = new Array(26);