Changeset 8431 for mauRepo


Ignore:
Timestamp:
03/07/12 17:39:04 (7 years ago)
Author:
mnagni
Message:

Complete - # 22488: CEDA Observation Collection - Geographical Extent
 http://team.ceda.ac.uk/trac/ceda/ticket/22488
Complete - # 22513: Missing ValidTime? tag in the CedaSearch?
 http://team.ceda.ac.uk/trac/ceda/ticket/22513

Location:
mauRepo/HPFos/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • mauRepo/HPFos/trunk/resources/requirements.txt

    r8421 r8431  
    88# to your pip install  
    99ceda-markup==0.0.3 
    10 ceda-moles-model==0.1.0 
     10ceda-moles-model==0.1.1 
    1111 
    1212#This package should be available in the machine where CedaManager will be deployed 

  • mauRepo/HPFos/trunk/src/HPFos/moles3epb.py

    r8417 r8431  
    117117        return None 
    118118     
    119     def getGeograpicExtentGeometry(self, ge): 
    120         ''' 
    121             Creates the appropriate postgis geometry from a EX_GeographicExtent 
    122             @param ge: an EX_GeographicExtent instance 
    123             @return: a postgix text geometry 
    124         ''' 
    125         if isinstance(ge, EX_GeographicBoundingBox): 
    126             return create_st_setSRID(ge.westBoundLongitude, ge.southBoundLatitude, \ 
    127                            ge.eastBoundLongitude, ge.northBoundLatitude) 
    128         return None 
    129      
    130      
    131      
    132119    def getUnifyObservationCollectionGE(self, collection): 
    133120        """ 
    … …  
    149136        """ 
    150137         
    151         collections = self._session.query(CEDA_ObservationCollection).all() 
    152         '''         
    153         for item in self._session.query(CEDA_ObservationCollection): 
    154             collections.append(self.searchSelectiveLoadByInstance(item, \ 
    155                                                            ['identifier', 'geographicExtent'])) 
    156         '''     
     138        collections = self._session.query(CEDA_ObservationCollection).all()     
    157139        if bbox == None: 
    158140            return collections 
    … …  
    377359    def executeNative(self, sqlNative): 
    378360        return EPB.executeNative(sqlNative, self._session)   
     361     
     362def getGeograpicExtentGeometry(self, ge): 
     363    ''' 
     364        Creates the appropriate postgis geometry from a EX_GeographicExtent 
     365        @param ge: an EX_GeographicExtent instance 
     366        @return: a postgix text geometry 
     367    ''' 
     368    if isinstance(ge, EX_GeographicBoundingBox): 
     369        return create_st_setSRID(ge.westBoundLongitude, ge.southBoundLatitude, \ 
     370                       ge.eastBoundLongitude, ge.northBoundLatitude) 
     371    return None 
Note: See TracChangeset for help on using the changeset viewer.