Changeset 7374

Timestamp:

06/18/08 04:57:02 (2 months ago)

Author:

pgiraud

Message:

add a map getUnits method, r=ahocevar (Closes 1591)

Files:

• trunk/openlayers/examples/projected-map.html (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/OverviewMap.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/ScaleLine.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)
• trunk/openlayers/tests/Control/ScaleLine.html (modified) (1 diff)
• trunk/openlayers/tests/Map.html (modified) (1 diff)

trunk/openlayers/examples/projected-map.html

@@ -48 +48 @@
-            map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
-            map.addControl(new OpenLayers.Control.LayerSwitcher());
+            map.addControl(new OpenLayers.Control.ScaleLine());
-        }
-    </script>

trunk/openlayers/lib/OpenLayers/Control/OverviewMap.js

@@ -496 +496 @@
-        // The base layer for overview map needs to be in the same projection
-        // as the base layer for the main map.  This should be made more robust.
-units
+getUnits()
-            if(this.ovmap.getProjection() && (this.map.getProjection() != this.ovmap.getProjection())) {
-                alert(OpenLayers.i18n("sameProjection"));

trunk/openlayers/lib/OpenLayers/Control/ScaleLine.js

@@ -154 +154 @@
-        }
-
-units
+getUnits()
-        var inches = OpenLayers.INCHES_PER_UNIT;
-

trunk/openlayers/lib/OpenLayers/Map.js

@@ -1764 +1764 @@
-    },
-
+    /**
+     * APIMethod: getUnits
+     * 
+     * Returns:
+     * {Float} The current units of the map. 
+     *         If no baselayer is set, returns null.
+     */
+    getUnits: function () {
+        var units = null;
+        if (this.baseLayer != null) {
+            units = this.baseLayer.units;
+        }
+        return units;
+    },
+
-     /**
-      * APIMethod: getScale

trunk/openlayers/tests/Control/ScaleLine.html

@@ -87 +87 @@
-        t.eq(control.div.firstChild.style.visibility, "visible", "top scale is present.");
-        t.eq(control.div.lastChild.style.visibility, "visible", "bottom scale is present.");
-00 k
-20000 mi
+ 
+1000 ft
-        map.destroy();
-    }

trunk/openlayers/tests/Map.html

@@ -1001 +1001 @@
-        map.destroy();
-    }
+    
+    function test_Map_getUnits(t) {
+        t.plan(2);
+        var map = new OpenLayers.Map("map");
+        var units = map.getUnits();
+        t.eq(units, null, "getUnits returns null for no base layer");
+        
+        var layer = new OpenLayers.Layer("test", {
+            isBaseLayer: true,
+            units: 'foo'
+        });
+        map.addLayer(layer);
+        var units = map.getUnits();
+        t.eq(units, 'foo', "getUnits returns the base layer units property");
+        layer.destroy();
+        map.destroy();
+    }
-
-    function test_Map_destroy (t) {