Merge pull request #61 from openego/dev

Release v0.4.0
openego · Jun 6, 2018 · 9bf991d · 9bf991d
2 parents 174c9cd + 119a7c0
commit 9bf991d
Show file tree

Hide file tree

Showing 16 changed files with 2,536 additions and 1,279 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,32 @@
-/.idea/*
-/ego.io.egg-info/*
+# exclude project files
+.idea/
+
+
+# exclude certain types of files
+*.doctree
+*.txt
+*.html
+*.js
+*.inv
+*.pyc
+*.ttf
+*.woff
+*.png
+*.css
+*.pkl
+
+# exclude locally built docs
+doc/_html
+
+# exclude egg-info
+ego.io.egg-info/
+ego.io.egg-info/*
 /egoio.egg-info/PKG-INFO
 /egoio.egg-info/SOURCES.txt
 /egoio.egg-info/dependency_links.txt
 /egoio.egg-info/top_level.txt
+
+#exclude pycaches
 /egoio/__pycache__/__init__.cpython-34.pyc
 /egoio/tools/__pycache__/__init__.cpython-34.pyc
 /egoio/tools/__pycache__/config.cpython-34.pyc
diff --git a/egoio/db_tables/boundaries.py b/egoio/db_tables/boundaries.py
@@ -3,7 +3,6 @@
 from geoalchemy2.types import Geometry
 from sqlalchemy.ext.declarative import declarative_base
 
-
 Base = declarative_base()
 metadata = Base.metadata
 
@@ -487,6 +486,16 @@ class BkgVg2506Gem(Base):
 )
 
 
+class FfeOsmNut3(Base):
+    __tablename__ = 'ffe_osm_nut3'
+    __table_args__ = {'schema': 'boundaries'}
+
+    id = Column(Integer, primary_key=True, server_default=text("nextval('boundaries.ffe_osm_nut3_id_seq'::regclass)"))
+    version = Column(Text)
+    nuts_code = Column(String(5))
+    geom = Column(Geometry('MULTIPOLYGON', 3035), index=True)
+
+
 class OsmPostcode(Base):
     __tablename__ = 'osm_postcode'
     __table_args__ = {'schema': 'boundaries'}

diff --git a/egoio/db_tables/climate.py b/egoio/db_tables/climate.py
@@ -3,7 +3,6 @@
 from geoalchemy2.types import Geometry
 from sqlalchemy.ext.declarative import declarative_base
 
-
 Base = declarative_base()
 metadata = Base.metadata
 

diff --git a/egoio/db_tables/demand.py b/egoio/db_tables/demand.py
@@ -3,7 +3,6 @@
 from geoalchemy2.types import Geometry
 from sqlalchemy.ext.declarative import declarative_base
 
-
 Base = declarative_base()
 metadata = Base.metadata
 

diff --git a/egoio/db_tables/economy.py b/egoio/db_tables/economy.py
@@ -2,7 +2,6 @@
 from sqlalchemy import Column, Float, String
 from sqlalchemy.ext.declarative import declarative_base
 
-
 Base = declarative_base()
 metadata = Base.metadata
 

diff --git a/egoio/db_tables/emission.py b/egoio/db_tables/emission.py
@@ -1,5 +1,7 @@
 # coding: utf-8
 from sqlalchemy import MetaData
 
-
 metadata = MetaData()
+
+
+
diff --git a/egoio/db_tables/environment.py b/egoio/db_tables/environment.py
@@ -3,7 +3,6 @@
 from geoalchemy2.types import Geometry
 from sqlalchemy.ext.declarative import declarative_base
 
-
 Base = declarative_base()
 metadata = Base.metadata