Changeset 357 for trunk/zoo-project/zoo-kernel

Timestamp:

Jun 4, 2012, 12:21:19 PM (12 years ago)

Author:

djay

Message:

Small fix in MS Support, reproject extent to epsg:4326 when no authority name and code can be found. Thanks to Truong Xuan Quang for pointing this issue.

File:

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

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

@@ -125 +125 @@
   char* webService_url=(char*)malloc((strlen(msUrl->value)+strlen(format->value)+strlen(tmpI->name)+strlen(width->value)+strlen(height->value)+strlen(extent->value)+256)*sizeof(char));
 
-  if(proto>0)
+  if(proto>0){
+    map* test=getMap(tmpI->content,"real_extent");
+    if(test!=NULL)
+        extent=test;
     sprintf(webService_url,
             "%s?map=%s/%s_%s.map&request=%s&service=%s&version=%s&%s&format=%s&bbox=%s&crs=%s",
@@ -140 +143 @@
             crs->value
             );
-  else
+  }
+  else{
+    map* test=getMap(tmpI->content,"real_extent_reverse");
+    if(test!=NULL)
+        extent=test;
     sprintf(webService_url,
             "%s?map=%s/%s_%s.map&request=%s&service=%s&version=%s&%s&width=%s&height=%s&format=%s&bbox=%s&crs=%s",
@@ -157 +164 @@
             crs->value
             );
+  }
   addToMap(tmpI->content,"Reference",webService_url);
 
@@ -224 +232 @@
       msInsertHashTable(&(m->web.metadata),"ows_srs", "EPSG:4326 EPSG:900913");
       msInsertHashTable(&(myLayer->metadata),"ows_srs","EPSG:4326 EPSG:900913");
+
+      addToMap(output->content,"real_extent","true");
+
     }
   }
@@ -270 +281 @@
   
   if(output!=NULL){
-    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);
-    addToMap(output->content,"wms_extent",tmpExtent); 
-    sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",minX,minY,maxX,maxY);
-    addToMap(output->content,"wcs_extent",tmpExtent);
+    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;
+      max.x = m->extent.maxx;
+      max.y = m->extent.maxy;
+      char tmpSrsStr[1024];
+      
+      msInitProjection(&tempSrs);
+      msLoadProjectionStringEPSG(&tempSrs,"EPSG:4326");
+      
+      msProjectPoint(&(m->projection),&tempSrs,&min);
+      msProjectPoint(&m->projection,&tempSrs,&max);
+      
+      sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",min.y,min.x,max.y,max.x);
+      addToMap(output->content,"wms_extent",tmpExtent);
+      sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",min.x,min.y,max.x,max.y);
+      addToMap(output->content,"wcs_extent",tmpExtent);
+      
+    }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);
+      addToMap(output->content,"wms_extent",tmpExtent); 
+      sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",minX,minY,maxX,maxY);
+      addToMap(output->content,"wcs_extent",tmpExtent); 
+    }
   }