Changeset 3306

Timestamp:

04/02/08 18:20:38 (13 years ago)

Author:

mkochan

Message:

Finished the testPointSeriesConvertor.py test script. Have running version of configurable PointSeriesConvertor? module.

Location:

DPPP/kml/csml2kml

Files:

• python/csml2kml/PointSeriesConvertor.py (moved) (moved from DPPP/kml/csml2kml/python/prototypes/PointSeriesConvertor.py) (4 diffs)
• python/csml2kml/tests/testPointSeriesConvertor.py (modified) (1 diff)
• python/csml2kml/utils.py (moved) (moved from DPPP/kml/csml2kml/python/prototypes/utils.py)
• testdata/midas.csml2kml.conf.xml (modified) (1 diff)

DPPP/kml/csml2kml/python/csml2kml/PointSeriesConvertor.py

@@ -15 +15 @@
         self.kmlFilename = kmlFilename
 
-    def parseGMLStationsCollection(textGml):
-        '''
-        Parse the GML returned from GeoServer and yield tuples containing information (gml_id, name, lon, lat)
-        about each station.
-        '''
-        root = XML(textGml)
-        featureCollectionElement = root
-        for featureMember in featureCollectionElement.getchildren():
-            stationElement = featureMember.getchildren()[0]
-            (stationNameElement, stationIDElement, locationElement) = stationElement.getchildren()
-            pointElement = locationElement.getchildren()[0]
-            posElement = pointElement.getchildren()[0]
-            (lon,lat) = map(float, posElement.text.split())
-            yield (stationElement.get('{http://www.opengis.net/gml}id'), stationNameElement.text, lon, lat)
-
-    def convert(self, config, kmlFilename):
+    def convert(self):
         '''
         Convert GML input from GeoServer (containing the <Station> tags with station information)
@@ -39 +24 @@
         '''
 
+        def _parseGMLStationsCollection(textGml):
+            '''
+            Parse the GML returned from GeoServer and yield tuples containing information (gml_id, name, lon, lat)
+            about each station.
+            '''
+            root = XML(textGml)
+            featureCollectionElement = root
+            for featureMember in featureCollectionElement.getchildren():
+                stationElement = featureMember.getchildren()[0]
+                (stationNameElement, stationIDElement, locationElement) = stationElement.getchildren()
+                pointElement = locationElement.getchildren()[0]
+                posElement = pointElement.getchildren()[0]
+                (lon,lat) = map(float, posElement.text.split())
+                yield (stationElement.get('{http://www.opengis.net/gml}id'), stationNameElement.text, lon, lat)
+
         # Read conversion configuration
         documentName = self.config.find('name').text
@@ -44 +44 @@
         balloonTemplate = self.config.find('GeoServerRequest/BalloonTemplate').text
         stationData = {}
-        data = self.config.findAll('GeoServerRequest/StationData/Datum')
+        data = self.config.findall('GeoServerRequest/StationData/Datum')
         for datum in data:
             datumName = datum.get('name')
@@ -54 +54 @@
         placemarkKmlStyle = createDefaultPlacemarKMLStyle(balloonTemplate = balloonTemplate)
         kmlDocument = KMLDocument(documentName, [placemarkKmlStyle])
-        generator = parseGMLStationsCollection(textGml)
+        generator = _parseGMLStationsCollection(textGml)
         for (gml_id, name, lon, lat) in generator:
             kmlStation = KMLPlacemark(gml_id, name, lon, lat, styleID = placemarkKmlStyle.id, data = stationData)

DPPP/kml/csml2kml/python/csml2kml/tests/testPointSeriesConvertor.py

@@ -1 @@
-import PointSeriesConvertor
+from PointSeriesConvertor import PointSeriesConvertor
 from cElementTree import ElementTree
 
 # Load the configuration XML element
 configTree = ElementTree()
-configTree.parse('../../testdata/midas.csml2kml.conf.xml')
+configTree.parse('../../../testdata/midas.csml2kml.conf.xml')
 configRoot = configTree.getroot()
-config = configRoot.find('CSML2KMLConfig/CSMLStationPointSeries')
+config = configRoot.find('CSMLStationPointSeries')
 
 # Do the conversion
-convertor = PointSeriesConvertor(config, '../../output/exampleps.3.xml')
+convertor = PointSeriesConvertor(config, '../../../output/exampleps_stations.2.xml')
+convertor.convert()

DPPP/kml/csml2kml/testdata/midas.csml2kml.conf.xml

@@ -1 +1 @@
 <CSML2KMLConfig>
   <CSMLStationPointSeries>
-    <name>MIDAS stations example</name>
+    <name>MIDAS stations (example)</name>
     <GeoServerRequest>
       <URL>http://bond.badc.rl.ac.uk:8089/dummyGeoServer/GetStationCSMLFeatures?gml_id=MIDAS_Stations</URL>
-      <BalloonTemplate>
-        &lt;img src="http://bond.badc.rl.ac.uk:8089/csmlGrapher/plot?feature_id=$[feature_id]"&gt;
-      </BalloonTemplate>
+      <BalloonTemplate>&lt;img src="http://bond.badc.rl.ac.uk:8089/csmlGrapher/plot?feature_id=$[feature_id]"&gt;</BalloonTemplate>
       <StationData>
         <Datum name="feature_id">#ID#</Datum>