Skip to content

Commit

Permalink
Point coordinates to fields extractor added
Browse files Browse the repository at this point in the history
  • Loading branch information
yellow-sky committed Jul 28, 2013
1 parent 30e5dfd commit 2a648a8
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 0 deletions.
78 changes: 78 additions & 0 deletions add_geom_columns.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# -*- coding: utf-8 -*-
import sys
import locale
from os import path

try:
from osgeo import ogr, osr, gdal
except ImportError:
import ogr, osr, gdal

#global vars
_fs_encoding = sys.getfilesystemencoding()
_message_encoding = locale.getdefaultlocale()[1]


class GeomColumnsExtractor():
latColumnName = 'lat'
lonColumnName = 'lon'

def extract_columns(self, sqlite_file):

drv = ogr.GetDriverByName("SQLite")
gdal.ErrorReset()
data_source = drv.Open(sqlite_file.encode('utf-8'), True)
if data_source==None:
self.__show_err("SQLite file can't be opened!\n" + unicode(gdal.GetLastErrorMsg(), _message_encoding))
return

#setup fast writing
data_source.ExecuteSQL('PRAGMA journal_mode=OFF')
data_source.ExecuteSQL('PRAGMA synchronous=0')
data_source.ExecuteSQL('PRAGMA cache_size=100000')


layer = data_source[0]

#add fields
out_defs = layer.GetLayerDefn()
if out_defs.GetFieldIndex(self.latColumnName) < 0:
if not self.__add_field(layer, self.latColumnName, ogr.OFTReal):
self.__show_err( self.tr("Unable to create a field %1!").arg(self.latColumnName))
return
if out_defs.GetFieldIndex(self.lonColumnName) < 0:
if not self.__add_field(layer, self.lonColumnName, ogr.OFTReal):
self.__show_err( self.tr("Unable to create a field %1!").arg(self.lonColumnName))
return

all_feats = []
layer.ResetReading()
feat = layer.GetNextFeature()
while feat is not None:
all_feats.append(feat)
feat = layer.GetNextFeature()

for feat in all_feats:
geom = feat.GetGeometryRef()
feat.SetField(self.lonColumnName, geom.GetX())
feat.SetField(self.latColumnName, geom.GetY())

if layer.SetFeature(feat) != 0:
print 'Failed to update feature.'

#close DS's
data_source.Destroy()

def __add_field(self, layer, field_name, field_type=ogr.OFTString, field_len=None):
field_def = ogr.FieldDefn(field_name, field_type)
if field_len:
field_def.SetWidth(field_len)
if layer.CreateField (field_def) != 0:
self.__show_err( self.tr("Unable to create a field %1!").arg(field_def.GetNameRef()))
return False
else:
return True

def __show_err(self, msg):
print "Error: " + msg

6 changes: 6 additions & 0 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from address_parser import AddressParser
from osm_ru_geocoder import OsmRuGeocoder
from structure_checker import DataStructureChecker
from add_geom_columns import GeomColumnsExtractor

def argparser_prepare():
class PrettyFormatter(argparse.ArgumentDefaultsHelpFormatter, argparse.RawDescriptionHelpFormatter):
Expand Down Expand Up @@ -38,6 +39,7 @@ def process_file(csv_file, thread_count, region_code):
district_helper = DistrictNameHelper()
addr_parser = AddressParser()
geocoder = OsmRuGeocoder()
extractor = GeomColumnsExtractor()


print "Process " + csv_file + ": "
Expand All @@ -62,6 +64,10 @@ def process_file(csv_file, thread_count, region_code):
addr_parser.parse(sqlite_path)
print "\t Geocode..."
geocoder.process(sqlite_path, thread_count = thread_count)
#print "\t Shift points..."
#???
print "\t Extract lat long..."
extractor.extract_columns(sqlite_path)


def main():
Expand Down

0 comments on commit 2a648a8

Please sign in to comment.