[OpenLayers-Commits] r2303 - in sandbox/oterral/ButtonBar/vector: examples lib lib/OpenLayers lib/OpenLayers/Control lib/OpenLayers/Layer
commits at openlayers.org
commits at openlayers.org
Mon Mar 5 05:01:46 EST 2007
Author: oterral
Date: 2007-03-05 05:01:34 -0500 (Mon, 05 Mar 2007)
New Revision: 2303
Removed:
sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Button/
Modified:
sandbox/oterral/ButtonBar/vector/examples/Buttonbar.html
sandbox/oterral/ButtonBar/vector/examples/getfeatureinfo.html
sandbox/oterral/ButtonBar/vector/lib/OpenLayers.js
sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Button.js
sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Control/Buttonbar.js
sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Layer/Google.js
sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Layer/WMS.js
sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Map.js
sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Util.js
Log:
EditingListener is renamed EditingButton
Modified: sandbox/oterral/ButtonBar/vector/examples/Buttonbar.html
===================================================================
--- sandbox/oterral/ButtonBar/vector/examples/Buttonbar.html 2007-03-05 07:02:40 UTC (rev 2302)
+++ sandbox/oterral/ButtonBar/vector/examples/Buttonbar.html 2007-03-05 10:01:34 UTC (rev 2303)
@@ -36,8 +36,8 @@
//toolbar.addTools([zoomworld]);
//toolbar.addTools([dragpan]);
//map.addControl(layerSwitcher);
+ map.addControl(new OpenLayers.Control.OverviewMap());
-
/* WMS Layers */
var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0",
@@ -92,21 +92,21 @@
toolbar.addTools([zoomin,zoomout,dragpan,zoomworld]);
/*Create Geometry Tool*/
- var drawlinearring=new OpenLayers.Button.EditingListener.DrawLinearRing(optionsTools);
- var drawlinestring=new OpenLayers.Button.EditingListener.DrawLineString(optionsTools);
- var drawpointstring=new OpenLayers.Button.EditingListener.DrawPoint(optionsTools);
+ var drawlinearring=new OpenLayers.Button.EditingButton.DrawLinearRing(optionsTools);
+ var drawlinestring=new OpenLayers.Button.EditingButton.DrawLineString(optionsTools);
+ var drawpointstring=new OpenLayers.Button.EditingButton.DrawPoint(optionsTools);
toolbar.addTools([measuredistance,measurearea,drawlinearring,drawlinestring,drawpointstring]);
/*Modify Geometry Tool*/
- var movepathpoint=new OpenLayers.Button.EditingListener.MovePathPoint(optionsTools);
- var addpathpoint=new OpenLayers.Button.EditingListener.AddPathPoint(optionsTools);
- var removepathpoint=new OpenLayers.Button.EditingListener.RemovePathPoint(optionsTools);
+ var movepathpoint=new OpenLayers.Button.EditingButton.MovePathPoint(optionsTools);
+ var addpathpoint=new OpenLayers.Button.EditingButton.AddPathPoint(optionsTools);
+ var removepathpoint=new OpenLayers.Button.EditingButton.RemovePathPoint(optionsTools);
toolbar.addTools([movepathpoint,addpathpoint,removepathpoint]);
/*Selection Geometry Tool*/
- var selection=new OpenLayers.Button.EditingListener.Selection(optionsTools);
+ var selection=new OpenLayers.Button.EditingButton.Selection(optionsTools);
var controlEditingAttributes=new OpenLayers.Button.EditingAttributes(optionsTools);
//map.addControl(controlEditingAttributes);
//editingattributes.div=controlEditingAttributes.div;
Modified: sandbox/oterral/ButtonBar/vector/examples/getfeatureinfo.html
===================================================================
--- sandbox/oterral/ButtonBar/vector/examples/getfeatureinfo.html 2007-03-05 07:02:40 UTC (rev 2302)
+++ sandbox/oterral/ButtonBar/vector/examples/getfeatureinfo.html 2007-03-05 10:01:34 UTC (rev 2303)
@@ -39,7 +39,8 @@
OpenLayers.loadURL(url, '', this, setHTML);
Event.stop(e);
});
- function setHTML(response) {
+ function setHTML(response) {
+ alert(url
$('nodeList').innerHTML = response.responseText;
}
</script>
Modified: sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Button.js
===================================================================
--- sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Button.js 2007-03-05 07:02:40 UTC (rev 2302)
+++ sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Button.js 2007-03-05 10:01:34 UTC (rev 2303)
@@ -36,6 +36,9 @@
buttonbar:null,
/** @type Boolean */
+ selected:false,
+
+ /** @type Boolean */
/**
* @constructor
*/
@@ -107,7 +110,7 @@
* @param {Button} tool
*
*/
- setTool: function(tool){
+ setTool: function(){
OpenLayers.Control.Buttonbar.prototype.setTool.apply(this.buttonbar, arguments);
},
Modified: sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Control/Buttonbar.js
===================================================================
--- sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Control/Buttonbar.js 2007-03-05 07:02:40 UTC (rev 2302)
+++ sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Control/Buttonbar.js 2007-03-05 10:01:34 UTC (rev 2303)
@@ -100,6 +100,7 @@
if(!(tools instanceof Array)) {
tools = [tools];
tools[0].buttonbar=this;
+ //this.centered = this.centered.add((this.direction == "vertical" ? 0 : tools[0].size.w), (this.direction == "vertical" ? tools[0].size.h : 0));
if (tools[0].selected) this.setTool(tools[0]);
}
if (tools.length>1)
@@ -136,8 +137,8 @@
*
*/
_addButton:function(tool) {
- tool.div.style.left=this.centered.x;
- tool.div.style.top=this.centered.y;
+ tool.div.style.left=this.centered.x+"px";
+ tool.div.style.top=this.centered.y+"px";
this.div.appendChild(tool.div);
},
Modified: sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Layer/Google.js
===================================================================
--- sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Layer/Google.js 2007-03-05 07:02:40 UTC (rev 2302)
+++ sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Layer/Google.js 2007-03-05 10:01:34 UTC (rev 2303)
@@ -28,7 +28,8 @@
/** @type GMapType */
type: null,
-
+
+ projection:"EPSG:41001",
/**
* @constructor
*
Modified: sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Layer/WMS.js
===================================================================
--- sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Layer/WMS.js 2007-03-05 07:02:40 UTC (rev 2302)
+++ sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Layer/WMS.js 2007-03-05 10:01:34 UTC (rev 2303)
@@ -92,6 +92,13 @@
* @type String
*/
getURL: function (bounds) {
+
+ if (this.map.baseLayer.projection=="EPSG:41001" && this.map.baseLayer.projection==this.projection && this.map.baseLayer.type){
+ bounds.left = OpenLayers.Util.ll2m(new Array(bounds.left,bounds.top))[0];
+ bounds.top = OpenLayers.Util.ll2m(new Array(bounds.left,bounds.top))[1];
+ bounds.right = OpenLayers.Util.ll2m(new Array(bounds.right,bounds.bottom))[0];
+ bounds.bottom = OpenLayers.Util.ll2m(new Array(bounds.right,bounds.bottom))[1];
+ }
return this.getFullRequestString(
{BBOX:bounds.toBBOX(),
WIDTH:this.tileSize.w,
Modified: sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Map.js
===================================================================
--- sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Map.js 2007-03-05 07:02:40 UTC (rev 2302)
+++ sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Map.js 2007-03-05 10:01:34 UTC (rev 2303)
@@ -267,8 +267,9 @@
this.tileSize = new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH,
OpenLayers.Map.TILE_HEIGHT);
- this.maxExtent = new OpenLayers.Bounds(-180, -90, 180, 90);
-
+ if (this.units=="degrees")
+ this.maxExtent=new OpenLayers.Bounds("-180","-90","180","90");
+
// now add the options declared by the user
// (these will override defaults)
OpenLayers.Util.extend(this, options);
Modified: sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Util.js
===================================================================
--- sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Util.js 2007-03-05 07:02:40 UTC (rev 2302)
+++ sandbox/oterral/ButtonBar/vector/lib/OpenLayers/Util.js 2007-03-05 10:01:34 UTC (rev 2303)
@@ -987,3 +987,113 @@
return urlObject;
};
+
+/* Initialize the Mercator projection
+ -------------------------------------------------*/
+function minit(param)
+{
+ this.r_major = 6378137.0;
+ this.r_minor = 6356752.31424518;
+ this.lon_center = 0.0;
+ this.lat_origin = 0.0;
+ this.false_northing = 0.0;
+ this.false_easting = 0.0;
+ this.temp = this.r_minor / this.r_major;
+ this.es=1.0 - Math.sqrt(this.temp);
+ this.e = Math.sqrt( this.es );
+ this.m1 = Math.cos(this.lat_origin) / (Math.sqrt( 1.0 - this.es * Math.sin(this.lat_origin) * Math.sin(this.lat_origin)));
+
+}
+/* Mercator forward equations--mapping lat,long to x,y
+ --------------------------------------------------*/
+
+OpenLayers.Util.ll2m = function (coords)
+{ //alert("ll2m coords : "+coords);
+
+
+ r_major = 6378137.0;
+ r_minor = 6356752.31424518;
+ lon_center = 0.0;
+ lat_origin = 0.0;
+ false_northing = 0.0;
+ false_easting = 0.0;
+ temp = r_minor / r_major;
+ es=1.0 - Math.sqrt(temp);
+ e = Math.sqrt( es );
+ m1 = Math.cos(lat_origin) / (Math.sqrt( 1.0 - es * Math.sin(lat_origin) * Math.sin(lat_origin)));
+
+
+ var lon=coords[0];
+ var lat=coords[1];
+
+ // convert to radians
+ if(lat >=90.0)
+ {lat=89.99;
+ }
+ if(lat <=-90.0)
+ {lat=-89.99;
+ }
+ if(lon >=180.0)
+ {lon=179;
+ }
+ if(lon <=-180.0)
+ {lon=-179;
+ }
+ if ( lat <= 90.0 && lat >= -90.0 && lon <= 180.0 && lon >= -180.0)
+ {
+ lat *= D2R;
+ lon *= D2R;
+ }
+ else
+ {
+ alert("*** Input out of range ***: lon: "+lon+" - lat: "+lat);
+ return null;
+ }
+
+ if(Math.abs(lat)>= 90 && Math.abs( Math.abs(lat) - HALF_PI) <= EPSLN)
+ {
+ alert("Transformation cannot be computed at the poles");
+ return null;
+ }
+ else
+ {
+ var sinphi = Math.sin(lat);
+ var ts = tsfnz(e,lat,sinphi);
+ var x = false_easting + r_major * m1 * adjust_lon(lon - lon_center);
+ var y = false_northing - r_major * m1 * Math.log(ts);
+ }
+
+ return new Array(x,y);
+};
+
+
+/* Mercator inverse equations--mapping x,y to lat/long
+ --------------------------------------------------*/
+OpenLayers.Util.m2ll = function (coords)
+{
+ r_major = 6378137.0;
+ r_minor = 6356752.31424518;
+ lon_center = 0.0;
+ lat_origin = 0.0;
+ false_northing = 0.0;
+ false_easting = 0.0;
+ temp = r_minor / r_major;
+ es=1.0 - Math.sqrt(temp);
+ e = Math.sqrt( es );
+ m1 = Math.cos(lat_origin) / (Math.sqrt( 1.0 - es * Math.sin(lat_origin) * Math.sin(lat_origin)));
+
+
+ var x = coords[0];
+ var y = coords[1];
+
+ x -= false_easting;
+ y -= false_northing
+
+ var ts = Math.exp(-y / (r_major * m1));
+
+ var lat = phi2z(e,ts);
+ if(lat == -9999){alert("lat = -9999");return null;}
+ var lon = adjust_lon(lon_center + x / (r_major * m1));
+
+ return new Array(R2D*lon,R2D*lat);
+};
\ No newline at end of file
Modified: sandbox/oterral/ButtonBar/vector/lib/OpenLayers.js
===================================================================
--- sandbox/oterral/ButtonBar/vector/lib/OpenLayers.js 2007-03-05 07:02:40 UTC (rev 2302)
+++ sandbox/oterral/ButtonBar/vector/lib/OpenLayers.js 2007-03-05 10:01:34 UTC (rev 2303)
@@ -80,6 +80,7 @@
"OpenLayers/Layer/GML.js",
"OpenLayers/Layer/WMS/Untiled.js",
"OpenLayers/Layer/GeoRSS.js",
+ "OpenLayers/Layer/Google.js",
"OpenLayers/Layer/Boxes.js",
"OpenLayers/Layer/Canvas.js",
"OpenLayers/Layer/TMS.js",
@@ -91,20 +92,20 @@
"OpenLayers/Button/ZoomIn.js",
"OpenLayers/Button/ZoomOut.js",
"OpenLayers/Button/Reset.js",
- "OpenLayers/Button/EditingListener.js",
+ "OpenLayers/Button/EditingButton.js",
"OpenLayers/Button/EditingAttributes.js",
"OpenLayers/Button/MeasureDistance.js",
"OpenLayers/Button/MeasureArea.js",
- "OpenLayers/Button/EditingListener/Selection.js",
- "OpenLayers/Button/EditingListener/DrawPoint.js",
- "OpenLayers/Button/EditingListener/DrawLineString.js",
- "OpenLayers/Button/EditingListener/DrawMultiLineString.js",
- "OpenLayers/Button/EditingListener/DrawLinearRing.js",
- "OpenLayers/Button/EditingListener/DrawPolygon.js",
- "OpenLayers/Button/EditingListener/DrawMultiPolygon.js",
- "OpenLayers/Button/EditingListener/MovePathPoint.js",
- "OpenLayers/Button/EditingListener/AddPathPoint.js",
- "OpenLayers/Button/EditingListener/RemovePathPoint.js",
+ "OpenLayers/Button/EditingButton/Selection.js",
+ "OpenLayers/Button/EditingButton/DrawPoint.js",
+ "OpenLayers/Button/EditingButton/DrawLineString.js",
+ "OpenLayers/Button/EditingButton/DrawMultiLineString.js",
+ "OpenLayers/Button/EditingButton/DrawLinearRing.js",
+ "OpenLayers/Button/EditingButton/DrawPolygon.js",
+ "OpenLayers/Button/EditingButton/DrawMultiPolygon.js",
+ "OpenLayers/Button/EditingButton/MovePathPoint.js",
+ "OpenLayers/Button/EditingButton/AddPathPoint.js",
+ "OpenLayers/Button/EditingButton/RemovePathPoint.js",
"OpenLayers/MouseListener.js",
"OpenLayers/Control.js",
"OpenLayers/Control/Container.js",
@@ -119,7 +120,8 @@
"OpenLayers/Control/PanZoom.js",
"OpenLayers/Control/PanZoomBar.js",
"OpenLayers/Control/ArgParser.js",
- "OpenLayers/Control/Permalink.js",
+ "OpenLayers/Control/Permalink.js",
+ "OpenLayers/Control/OverviewMap.js",
"OpenLayers/Geometry.js",
"OpenLayers/Geometry/Aggregate.js",
"OpenLayers/Geometry/Point.js",
More information about the Commits
mailing list