Upgrade

.gitignore

@@ -0,0 +1,2 @@
+.idea
+docker-compose.yml

Dockerfile

@@ -0,0 +1,10 @@
+FROM python:3
+
+WORKDIR /usr/src/app
+
+COPY requirements.txt ./
+
+RUN apt-get update &&  \
+    apt-get install -y libgdal28 libgdal-dev binutils gdal-bin gdal-data
+
+RUN python3 -m pip install --no-cache-dir -r requirements.txt

requirements.txt

@@ -1,11 +1,11 @@
-certifi==2018.8.24
+certifi==2022.12.7
 chardet==3.0.4
 GeoAlchemy2==0.5.0
 idna==2.7
-psycopg2==2.7.5
-pyproj==1.9.5.1
+psycopg2==2.9.5
+pyproj==3.4.1
 requests==2.22.0
-Shapely==1.6.4.post2
-SQLAlchemy==1.3.0
+Shapely==2.0.0
+SQLAlchemy==1.4.45
 urllib3==1.25.7
-pygdaltools
+pygdalTools==1.3.2

ruian-addresses2db.py

@@ -39,6 +39,7 @@
 """
 
 import argparse
+import sqlalchemy as sa
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import Column, Integer, String, Date
@@ -161,22 +162,23 @@ def main(connection, schema=None, verbose=False, zipfile=None):
     if schema:
         Address.__table__.schema = schema
 
-    if engine.dialect.has_table(engine, "addresses", schema=schema):
+    inspect = sa.inspect(engine)
+
+    if inspect.has_table("addresses", schema=schema):
         Address.__table__.drop(engine)
 
     Address.__table__.create(engine)
 
-    Session = sessionmaker(bind=engine)
+    Session = sessionmaker(engine)
     session = Session()
 
-    epsg4326 = pyproj.Proj(init="epsg:4326")
+    epsg4326 = pyproj.Proj("epsg:4326")
     epsg5514 = pyproj.Proj(
         "+proj=krovak +lat_0=49.5 +lon_0=24.83333333333333 "
         "+alpha=30.28813972222222 +k=0.9999 +x_0=0 +y_0=0 +ellps=bessel "
         "+pm=greenwich +units=m +no_defs "
         "+towgs84=570.8,85.7,462.8,4.998,1.587,5.261,3.56")
-
-    project = partial(pyproj.transform, epsg5514, epsg4326)
+    project = pyproj.Transformer.from_proj(epsg5514, epsg4326).transform
 
     data = []
 
@@ -215,8 +217,8 @@ def main(connection, schema=None, verbose=False, zipfile=None):
                     cislo_orientacni=myint(cislo_orientacni),
                     cislo_orientacni_znak=cislo_orientacni_znak,
                     psc=psc, plati_od=plati_od,
-                    geometry="SRID=4326;{}".format(geometry_wgs.to_wkt()),
-                    geometry_jtsk="SRID=5514;{}".format(geometry.to_wkt())
+                    geometry="SRID=4326;{}".format(geometry_wgs.wkt),
+                    geometry_jtsk="SRID=5514;{}".format(geometry.wkt)
                 )
 
                 data.append(new_address)