Skip to content

Commit

Permalink
Merge pull request #11 from larsupb/master
Browse files Browse the repository at this point in the history
Adaption of geo authority initialization
  • Loading branch information
wannesm authored Nov 16, 2020
2 parents 70a6f9c + a81c074 commit b15d921
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions leuvenmapmatching/map/inmem.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ class (e.g. to connect to your database instance).
if self.use_rtree:
self.setup_index(deserializing=deserializing)

self.crs_lonlat = {'init': 'epsg:4326'} if crs_lonlat is None else crs_lonlat # GPS
self.crs_xy = {'init': 'epsg:3395'} if crs_xy is None else crs_xy # Mercator projection
self.crs_lonlat = 'EPSG:4326' if crs_lonlat is None else crs_lonlat # GPS
self.crs_xy = 'EPSG:3395' if crs_xy is None else crs_xy # Mercator projection
if pyproj:
proj_lonlat = pyproj.Proj(self.crs_lonlat, preserve_units=True)
proj_xy = pyproj.Proj(self.crs_xy, preserve_units=True)
Expand Down
4 changes: 2 additions & 2 deletions leuvenmapmatching/map/sqlite.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ def __init__(self, name, use_latlon=True,
self.create_db()

if self.crs_lonlat is None:
self.crs_lonlat = {'init': 'epsg:4326'} # GPS
self.crs_lonlat = 'EPSG:4326' # GPS
if self.crs_xy is None:
self.crs_xy = {'init': 'epsg:3395'} # Mercator projection
self.crs_xy = 'EPSG:3395' # Mercator projection

self.save_properties()

Expand Down

0 comments on commit b15d921

Please sign in to comment.