Merge pull request #12 from desmondlsl/20250118-optimize

Optimize; Update dependencies

Author: chunlaw

requirements.txt

@@ -1,23 +1,16 @@
-attrs==23.1.0
-certifi==2023.11.17
-charset-normalizer==3.3.2
-click==8.1.7
-click-plugins==1.1.1
-cligj==0.7.2
-fiona==1.9.5
-geopandas==0.14.1
-idna==3.6
-numpy==1.26.2
-packaging==23.2
-pandas==2.1.3
-pyproj==3.6.1
-python-dateutil==2.8.2
-pytz==2023.3.post1
-requests==2.31.0
-setuptools==68.0.0
-shapely==2.0.2
-six==1.16.0
-tzdata==2023.3
-urllib3==2.1.0
-wheel==0.41.2
-pyogrio~=0.9.0
+certifi==2024.12.14
+charset-normalizer==3.4.1
+geopandas==1.0.1
+idna==3.10
+numpy==2.2.1
+packaging==24.2
+pandas==2.2.3
+pyogrio==0.10.0
+pyproj==3.7.0
+python-dateutil==2.9.0.post0
+pytz==2024.2
+requests==2.32.3
+shapely==2.0.6
+six==1.17.0
+tzdata==2024.2
+urllib3==2.3.0

waypoints.py

@@ -9,9 +9,6 @@
 import glob
 import shutil
 import geopandas
-# noinspection PyUnresolvedReferences
-import pyogrio
-from pyproj import Transformer
 from tempfile import TemporaryDirectory
 import logging
 
@@ -49,8 +46,6 @@ def store_version(key: str, version: str):
         csdi_dataset["id"])
     src_id = json.loads(r.content)['_source']['fileid'].replace('-', '')
 
-    epsgTransformer = Transformer.from_crs('epsg:2326', 'epsg:4326')
-
     logging.info("Fetching FGDB")
     r = requests.get(
         "https://static.csdi.gov.hk/csdi-webpage/download/" + src_id + "/fgdb")
@@ -67,25 +62,11 @@ def store_version(key: str, version: str):
         z.extractall(tmpdir)
         gdb_path = os.path.join(tmpdir, gdb_name)
         logging.info("Reading data (1)")
-        gdf = geopandas.read_file(gdb_path, encoding='utf-8', engine="pyogrio")
+        gdf = geopandas.read_file(gdb_path, encoding='utf-8')
+        logging.info("Transforming data")
+        gdf.to_crs(epsg=4326, inplace=True)
         logging.info("Reading data (2)")
-        data = json.loads(gdf.to_json(drop_id=True))
-
-    logging.info("Transforming data")
-    for i, feature in enumerate(data["features"]):
-        if feature["geometry"]["type"] == "MultiLineString":
-            for j, coordinates in enumerate(
-                    feature["geometry"]["coordinates"]):
-                for k, coordinate in enumerate(coordinates):
-                    lat, lng = epsgTransformer.transform(
-                        coordinate[1], coordinate[0])
-                    data["features"][i]["geometry"]["coordinates"][j][k] = [
-                        lng, lat]
-        else:
-            for j, coordinate in enumerate(feature["geometry"]["coordinates"]):
-                lat, lng = epsgTransformer.transform(
-                    coordinate[1], coordinate[0])
-                data["features"][i]["geometry"]["coordinates"][j] = [lng, lat]
+        data = gdf.to_geo_dict(drop_id=True)
 
     logging.info("Storing data")
     for feature in data["features"]: