Changeset 55 for trunk

Timestamp:

Dec 21, 2010, 4:34:01 PM (14 years ago)

Author:

nmarco

Message:

fixed error in GetArea? and Distance functions: wrong data type. Added the output in GML format in the ApplayTwo? function. Distance.zcfg: translated from French to English

Location:

trunk/zoo-services/ogr/base-vect-ops

Files:

• cgi-env/Distance.zcfg (modified) (1 diff)
• service.c (modified) (4 diffs)

trunk/zoo-services/ogr/base-vect-ops/cgi-env/Distance.zcfg

@@ -1 +1 @@
 [Distance]
- Title = Calcul la distance entre deux entites geographique. 
- Abstract = Calcul de la distance entre deux entites geographique. 
+ Title = Compute the distance between two geometries
+ Abstract = Compute the distance between two geometries
  Profile = urn:ogc:wps:1.0.0:buffer
  processVersion = 2

trunk/zoo-services/ogr/base-vect-ops/service.c

@@ -393 +393 @@
     res=(*myFunc)(geometry1,geometry2);
     fprintf(stderr,"\nService internal print1\n");
+    
+    /* nuova parte */
+    map* tmp2=getMapFromMaps(outputs,"Result","mimeType");
+    if(strncmp(tmp2->value,"application/json",16)==0){
+      char *tmpS=OGR_G_ExportToJson(res);
+      setMapInMaps(outputs,"Result","value",tmpS);
+      setMapInMaps(outputs,"Result","mimeType","text/plain");
+      setMapInMaps(outputs,"Result","encoding","UTF-8");
+      free(tmpS);
+    }
+    else{
+      char *tmpS=OGR_G_ExportToGML(res);
+      setMapInMaps(outputs,"Result","value",tmpS);
+      setMapInMaps(outputs,"Result","mimeType","text/xml");
+      setMapInMaps(outputs,"Result","encoding","UTF-8");
+      setMapInMaps(outputs,"Result","schema","http://fooa/gml/3.1.0/polygon.xsd");
+      free(tmpS);
+    }
+    
+    /* vecchia da togliere */
+    /*
     char *tmpS=OGR_G_ExportToJson(res);
     setMapInMaps(outputs,"Result","value",tmpS);
@@ -398 +419 @@
     setMapInMaps(outputs,"Result","encoding","UTF-8");
     free(tmpS);
+    */
     OGR_G_DestroyGeometry(geometry1);
     OGR_G_DestroyGeometry(geometry2);
@@ -491 +513 @@
     res=OGR_G_Distance(geometry1,geometry2);    
     char tmpres[100];
-    sprintf(tmpres,"%d",res);
+    sprintf(tmpres,"%f",res);
     setMapInMaps(outputs,"Distance","value",tmpres);
     setMapInMaps(outputs,"Distance","dataType","float");
@@ -529 +551 @@
      */
     char tmp1[100];
-    sprintf(tmp1,"%d",res);
+    sprintf(tmp1,"%f",res);
     setMapInMaps(outputs,"Area","value",tmp1);
     setMapInMaps(outputs,"Area","dataType","float");