[Mapbender-commits] r3753 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-03-16 11:42:08 -0400 (Mon, 16 Mar 2009)
New Revision: 3753

Modified:
   trunk/mapbender/http/javascripts/geometry.js
   trunk/mapbender/http/javascripts/mod_digitize_tab.php
Log:
WFS insert failed after split polygon

added srs as 2nd parameter to importGeometryFromText

Modified: trunk/mapbender/http/javascripts/geometry.js
===================================================================
--- trunk/mapbender/http/javascripts/geometry.js	2009-03-16 15:28:43 UTC (rev 3752)
+++ trunk/mapbender/http/javascripts/geometry.js	2009-03-16 15:42:08 UTC (rev 3753)
@@ -268,7 +268,7 @@
 	return [min, max];
 };
 
-GeometryArray.prototype.importGeometryFromText = function (text) {
+GeometryArray.prototype.importGeometryFromText = function (text, srs) {
 
 	var tmpArray = text.split("(");
 	var geometryType = tmpArray[0];
@@ -290,6 +290,7 @@
 						for (var m = 0; m < -1 + coordinatesArray.length; m++) {
 							var currentPoint = coordinatesArray[m].split(" ");
 							this.getGeometry(-1, -1).addPointByCoordinates(parseFloat(currentPoint[0]), parseFloat(currentPoint[1]));
+							this.getGeometry(-1,-1).setEpsg(srs);
 						}
 						this.close();
 					}		
@@ -302,6 +303,7 @@
 						}
 						ring.close();
 						this.getGeometry(-1,-1).addInnerRing(ring);				
+						this.getGeometry(-1,-1).setEpsg(srs);
 					}
 				}
 			}

Modified: trunk/mapbender/http/javascripts/mod_digitize_tab.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_digitize_tab.php	2009-03-16 15:28:43 UTC (rev 3752)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php	2009-03-16 15:42:08 UTC (rev 3753)
@@ -849,7 +849,8 @@
 			parent.mb_ajax_post("../php/mod_digitize_mergePolygon.php", {polygons: polygonTextArray.join(";")}, function(json, status) {
 				var response = eval('(' + json + ')');
 				var polygon = response.polygon;
-				d.importGeometryFromText(polygon);
+				var mapIndex = parent.getMapObjIndexByName(mod_digitize_target);
+				d.importGeometryFromText(polygon, parent.mb_mapObj[mapIndex].epsg);
 
 				// remove the original polygons
 				var len = d.count();
@@ -876,8 +877,9 @@
 				var response = eval('(' + json + ')');
 				var polygonArray = response.polygons;
 				var wfsConfId = d.get(0).wfs_conf;
+				var mapIndex = parent.getMapObjIndexByName(mod_digitize_target);
 				for (var i in polygonArray) {
-					d.importGeometryFromText(polygonArray[i]);
+					d.importGeometryFromText(polygonArray[i], parent.mb_mapObj[mapIndex].epsg);
 					d.get(-1).wfs_conf = wfsConfId;
 				}
 				// remove the original polygon and the temporary line
@@ -904,8 +906,9 @@
 				var polygonArray = response.polygons;
 				var wfsConfId = d.get(0).wfs_conf;
 				var wfsProperties = d.get(0).e;
+				var mapIndex = parent.getMapObjIndexByName(mod_digitize_target);
 				for (var i in polygonArray) {
-					d.importGeometryFromText(polygonArray[i]);
+					d.importGeometryFromText(polygonArray[i], parent.mb_mapObj[mapIndex].epsg);
 					d.get(-1).wfs_conf = wfsConfId;
 					d.get(-1).e = wfsProperties;
 				}