Ticket #170: service_internal_ms.patch

service_internal_ms.c

@@ -402 +402 @@
     protoVersion=options[proto][1];
     extent=getMapArray(tmpI->content,options[proto][4],imyIndex);
     memset(webService_url,0,strlen(webService_url));
-    freeMap(&rformat);
+     freeMap(&rformat);
     free(rformat);
     rformat=createMap("value","image/tiff");
     sprintf(webService_url,
@@ -549 +549 @@
 void setMsExtent(maps* output,mapObj* m,layerObj* myLayer,
                  double minX,double minY,double maxX,double maxY){
   int imyIndex=getPublishedId(output);
+  
   msMapSetExtent(m,minX,minY,maxX,maxY);
   //m->maxsize=4096;
 #ifdef DEBUGMS
@@ -559 +560 @@
 #ifdef DEBUGMS
   fprintf(stderr,"Extent %s\n",tmpExtent);
 #endif
-  msInsertHashTable(&(myLayer->metadata), "ows_extent", tmpExtent);
+  msInsertHashTable(&(myLayer->metadata), "ows_extent", tmpExtent); 
   
   if(output!=NULL){
     map* test=getMapArray(output->content,"real_extent",imyIndex);
@@ -577 +578 @@
     msProjectPoint(&myLayer->projection,&tempSrs,&max);
   
     if(test!=NULL){
-      sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",min.y,min.x,max.y,max.x);
+      sprintf(tmpExtent,"%.15f,%.15f,%.15f,%.15f",min.y,min.x,max.y,max.x);
       map* isGeo=getMapArray(output->content,"crs_isGeographic",imyIndex);
 #ifdef DEBUGMS
       fprintf(stderr,"isGeo = %s\n",isGeo->value);
 #endif
       if(isGeo!=NULL && strcasecmp("true",isGeo->value)==0){
-        sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",min.y,min.x,max.y,max.x);
+        sprintf(tmpExtent,"%.15f,%.15f,%.15f,%.15f",min.y,min.x,max.y,max.x);
         setMapArray(output->content,"wgs84_extent",imyIndex,tmpExtent);
         sprintf(tmpExtent,"%f,%f,%f,%f", minY,minX, maxY, maxX);
       }else{
-        sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",min.x,min.y,max.x,max.y);
+        sprintf(tmpExtent,"%.15f,%.15f,%.15f,%.15f",min.x,min.y,max.x,max.y);
         setMapArray(output->content,"wgs84_extent",imyIndex,tmpExtent);
       }
       setMapArray(output->content,"wms_extent",imyIndex,tmpExtent);
-      sprintf(tmpSrsStr,"%.3f,%.3f,%.3f,%.3f",min.x,min.y,max.x,max.y);
+      sprintf(tmpSrsStr,"%.15f,%.15f,%.15f,%.15f",min.x,min.y,max.x,max.y);
       setMapArray(output->content,"wcs_extent",imyIndex,tmpExtent);
     }else{
-      sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",min.x,min.y,max.x,max.y);
+      sprintf(tmpExtent,"%.15f,%.15f,%.15f,%.15f",min.x,min.y,max.x,max.y);
       setMapArray(output->content,"wgs84_extent",imyIndex,tmpExtent);
       sprintf(tmpExtent,"%f,%f,%f,%f",minX, minY, maxX, maxY);
       map* isGeo=getMapArray(output->content,"crs_isGeographic",imyIndex);
@@ -603 +604 @@
         fprintf(stderr,"isGeo = %s\n",isGeo->value);
 #endif
         if(isGeo!=NULL && strcasecmp("true",isGeo->value)==0)
-          sprintf(tmpExtent,"%f,%f,%f,%f", minY,minX, maxY, maxX);
+          sprintf(tmpExtent,"%.15f,%.15f,%.15f,%.15f", minY,minX,maxY,maxX);
       }
       setMapArray(output->content,"wms_extent",imyIndex,tmpExtent); 
-      sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",minX,minY,maxX,maxY);
+      sprintf(tmpExtent,"%.15f,%.15f,%.15f,%.15f",minX,minY,maxX,maxY);
       setMapArray(output->content,"wcs_extent",imyIndex,tmpExtent);
     }
   }
-
+#ifdef DEBUGMS
+        fprintf(stderr,"SetMapSize EXTENT: %f,%f,%f,%f\n",minX,minY,maxX,maxY);
+#endif
   setMapSize(output,minX,minY,maxX,maxY);
 }
 
@@ -859 +862 @@
       char extent[1024];
       memset(&extent,0,1024);
       sprintf(extent,"%d,%d,%d,%d",oExt.MinX, oExt.MinY, oExt.MaxX, oExt.MaxY);
+#ifdef DEBUGMS
+      fprintf(stderr,"OGR Extent %d,%d,%d,%d\n",oExt.MinX, oExt.MinY, oExt.MaxX, oExt.MaxY);
+#endif      
+      
       setMapArray(output->content,"boundingbox",imyIndex,extent);
     }
   
@@ -1088 +1095 @@
       char extent[1024];
       memset(&extent,0,1024);
       sprintf(extent,"%d,%d,%d,%d",minX,minY,maxX,maxY);
+#ifdef DEBUGMS
+      fprintf(stderr,"GDAL Transform Extent %d,%d,%d,%d\n",minX,minY,maxX,maxY);
+#endif      
       setMapArray(output->content,"boundingbox",imyIndex,extent);
     }
   }else{
@@ -1277 +1287 @@
    */
   int imyIndex=getPublishedId(outputs);
   map* mime=getMapArray(outputs->content,"mimeType",imyIndex);
+  map* msUrl=getMapFromMaps(conf,"main","mapserverAddress");
+  map* dataPath=getMapFromMaps(conf,"main","dataPath");
   char *ext="data";
   if(mime!=NULL)
     if(strncasecmp(mime->value,"application/json",16)==0)
@@ -1481 +1493 @@
   freeMap(&correspondance);
   free(correspondance);
 
+  map* sid=getMapFromMaps(conf,"lenv","usid");
+  char *mapPath=
+    (char*)malloc((14+strlen(sid->value)+strlen(outputs->name)+strlen(dataPath->value))*sizeof(char));
+  sprintf(mapPath,"%s/%s_%d_%s.map",dataPath->value,outputs->name,imyIndex,sid->value);
+  char *mapUrl=
+    (char*)malloc((6+strlen(mapPath)+strlen(msUrl->value))*sizeof(char));
+  sprintf(mapUrl,"%s?map=%s",msUrl->value,mapPath);
 
+  if (msInsertHashTable(&(myMap->web.metadata), "ows_onlineresource", mapUrl) == NULL){
+#ifdef DEBUGMS
+    fprintf(stderr,"Unable to add metadata");
+#endif
+    return;
+  }
+
   if(tryOgr(conf,outputs,myMap)<0)
     if(tryGdal(conf,outputs,myMap)<0)
       return ;
 
-  tmp1=getMapFromMaps(conf,"main","dataPath");
-  char *tmpPath=(char*)malloc((13+strlen(tmp1->value))*sizeof(char));
-  sprintf(tmpPath,"%s/symbols.sym",tmp1->value);
+  char *tmpPath=(char*)malloc((13+strlen(dataPath->value))*sizeof(char));
+  sprintf(tmpPath,"%s/symbols.sym",dataPath->value);
   msInitSymbolSet(&myMap->symbolset);
   myMap->symbolset.filename=zStrdup(tmpPath);
   free(tmpPath);
 
-  map* sid=getMapFromMaps(conf,"lenv","usid");
-  char *mapPath=
-    (char*)malloc((14+strlen(sid->value)+strlen(outputs->name)+strlen(tmp1->value))*sizeof(char));
-  sprintf(mapPath,"%s/%s_%d_%s.map",tmp1->value,outputs->name,imyIndex,sid->value);
   msSaveMap(myMap,mapPath);
   saveMapNames(conf,outputs,mapPath);
   free(mapPath);