Changeset 103

Timestamp:

05/17/06 12:20:12 (3 years ago)

Author:

euzuro

Message:

another round of LatLon -> LonLat [99] revisions

Files:

• trunk/openlayers/google.html (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Util.js (modified) (3 diffs)
• trunk/openlayers/tests/test_Bounds.html (modified) (1 diff)
• trunk/openlayers/tests/test_LonLat.html (modified) (1 diff)
• trunk/openlayers/tests/test_Map.html (modified) (2 diffs)
• trunk/openlayers/tests/test_Marker.html (modified) (1 diff)
• trunk/openlayers/tests/test_Tile.html (modified) (1 diff)
• trunk/openlayers/tests/test_Tile_Image.html (modified) (1 diff)

trunk/openlayers/google.html

@@ -15 +15 @@
-    <script type="text/javascript">
-        <!--
+        var lon = 5;
-        var lat = 40;
-        var lon = 5;
-        var zoom = 5;
-        var map, layer;

trunk/openlayers/lib/OpenLayers/Map.js

@@ -223 +223 @@
-    */
-    getLonLatFromPixel: function (point) {
-at/lon
+on/lat
-        var res  = this.getResolution();
-        var size = this.getSize();

trunk/openlayers/lib/OpenLayers/Util.js

@@ -149 +149 @@
-
-/**
-atitude and long
+ongitude and lat
-*/
-OpenLayers.LonLat = Class.create();
@@ -161 +161 @@
-    */
-    initialize: function(lon, lat) {
+        this.lon = lon;
-        this.lat = lat;
-        this.lon = lon;
-    },
-    
@@ -234 +234 @@
-/**
-* @class This class represents a bounding box. 
-atitudes and Long
+ongitudes and Lat
-*/
-OpenLayers.Bounds = Class.create();

trunk/openlayers/tests/test_Bounds.html

@@ -8 +8 @@
-        bounds = new OpenLayers.Bounds(1,2,3,4);
-        t.ok( bounds instanceof OpenLayers.Bounds, "new OpenLayers.Bounds returns Bounds object" );
+        t.eq( bounds.minlon, 2, "bounds.minlon is set correctly" );
-        t.eq( bounds.minlat, 1, "bounds.minlat is set correctly" );
-inlon, 2, "bounds.min
+axlon, 4, "bounds.max
-        t.eq( bounds.maxlat, 3, "bounds.maxlat is set correctly" );
-        t.eq( bounds.maxlon, 4, "bounds.maxlon is set correctly" );
-    
-     }

trunk/openlayers/tests/test_LonLat.html

@@ -8 +8 @@
-        lonlat = new OpenLayers.LonLat(6, 5);
-        t.ok( lonlat instanceof OpenLayers.LonLat, "new OpenLayers.LonLat returns LonLat object" );
+        t.eq( lonlat.lon, 6, "lonlat.lon is set correctly");
-        t.eq( lonlat.lat, 5, "lonlat.lat is set correctly");
-        t.eq( lonlat.lon, 6, "lonlat.lon is set correctly");
-    }
-  // -->

trunk/openlayers/tests/test_Map.html

@@ -28 +28 @@
-        t.eq( map.getZoom(), 0, "map.zoom is correct after calling setCenter");
-        t.eq( map.getResolution(), map.maxResolution, "map.getResolution() == map.maxResolution");
+        t.eq( map.getCenter().lon, 2, "map center lon is correct after calling setCenter");
-        t.eq( map.getCenter().lat, 1, "map center lat is correct after calling setCenter");
-        t.eq( map.getCenter().lon, 2, "map center lon is correct after calling setCenter");
-    }
-    function test_03_Map_add_layers(t) {
@@ -60 +60 @@
-        map.zoomIn();
-        t.eq( map.getZoom(), 1, "map.zoom is correct after calling setCenter,zoom in");
+        t.eq( map.getCenter().lon, 2, "map center lon is correct after calling setCenter, zoom in");
-        t.eq( map.getCenter().lat, 1, "map center lat is correct after calling setCenter,zoom in");
-        t.eq( map.getCenter().lon, 2, "map center lon is correct after calling setCenter, zoom in");
-        map.zoomOut();
-        t.eq( map.getZoom(), 0, "map.zoom is correct after calling setCenter,zoom in, zoom out");

trunk/openlayers/tests/test_Marker.html

@@ -11 +11 @@
-        t.ok( marker.icon instanceof OpenLayers.Icon, "new marker.Icon returns Icon object" );
-        t.ok( marker.lonlat instanceof OpenLayers.LonLat, "new marker.lonlat returns LonLat object" );
+        t.eq( marker.lonlat.lon, 2, "marker.lonlat.lon returns correct lon" );
-        t.eq( marker.lonlat.lat, 1, "marker.lonlat.lat returns correct lat" );
-        t.eq( marker.lonlat.lon, 2, "marker.lonlat.lon returns correct lon" );
-    }
-

trunk/openlayers/tests/test_Tile.html

@@ -12 +12 @@
-        t.ok( tile instanceof OpenLayers.Tile, "new OpenLayers.Tile returns Tile object" );
-        t.ok( tile.bounds instanceof OpenLayers.Bounds, "tile.bounds is a Bounds object" );
+        t.eq( tile.bounds.minlon, 2, "tile.bounds.minlon is set correctly");
-        t.eq( tile.bounds.minlat, 1, "tile.bounds.minlat is set correctly");
+        t.eq( tile.bounds.maxlon, 4, "tile.bounds.maxlon is set correctly");
-        t.eq( tile.bounds.maxlat, 3, "tile.bounds.maxlat is set correctly");
-        t.eq( tile.bounds.minlon, 2, "tile.bounds.minlon is set correctly");
-        t.eq( tile.bounds.maxlon, 4, "tile.bounds.maxlon is set correctly");
-        t.ok( tile.size instanceof OpenLayers.Size, "tile.size is a Size object" );
-        t.eq( tile.size.w, 5, "tile.size.w is set correctly");

trunk/openlayers/tests/test_Tile_Image.html

@@ -12 +12 @@
-        t.ok( tile instanceof OpenLayers.Tile.Image, "new OpenLayers.Tile returns Tile object" );
-        t.ok( tile.bounds instanceof OpenLayers.Bounds, "tile.bounds is a Bounds object" );
+        t.eq( tile.bounds.minlon, 2, "tile.bounds.minlon is set correctly");
-        t.eq( tile.bounds.minlat, 1, "tile.bounds.minlat is set correctly");
+        t.eq( tile.bounds.maxlon, 4, "tile.bounds.maxlon is set correctly");
-        t.eq( tile.bounds.maxlat, 3, "tile.bounds.maxlat is set correctly");
-        t.eq( tile.bounds.minlon, 2, "tile.bounds.minlon is set correctly");
-        t.eq( tile.bounds.maxlon, 4, "tile.bounds.maxlon is set correctly");
-        t.ok( tile.size instanceof OpenLayers.Size, "tile.size is a Size object" );
-        t.eq( tile.size.w, 5, "tile.size.w is set correctly");