[Mapbender-commits] r4670 - in branches/2.6: core http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-09-21 09:57:37 -0400 (Mon, 21 Sep 2009)
New Revision: 4670

Modified:
   branches/2.6/core/system.php
   branches/2.6/http/javascripts/mod_digitize_tab.php
Log:


Modified: branches/2.6/core/system.php
===================================================================
--- branches/2.6/core/system.php	2009-09-21 13:51:44 UTC (rev 4669)
+++ branches/2.6/core/system.php	2009-09-21 13:57:37 UTC (rev 4670)
@@ -20,8 +20,8 @@
 # mapbender version
 #
 define("MB_VERSION_NUMBER", "2.6");
-define("MB_VERSION_APPENDIX", "rc1");
-define("MB_RELEASE_DATE", mktime(0,0,0,3,17,2009));//h, min,sec,month,day,year
+define("MB_VERSION_APPENDIX", "");
+define("MB_RELEASE_DATE", mktime(0,0,0,9,21,2009));//h, min,sec,month,day,year
 
 #
 # constants from map.js

Modified: branches/2.6/http/javascripts/mod_digitize_tab.php
===================================================================
--- branches/2.6/http/javascripts/mod_digitize_tab.php	2009-09-21 13:51:44 UTC (rev 4669)
+++ branches/2.6/http/javascripts/mod_digitize_tab.php	2009-09-21 13:57:37 UTC (rev 4670)
@@ -1414,7 +1414,6 @@
 
 function getAvailableWfsForGeom(geom, wfsConf) {
 	var wfsConfIndices = [];
-	
 	for (var attr in wfsConf) {
 		var isTrans = (wfsConf[attr]['wfs_transaction'] != "");
 		if (!isTrans) {
@@ -1465,8 +1464,9 @@
 						)
 					);
 					var isPoint = (geom.geomType == parent.geomType.point && wfsConf[attr]['element'][elementIndex]['element_type'] == 'PointPropertyType');
+					var isMultiPoint = (geom.geomType == parent.geomType.point && wfsConf[attr]['element'][elementIndex]['element_type'] == 'MultiPointPropertyType');
 //					alert(isMultiPolygon + " " + isPolygon + " " + isMultiLine + " " + isLine + " " + isPoint);
-					if (isMultiPolygon || isPolygon || isMultiLine || isLine || isPoint || wfsConf[attr]['element'][elementIndex]['element_type'] == 'GeometryPropertyType') {
+					if (isMultiPolygon || isPolygon || isMultiLine || isLine || isMultiPoint || isPoint || wfsConf[attr]['element'][elementIndex]['element_type'] == 'GeometryPropertyType') {
 						
 						wfsConfIndices.push(attr);
 					}