Merge pull request #1365 from gioman/ogr2ogr

fixes ogr2ogr.py
qgis · May 18, 2014 · eba6088 · eba6088
2 parents 0791930 + 0f2b92f
commit eba6088
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/python/plugins/processing/algs/gdal/ogr2ogr.py b/python/plugins/processing/algs/gdal/ogr2ogr.py
@@ -51,42 +51,50 @@
 FORMATS = [
     'ESRI Shapefile',
     'GeoJSON',
-    ' GeoRSS',
+    'GeoRSS',
     'SQLite',
-    'Generic Mapping Tools',
+    'GMT',
-    'Mapinfo TAB',
+    'MapInfo File',
-    'ESRI Shapefile',
     'INTERLIS 1',
-    'Geography Markup Language',
-    'Geoconcept',
-    'AutoCAD DXF',
     'INTERLIS 2',
-    '',
+    'GML',
-    'Microstation DGN',
+    'Geoconcept',
-    'Comma Separated Value',
+    'DXF',
-    'Atlas BNAGPS eXchange Format',
+    'DGN',
-    'S-57 Base file',
+    'CSV',
-    'Keyhole Markup Language',
+    'BNA',
+    'S57',
+    'KML',
+    'GPX',
+    'PGDump',
+    'GPSTrackMaker',
+    'ODS',  
+    'XLSX',
+    'PDF',
     ]
 EXTS = [
-    'shp',
+    '.shp',
-    'geojson',
+    '.geojson',
     '.xml',
     '.sqlite',
     '.gmt',
     '.tab',
-    '.shp',
+    '.ili',
     '.ili',
     '.gml',
     '.txt',
     '.dxf',
-    '.ili',
     '.dgn',
     '.csv',
     '.bna',
-    '.gpx',
     '.000',
     '.kml',
+    '.gpx',
+    '.pgdump',
+    '.gtm',
+    '.ods',
+    '.xlsx',
+    '.pdf',
     ]