bug fixes

calvinmetcalf · Mar 25, 2013 · 99a1aa2 · 99a1aa2
1 parent 5a91df9
commit 99a1aa2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/esri2geo.py b/esri2geo.py
@@ -245,15 +245,14 @@ def closeUp(out,fileType):
     if fileType=="geojson" or fileType=="json":
             out.write("""]}""")
     out.close()
-def writeFile(outFile,featureClass,fileType,includeGeometry):
+def writeFile(outFile,featureClass,fileType,includeGeometry, first=True):
     [shp,shpType]=getShp(featureClass)
     fields=listFields(featureClass)
     oid=getOID(fields)
     sr=SpatialReference()
     sr.loadFromString(wgs84)
     rows=SearchCursor(featureClass,"",sr)
     del fields[shp]
-    first = True
     i=0
     iPercent=0
     featureCount = int(GetCount_management(featureClass).getOutput(0))
@@ -307,7 +306,7 @@ def writeFile(outFile,featureClass,fileType,includeGeometry):
         del row
         del rows
         return True
-def toOpen(featureClass, outJSON,includeGeometry="true"):
+def toOpen(featureClass, outJSON, includeGeometry="true"):
     if not int(GetCount_management(featureClass).getOutput(0)):
         AddMessage("No features found, skipping")
         return

diff --git a/esri2geo.tbx b/esri2geo.tbx
diff --git a/merge.py b/merge.py
@@ -6,8 +6,10 @@
 fileType = "geojson"
 out=open(outJSON,"wb")
 prepareGeoJson(out)
+first=True
 for feature in features:
     if feature[0] in ("'",'"'):
         feature = feature[1:-1]
-    writeFile(out,feature,fileType,includeGeometry)
+    writeFile(out,feature,fileType,includeGeometry, first)
+    first=False
 closeUp(out,fileType)