Commit d6b6f163 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge branch 'master' into fmask_wrapper


Former-commit-id: 6b215624
parents c61d7780 dfd6baa9
......@@ -2,8 +2,8 @@
__author__ = """Daniel Scheffler"""
__email__ = 'daniel.scheffler@gfz-potsdam.de'
__version__ = '0.5.0'
__versionalias__ = '20170710.02'
__version__ = '0.5.1'
__versionalias__ = '20170718.01'
from . import algorithms
......
......@@ -939,8 +939,10 @@ class GMS_JOB(object):
all_senIDs = gdf.sensorid.unique() .tolist()
satName_res = get_info_from_postgreSQLdb(self.conn, 'satellites', ['name'], {'id': all_satIDs})
senName_res = get_info_from_postgreSQLdb(self.conn, 'sensors', ['name'], {'id': all_senIDs})
id_satName_dict = dict(zip(all_satIDs, satName_res[0]))
id_senName_dict = dict(zip(all_senIDs, senName_res[0]))
all_satNames = [i[0] for i in satName_res]
all_senNames = [i[0] for i in senName_res]
id_satName_dict = dict(zip(all_satIDs, all_satNames))
id_senName_dict = dict(zip(all_senIDs, all_senNames))
gdf.insert(0, 'satellite', list(gdf.satelliteid.map(lambda satID: id_satName_dict[satID])))
gdf.insert(1, 'sensor', list(gdf.sensorid .map(lambda senID: id_senName_dict[senID])))
gdf['polygons'] = list(gdf.geom.map(lambda wkb_hex: shapely.wkb.loads(wkb_hex, hex=True)))
......
......@@ -22,7 +22,7 @@ test_requirements = requirements+ ['coverage']
setup(
name='geomultisens',
version='0.5.0',
version='0.5.1',
description="GeoMultiSens - Scalable Multi-Sensor Analysis of Remote Sensing Data",
long_description=readme + '\n\n' + history,
author="Daniel Scheffler",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment