Changeset 402 for trunk

Timestamp:

Mar 27, 2013, 7:09:39 PM (12 years ago)

Author:

djay

Message:

Fixing issue when there is no SRS in the file you want to return as result of your processing (cf. #77).

File:

• trunk/zoo-project/zoo-kernel/service_internal_ms.c (modified) (6 diffs)

trunk/zoo-project/zoo-kernel/service_internal_ms.c

@@ -105 +105 @@
 
 void setReferenceUrl(maps* m,maps* tmpI){
-  //dumpMaps(tmpI);
   outputMapfile(m,tmpI);
   map *msUrl=getMapFromMaps(m,"main","mapserverAddress");
@@ -148 +147 @@
   map* extent=getMap(tmpI->content,options[proto][4]);
   map* crs=getMap(tmpI->content,"crs");
+  int hasCRS=1;
+  if(crs==NULL){
+    crs=getMapFromMaps(m,"main","crs");
+    if(crs==NULL){
+      crs=createMap("crs","epsg:4326");
+      hasCRS=0;
+    }
+  }
   char layers[128];
   sprintf(layers,options[proto][3],tmpI->name);
@@ -186 +193 @@
             crs->value
             );
+  }
+  if(hasCRS==0){
+    freeMap(&crs);
+    free(crs);
   }
   addToMap(tmpI->content,"Reference",webService_url);
@@ -300 +311 @@
   
   if(output!=NULL){
-
     map* test=getMap(output->content,"real_extent");
     if(test!=NULL){
       pointObj min, max;
       projectionObj tempSrs;
-
       min.x = m->extent.minx;
       min.y = m->extent.miny;
@@ -311 +320 @@
       max.y = m->extent.maxy;
       char tmpSrsStr[1024];
-
-
       msInitProjection(&tempSrs);
       msLoadProjectionStringEPSG(&tempSrs,"EPSG:4326");
@@ -327 +334 @@
       sprintf(tmpSrsStr,"%.3f,%.3f,%.3f,%.3f",min.x,min.y,max.x,max.y);
       addToMap(output->content,"wcs_extent",tmpExtent);
-      //dumpMap(output->content);
-
     }else{
       sprintf(tmpExtent,"%f,%f,%f,%f",minX, minY, maxX, maxY);
       map* isGeo=getMap(output->content,"crs_isGeographic");
-      fprintf(stderr,"isGeo = %s\n",isGeo->value);
-      if(isGeo!=NULL && strcasecmp("true",isGeo->value)==0)
-        sprintf(tmpExtent,"%f,%f,%f,%f", minY,minX, maxY, maxX);
+      if(isGeo!=NULL){
+        fprintf(stderr,"isGeo = %s\n",isGeo->value);
+        if(isGeo!=NULL && strcasecmp("true",isGeo->value)==0)
+          sprintf(tmpExtent,"%f,%f,%f,%f", minY,minX, maxY, maxX);
+      }
       addToMap(output->content,"wms_extent",tmpExtent); 
       sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",minX,minY,maxX,maxY);
       addToMap(output->content,"wcs_extent",tmpExtent);
-      
-    }
-
+    }
   }