Changeset 1403

Timestamp:

16/08/06 10:18:27 (13 years ago)

Author:

domlowe

Message:

removed need to keep passing extracttype around

Location:

TI02-CSML/trunk/Scanner/csmllibs

Files:

• csmlbuilder.py (modified) (1 diff)
• csmlfeaturetypes.py (modified) (2 diffs)

TI02-CSML/trunk/Scanner/csmllibs/csmlbuilder.py

@@ -107 +107 @@
         if not hasattr(self, 'extractDictionary'):
             self.extractDictionary=None
-        thefeatures = csmllibs.csmlfeaturetypes.featureBuilder( self.ds,self.gml_FeatureCollection,self.extractType, self.ffmap, self.extractDictionary,self.timedimension, self.timestorage, self.spatialstorage,self.valuestorage)
+        thefeatures = csmllibs.csmlfeaturetypes.featureBuilder( self.ds,self.gml_FeatureCollection, self.ffmap, self.extractDictionary,self.timedimension, self.timestorage, self.spatialstorage,self.valuestorage)
         #self.csml = thefeatures.csml
         self.ds=thefeatures.ds_element

TI02-CSML/trunk/Scanner/csmllibs/csmlfeaturetypes.py

@@ -11 +11 @@
 
 class featureBuilder:
-    def __init__(self, dataset_element, gml_FeatureCollection_element,extractType, ffmap,fileExtractDictionary, timedim, timestorage,spatialstorage,valuestorage):
+    def __init__(self, dataset_element, gml_FeatureCollection_element, ffmap,fileExtractDictionary, timedim, timestorage,spatialstorage,valuestorage):
         self.ds_element=dataset_element
         self.gml_FeatureCollection_element = gml_FeatureCollection_element
-        self.extractType = extractType
         self.ffmap = ffmap
         self.fileExtractDictionary = fileExtractDictionary
@@ -207 +206 @@
             DI.closeFile()
         
-        #this is now done outside this function
-        #self.gml_FeatureCollection_element.members=self.fms
 
 #########################################################################