remove geopandas

Author: wolfbunke

ego/tools/io.py

@@ -394,73 +394,71 @@ def plot_total_investment_costs(self):
     logging.info('Initialisation of eGo Results')
 
 
-"""
-def geolocation_buses(network, session):
-    """
-    Use Geometries of buses x/y(lon/lat) and Polygons
-    of Countries from RenpassGisParameterRegion
-    in order to locate the buses
-
-    Parameters
-    ----------
-    network_etrago: : class: `etrago.tools.io.NetworkScenario`
-        eTraGo network object compiled by: meth: `etrago.appl.etrago`
-    session: : sqlalchemy: `sqlalchemy.orm.session.Session < orm/session_basics.html >`
-        SQLAlchemy session to the OEDB
-
-    """
-    # ToDo: check eTrago stack generation plots and other in order of adaptation
-    # Start db connetion
-    # get renpassG!S scenario data
-
-    meta = MetaData()
-    meta.bind = session.bind
-    conn = meta.bind
-    # get db table
-    meta.reflect(bind=conn, schema='model_draft',
-                 only=['renpass_gis_parameter_region'])
-
-    # map to classes
-    Base = automap_base(metadata=meta)
-    Base.prepare()
-    RenpassGISRegion = Base.classes.renpass_gis_parameter_region
-
-    # Define regions
-    region_id = ['DE', 'DK', 'FR', 'BE', 'LU',
-                 'NO', 'PL', 'CH', 'CZ', 'SE', 'NL']
-
-    query = session.query(RenpassGISRegion.gid, RenpassGISRegion.u_region_id,
-                          RenpassGISRegion.stat_level, RenpassGISRegion.geom,
-                          RenpassGISRegion.geom_point)
-
-    # get regions by query and filter
-    Regions = [(gid, u_region_id, stat_level, shape.to_shape(geom),
-                shape.to_shape(geom_point)) for gid, u_region_id, stat_level,
-               geom, geom_point in query.filter(RenpassGISRegion.u_region_id.
-                                                in_(region_id)).all()]
-
-    crs = {'init': 'epsg:4326'}
-    # transform lon lat to shapely Points and create GeoDataFrame
-    points = [Point(xy) for xy in zip(network.buses.x,  network.buses.y)]
-    bus = gpd.GeoDataFrame(network.buses, crs=crs, geometry=points)
-    # Transform Countries Polygons as Regions
-    region = pd.DataFrame(
-        Regions, columns=['id', 'country', 'stat_level', 'Polygon', 'Point'])
-    re = gpd.GeoDataFrame(region, crs=crs, geometry=region['Polygon'])
-    # join regions and buses by geometry which intersects
-    busC = gpd.sjoin(bus, re, how='inner', op='intersects')
-    # busC
-    # Drop non used columns
-    busC = busC.drop(['index_right', 'Point', 'id', 'Polygon',
-                      'stat_level', 'geometry'], axis=1)
-    # add busC to eTraGo.buses
-    network.buses['country_code'] = busC['country']
-
-    # close session
-    session.close()
-
-    return network
-"""
+# def geolocation_buses(network, session):
+#     """
+#     Use Geometries of buses x/y(lon/lat) and Polygons
+#     of Countries from RenpassGisParameterRegion
+#     in order to locate the buses
+#
+#     Parameters
+#     ----------
+#     network_etrago: : class: `etrago.tools.io.NetworkScenario`
+#         eTraGo network object compiled by: meth: `etrago.appl.etrago`
+#     session: : sqlalchemy: `sqlalchemy.orm.session.Session < orm/session_basics.html >`
+#         SQLAlchemy session to the OEDB
+    #
+    # """
+    # # ToDo: check eTrago stack generation plots and other in order of adaptation
+    # # Start db connetion
+    # # get renpassG!S scenario data
+    #
+    # meta = MetaData()
+    # meta.bind = session.bind
+    # conn = meta.bind
+    # # get db table
+    # meta.reflect(bind=conn, schema='model_draft',
+    #              only=['renpass_gis_parameter_region'])
+    #
+    # # map to classes
+    # Base = automap_base(metadata=meta)
+    # Base.prepare()
+    # RenpassGISRegion = Base.classes.renpass_gis_parameter_region
+    #
+    # # Define regions
+    # region_id = ['DE', 'DK', 'FR', 'BE', 'LU',
+    #              'NO', 'PL', 'CH', 'CZ', 'SE', 'NL']
+    #
+    # query = session.query(RenpassGISRegion.gid, RenpassGISRegion.u_region_id,
+    #                       RenpassGISRegion.stat_level, RenpassGISRegion.geom,
+    #                       RenpassGISRegion.geom_point)
+    #
+    # # get regions by query and filter
+    # Regions = [(gid, u_region_id, stat_level, shape.to_shape(geom),
+    #             shape.to_shape(geom_point)) for gid, u_region_id, stat_level,
+    #            geom, geom_point in query.filter(RenpassGISRegion.u_region_id.
+    #                                             in_(region_id)).all()]
+    #
+    # crs = {'init': 'epsg:4326'}
+    # # transform lon lat to shapely Points and create GeoDataFrame
+    # points = [Point(xy) for xy in zip(network.buses.x,  network.buses.y)]
+    # bus = gpd.GeoDataFrame(network.buses, crs=crs, geometry=points)
+    # # Transform Countries Polygons as Regions
+    # region = pd.DataFrame(
+    #     Regions, columns=['id', 'country', 'stat_level', 'Polygon', 'Point'])
+    # re = gpd.GeoDataFrame(region, crs=crs, geometry=region['Polygon'])
+    # # join regions and buses by geometry which intersects
+    # busC = gpd.sjoin(bus, re, how='inner', op='intersects')
+    # # busC
+    # # Drop non used columns
+    # busC = busC.drop(['index_right', 'Point', 'id', 'Polygon',
+    #                   'stat_level', 'geometry'], axis=1)
+    # # add busC to eTraGo.buses
+    # network.buses['country_code'] = busC['country']
+    #
+    # # close session
+    # session.close()
+    #
+    # return network
 
 
 def results_to_excel(ego):