[Mapbender-commits] r9203 - in trunk/mapbender/http: javascripts plugins widgets
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri May 22 06:58:40 PDT 2015
Author: syed
Date: 2015-05-22 06:58:40 -0700 (Fri, 22 May 2015)
New Revision: 9203
Modified:
trunk/mapbender/http/javascripts/mod_loadwmc.js
trunk/mapbender/http/plugins/kmlTree.js
trunk/mapbender/http/plugins/mb_digitize_widget.php
trunk/mapbender/http/widgets/w_digitize.js
Log:
moving the first vertex of a polygon initiate to move the last vertex also
Modified: trunk/mapbender/http/javascripts/mod_loadwmc.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_loadwmc.js 2015-05-21 13:06:22 UTC (rev 9202)
+++ trunk/mapbender/http/javascripts/mod_loadwmc.js 2015-05-22 13:58:40 UTC (rev 9203)
@@ -936,6 +936,7 @@
if (tagName === "IMG") {
$loadWmc.click(function () {
+ console.log( "sdfdsfdsfasdf" );
that.show();
}).mouseover(function () {
if (options.src) {
Modified: trunk/mapbender/http/plugins/kmlTree.js
===================================================================
--- trunk/mapbender/http/plugins/kmlTree.js 2015-05-21 13:06:22 UTC (rev 9202)
+++ trunk/mapbender/http/plugins/kmlTree.js 2015-05-22 13:58:40 UTC (rev 9203)
@@ -610,6 +610,9 @@
$(dlg).dialog('destroy');
};
$('#kml-from-upload form').bind('submit', function() {
+ if ( $( "#kml-from-upload > form > input[type='file'] " ).val() === "") {
+ return;
+ }
ifr.onload = onloadfun;
});
Modified: trunk/mapbender/http/plugins/mb_digitize_widget.php
===================================================================
--- trunk/mapbender/http/plugins/mb_digitize_widget.php 2015-05-21 13:06:22 UTC (rev 9202)
+++ trunk/mapbender/http/plugins/mb_digitize_widget.php 2015-05-22 13:58:40 UTC (rev 9203)
@@ -548,9 +548,12 @@
$link = $link.parent();
}
var menu = $(geomMenu);
+ if ( $( '.digitize-contextmenu' ).length != 0 ) {
+ return;
+ }
$(document.body).append(menu);
var pos = $link.offset();
- menu.css({position: 'absolute', top: pos.top, left: pos.left}).menu()
+ menu.css({position: 'absolute', top: pos.top, left: pos.left, width: "120px"}).menu()
.children().addClass('ui-menu-item')
.hover(function() {$(this).addClass('ui-state-hover'); },
function() {$(this).removeClass('ui-state-hover'); });
@@ -847,6 +850,8 @@
$(this).addClass('active').siblings().removeClass('active');
});
editDialog.find('.digitize-move-vertex').bind('click', function() {
+ console.log( o );
+ console.log( o.$target );
o.$target.mb_digitize('moveVertexMode');
$(this).addClass('active').siblings().removeClass('active');
});
@@ -865,9 +870,13 @@
var contextmenuLayer = function() {
var $link = $(this);
var menu = $(folderMenu);
+ // check if the dialog is already open
+ if ( $( '.digitize-contextmenu' ).length != 0 ) {
+ return;
+ }
$(document.body).append(menu);
var pos = $link.offset();
- menu.css({position: 'absolute', top: pos.top, left: pos.left}).menu()
+ menu.css({position: 'absolute', top: pos.top, left: pos.left, width: "120px"}).menu()
.children().addClass('ui-menu-item')
.hover(function() {$(this).addClass('ui-state-hover'); },
function() {$(this).removeClass('ui-state-hover'); });
@@ -1171,7 +1180,7 @@
header = "<?php echo _mb("Length [m]");?>";
break;
}
-
+ // append the matchin geometry-property to the geometryDiv
geometryDiv.append('<div><p class = " geometry-p "name="' + propertyKey + '">'+ header +' : ' + propertyValue + '</p></div>');
}
}
Modified: trunk/mapbender/http/widgets/w_digitize.js
===================================================================
--- trunk/mapbender/http/widgets/w_digitize.js 2015-05-21 13:06:22 UTC (rev 9202)
+++ trunk/mapbender/http/widgets/w_digitize.js 2015-05-22 13:58:40 UTC (rev 9203)
@@ -419,8 +419,17 @@
},
startVertexMoving: function(e) {
+
+ var self = this;
var pt = this.pointFromEvent(e);
- var self = this;
+ self.dualPoint = {};
+ self.dualVertexMove = false;
+ if ( self._isFirstPointSnapped(pt.mousePos) ) {
+ self.dualVertexMove = true;
+ } else if( self._isLastPointSnapped(pt.mousePos) ) {
+ self.dualVertexMove = true;
+ }
+
this.vertexMoving = false;
$.each(this._digitizePoints, function(k, v) {
if(self._isPointSnapped(v.mousePos, pt.mousePos)) {
@@ -432,14 +441,20 @@
},
vertexMove: function(e) {
+ var self = this;
+ var pt = this.pointFromEvent(e);
if(this.vertexMoving) {
- var pt = this.pointFromEvent(e);
this._digitizePoints[this.vertexMovingIndex] = pt;
+ if (self.dualVertexMove) {
+ this._digitizePoints[0] = pt;
+ }
}
this._redraw();
},
stopVertexMoving: function(e) {
+ var self = this;
+ self.dualVertexMove = false;
this.vertexMoving = false;
this._trigger('featuremodified', e);
},
More information about the Mapbender_commits
mailing list