[Mapbender-commits] r1108 - in trunk/mapbender/http: classes
javascripts php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Thu Feb 8 11:33:44 EST 2007
Author: christoph
Date: 2007-02-08 11:33:35 -0500 (Thu, 08 Feb 2007)
New Revision: 1108
Modified:
trunk/mapbender/http/classes/class_gml2.php
trunk/mapbender/http/javascripts/geometry.js
trunk/mapbender/http/javascripts/mod_digitize_tab.php
trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php
trunk/mapbender/http/javascripts/wfs.js
trunk/mapbender/http/javascripts/wfs_usemap.js
trunk/mapbender/http/php/mod_wfs_result.php
Log:
changed geomtypes to object geomType
Modified: trunk/mapbender/http/classes/class_gml2.php
===================================================================
--- trunk/mapbender/http/classes/class_gml2.php 2007-02-08 15:33:57 UTC (rev 1107)
+++ trunk/mapbender/http/classes/class_gml2.php 2007-02-08 16:33:35 UTC (rev 1108)
@@ -194,13 +194,13 @@
function exportMemberToJS ($i) {
$js = "";
if ($this->getGeometryTypeFromMember($i) == $this->geomtype_point) {
- $js .= "var current_geomtype = geomTypePoint;\n";
+ $js .= "var current_geomtype = geomType.point;\n";
}
elseif ($this->getGeometryTypeFromMember($i) == $this->geomtype_line || $this->getGeometryTypeFromMember($i) == $this->geomtype_multiline) {
- $js .= "var current_geomtype = geomTypeLine;\n";
+ $js .= "var current_geomtype = geomType.line;\n";
}
elseif ($this->getGeometryTypeFromMember($i) == $this->geomtype_polygon || $this->getGeometryTypeFromMember($i) == $this->geomtype_multipolygon) {
- $js .= "var current_geomtype = geomTypePolygon;\n";
+ $js .= "var current_geomtype = geomType.polygon;\n";
}
else die("unknown geometry type: '".$this->getGeometryTypeFromMember($i)."'");
Modified: trunk/mapbender/http/javascripts/geometry.js
===================================================================
--- trunk/mapbender/http/javascripts/geometry.js 2007-02-08 15:33:57 UTC (rev 1107)
+++ trunk/mapbender/http/javascripts/geometry.js 2007-02-08 16:33:35 UTC (rev 1108)
@@ -6,10 +6,6 @@
// http://www.mapbender.org/index.php/GeometryArray.js
-var geomTypePolygon = "polygon";
-var geomTypeLine = "line";
-var geomTypePoint = "point";
-
var nameGeometryArray = "GeometryArray";
var nameMultiGeometry = "MultiGeometry";
var nameGeometry = "Geometry";
@@ -53,8 +49,8 @@
return this.get(i).get(j).get(k);
}
- this.addMember = function(geomtype){ // public
- this.m[this.m.length] = new MultiGeometry(geomtype);
+ this.addMember = function(geomType){ // public
+ this.m[this.m.length] = new MultiGeometry(geomType);
}
this.appendMember = function(aMember){ // public
@@ -95,9 +91,9 @@
this.combineToMultiGeometry = function(){
if (this.count() == 0) return true;
- var geomtype = this.get(0).geomtype;
+ var geomType = this.get(0).geomType;
for (var i = 1 ; i < this.count() ; i++) {
- if (geomtype != this.get(i).geomtype) return false;
+ if (geomType != this.get(i).geomType) return false;
}
// TODO:combine geometries
return true;
@@ -143,10 +139,6 @@
return null;
}
}
-
- this.geomTypePolygon = "polygon";
- this.geomTypeLine = "line";
- this.geomTypePoint = "point";
this.name = nameGeometryArray;
this.m = [];
}
@@ -155,7 +147,7 @@
// MultiGeometry
// ----------------------------------------------------------------------------------------------------
-function MultiGeometry(geomtype){
+function MultiGeometry(geomType){
this.count = function(){ // public
return this.g.length;
@@ -172,11 +164,11 @@
}
this.addGeometry = function(){ // public
- this.g[this.g.length] = new Geometry(this.geomtype);
+ this.g[this.g.length] = new Geometry(this.geomType);
}
this.equals = function(multigeom) { // public
- if (this.geomtype != multigeom.geomtype) return false;
+ if (this.geomType != multigeom.geomType) return false;
if (this.count() != multigeom.count()) return false;
if (this.getTotalPointCount() != multigeom.getTotalPointCount()) return false;
for (var i=0; i<this.count(); i++) {
@@ -258,7 +250,7 @@
this.g = [];
this.e = new Wfs_element();
- this.geomtype = geomtype;
+ this.geomType = geomType;
this.name = nameMultiGeometry;
}
@@ -295,7 +287,7 @@
this.close = function(){
this.complete = true;
- if (this.geomtype == geomTypePolygon){
+ if (this.geomType == geomType.polygon){
if (this.count() > 0){
if (!this.get(0).equals(this.get(-1))) {
this.addPoint(this.get(0));
@@ -335,7 +327,7 @@
}
this.v.length -= 1;
- if (this.geomtype == geomTypePolygon){
+ if (this.geomType == geomType.polygon){
if (i == tmpLength) {this.v[0] = this.v[tmpLength-1];}
else if (i == 0) {this.v[tmpLength-1] = this.v[0];}
if (this.v.length == 1){return false;}
@@ -349,7 +341,7 @@
this.updateGeometry = function(p, i){ // public
i = this.getIndex(i);
- if ((i == 0 || i == this.count()-1) && this.geomtype == geomTypePolygon){
+ if ((i == 0 || i == this.count()-1) && this.geomType == geomType.polygon){
this.v[0] = p;
this.v[this.count()-1] = p;
}
@@ -382,7 +374,7 @@
}
this.equals = function(geom) { // public
- if (this.geomtype != geom.geomtype) return false;
+ if (this.geomType != geom.geomType) return false;
if (this.count() != geom.count()) return false;
for (var i=0; i < this.count(); i++) {
if (!this.get(i).equals(geom.get(i))) return false;
@@ -422,7 +414,7 @@
return this.totaldist[this.count()-1];
}
- this.geomtype = aGeomtype;
+ this.geomType = aGeomtype;
this.complete = false;
this.v = [];
this.dist = [];
@@ -550,20 +542,20 @@
if (this.checkTag()) {
for (var q = 0; q < gA.count(); q++) {
var m = gA.get(q);
- var t = m.geomtype;
+ var t = m.geomType;
var col = m.color;
- if (t == geomTypePoint) this.drawGeometry(t,m,col);
+ if (t == geomType.point) this.drawGeometry(t,m,col);
else {
if (this.isTooSmall(m)){
- var newMember = new MultiGeometry(geomTypePoint);
+ var newMember = new MultiGeometry(geomType.point);
newMember.addGeometry();
newMember.get(-1).addPoint(m.getCenter());
- this.drawGeometry(geomTypePoint,newMember,col);
+ this.drawGeometry(geomType.point,newMember,col);
}
else{
- if(t == geomTypeLine) this.drawGeometry(t,m, col);
- else if(t == geomTypePolygon) this.drawGeometry(t,m,col);
- else alert("unknown geomtype");
+ if(t == geomType.line) this.drawGeometry(t,m, col);
+ else if(t == geomType.polygon) this.drawGeometry(t,m,col);
+ else alert("unknown geomType");
}
}
}
@@ -579,14 +571,14 @@
width = mb_mapObj[mapObjInd].width;
height = mb_mapObj[mapObjInd].height;
for(var i=0; i < g.count(); i++){
- if(t==geomTypePoint) {
+ if(t==geomType.point) {
var p = realToMap(this.mapframe,g.get(i).get(0));
if (p.x + this.diameter < mb_mapObj[mapObjInd].width && p.x - this.diameter > 0 &&
p.y + this.diameter < mb_mapObj[mapObjInd].height && p.y - this.diameter > 0) {
this.drawCircle(p.x-1,p.y-1,this.diameter,col);
}
}
- else if(t==geomTypeLine) {
+ else if(t==geomType.line) {
for (var j=0; j<g.get(i).count()-1; j++) {
var pq = calculateVisibleDash(realToMap(this.mapframe,g.get(i).get(j)), realToMap(this.mapframe,g.get(i).get(j+1)), width, height);
if (pq) {
@@ -594,7 +586,7 @@
}
}
}
- else if(t==geomTypePolygon) {
+ else if(t==geomType.polygon) {
for (var j=0; j<g.get(i).count()-1; j++) {
var pq = calculateVisibleDash(realToMap(this.mapframe,g.get(i).get(j)), realToMap(this.mapframe,g.get(i).get(j+1)), width, height);
if (pq) {
@@ -603,7 +595,7 @@
}
}
else {
- alert('unknown geomtype ' + t);
+ alert('unknown geomType ' + t);
}
}
var el = window.frames[this.mapframe].document.getElementById(this.tagname);
@@ -803,7 +795,7 @@
}
this.draw = function(center,radius,size){ //private
- mG = new MultiGeometry(geomTypePoint);
+ mG = new MultiGeometry(geomType.point);
mG.addGeometry();
mG.get(-1).addPoint(center);
this.highlight.add(mG);
Modified: trunk/mapbender/http/javascripts/mod_digitize_tab.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_digitize_tab.php 2007-02-08 15:33:57 UTC (rev 1107)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php 2007-02-08 16:33:35 UTC (rev 1108)
@@ -145,12 +145,12 @@
realWorldPos = parent.mapToReal(mod_digitize_target,new parent.Point(parent.clickX,parent.clickY));
}
- if (d.get(-1).geomtype == parent.geomTypePolygon && d.getGeometry(-1,-1).count() > 1 && d.getGeometry(-1,-1).get(0).equals(realWorldPos)) {
+ if (d.get(-1).geomType == parent.geomType.polygon && d.getGeometry(-1,-1).count() > 1 && d.getGeometry(-1,-1).get(0).equals(realWorldPos)) {
// close the polygon
parent.mb_disableThisButton(button_polygon);
}
- else if (d.get(-1).geomtype == parent.geomTypeLine && d.getGeometry(-1,-1).count() > 1 && d.getGeometry(-1,-1).get(-1).equals(realWorldPos)) {
+ else if (d.get(-1).geomType == parent.geomType.line && d.getGeometry(-1,-1).count() > 1 && d.getGeometry(-1,-1).get(-1).equals(realWorldPos)) {
// close the line
parent.mb_disableThisButton(button_line);
}
@@ -158,17 +158,17 @@
// set the calculated real world position as point of the geometry
d.getGeometry(-1,-1).addPoint(realWorldPos);
- if(d.get(-1).geomtype == parent.geomTypePoint){
+ if(d.get(-1).geomType == parent.geomType.point){
parent.mb_disableThisButton(button_point);
}
// add first point of polygon to snapping list (if three points have been inserted).
- else if (d.get(-1).geomtype == parent.geomTypePolygon && d.getGeometry(-1,-1).count() == 3) {
+ else if (d.get(-1).geomType == parent.geomType.polygon && d.getGeometry(-1,-1).count() == 3) {
s.add(d, 0, -1, -1);
}
// add last point of line to snapping list (if at least two points have been inserted).
- else if (d.get(-1).geomtype == parent.geomTypeLine && d.getGeometry(-1,-1).count() >= 2) {
+ else if (d.get(-1).geomType == parent.geomType.line && d.getGeometry(-1,-1).count() >= 2) {
if (mod_digitizeEvent != button_move) {
s.store(d);
}
@@ -464,15 +464,15 @@
executeDigitizePreFunctions();
obj.title = obj.title_on;
if (obj.id == button_point) {
- d.addMember(parent.geomTypePoint);
+ d.addMember(parent.geomType.point);
d.get(-1).addGeometry();
}
else if (obj.id == button_polygon) {
- d.addMember(parent.geomTypePolygon);
+ d.addMember(parent.geomType.polygon);
d.get(-1).addGeometry();
}
else if (obj.id == button_line) {
- d.addMember(parent.geomTypeLine);
+ d.addMember(parent.geomType.line);
d.get(-1).addGeometry();
}
else if (obj.id == button_clear) {
@@ -540,13 +540,13 @@
var pos = parent.makeRealWorld2mapPos(mod_digitize_target,d.getPoint(i,j,k).x,d.getPoint(i,j,k).y);
if (!d.getGeometry(i,j).isComplete() &&
- ( (k == 0 && d.get(i).geomtype == parent.geomTypePolygon) || (k == d.getGeometry(i,j).count()-1 && d.get(i).geomtype == parent.geomTypeLine))) {
+ ( (k == 0 && d.get(i).geomType == parent.geomType.polygon) || (k == d.getGeometry(i,j).count()-1 && d.get(i).geomType == parent.geomType.line))) {
smP += "<div class='bp' style='top:"+(pos[1]-2)+"px;left:"+(pos[0]-2)+"px;z-index:"+digitizeTransactionalZIndex+";background-color:"+linepointColor+"'";
}
else {
smP += "<div class='bp' style='top:"+(pos[1]-2)+"px;left:"+(pos[0]-2)+"px;z-index:"+digitizeTransactionalZIndex+";'";
}
- if(j==0 && d.get(i).geomtype == parent.geomTypePolygon && !d.getGeometry(i,j).complete){
+ if(j==0 && d.get(i).geomType == parent.geomType.polygon && !d.getGeometry(i,j).complete){
smP += " title='"+closePolygon_title+"' ";
}
if(mod_digitizeEvent == button_move || mod_digitizeEvent == button_insert || mod_digitizeEvent == button_delete) {
@@ -659,9 +659,9 @@
listOfGeom += " onmouseout='parent.mb_wfs_perform(\"out\",d.get("+i+"))' ";
listOfGeom += " onclick='parent.mb_wfs_perform(\"click\",d.get("+i+"));' ";
var geomName = getName(d.get(i));
- if (d.get(i).geomtype == parent.geomTypePolygon) {geomName += " (polygon)";}
- else if (d.get(i).geomtype == parent.geomTypeLine) {geomName += " (line)";}
- else if (d.get(i).geomtype == parent.geomTypePoint) {geomName += " (point)";}
+ if (d.get(i).geomType == parent.geomType.polygon) {geomName += " (polygon)";}
+ else if (d.get(i).geomType == parent.geomType.line) {geomName += " (line)";}
+ else if (d.get(i).geomType == parent.geomType.point) {geomName += " (point)";}
listOfGeom += ">" + geomName +"</div>\t\t</td>\n\t</tr>\n";
}
@@ -847,11 +847,11 @@
for (var elementIndex = 0; elementIndex < wfsConf[attr]['element'].length ; elementIndex++) {
var isGeomColumn = (parseInt(wfsConf[attr]['element'][elementIndex]['f_geom']) == 1);
if (isGeomColumn) {
- var isMultiPolygon = (d.get(geometryIndex).geomtype == parent.geomTypePolygon && wfsConf[attr]['element'][elementIndex]['element_type'] == 'MultiPolygonPropertyType');
- var isPolygon = (d.get(geometryIndex).geomtype == parent.geomTypePolygon && d.get(geometryIndex).count() == 1 && wfsConf[attr]['element'][elementIndex]['element_type'] == 'PolygonPropertyType');
- var isMultiLine = (d.get(geometryIndex).geomtype == parent.geomTypeLine && wfsConf[attr]['element'][elementIndex]['element_type'] == 'MultiLineStringPropertyType');
- var isLine = (d.get(geometryIndex).geomtype == parent.geomTypeLine && d.get(geometryIndex).count() == 1 && wfsConf[attr]['element'][elementIndex]['element_type'] == 'LineStringPropertyType');
- var isPoint = (d.get(geometryIndex).geomtype == parent.geomTypePoint && wfsConf[attr]['element'][elementIndex]['element_type'] == 'PointPropertyType');
+ var isMultiPolygon = (d.get(geometryIndex).geomType == parent.geomType.polygon && wfsConf[attr]['element'][elementIndex]['element_type'] == 'MultiPolygonPropertyType');
+ var isPolygon = (d.get(geometryIndex).geomType == parent.geomType.polygon && d.get(geometryIndex).count() == 1 && wfsConf[attr]['element'][elementIndex]['element_type'] == 'PolygonPropertyType');
+ var isMultiLine = (d.get(geometryIndex).geomType == parent.geomType.line && wfsConf[attr]['element'][elementIndex]['element_type'] == 'MultiLineStringPropertyType');
+ var isLine = (d.get(geometryIndex).geomType == parent.geomType.line && d.get(geometryIndex).count() == 1 && wfsConf[attr]['element'][elementIndex]['element_type'] == 'LineStringPropertyType');
+ var isPoint = (d.get(geometryIndex).geomType == parent.geomType.point && wfsConf[attr]['element'][elementIndex]['element_type'] == 'PointPropertyType');
// alert(isMultiPolygon + " " + isPolygon + " " + isMultiLine + " " + isLine + " " + isPoint);
if (isMultiPolygon || isPolygon || isMultiLine || isLine || isPoint || wfsConf[attr]['element'][elementIndex]['element_type'] == 'GeometryAssociationType') {
str += "<option value='" + attr + "'";
Modified: trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php 2007-02-08 15:33:57 UTC (rev 1107)
+++ trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php 2007-02-08 16:33:35 UTC (rev 1108)
@@ -107,17 +107,17 @@
if (activeButton == null) {
activeButton = obj;
}
- mod_wfs_spatialRequest_geometry = new Geometry(geomTypePoint);
+ mod_wfs_spatialRequest_geometry = new Geometry(geomType.point);
wfsAreaType_current = wfsAreaType_point;
- mod_wfs_spatialRequest_digitize_go(geomTypePoint);
+ mod_wfs_spatialRequest_digitize_go(geomType.point);
}
if (obj.id == button_polygon) {
if (activeButton == null) {
activeButton = obj;
}
- mod_wfs_spatialRequest_geometry = new Geometry(geomTypePolygon);
+ mod_wfs_spatialRequest_geometry = new Geometry(geomType.polygon);
wfsAreaType_current = wfsAreaType_polygon;
- mod_wfs_spatialRequest_digitize_go(geomTypePolygon);
+ mod_wfs_spatialRequest_digitize_go(geomType.polygon);
var measureSub = "";
for(var i=0; i<mod_wfs_spatialRequestSubFunctions.length; i++){
measureSub += eval(mod_wfs_spatialRequestSubFunctions[i]);
@@ -128,7 +128,7 @@
if (activeButton == null) {
activeButton = obj;
}
- mod_wfs_spatialRequest_geometry = new Geometry(geomTypeLine);
+ mod_wfs_spatialRequest_geometry = new Geometry(geomType.line);
wfsAreaType_current = wfsAreaType_rectangle;
mod_selAreaExt_click();
}
@@ -136,7 +136,7 @@
if (activeButton == null) {
activeButton = obj;
}
- mod_wfs_spatialRequest_geometry = new Geometry(geomTypeLine);
+ mod_wfs_spatialRequest_geometry = new Geometry(geomType.line);
wfsAreaType_current = wfsAreaType_extent;
var ind = getMapObjIndexByName(mod_wfs_spatialRequest_target);
var p0 = mapToReal(mod_wfs_spatialRequest_target, new Point(0,0));
@@ -202,9 +202,9 @@
// ----------------------------------------------------------------------------------------------
// -------------------- polygon && point --------------------------------------------------------
-function mod_wfs_spatialRequest_digitize_go(geomtype){
- if (geomtype == geomTypePolygon) {
- mod_wfs_spatialRequest_geometry = new Geometry(geomTypePolygon);
+function mod_wfs_spatialRequest_digitize_go(geomType){
+ if (geomType == geomType.polygon) {
+ mod_wfs_spatialRequest_geometry = new Geometry(geomType.polygon);
}
s = new Snapping(mod_wfs_spatialRequest_target);
@@ -387,7 +387,7 @@
}
}
- if(queryGeom.geomtype==geomTypePolygon){
+ if(queryGeom.geomType==geomType.polygon){
for(var i=0; i<w_.length; i++){
var url = wfs_config[w_[i]]['wfs_getfeature'];
url += "service=wfs&request=getFeature&version=1.0.0";
@@ -411,9 +411,9 @@
mb_get_geom(url, filter, i, w_[i]);
}
}
- else if(queryGeom.geomtype==geomTypeLine){
+ else if(queryGeom.geomType==geomType.line){
var rectangle = [];
- if(queryGeom.geomtype == geomTypeLine){
+ if(queryGeom.geomType == geomType.line){
var rectangle = queryGeom.getBBox();
}
for(var i=0; i<w_.length; i++){
@@ -433,7 +433,7 @@
mb_get_geom(url, filter, i, w_[i]);
}
}
- else if(queryGeom.geomtype == geomTypePoint){
+ else if(queryGeom.geomType == geomType.point){
var tmp = queryGeom.get(0);
var buffer = mb_wfs_tolerance/2;
for(var i=0; i<w_.length; i++){
Modified: trunk/mapbender/http/javascripts/wfs.js
===================================================================
--- trunk/mapbender/http/javascripts/wfs.js 2007-02-08 15:33:57 UTC (rev 1107)
+++ trunk/mapbender/http/javascripts/wfs.js 2007-02-08 16:33:35 UTC (rev 1108)
@@ -220,14 +220,14 @@
}
}
str += '<' + el_geom + '>';
- if(d.get(m).geomtype == geomTypePoint){
+ if(d.get(m).geomType == geomType.point){
str += '<gml:Point srsName="' + myconf['featuretype_srs'] + '">';
str += '<gml:coordinates>';
str += d.getPoint(m,0,0).x + "," + d.getPoint(m,0,0).y;
str += '</gml:coordinates>';
str += '</gml:Point>';
}
- if(d.get(m).geomtype == geomTypeLine){
+ if(d.get(m).geomType == geomType.line){
str += '<gml:MultiLineString srsName="' + myconf['featuretype_srs'] + '">';
str += '<gml:lineStringMember><gml:LineString><gml:coordinates>';
for(var k=0; k<d.getGeometry(m,0).count(); k++){
@@ -237,7 +237,7 @@
str += '</gml:coordinates></gml:LineString></gml:lineStringMember>';
str += '</gml:MultiLineString>';
}
- if(d.get(m).geomtype == geomTypePolygon){
+ if(d.get(m).geomType == geomType.polygon){
str += '<gml:MultiPolygon srsName="' + myconf['featuretype_srs'] + '">';
str += '<gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>';
@@ -268,12 +268,12 @@
}
}
str += '<wfs:Property><wfs:Name>' + el_geom + '</wfs:Name><wfs:Value>';
- if(d.get(m).geomtype == geomTypePoint){
+ if(d.get(m).geomType == geomType.point){
str += '<gml:Point srsName="' + myconf['featuretype_srs'] + '"><gml:coordinates>';
str += d.getPoint(m,0,0).x + "," + d.getPoint(m,0,0).y;
str += '</gml:coordinates></gml:Point>';
}
- if(d.get(m).geomtype == geomTypeLine){
+ if(d.get(m).geomType == geomType.line){
str += '<gml:MultiLineString srsName="' + myconf['featuretype_srs'] + '">';
str += '<gml:lineStringMember><gml:LineString><gml:coordinates>';
for(var k=0; k<d.getGeometry(m,0).count(); k++){
@@ -283,7 +283,7 @@
str += '</gml:coordinates></gml:LineString></gml:lineStringMember>';
str += '</gml:MultiLineString>';
}
- if(d.get(m).geomtype == geomTypePolygon){
+ if(d.get(m).geomType == geomType.polygon){
str += '<gml:MultiPolygon srsName="' + myconf['featuretype_srs'] + '">';
str += '<gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>';
for(var k=0; k<d.getGeometry(m,0).count(); k++){
Modified: trunk/mapbender/http/javascripts/wfs_usemap.js
===================================================================
--- trunk/mapbender/http/javascripts/wfs_usemap.js 2007-02-08 15:33:57 UTC (rev 1107)
+++ trunk/mapbender/http/javascripts/wfs_usemap.js 2007-02-08 16:33:35 UTC (rev 1108)
@@ -19,13 +19,13 @@
for (var i = 0 ; i < mb_wfs_fetch.count() ; i ++) {
if (mb_wfs_fetch.get(i).wfs_conf == wfs_name || wfs_name == "") {
- if (mb_wfs_fetch.get(i).geomtype == geomTypePolygon) {
+ if (mb_wfs_fetch.get(i).geomType == geomType.polygon) {
usemap += mod_usemap_polygon(i);
}
- else if (mb_wfs_fetch.get(i).geomtype == geomTypePoint) {
+ else if (mb_wfs_fetch.get(i).geomType == geomType.point) {
usemap += mod_usemap_circle(i);
}
- else if (mb_wfs_fetch.get(i).geomtype == geomTypeLine) {
+ else if (mb_wfs_fetch.get(i).geomType == geomType.line) {
usemap += mod_usemap_line(i);
}
}
Modified: trunk/mapbender/http/php/mod_wfs_result.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_result.php 2007-02-08 15:33:57 UTC (rev 1107)
+++ trunk/mapbender/http/php/mod_wfs_result.php 2007-02-08 16:33:35 UTC (rev 1108)
@@ -122,28 +122,28 @@
else if(in_array(sepNameSpace($element[tag]),$geometries) && $element[type] == "open" && $section == true){
$geom = true;
if (sepNameSpace($element[tag]) == "MultiLineString") {
- $geom_str .= "geom.addMember(geomTypeLine);\n";
+ $geom_str .= "geom.addMember(geomType.line);\n";
$memberHasBeenCreated = true;
}
else if (sepNameSpace($element[tag]) == "MultiPolygon" ) {
- $geom_str .= "geom.addMember(geomTypePolygon);\n";
+ $geom_str .= "geom.addMember(geomType.polygon);\n";
$memberHasBeenCreated = true;
}
elseif (sepNameSpace($element[tag]) == "Point") {
- $geom_str .= "geom.addMember(geomTypePoint);\n";
+ $geom_str .= "geom.addMember(geomType.point);\n";
$memberHasBeenCreated = true;
$geom_str .= "geom.get(-1).addGeometry();\n";
}
elseif (sepNameSpace($element[tag]) == "LineString") {
if (!$memberHasBeenCreated) {
- $geom_str .= "geom.addMember(geomTypeLine);\n";
+ $geom_str .= "geom.addMember(geomType.line);\n";
$memberHasBeenCreated = true;
}
$geom_str .= "geom.get(-1).addGeometry();\n";
}
else if (sepNameSpace($element[tag]) == "Polygon" ) {
if (!$memberHasBeenCreated) {
- $geom_str .= "geom.addMember(geomTypePolygon);\n";
+ $geom_str .= "geom.addMember(geomType.polygon);\n";
$memberHasBeenCreated = true;
}
$geom_str .= "geom.get(-1).addGeometry();\n";
More information about the Mapbender_commits
mailing list