[Mapbender-commits] r4084 - in trunk/mapbender: core
http/javascripts
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Jun 23 06:18:27 EDT 2009
Author: christoph
Date: 2009-06-23 06:18:27 -0400 (Tue, 23 Jun 2009)
New Revision: 4084
Modified:
trunk/mapbender/core/system.php
trunk/mapbender/http/javascripts/geometry.js
trunk/mapbender/http/javascripts/map.php
trunk/mapbender/http/javascripts/mapnf.php
trunk/mapbender/http/javascripts/mod_box1.js
trunk/mapbender/http/javascripts/mod_reload.php
trunk/mapbender/http/javascripts/mod_sandclock.php
trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
trunk/mapbender/http/javascripts/ovnf.php
Log:
Mapbender API
Modified: trunk/mapbender/core/system.php
===================================================================
--- trunk/mapbender/core/system.php 2009-06-23 09:15:11 UTC (rev 4083)
+++ trunk/mapbender/core/system.php 2009-06-23 10:18:27 UTC (rev 4084)
@@ -40,5 +40,5 @@
"mapframe1,featureInfo1,gazetteerWFS,back,forward,zoomFull,zoomIn1," .
"zoomOut1,selArea1,pan1,copyright,dependentDiv,dragMapSize," .
"dynamicOverview,FeatureInfoRedirect,highlightPOI,navFrame,sandclock," .
- "scaleBar,scaleSelect,setBBOX,setPOI2Scale,reload"
+ "scaleBar,scaleSelect,setBBOX,setPOI2Scale,reload,overview"
);
Modified: trunk/mapbender/http/javascripts/geometry.js
===================================================================
--- trunk/mapbender/http/javascripts/geometry.js 2009-06-23 09:15:11 UTC (rev 4083)
+++ trunk/mapbender/http/javascripts/geometry.js 2009-06-23 10:18:27 UTC (rev 4084)
@@ -1499,8 +1499,8 @@
* @private
*/
this.drawGeometry = function(t,g,col){
- var mapframeWidth = mb_mapObj[mapObjInd].width;
- var mapframeHeight = mb_mapObj[mapObjInd].height;
+ var mapframeWidth = map.width;
+ var mapframeHeight = map.height;
if(t == geomType.point) {
var poiIcon = g.e.getElementValueByName("Mapbender:icon");
@@ -1669,13 +1669,16 @@
* @type DivTag
*/
var mapframe = aMapframe;
- var mapObjInd = getMapObjIndexByName(mapframe);
-
- if (mb_mapObj[mapObjInd].getDomElement().frameName) {
+ var map = Mapbender.Modules[mapframe];
+ if (!map) {
+ new Mb_exception(mapframe + " not found by geometry.js.");
+ return;
+ }
+ if (map.getDomElement().frameName) {
this.canvasDivTag = new DivTag(aTagName, mapName, aStyle);
}
else {
- this.canvasDivTag = new DivTag(aTagName, "", aStyle, mb_mapObj[mapObjInd].getDomElement());
+ this.canvasDivTag = new DivTag(aTagName, "", aStyle, map.getDomElement());
}
var that = this;
@@ -1684,7 +1687,7 @@
var minWidth = 8;
var lineWidth = aLineWidth || 2;
var style = aStyle;
- var canvas = new jsGraphics(aTagName, mb_mapObj[mapObjInd].getDomElement().frameName ? window.frames[mapframe] : window);
+ var canvas = new jsGraphics(aTagName, map.getDomElement().frameName ? window.frames[mapframe] : window);
canvas.setStroke(lineWidth);
mb_registerPanSubElement(aTagName);
}
Modified: trunk/mapbender/http/javascripts/map.php
===================================================================
--- trunk/mapbender/http/javascripts/map.php 2009-06-23 09:15:11 UTC (rev 4083)
+++ trunk/mapbender/http/javascripts/map.php 2009-06-23 10:18:27 UTC (rev 4084)
@@ -95,7 +95,8 @@
?>
$(function () {
- new Mb_notice("new jquery init function");
+ initModules();
+
// creates the map objects (mapframe1, overview...)
eventInitMap.trigger();
@@ -105,6 +106,7 @@
eventInit.trigger();
eventAfterInit.trigger();
+
});
<?php
//
@@ -245,5 +247,8 @@
}
}
}
+
+echo "function initModules () {";
echo implode("\n", $executeJsPluginsArray);
+echo "}\n";
?>
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/mapnf.php
===================================================================
--- trunk/mapbender/http/javascripts/mapnf.php 2009-06-23 09:15:11 UTC (rev 4083)
+++ trunk/mapbender/http/javascripts/mapnf.php 2009-06-23 10:18:27 UTC (rev 4084)
@@ -22,12 +22,18 @@
var lastTimestamp;
var lastScrollPosition;
- Mapbender.Modules[options.id] = new Map('', options.id, options.width, options.height, null);
eventInitMap.register(function () {
+ Mapbender.Modules[options.id] = new Map (
+ '',
+ options.id,
+ options.width,
+ options.height,
+ null
+ );
+ mb_mapObj.push(Mapbender.Modules[options.id]);
var mapObject = Mapbender.Modules[options.id];
- mb_mapObj.push(mapObject);
try {
if (restrictedExtent !== '') {
Modified: trunk/mapbender/http/javascripts/mod_box1.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_box1.js 2009-06-23 09:15:11 UTC (rev 4083)
+++ trunk/mapbender/http/javascripts/mod_box1.js 2009-06-23 10:18:27 UTC (rev 4084)
@@ -60,7 +60,7 @@
}
function mb_drawBox(left,top,right,bottom){
//Look if we have the Box elements
- mb_boxMapObj = getMapObjByName(mb_isBF);
+ mb_boxMapObj = Mapbender.Modules[mb_isBF];
var map_el = mb_boxMapObj.getDomElement();
if(!map_el.ownerDocument.getElementById(mb_boxMapObj.elementName+"_l_top")){
//create Box Elements
Modified: trunk/mapbender/http/javascripts/mod_reload.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_reload.php 2009-06-23 09:15:11 UTC (rev 4083)
+++ trunk/mapbender/http/javascripts/mod_reload.php 2009-06-23 10:18:27 UTC (rev 4084)
@@ -35,10 +35,10 @@
* Maintainer:
* http://www.mapbender.org/User:Vera_Schulze
*/
-var Reload = function (domElement) {
-
+var Reload = function (options) {
var that = this;
+ var domElement = $("#" + options.id);
domElement.src = options.src;
if (!options.src) {
new Mb_exception(options.id + " requires a src.");
@@ -63,4 +63,5 @@
};
};
-var reload = new Reload(this);
\ No newline at end of file
+
+var reload = new Reload(options);
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/mod_sandclock.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_sandclock.php 2009-06-23 09:15:11 UTC (rev 4083)
+++ trunk/mapbender/http/javascripts/mod_sandclock.php 2009-06-23 10:18:27 UTC (rev 4084)
@@ -58,7 +58,7 @@
if (!Mapbender.Modules[options.target]) {
new Mb_exception("Target " + options.target + " not found by " + this.id)
}
- var map = Mapbender.Modules[options.target];
+ var map;
//
// element vars
@@ -89,8 +89,9 @@
*/
this.show = function (mapId) {
if (!isInitialised) {
+ map = Mapbender.Modules[options.target];
var temp = "<img src='"+mod_sandclock_img.src+"'>";
-
+ console.log(map);
var map_el = map.getDomElement();
if(!map_el.ownerDocument.getElementById(map.elementName+"_sandclock")){
//create Box Elements
Modified: trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php 2009-06-23 09:15:11 UTC (rev 4083)
+++ trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php 2009-06-23 10:18:27 UTC (rev 4084)
@@ -125,8 +125,12 @@
}
// end of button management spatialRequest ///////////
-parent.mb_registerInitFunctions("window.frames['"+this.name+"'].initModWfsGazetteer()");
-parent.mb_registerInitFunctions("window.frames['"+this.name+"'].init_wfsSpatialRequest()");
+parent.Mapbender.Event.init.register(function () {
+ initModWfsGazetteer();
+});
+parent.Mapbender.Event.init.register(function () {
+ init_wfsSpatialRequest();
+});
function init_wfsSpatialRequest() {
buttonWfs_id = [];
Modified: trunk/mapbender/http/javascripts/ovnf.php
===================================================================
--- trunk/mapbender/http/javascripts/ovnf.php 2009-06-23 09:15:11 UTC (rev 4083)
+++ trunk/mapbender/http/javascripts/ovnf.php 2009-06-23 10:18:27 UTC (rev 4084)
@@ -16,43 +16,46 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-include '../include/dyn_js.php';
?>
-var mod_overview_target = "<?php echo $e_target[0]; ?>";
-if (typeof(overview_wms) === 'undefined')overview_wms = 0;
-overview_wms = parseInt(overview_wms);
-
-var mod_overview_width = <?php echo $e_width; ?>;
-var mod_overview_height = <?php echo $e_height; ?>;
-
-mb_registerMapObj('', 'overview', overview_wms ,<?php echo $e_width; ?>, <?php echo $e_height; ?>);
-parent.eventInitMap.register(function init_overview(){
- var ind = getMapObjIndexByName('overview');
-
- var el = mb_mapObj[ind].getDomElement();
- el.onmouseover = mod_ovSetHandler;
- el.onmousedown = mod_box_start;
- el.onmouseup = mod_ovGetExtent;
- el.onmousemove = mod_box_run;
-
- var ov_extent = mb_mapObj[ind].getExtentInfos();
- mb_mapObj[ind].isOverview = true;
+if (typeof options.overview_wms === 'undefined') {
+ options.overview_wms = 0;
+}
+options.overview_wms = parseInt(options.overview_wms);
+if (!options.target) {
+ new Mb_exception(options.id + " needs a target.");
+ return;
+}
+parent.eventInitMap.register(function () {
+ var map = Mapbender.Modules[options.id] = new Map (
+ '',
+ options.id,
+ options.width,
+ options.height,
+ options.overview_wms
+ );
+
+ var el = map.getDomElement();
+ el.onmouseover = mod_ovSetHandler;
+ el.onmousedown = mod_box_start;
+ el.onmouseup = mod_ovGetExtent;
+ el.onmousemove = mod_box_run;
+
+ var ov_extent = map.getExtentInfos();
+ map.isOverview = true;
});
function mod_ovSetHandler(e){
mb_isBF = 'overview';
- mb_zF = mod_overview_target;
+ mb_zF = options.target;
}
function mod_ovGetExtent(e){
mb_isBF = 'overview';
- mb_zF = mod_overview_target;
+ mb_zF = options.target;
mod_box_setValidClipping(mod_box_stop(e));
}
eventAfterMapRequest.register(function () {
- var targetMapObj = getMapObjByName(mod_overview_target);
+ var targetMapObj = Mapbender.Modules[options.target];
if (!targetMapObj) {
return;
@@ -62,7 +65,7 @@
var minY = parseFloat(arrayBBox[1]);
var maxX = parseFloat(arrayBBox[2]);
var maxY = parseFloat(arrayBBox[3]);
- var mapObj = getMapObjByName("overview");
+ var mapObj = Mapbender.Modules[options.id];
var pointMin = mapObj.convertRealToPixel(new Point(minX, maxY));
var pointMax = mapObj.convertRealToPixel(new Point(maxX, minY));
var px1 = pointMin.x;
@@ -71,7 +74,7 @@
var py2 = pointMax.y;
mb_isBF = "overview";
- mb_zF = mod_overview_target;
+ mb_zF = options.target;
while((px2 - px1) < 8){
px1 -= 1;
@@ -83,15 +86,15 @@
}
if(px1 < 0){px1 = 1;}
- if(px1 > mod_overview_width){px1 = mod_overview_width-1;}
+ if(px1 > options.width){px1 = options.width-1;}
if(py1 < 0){py1 = 1;}
- if(py1 > mod_overview_height){py1 = mod_overview_height-1;}
+ if(py1 > options.height){py1 = options.height-1;}
- if(px2 > mod_overview_width){px2 = mod_overview_width-1;}
+ if(px2 > options.width){px2 = options.width-1;}
if(px2 < 0){px2 = 1;}
- if(py2 > mod_overview_height){py2 = mod_overview_height-1;}
+ if(py2 > options.height){py2 = options.height-1;}
if(py2 < 0){py2 = 1;}
mb_drawBox(px1,py1,px2,py2);
More information about the Mapbender_commits
mailing list