Changeset 360 for trunk/zoo-project/zoo-services

Timestamp:

Jun 7, 2012, 10:54:31 PM (13 years ago)

Author:

djay

Message:

Add support for multiple inputs values for the same identifier.

File:

• trunk/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py (modified) (9 diffs)

trunk/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py

@@ -6 +6 @@
 import sys
 
+def readFileFromBuffer(data,ext):
+    geometry=[]
+    osgeo.gdal.FileFromMemBuffer('/vsimem//temp1'+ext,data)
+    ds = osgeo.ogr.Open('/vsimem//temp1'+ext)
+    lyr = ds.GetLayer(0)
+    feat = lyr.GetNextFeature()
+    while feat is not None:
+        geometry+=[feat.Clone()]
+        feat.Destroy()
+        feat = lyr.GetNextFeature()
+    ds.Destroy()
+    osgeo.gdal.Unlink('/vsimem//temp1'+ext)
+    return geometry
+
+def buildFeatureFromGeomtry(conf,geom,driverName,ext):
+    drv = osgeo.ogr.GetDriverByName( driverName )
+    ds = drv.CreateDataSource( "/vsimem//store"+conf["lenv"]["sid"]+"0."+ext )
+    lyr = ds.CreateLayer( "Result", None, osgeo.ogr.wkbUnknown )
+    field_defn = osgeo.ogr.FieldDefn( "Name", osgeo.ogr.OFTString )
+    field_defn.SetWidth( len("Result10000") )
+    lyr.CreateField ( field_defn )
+    feat = osgeo.ogr.Feature(lyr.GetLayerDefn())
+    feat.SetField( "Name", "Input0" )
+    feat.SetGeometry(geom)
+    lyr.CreateFeature(feat)
+    ds.Destroy()
+    return [feat]
+
 def createGeometryFromWFS(conf,my_wfs_response):
-    geometry=[]
-    try:
-        # Create virtual file or parse XML file depending on the GDAL Version
-        gV=int(osgeo.gdal.VersionInfo())
-        if gV >= 1800:
-            osgeo.gdal.FileFromMemBuffer('/vsimem//temp', my_wfs_response)
-            ds = osgeo.ogr.Open('/vsimem//temp')
-            lyr = ds.GetLayer(0)
-            feat = lyr.GetNextFeature()
-            while feat is not None:
-                geometry+=[feat.GetGeometryRef().Clone()]
-                feat.Destroy()
-                feat = lyr.GetNextFeature()
-            ds.Destroy()
-            osgeo.gdal.Unlink('/vsimem//temp')
+    try:
+        geom=osgeo.ogr.CreateGeometryFromGML(my_wfs_response.replace('<?xml version="1.0" encoding="utf-8"?>\n',''))
+    except:
+        geom=None
+    try:
+        if geom is None:
+            return readFileFromBuffer(my_wfs_response,"")
         else:
-            doc=libxml2.parseMemory(my_wfs_response,len(my_wfs_response))
-            ctxt = doc.xpathNewContext()
-            res=ctxt.xpathEval("/*/*/*/*/*[local-name()='Polygon' or local-name()='MultiPolygon' or local-name()='Point' or local-name()='MultiPoint' or local-name()='MultiLineString' or local-name()='LineString' ]")
-            for node in res:
-                geometry_as_string=node.serialize()
-                geometry+=[osgeo.ogr.CreateGeometryFromGML(geometry_as_string)]
-    except:
-        print >> sys.stderr,"Unable to load file from mem buffer\n\n\n"
-    return geometry
+            return buildFeatureFromGeomtry(conf,geom,"GML","xml")
+    except:
+        print >> sys.stderr,"Unable to load file input data !!!\n\n\n"
+
+def createLayerFromJson(conf,obj):
+    geom=osgeo.ogr.CreateGeometryFromJson(obj)
+    if geom is None:
+        return readFileFromBuffer(obj,".json")
+    else:
+        return buildFeatureFromGeomtry(conf,geom,"GeoJSON","json")
 
 def extractInputs(conf,obj):
     if obj["mimeType"]=="application/json":
-        return [osgeo.ogr.CreateGeometryFromJson(obj["value"])]
+        return createLayerFromJson(conf,obj["value"])
     else:
-        try:
-                return createGeometryFromWFS(conf,obj["value"])
-        except:
-                return [osgeo.ogr.CreateGeometryFromJson(obj["value"])]
-    return null
+        return createGeometryFromWFS(conf,obj["value"])
     
 def outputResult(conf,obj,geom):
@@ -49 +66 @@
         driverName = "GeoJSON"
         extension = [ ".js" ]
+    if obj.keys().count("schema")>0 and \
+            obj["schema"]=="http://schemas.opengis.net/kml/2.2.0/ogckml22.xsd":
+        driverName = "KML"
+        extension = [ ".kml" ]
     drv = osgeo.ogr.GetDriverByName( driverName )
-    # Create virtual file or real one depending on the GDAL Version
-    gV=int(osgeo.gdal.VersionInfo())
-    if gV >= 1800:
-        ds = drv.CreateDataSource( "/vsimem/store"+conf["lenv"]["sid"]+extension[0] )
-    else:
-        ds = drv.CreateDataSource( conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[0] )
+    # Create virtual file 
+    ds = drv.CreateDataSource( "/vsimem/store"+conf["lenv"]["sid"]+extension[0] )
     lyr = ds.CreateLayer( "Result", None, osgeo.ogr.wkbUnknown )
-    field_defn = osgeo.ogr.FieldDefn( "Name", osgeo.ogr.OFTString )
-    field_defn.SetWidth( len("Result10000") )
-    lyr.CreateField ( field_defn )
     i=0
     while i < len(geom):
-        feat = osgeo.ogr.Feature( lyr.GetLayerDefn())
-        feat.SetField( "Name", "Result"+str(i) )
-        feat.SetGeometry(geom[i])
-        lyr.CreateFeature(feat)
-        feat.Destroy()
+        lyr.CreateFeature(geom[i])
         geom[i].Destroy()
         i+=1
     ds.Destroy()
-    if gV >= 1800:
-        vsiFile=osgeo.gdal.VSIFOpenL("/vsimem/store"+conf["lenv"]["sid"]+extension[0],"r")
-        i=0
-        while osgeo.gdal.VSIFSeekL(vsiFile,0,os.SEEK_END)>0:
-            i+=1
-        fileSize=osgeo.gdal.VSIFTellL(vsiFile)
-        osgeo.gdal.VSIFSeekL(vsiFile,0,os.SEEK_SET)
-        obj["value"]=osgeo.gdal.VSIFReadL(fileSize,1,vsiFile)
-        osgeo.gdal.Unlink("/vsimem/store"+conf["lenv"]["sid"]+extension[0])
-    else:
-        obj["value"]=open(conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[0],"r").read()
-        os.unlink(conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[0])
-        if len(extension)>1:
-            os.unlink(conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[1])
+    vsiFile=osgeo.gdal.VSIFOpenL("/vsimem/store"+conf["lenv"]["sid"]+extension[0],"r")
+    i=0
+    while osgeo.gdal.VSIFSeekL(vsiFile,0,os.SEEK_END)>0:
+        i+=1
+    fileSize=osgeo.gdal.VSIFTellL(vsiFile)
+    osgeo.gdal.VSIFSeekL(vsiFile,0,os.SEEK_SET)
+    obj["value"]=osgeo.gdal.VSIFReadL(fileSize,1,vsiFile)
+    osgeo.gdal.Unlink("/vsimem/store"+conf["lenv"]["sid"]+extension[0])
+
+def BufferPy(conf,inputs,outputs):
+    print >> sys.stderr, inputs
+    print >> sys.stderr, outputs
+    try:
+        bdist=float(inputs["BufferDistance"]["value"])
+    except:
+        bdist=1
+    print >> sys.stderr, bdist
     
+    geometry=extractInputs(conf,inputs["InputPolygon"])
+    i=0
+    rgeometries=[]
+    while i < len(geometry):
+        tmp=geometry[i].Clone()
+        resg=geometry[i].GetGeometryRef().Buffer(bdist)
+        tmp.SetGeometryDirectly(resg)
+        rgeometries+=[tmp]
+        geometry[i].Destroy()
+        resg.thisown=False 
+        tmp.thisown=False
+        i+=1
+    outputResult(conf,outputs["Result"],rgeometries)
+    i=0
+    return 3
 
 def BoundaryPy(conf,inputs,outputs):
@@ -91 +119 @@
     rgeometries=[]
     while i < len(geometry):
-        rgeometries+=[geometry[i].GetBoundary()]
+        tmp=geometry[i].Clone()
+        resg=geometry[i].GetGeometryRef()
+        resg=resg.GetBoundary()
+        tmp.SetGeometryDirectly(resg)
+        rgeometries+=[tmp]
         geometry[i].Destroy()
         i+=1
@@ -102 +134 @@
     rgeometries=[]
     while i < len(geometry):
-        if geometry[i].GetGeometryType()!=3:
-            geometry[i]=geometry[i].ConvexHull()
-        rgeometries+=[geometry[i].Centroid()]
+        tmp=geometry[i].Clone()
+        resg=geometry[i].GetGeometryRef()
+        if resg.GetGeometryType()!=3:
+            resg=resg.ConvexHull()
+        resg=resg.Centroid()
+        tmp.SetGeometryDirectly(resg)
+        rgeometries+=[tmp]
         geometry[i].Destroy()
         i+=1
@@ -115 +151 @@
     rgeometries=[]
     while i < len(geometry):
-        rgeometries+=[geometry[i].ConvexHull()]
-        geometry[i].Destroy()
-        i+=1
-    outputResult(conf,outputs["Result"],rgeometries)
-    return 3
-
-def BufferPy(conf,inputs,outputs):
+        tmp=geometry[i].Clone()
+        resg=geometry[i].GetGeometryRef().ConvexHull()
+        tmp.SetGeometryDirectly(resg)
+        rgeometries+=[tmp]
+        geometry[i].Destroy()
+        i+=1
+    outputResult(conf,outputs["Result"],rgeometries)
+    return 3
+
+
+
+def EnvelopePy(conf,inputs,outputs):
+    print >> sys.stderr, inputs
     try:
         bdist=float(inputs["BufferDistance"]["value"])
@@ -127 +169 @@
         bdist=10
     geometry=extractInputs(conf,inputs["InputPolygon"])
-    i=0
-    rgeometries=[]
-    while i < len(geometry):
-        rgeometries+=[geometry[i].Buffer(bdist)]
-        geometry[i].Destroy()
-        i+=1
-    outputResult(conf,outputs["Result"],rgeometries)
-    i=0
+    tmp=geometry[0].GetGeometryRef().GetEnvelope()
+    outputs["Result"]["value"]=str(tmp[0])+','+str(tmp[2])+','+str(tmp[1])+','+str(tmp[3])+','+'urn:ogc:def:crs:OGC:1.3:CRS84'
+    print >> sys.stderr,outputs["Result"]
     return 3
 
@@ -159 +196 @@
 
 def IntersectionPy(conf,inputs,outputs):
-    geometry1=extractInputs(conf,inputs["InputEntity1"])
-    geometry2=extractInputs(conf,inputs["InputEntity2"])
-    rgeometries=[]
-    i=0
-    while i < len(geometry1):
-        j=0
-        while j < len(geometry2):
-            tres=geometry1[i].Intersection(geometry2[j])
-            if not(tres.IsEmpty()):
-                rgeometries+=[tres]
-            j+=1
-        geometry1[i].Destroy()
-        i+=1
-    i=0
-    while i < len(geometry2):
-        geometry2[i].Destroy()
-        i+=1
-    outputResult(conf,outputs["Result"],rgeometries)
+
+    geometry1=extractInputs(conf,inputs["InputEntity1"])
+    print >> sys.stderr,inputs["InputEntity2"]
+    geometry2=extractInputs(conf,inputs["InputEntity2"])
+
+    rgeometries=[]
+    i=0
+    while i < len(geometry1):
+        j=0
+        while j < len(geometry2):
+            tmp=geometry2[j].Clone()
+            resg=geometry2[j].GetGeometryRef()
+            #resg=resg.Intersection(geometry1[i].GetGeometryRef())
+            resg=geometry1[i].GetGeometryRef().Intersection(resg)
+            tmp.SetGeometryDirectly(resg)
+            if not(resg.IsEmpty()):
+                rgeometries+=[tmp]
+            j+=1
+        geometry1[i].Destroy()
+        i+=1
+    i=0
+    while i < len(geometry2):
+        geometry2[i].Destroy()
+        i+=1
+    outputResult(conf,outputs["Result"],rgeometries)
+    print >> sys.stderr,"/outputResult"
     return 3
 
@@ -187 +232 @@
         j=0
         while j < len(geometry2):
-            tres=geometry1[i].Difference(geometry2[j])
-            if not(tres.IsEmpty()):
-                rgeometries+=[tres]
+            tmp=geometry2[j].Clone()
+            resg=geometry1[i].GetGeometryRef()
+            resg=resg.Difference(geometry2[i].GetGeometryRef())
+            tmp.SetGeometryDirectly(resg)
+            if not(resg.IsEmpty()):
+                rgeometries+=[tmp]
             j+=1
         geometry1[i].Destroy()
@@ -208 +256 @@
         j=0
         while j < len(geometry2):
-            rgeometries+=[geometry1[i].SymmetricDifference(geometry2[j])]
-            j+=1
-        geometry1[i].Destroy()
-        i+=1
-    i=0
-    while i < len(geometry2):
-        geometry2[i].Destroy()
-        i+=1
-    outputResult(conf,outputs["Result"],rgeometries)
-    return 3
+            tmp=geometry2[j].Clone()
+            resg=geometry1[i].GetGeometryRef()
+            resg=resg.SymmetricDifference(geometry2[i].GetGeometryRef())
+            tmp.SetGeometryDirectly(resg)
+            rgeometries+=[tmp]
+            j+=1
+        geometry1[i].Destroy()
+        i+=1
+    i=0
+    while i < len(geometry2):
+        geometry2[i].Destroy()
+        i+=1
+    outputResult(conf,outputs["Result"],rgeometries)
+    return 3
+