Merge pull request #219 from ahocevar/proj-defaults

New OpenLayers.Projection.defaults property. r=@tschaub,@fredj
2012-02-16 01:29:29 -08:00
parent b3ad241055 79bab72269
commit 2fe882f4d8
27 changed files with 151 additions and 167 deletions
--- a/examples/canvas.js
+++ b/examples/canvas.js
@@ -5,12 +5,7 @@ function init() {
    map = new OpenLayers.Map({
        div: "map",
        projection: new OpenLayers.Projection("EPSG:900913"),
-        displayProjection: new OpenLayers.Projection("EPSG:4326"),
-        units: "m",
-        maxResolution: 156543.0339,
-        maxExtent: new OpenLayers.Bounds(
-            -20037508, -20037508, 20037508, 20037508
-        )
+        displayProjection: new OpenLayers.Projection("EPSG:4326")
    });

    var g = new OpenLayers.Layer.Google("Google Layer", {
--- a/examples/clientzoom.js
+++ b/examples/clientzoom.js
@@ -5,10 +5,6 @@ function init() {
    map = new OpenLayers.Map({
        div: "map",
        projection: "EPSG:900913",
-        units: "m",
-        maxExtent: new OpenLayers.Bounds(
-            -20037508.34, -20037508.34, 20037508.34, 20037508.34
-        ),
        controls: [],
        fractionalZoom: true
    });
--- a/examples/mobile-base.js
+++ b/examples/mobile-base.js
@@ -41,12 +41,7 @@ var init = function (onSelectFeatureFunction) {
        div: "map",
        theme: null,
        projection: sm,
-        units: "m",
        numZoomLevels: 18,
-        maxResolution: 156543.0339,
-        maxExtent: new OpenLayers.Bounds(
-            -20037508.34, -20037508.34, 20037508.34, 20037508.34
-        ),
        controls: [
            new OpenLayers.Control.Attribution(),
            new OpenLayers.Control.TouchNavigation({
--- a/examples/mobile-drawing.js
+++ b/examples/mobile-drawing.js
@@ -41,12 +41,7 @@ function init() {
    map = new OpenLayers.Map({
        div: 'map',
        projection: 'EPSG:900913',
-        units: 'm',
        numZoomLevels: 18,
-        maxResolution: 156543.0339,
-        maxExtent: new OpenLayers.Bounds(
-            -20037508.34, -20037508.34, 20037508.34, 20037508.34
-        ),
        controls: [
            new OpenLayers.Control.TouchNavigation({
                dragPanOptions: {
--- a/examples/mobile-navigation.js
+++ b/examples/mobile-navigation.js
@@ -5,12 +5,7 @@ function init() {
        div: "map",
        theme: null,
        projection: new OpenLayers.Projection("EPSG:900913"),
-        units: "m",
        numZoomLevels: 18,
-        maxResolution: 156543.0339,
-        maxExtent: new OpenLayers.Bounds(
-            -20037508.34, -20037508.34, 20037508.34, 20037508.34
-        ),
        controls: [
            new OpenLayers.Control.TouchNavigation({
                dragPanOptions: {
--- a/examples/osm-google.js
+++ b/examples/osm-google.js
@@ -3,12 +3,7 @@ var map;
 function init() {
    map = new OpenLayers.Map({
        div: "map",
-        projection: new OpenLayers.Projection("EPSG:900913"),
-        units: "m",
-        maxResolution: 156543.0339,
-        maxExtent: new OpenLayers.Bounds(
-            -20037508, -20037508, 20037508, 20037508.34
-        )
+        projection: new OpenLayers.Projection("EPSG:900913")
    });
    
    var osm = new OpenLayers.Layer.OSM();            
--- a/examples/overviewmap.html
+++ b/examples/overviewmap.html
@@ -91,8 +91,7 @@
            maxExtent: new OpenLayers.Bounds(-8242894.927728, 4965204.031195,
                    -8227290.161511, 4994963.723637), 
            maxResolution: 116.24879860156216,
-            projection: "EPSG:900913",
-            units: "m"
+            projection: "EPSG:900913"
        };

        var map2 = new OpenLayers.Map('map2', mapOptions);
--- a/examples/spherical-mercator.html
+++ b/examples/spherical-mercator.html
@@ -12,7 +12,10 @@
    <link rel="stylesheet" href="style.css" type="text/css">
    <style type="text/css">
        .olControlAttribution { 
-            bottom: 0px 
+            bottom: 0px;
+            left: 2px;
+            right: inherit;
+            width: 400px;
        }
        #map {
            height: 512px;
@@ -42,10 +45,7 @@
        div: "map",
        projection: "EPSG:900913",
        displayProjection: "EPSG:4326",
-        units: "m",
-        numZoomLevels: 18,
-        maxResolution: 156543.0339,
-        maxExtent: [-20037508, -20037508, 20037508, 20037508],
+        numZoomLevels: 18
    });

    // create Google Mercator layers
--- a/examples/sundials-spherical-mercator.html
+++ b/examples/sundials-spherical-mercator.html
@@ -31,11 +31,7 @@
        function init(){
            var options = {
                projection: new OpenLayers.Projection("EPSG:900913"),
-                displayProjection: new OpenLayers.Projection("EPSG:4326"),
-                units: "m",
-                maxResolution: 156543.0339,
-                maxExtent: new OpenLayers.Bounds(-20037508.34, -20037508.34,
-                                                 20037508.34, 20037508.34)
+                displayProjection: new OpenLayers.Projection("EPSG:4326")
            };
            map = new OpenLayers.Map('map', options);
            var mapnik = new OpenLayers.Layer.OSM("OpenStreetMap (Mapnik)");
--- a/examples/wfs-protocol-transactions.js
+++ b/examples/wfs-protocol-transactions.js
@@ -38,9 +38,6 @@ function init() {
    map = new OpenLayers.Map('map', {
        projection: new OpenLayers.Projection("EPSG:900913"),
        displayProjection: new OpenLayers.Projection("EPSG:4326"),
-        units: "m",
-        maxResolution: 20037508.34 / 128,
-        maxExtent: new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508),
        restrictedExtent: extent,
        controls: [
            new OpenLayers.Control.PanZoom(),
--- a/examples/wfs-reprojection.js
+++ b/examples/wfs-reprojection.js
@@ -7,12 +7,7 @@ function init() {
    var mercator = new OpenLayers.Projection("EPSG:900913");

    map = new OpenLayers.Map('map', {
-        projection: mercator,
-        units: "m",
-        maxResolution: 156543.0339,
-        maxExtent: new OpenLayers.Bounds(
-            -20037508, -20037508, 20037508, 20037508
-        )
+        projection: mercator
    });

    var g = new OpenLayers.Layer.Google("Google Layer", {
--- a/examples/wmts-capabilities.js
+++ b/examples/wmts-capabilities.js
@@ -47,12 +47,7 @@ function init() {
    
    map = new OpenLayers.Map({
        div: "map",
-        projection: "EPSG:900913",
-        units: "m",
-        maxExtent: new OpenLayers.Bounds(
-            -20037508.34, -20037508.34, 20037508.34, 20037508.34
-        ),
-        maxResolution: 156543.0339
+        projection: "EPSG:900913"
    });    
    
    var osm = new OpenLayers.Layer.OSM();
--- a/examples/wmts-getfeatureinfo.js
+++ b/examples/wmts-getfeatureinfo.js
@@ -5,12 +5,7 @@ function init() {
    
    map = new OpenLayers.Map({
        div: "map",
-        projection: "EPSG:900913",
-        units: "m",
-        maxExtent: new OpenLayers.Bounds(
-            -20037508.34, -20037508.34, 20037508.34, 20037508.34
-        ),
-        maxResolution: 156543.0339
+        projection: "EPSG:900913"
    });    
    
    var osm = new OpenLayers.Layer.OSM();
--- a/examples/wmts.js
+++ b/examples/wmts.js
@@ -4,12 +4,7 @@ function init() {
    
    map = new OpenLayers.Map({
        div: "map",
-        projection: "EPSG:900913",
-        units: "m",
-        maxExtent: new OpenLayers.Bounds(
-            -20037508.34, -20037508.34, 20037508.34, 20037508.34
-        ),
-        maxResolution: 156543.0339
+        projection: "EPSG:900913"
    });    
    
    var osm = new OpenLayers.Layer.OSM();