From 413c2909bfbb966ed0df37a4e3b6132ad67a6a52 Mon Sep 17 00:00:00 2001 From: spwoodcock Date: Mon, 9 Oct 2023 18:16:50 +0100 Subject: [PATCH 1/3] build: update osm-rawdata --> 0.1.3 --- pdm.lock | 234 ++++++++++++++++++++++++++++++------------------- pyproject.toml | 2 +- 2 files changed, 146 insertions(+), 90 deletions(-) diff --git a/pdm.lock b/pdm.lock index 9d4c2c04..57592707 100644 --- a/pdm.lock +++ b/pdm.lock @@ -6,7 +6,7 @@ groups = ["default", "docs", "debug", "test", "dev"] cross_platform = true static_urls = false lock_version = "4.3" -content_hash = "sha256:cadf66e8ae04b2046e74c29c2cb5b6010b9f59f29dad9f2829061c9ded116800" +content_hash = "sha256:0187126a1742fc2c274bd92c235f23e01aa6df59a29f03c8081e26440c1ad058" [[package]] name = "appnope" @@ -241,19 +241,6 @@ files = [ {file = "decorator-5.1.1.tar.gz", hash = "sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"}, ] -[[package]] -name = "deepdiff" -version = "6.4.1" -requires_python = ">=3.7" -summary = "Deep Difference and Search of any Python object/data. Recreate objects by adding adding deltas to each other." -dependencies = [ - "ordered-set<4.2.0,>=4.0.2", -] -files = [ - {file = "deepdiff-6.4.1-py3-none-any.whl", hash = "sha256:065cdbbe62f66447cf507b32351579ffcc4a80bb28f567ac27e92a21ddca99f9"}, - {file = "deepdiff-6.4.1.tar.gz", hash = "sha256:744c4e54ff83eaa77a995b3311dccdce6ee67773335a34a5ef269fa048005457"}, -] - [[package]] name = "distlib" version = "0.3.7" @@ -315,6 +302,20 @@ files = [ {file = "flatdict-4.0.1.tar.gz", hash = "sha256:cd32f08fd31ed21eb09ebc76f06b6bd12046a24f77beb1fd0281917e47f26742"}, ] +[[package]] +name = "geoalchemy2" +version = "0.14.1" +requires_python = ">=3.7" +summary = "Using SQLAlchemy with Spatial Databases" +dependencies = [ + "SQLAlchemy>=1.4", + "packaging", +] +files = [ + {file = "GeoAlchemy2-0.14.1-py3-none-any.whl", hash = "sha256:0830c98f83d6b1706e62b5544793d304e2853493d6e70ac18444c13748c3d1c7"}, + {file = "GeoAlchemy2-0.14.1.tar.gz", hash = "sha256:620b31cbf97a368b2486dbcfcd36da2081827e933d4163bcb942043b79b545e8"}, +] + [[package]] name = "geodex" version = "0.1.2" @@ -349,6 +350,44 @@ files = [ {file = "ghp_import-2.1.0-py3-none-any.whl", hash = "sha256:8337dd7b50877f163d4c0289bc1f1c7f127550241988d568c1db512c4324a619"}, ] +[[package]] +name = "greenlet" +version = "3.0.0" +requires_python = ">=3.7" +summary = "Lightweight in-process concurrent programming" +files = [ + {file = "greenlet-3.0.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e09dea87cc91aea5500262993cbd484b41edf8af74f976719dd83fe724644cd6"}, + {file = "greenlet-3.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f47932c434a3c8d3c86d865443fadc1fbf574e9b11d6650b656e602b1797908a"}, + {file = "greenlet-3.0.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bdfaeecf8cc705d35d8e6de324bf58427d7eafb55f67050d8f28053a3d57118c"}, + {file = "greenlet-3.0.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6a68d670c8f89ff65c82b936275369e532772eebc027c3be68c6b87ad05ca695"}, + {file = "greenlet-3.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:38ad562a104cd41e9d4644f46ea37167b93190c6d5e4048fcc4b80d34ecb278f"}, + {file = "greenlet-3.0.0-cp310-cp310-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:02a807b2a58d5cdebb07050efe3d7deaf915468d112dfcf5e426d0564aa3aa4a"}, + {file = "greenlet-3.0.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b1660a15a446206c8545edc292ab5c48b91ff732f91b3d3b30d9a915d5ec4779"}, + {file = "greenlet-3.0.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:813720bd57e193391dfe26f4871186cf460848b83df7e23e6bef698a7624b4c9"}, + {file = "greenlet-3.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:aa15a2ec737cb609ed48902b45c5e4ff6044feb5dcdfcf6fa8482379190330d7"}, + {file = "greenlet-3.0.0-cp310-universal2-macosx_11_0_x86_64.whl", hash = "sha256:7709fd7bb02b31908dc8fd35bfd0a29fc24681d5cc9ac1d64ad07f8d2b7db62f"}, + {file = "greenlet-3.0.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:211ef8d174601b80e01436f4e6905aca341b15a566f35a10dd8d1e93f5dbb3b7"}, + {file = "greenlet-3.0.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6512592cc49b2c6d9b19fbaa0312124cd4c4c8a90d28473f86f92685cc5fef8e"}, + {file = "greenlet-3.0.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:871b0a8835f9e9d461b7fdaa1b57e3492dd45398e87324c047469ce2fc9f516c"}, + {file = "greenlet-3.0.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b505fcfc26f4148551826a96f7317e02c400665fa0883fe505d4fcaab1dabfdd"}, + {file = "greenlet-3.0.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:123910c58234a8d40eaab595bc56a5ae49bdd90122dde5bdc012c20595a94c14"}, + {file = "greenlet-3.0.0-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:96d9ea57292f636ec851a9bb961a5cc0f9976900e16e5d5647f19aa36ba6366b"}, + {file = "greenlet-3.0.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0b72b802496cccbd9b31acea72b6f87e7771ccfd7f7927437d592e5c92ed703c"}, + {file = "greenlet-3.0.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:527cd90ba3d8d7ae7dceb06fda619895768a46a1b4e423bdb24c1969823b8362"}, + {file = "greenlet-3.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:37f60b3a42d8b5499be910d1267b24355c495064f271cfe74bf28b17b099133c"}, + {file = "greenlet-3.0.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:1482fba7fbed96ea7842b5a7fc11d61727e8be75a077e603e8ab49d24e234383"}, + {file = "greenlet-3.0.0-cp312-cp312-macosx_13_0_arm64.whl", hash = "sha256:be557119bf467d37a8099d91fbf11b2de5eb1fd5fc5b91598407574848dc910f"}, + {file = "greenlet-3.0.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:73b2f1922a39d5d59cc0e597987300df3396b148a9bd10b76a058a2f2772fc04"}, + {file = "greenlet-3.0.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d1e22c22f7826096ad503e9bb681b05b8c1f5a8138469b255eb91f26a76634f2"}, + {file = "greenlet-3.0.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1d363666acc21d2c204dd8705c0e0457d7b2ee7a76cb16ffc099d6799744ac99"}, + {file = "greenlet-3.0.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:334ef6ed8337bd0b58bb0ae4f7f2dcc84c9f116e474bb4ec250a8bb9bd797a66"}, + {file = "greenlet-3.0.0-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6672fdde0fd1a60b44fb1751a7779c6db487e42b0cc65e7caa6aa686874e79fb"}, + {file = "greenlet-3.0.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:952256c2bc5b4ee8df8dfc54fc4de330970bf5d79253c863fb5e6761f00dda35"}, + {file = "greenlet-3.0.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:269d06fa0f9624455ce08ae0179430eea61085e3cf6457f05982b37fd2cefe17"}, + {file = "greenlet-3.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:9adbd8ecf097e34ada8efde9b6fec4dd2a903b1e98037adf72d12993a1c80b51"}, + {file = "greenlet-3.0.0.tar.gz", hash = "sha256:19834e3f91f485442adc1ee440171ec5d9a4840a1f7bd5ed97833544719ce10b"}, +] + [[package]] name = "griffe" version = "0.36.2" @@ -483,18 +522,6 @@ files = [ {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"}, ] -[[package]] -name = "landez" -version = "2.5.0" -summary = "Landez is a python toolbox to manipulate map tiles." -dependencies = [ - "mbutil", - "requests", -] -files = [ - {file = "landez-2.5.0.tar.gz", hash = "sha256:a936b43d50322761cb04e3dc45d80764b0eea0df742d18f632ed163dc8e2b0c1"}, -] - [[package]] name = "levenshtein" version = "0.21.1" @@ -614,15 +641,6 @@ files = [ {file = "matplotlib_inline-0.1.6-py3-none-any.whl", hash = "sha256:f1f41aab5328aa5aaea9b16d083b128102f8712542f819fe7e6a420ff581b311"}, ] -[[package]] -name = "mbutil" -version = "0.3.0" -summary = "An importer and exporter for MBTiles" -files = [ - {file = "mbutil-0.3.0-py2.py3-none-any.whl", hash = "sha256:ebbc67c966f71a45e6cc6e9e17a840efdc0aa56557abac71a58beb92f0572eaa"}, - {file = "mbutil-0.3.0.tar.gz", hash = "sha256:78fca26f2497c4e20592792e2fe4abd5fd51e58a03a023a42a54274b7c13c419"}, -] - [[package]] name = "mercantile" version = "1.2.1" @@ -809,54 +827,25 @@ files = [ {file = "numpy-1.25.2.tar.gz", hash = "sha256:fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760"}, ] -[[package]] -name = "ordered-set" -version = "4.1.0" -requires_python = ">=3.7" -summary = "An OrderedSet is a custom MutableSet that remembers its order, so that every" -files = [ - {file = "ordered-set-4.1.0.tar.gz", hash = "sha256:694a8e44c87657c59292ede72891eb91d34131f6531463aab3009191c77364a8"}, - {file = "ordered_set-4.1.0-py3-none-any.whl", hash = "sha256:046e1132c71fcf3330438a539928932caf51ddbc582496833e23de611de14562"}, -] - [[package]] name = "osm-rawdata" -version = "0.1.2rc0" +version = "0.1.3" requires_python = ">=3.10" summary = "Make data extracts from OSM data." dependencies = [ + "GeoAlchemy2>=0.12.5", "PyYAML>=6.0.1", - "deepdiff>=6.3.1", - "flatdict>=4.0.1", + "SQLAlchemy-Utils>=0.41.1", "geojson>=2.5.0", - "landez>=2.5.0", - "osmium>=3.6.0", - "psycopg2>=2.9.7", - "pyparsing>=3.0.9", + "psycopg2>=2.9.9", + "pyarrow>=1.24.2", "requests>=2.28.2", "shapely>=2.0.1", + "sqlalchemy>=1.4.41", ] files = [ - {file = "osm-rawdata-0.1.2rc0.tar.gz", hash = "sha256:68a2119593280d0b8e31b584879638749d35c34f0fd8f9951c264e512a119042"}, - {file = "osm_rawdata-0.1.2rc0-py3-none-any.whl", hash = "sha256:684615c1b690cb971e9fab76b710f8ce139502a14e56efd678ec015b00cc4755"}, -] - -[[package]] -name = "osmium" -version = "3.6.0" -requires_python = ">=3.6" -summary = "Python bindings for libosmium, the data processing library for OSM data" -dependencies = [ - "requests", -] -files = [ - {file = "osmium-3.6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0520d39797c17030c11427213421237aa17f327b076c5367dd2721e856a8aab7"}, - {file = "osmium-3.6.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e46615d9761f49ae86b7f891c1e00a7e010b85622d17d956029299407b86b0cb"}, - {file = "osmium-3.6.0-cp310-cp310-win_amd64.whl", hash = "sha256:ae26ef88d386ba57eece0b577d61d58f70688f04f4366265001fe63f0d0da1ac"}, - {file = "osmium-3.6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:844a614a39435ab6d20ae136feda9b57acd15f062b8177321ec3343610d12dd7"}, - {file = "osmium-3.6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:184bb9dc6938db2e0f08cf4f33fd1d1d35fa106c9a71bb5f060967110d701bf3"}, - {file = "osmium-3.6.0-cp311-cp311-win_amd64.whl", hash = "sha256:6ecd7f036bf89e69e67aa1f8ed4fa1b5997307c7586a17e793b250cdcb8e7a0f"}, - {file = "osmium-3.6.0.tar.gz", hash = "sha256:c7b4becb5f13aa82421b269e583bee4d14b56a2c490b334d44ec954cb480a289"}, + {file = "osm-rawdata-0.1.3.tar.gz", hash = "sha256:4ebca28fd1f164ba012bb47e2799aaa211f1799e85b85b2fd73de21090c8c46e"}, + {file = "osm_rawdata-0.1.3-py3-none-any.whl", hash = "sha256:44c2c350a2b51fa491a51d05e9498c056c8cacbdca804dc4d9dec9b7ac0d0d4e"}, ] [[package]] @@ -1015,15 +1004,15 @@ files = [ [[package]] name = "psycopg2" -version = "2.9.7" -requires_python = ">=3.6" +version = "2.9.9" +requires_python = ">=3.7" summary = "psycopg2 - Python-PostgreSQL Database Adapter" files = [ - {file = "psycopg2-2.9.7-cp310-cp310-win32.whl", hash = "sha256:1a6a2d609bce44f78af4556bea0c62a5e7f05c23e5ea9c599e07678995609084"}, - {file = "psycopg2-2.9.7-cp310-cp310-win_amd64.whl", hash = "sha256:b22ed9c66da2589a664e0f1ca2465c29b75aaab36fa209d4fb916025fb9119e5"}, - {file = "psycopg2-2.9.7-cp311-cp311-win32.whl", hash = "sha256:44d93a0109dfdf22fe399b419bcd7fa589d86895d3931b01fb321d74dadc68f1"}, - {file = "psycopg2-2.9.7-cp311-cp311-win_amd64.whl", hash = "sha256:91e81a8333a0037babfc9fe6d11e997a9d4dac0f38c43074886b0d9dead94fe9"}, - {file = "psycopg2-2.9.7.tar.gz", hash = "sha256:f00cc35bd7119f1fed17b85bd1007855194dde2cbd8de01ab8ebb17487440ad8"}, + {file = "psycopg2-2.9.9-cp310-cp310-win32.whl", hash = "sha256:38a8dcc6856f569068b47de286b472b7c473ac7977243593a288ebce0dc89516"}, + {file = "psycopg2-2.9.9-cp310-cp310-win_amd64.whl", hash = "sha256:426f9f29bde126913a20a96ff8ce7d73fd8a216cfb323b1f04da402d452853c3"}, + {file = "psycopg2-2.9.9-cp311-cp311-win32.whl", hash = "sha256:ade01303ccf7ae12c356a5e10911c9e1c51136003a9a1d92f7aa9d010fb98372"}, + {file = "psycopg2-2.9.9-cp311-cp311-win_amd64.whl", hash = "sha256:121081ea2e76729acfb0673ff33755e8703d45e926e416cb59bae3a86c6a4981"}, + {file = "psycopg2-2.9.9.tar.gz", hash = "sha256:d1454bde93fb1e224166811694d600e746430c006fbb031ea06ecc2ea41bf156"}, ] [[package]] @@ -1053,6 +1042,32 @@ files = [ {file = "py_cpuinfo-9.0.0-py3-none-any.whl", hash = "sha256:859625bc251f64e21f077d099d4162689c762b5d6a4c3c97553d56241c9674d5"}, ] +[[package]] +name = "pyarrow" +version = "13.0.0" +requires_python = ">=3.8" +summary = "Python library for Apache Arrow" +dependencies = [ + "numpy>=1.16.6", +] +files = [ + {file = "pyarrow-13.0.0-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:1afcc2c33f31f6fb25c92d50a86b7a9f076d38acbcb6f9e74349636109550148"}, + {file = "pyarrow-13.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:70fa38cdc66b2fc1349a082987f2b499d51d072faaa6b600f71931150de2e0e3"}, + {file = "pyarrow-13.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd57b13a6466822498238877892a9b287b0a58c2e81e4bdb0b596dbb151cbb73"}, + {file = "pyarrow-13.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8ce69f7bf01de2e2764e14df45b8404fc6f1a5ed9871e8e08a12169f87b7a26"}, + {file = "pyarrow-13.0.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:588f0d2da6cf1b1680974d63be09a6530fd1bd825dc87f76e162404779a157dc"}, + {file = "pyarrow-13.0.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:6241afd72b628787b4abea39e238e3ff9f34165273fad306c7acf780dd850956"}, + {file = "pyarrow-13.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:fda7857e35993673fcda603c07d43889fca60a5b254052a462653f8656c64f44"}, + {file = "pyarrow-13.0.0-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:aac0ae0146a9bfa5e12d87dda89d9ef7c57a96210b899459fc2f785303dcbb67"}, + {file = "pyarrow-13.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d7759994217c86c161c6a8060509cfdf782b952163569606bb373828afdd82e8"}, + {file = "pyarrow-13.0.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:868a073fd0ff6468ae7d869b5fc1f54de5c4255b37f44fb890385eb68b68f95d"}, + {file = "pyarrow-13.0.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51be67e29f3cfcde263a113c28e96aa04362ed8229cb7c6e5f5c719003659d33"}, + {file = "pyarrow-13.0.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:d1b4e7176443d12610874bb84d0060bf080f000ea9ed7c84b2801df851320295"}, + {file = "pyarrow-13.0.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:69b6f9a089d116a82c3ed819eea8fe67dae6105f0d81eaf0fdd5e60d0c6e0944"}, + {file = "pyarrow-13.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:ab1268db81aeb241200e321e220e7cd769762f386f92f61b898352dd27e402ce"}, + {file = "pyarrow-13.0.0.tar.gz", hash = "sha256:83333726e83ed44b0ac94d8d7a21bbdee4a05029c3b1e8db58a863eec8fd8a33"}, +] + [[package]] name = "pygeotile" version = "1.0.6" @@ -1094,16 +1109,6 @@ files = [ {file = "pymdown_extensions-10.3.tar.gz", hash = "sha256:94a0d8a03246712b64698af223848fd80aaf1ae4c4be29c8c61939b0467b5722"}, ] -[[package]] -name = "pyparsing" -version = "3.1.1" -requires_python = ">=3.6.8" -summary = "pyparsing module - Classes and methods to define and execute parsing grammars" -files = [ - {file = "pyparsing-3.1.1-py3-none-any.whl", hash = "sha256:32c7c0b711493c72ff18a981d24f28aaf9c1fb7ed5e9667c9e84e3db623bdbfb"}, - {file = "pyparsing-3.1.1.tar.gz", hash = "sha256:ede28a1a32462f5a9705e07aea48001a08f7cf81a021585011deba701581a0db"}, -] - [[package]] name = "pypng" version = "0.20220715.0" @@ -1401,6 +1406,57 @@ files = [ {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, ] +[[package]] +name = "sqlalchemy" +version = "2.0.21" +requires_python = ">=3.7" +summary = "Database Abstraction Library" +dependencies = [ + "greenlet!=0.4.17; platform_machine == \"aarch64\" or (platform_machine == \"ppc64le\" or (platform_machine == \"x86_64\" or (platform_machine == \"amd64\" or (platform_machine == \"AMD64\" or (platform_machine == \"win32\" or platform_machine == \"WIN32\")))))", + "typing-extensions>=4.2.0", +] +files = [ + {file = "SQLAlchemy-2.0.21-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1e7dc99b23e33c71d720c4ae37ebb095bebebbd31a24b7d99dfc4753d2803ede"}, + {file = "SQLAlchemy-2.0.21-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7f0c4ee579acfe6c994637527c386d1c22eb60bc1c1d36d940d8477e482095d4"}, + {file = "SQLAlchemy-2.0.21-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3f7d57a7e140efe69ce2d7b057c3f9a595f98d0bbdfc23fd055efdfbaa46e3a5"}, + {file = "SQLAlchemy-2.0.21-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ca38746eac23dd7c20bec9278d2058c7ad662b2f1576e4c3dbfcd7c00cc48fa"}, + {file = "SQLAlchemy-2.0.21-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:3cf229704074bce31f7f47d12883afee3b0a02bb233a0ba45ddbfe542939cca4"}, + {file = "SQLAlchemy-2.0.21-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fb87f763b5d04a82ae84ccff25554ffd903baafba6698e18ebaf32561f2fe4aa"}, + {file = "SQLAlchemy-2.0.21-cp310-cp310-win32.whl", hash = "sha256:89e274604abb1a7fd5c14867a412c9d49c08ccf6ce3e1e04fffc068b5b6499d4"}, + {file = "SQLAlchemy-2.0.21-cp310-cp310-win_amd64.whl", hash = "sha256:e36339a68126ffb708dc6d1948161cea2a9e85d7d7b0c54f6999853d70d44430"}, + {file = "SQLAlchemy-2.0.21-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:bf8eebccc66829010f06fbd2b80095d7872991bfe8415098b9fe47deaaa58063"}, + {file = "SQLAlchemy-2.0.21-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b977bfce15afa53d9cf6a632482d7968477625f030d86a109f7bdfe8ce3c064a"}, + {file = "SQLAlchemy-2.0.21-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ff3dc2f60dbf82c9e599c2915db1526d65415be323464f84de8db3e361ba5b9"}, + {file = "SQLAlchemy-2.0.21-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:44ac5c89b6896f4740e7091f4a0ff2e62881da80c239dd9408f84f75a293dae9"}, + {file = "SQLAlchemy-2.0.21-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:87bf91ebf15258c4701d71dcdd9c4ba39521fb6a37379ea68088ce8cd869b446"}, + {file = "SQLAlchemy-2.0.21-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:b69f1f754d92eb1cc6b50938359dead36b96a1dcf11a8670bff65fd9b21a4b09"}, + {file = "SQLAlchemy-2.0.21-cp311-cp311-win32.whl", hash = "sha256:af520a730d523eab77d754f5cf44cc7dd7ad2d54907adeb3233177eeb22f271b"}, + {file = "SQLAlchemy-2.0.21-cp311-cp311-win_amd64.whl", hash = "sha256:141675dae56522126986fa4ca713739d00ed3a6f08f3c2eb92c39c6dfec463ce"}, + {file = "SQLAlchemy-2.0.21-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:56628ca27aa17b5890391ded4e385bf0480209726f198799b7e980c6bd473bd7"}, + {file = "SQLAlchemy-2.0.21-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:db726be58837fe5ac39859e0fa40baafe54c6d54c02aba1d47d25536170b690f"}, + {file = "SQLAlchemy-2.0.21-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7421c1bfdbb7214313919472307be650bd45c4dc2fcb317d64d078993de045b"}, + {file = "SQLAlchemy-2.0.21-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:632784f7a6f12cfa0e84bf2a5003b07660addccf5563c132cd23b7cc1d7371a9"}, + {file = "SQLAlchemy-2.0.21-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:f6f7276cf26145a888f2182a98f204541b519d9ea358a65d82095d9c9e22f917"}, + {file = "SQLAlchemy-2.0.21-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:2a1f7ffac934bc0ea717fa1596f938483fb8c402233f9b26679b4f7b38d6ab6e"}, + {file = "SQLAlchemy-2.0.21-cp312-cp312-win32.whl", hash = "sha256:bfece2f7cec502ec5f759bbc09ce711445372deeac3628f6fa1c16b7fb45b682"}, + {file = "SQLAlchemy-2.0.21-cp312-cp312-win_amd64.whl", hash = "sha256:526b869a0f4f000d8d8ee3409d0becca30ae73f494cbb48801da0129601f72c6"}, + {file = "SQLAlchemy-2.0.21-py3-none-any.whl", hash = "sha256:ea7da25ee458d8f404b93eb073116156fd7d8c2a776d8311534851f28277b4ce"}, + {file = "SQLAlchemy-2.0.21.tar.gz", hash = "sha256:05b971ab1ac2994a14c56b35eaaa91f86ba080e9ad481b20d99d77f381bb6258"}, +] + +[[package]] +name = "sqlalchemy-utils" +version = "0.41.1" +requires_python = ">=3.6" +summary = "Various utility functions for SQLAlchemy." +dependencies = [ + "SQLAlchemy>=1.3", +] +files = [ + {file = "SQLAlchemy-Utils-0.41.1.tar.gz", hash = "sha256:a2181bff01eeb84479e38571d2c0718eb52042f9afd8c194d0d02877e84b7d74"}, + {file = "SQLAlchemy_Utils-0.41.1-py3-none-any.whl", hash = "sha256:6c96b0768ea3f15c0dc56b363d386138c562752b84f647fb8d31a2223aaab801"}, +] + [[package]] name = "stack-data" version = "0.6.2" diff --git a/pyproject.toml b/pyproject.toml index 61e05d66..0e762f6c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "psycopg2>=2.9.7", "py-cpuinfo>=9.0.0", "requests>=2.31.0", - "osm-rawdata==0.1.2rc0", + "osm-rawdata==0.1.3", ] requires-python = ">=3.10" readme = "README.md" From 756d464325f7bfde5358de0f7aeea75a658e0405 Mon Sep 17 00:00:00 2001 From: spwoodcock Date: Mon, 9 Oct 2023 18:17:35 +0100 Subject: [PATCH 2/3] fix: update all data-models to latest osm-rawdata syntax --- osm_fieldwork/data_models/__init__.py | 2 -- osm_fieldwork/data_models/amenities.yaml | 34 ++++++++++++++------ osm_fieldwork/data_models/buildings.yaml | 32 +++++++++--------- osm_fieldwork/data_models/camping.yaml | 5 +-- osm_fieldwork/data_models/cemeteries.yaml | 6 ++-- osm_fieldwork/data_models/education.yaml | 20 +++++------- osm_fieldwork/data_models/emergency.yaml | 4 +-- osm_fieldwork/data_models/health.yaml | 10 +++--- osm_fieldwork/data_models/highways.yaml | 3 +- osm_fieldwork/data_models/landusage.yaml | 3 +- osm_fieldwork/data_models/nature.yaml | 3 +- osm_fieldwork/data_models/places.yaml | 3 +- osm_fieldwork/data_models/religious.yaml | 3 +- osm_fieldwork/data_models/toilets.yaml | 15 ++++----- osm_fieldwork/data_models/wastedisposal.yaml | 31 ++++++++---------- osm_fieldwork/data_models/waterpoints.yaml | 11 +++---- osm_fieldwork/data_models/waterways.yaml | 4 +-- 17 files changed, 94 insertions(+), 95 deletions(-) diff --git a/osm_fieldwork/data_models/__init__.py b/osm_fieldwork/data_models/__init__.py index 975ae952..f8943391 100644 --- a/osm_fieldwork/data_models/__init__.py +++ b/osm_fieldwork/data_models/__init__.py @@ -7,14 +7,12 @@ amenities = f"{data_models_path}/amenities.yaml" buildings = f"{data_models_path}/buildings.yaml" camping = f"{data_models_path}/camping.yaml" -category = f"{data_models_path}/category.yaml" cemeteries = f"{data_models_path}/cemeteries.yaml" education = f"{data_models_path}/education.yaml" emergency = f"{data_models_path}/emergency.yaml" health = f"{data_models_path}/health.yaml" highways = f"{data_models_path}/highways.yaml" landusage = f"{data_models_path}/landusage.yaml" -models = f"{data_models_path}/models.yaml" nature = f"{data_models_path}/nature.yaml" places = f"{data_models_path}/places.yaml" religious = f"{data_models_path}/religious.yaml" diff --git a/osm_fieldwork/data_models/amenities.yaml b/osm_fieldwork/data_models/amenities.yaml index 05cf1819..a324cce7 100644 --- a/osm_fieldwork/data_models/amenities.yaml +++ b/osm_fieldwork/data_models/amenities.yaml @@ -1,15 +1,31 @@ select: - osm_id: id + osm_id: id from: - - nodes - - ways_poly + - nodes + - ways_poly where: tags: - - join_or: - - { amenity: [brewery, cafe, bar, pub, fuel, fire_station, library, - townhall, courthouse, hospital, restaurant, clinic], shop: - [alcohol, bakery, car_parts, hardware, convienience, general], - cusine: not null} + - amenity: + - brewery + - cafe + - bar + - pub + - fuel + - fire_station + - library + - townhall + - courthouse + - hospital + - restaurant + - clinic + shop: + - alcohol + - bakery + - car_parts + - hardware + - convienience + - general + cuisine: not null keep: - leisure @@ -23,7 +39,7 @@ keep: - parking - amenity - shop - - cusine + - cuisine - amenity - convenience - diesel diff --git a/osm_fieldwork/data_models/buildings.yaml b/osm_fieldwork/data_models/buildings.yaml index e691057d..cb1bc1f8 100644 --- a/osm_fieldwork/data_models/buildings.yaml +++ b/osm_fieldwork/data_models/buildings.yaml @@ -6,19 +6,21 @@ from: - ways_poly where: tags: - - join_or: - - { building: not null, amenity: not null, tourism: not null } + - building: not null + amenity: not null + tourism: not null + keep: - - building - - building:levels - - building:material - - roof:material - - roof:shape - - roof:levels - - cusine - - amenity - - convenience - - diesel - - version - - name - - name:en + - building + - building:levels + - building:material + - roof:material + - roof:shape + - roof:levels + - cuisine + - amenity + - convenience + - diesel + - version + - name + - name:en diff --git a/osm_fieldwork/data_models/camping.yaml b/osm_fieldwork/data_models/camping.yaml index ca6310fd..f604ba93 100644 --- a/osm_fieldwork/data_models/camping.yaml +++ b/osm_fieldwork/data_models/camping.yaml @@ -5,8 +5,9 @@ from: - ways_poly where: tags: - - join_or: - - { tourism: [camp_site, camp_pitch] } + - tourism: + - camp_site + - camp_pitch keep: - leisure diff --git a/osm_fieldwork/data_models/cemeteries.yaml b/osm_fieldwork/data_models/cemeteries.yaml index 887418e3..718e54cb 100644 --- a/osm_fieldwork/data_models/cemeteries.yaml +++ b/osm_fieldwork/data_models/cemeteries.yaml @@ -4,5 +4,7 @@ from: - ways_poly where: tags: - - join_or: - - { amenity: [grave_yard], landuse: [cemetery] } + - amenity: + - grave_yard + landuse: + - cemetery diff --git a/osm_fieldwork/data_models/education.yaml b/osm_fieldwork/data_models/education.yaml index c6de922f..83373e18 100644 --- a/osm_fieldwork/data_models/education.yaml +++ b/osm_fieldwork/data_models/education.yaml @@ -5,18 +5,14 @@ from: - ways_poly where: tags: - - join_or: - - { - amenity: - [ - college, - indergarten, - school, - music_school, - language_school, - university, - ], - } + - amenity: + - college + - indergarten + - school + - music_school + - language_school + - university + keep: - wheelchar - religion diff --git a/osm_fieldwork/data_models/emergency.yaml b/osm_fieldwork/data_models/emergency.yaml index c2ffca82..808834ee 100644 --- a/osm_fieldwork/data_models/emergency.yaml +++ b/osm_fieldwork/data_models/emergency.yaml @@ -5,5 +5,5 @@ from: - ways_poly where: tags: - - join_or: - - { emergency: not null, fire_hydrant:type: not null } + - emergency: not null + fire_hydrant:type: not null diff --git a/osm_fieldwork/data_models/health.yaml b/osm_fieldwork/data_models/health.yaml index 5b484060..9677e649 100644 --- a/osm_fieldwork/data_models/health.yaml +++ b/osm_fieldwork/data_models/health.yaml @@ -5,12 +5,10 @@ from: - ways_poly where: tags: - - join_or: - - { - healthcare: not null, - social_facility: not null, - healthcare:speciality: not null, - } + - healthcare: not null + social_facility: not null + healthcare:speciality: not null + keep: - healthcare:type - healthcare diff --git a/osm_fieldwork/data_models/highways.yaml b/osm_fieldwork/data_models/highways.yaml index 3e7e39d6..0a9c68ed 100644 --- a/osm_fieldwork/data_models/highways.yaml +++ b/osm_fieldwork/data_models/highways.yaml @@ -5,8 +5,7 @@ from: - ways_line where: tags: - - join_or: - - { highway: not null } + - highway: not null keep: - name - smoothness diff --git a/osm_fieldwork/data_models/landusage.yaml b/osm_fieldwork/data_models/landusage.yaml index 70bfc6d5..bb414e0b 100644 --- a/osm_fieldwork/data_models/landusage.yaml +++ b/osm_fieldwork/data_models/landusage.yaml @@ -4,5 +4,4 @@ from: - ways_poly where: tags: - - join_or: - - { landuse: not null } + - landuse: not null diff --git a/osm_fieldwork/data_models/nature.yaml b/osm_fieldwork/data_models/nature.yaml index 1738c48f..057584b9 100644 --- a/osm_fieldwork/data_models/nature.yaml +++ b/osm_fieldwork/data_models/nature.yaml @@ -5,5 +5,4 @@ from: - ways_poly where: tags: - - join_or: - - { natural: not null } + - natural: not null diff --git a/osm_fieldwork/data_models/places.yaml b/osm_fieldwork/data_models/places.yaml index feed8e29..bbcfb314 100644 --- a/osm_fieldwork/data_models/places.yaml +++ b/osm_fieldwork/data_models/places.yaml @@ -5,5 +5,4 @@ from: - ways_poly where: tags: - - join_or: - - { place: not null } + - place: not null diff --git a/osm_fieldwork/data_models/religious.yaml b/osm_fieldwork/data_models/religious.yaml index f74ef66f..1fb97271 100644 --- a/osm_fieldwork/data_models/religious.yaml +++ b/osm_fieldwork/data_models/religious.yaml @@ -5,5 +5,4 @@ from: - ways_poly where: tags: - - join_or: - - { religion: not null } + - religion: not null diff --git a/osm_fieldwork/data_models/toilets.yaml b/osm_fieldwork/data_models/toilets.yaml index 7982be00..7eb90e90 100644 --- a/osm_fieldwork/data_models/toilets.yaml +++ b/osm_fieldwork/data_models/toilets.yaml @@ -5,12 +5,9 @@ from: - ways_poly where: tags: - - join_or: - - { - amenity: not null, - toilets:access: not null, - toilets:disposal: not null, - toilets:position: not null, - toilets:unisex: not null, - toilets:wheelchair: not null, - } + - amenity: not null + toilets:access: not null + toilets:disposal: not null + toilets:position: not null + toilets:unisex: not null + toilets:wheelchair: not null diff --git a/osm_fieldwork/data_models/wastedisposal.yaml b/osm_fieldwork/data_models/wastedisposal.yaml index a003712d..17f01598 100644 --- a/osm_fieldwork/data_models/wastedisposal.yaml +++ b/osm_fieldwork/data_models/wastedisposal.yaml @@ -5,21 +5,16 @@ from: - ways_poly where: tags: - - join_or: - - { - amenity: - [ - waste_disposal, - waste_dump_site, - waste_transfer_station, - waste_basket, - recycling, - landfill, - ], - waste: not null, - recycling_type: not null, - recycling: not null, - recycling:aluminum: not null, - recycling:glass: not null, - recycling:hazardous_waste: not null, - } + - amenity: + - waste_disposal + - waste_dump_site + - waste_transfer_station + - waste_basket + - recycling + - landfill + waste: not null + recycling_type: not null + recycling: not null + recycling:aluminum: not null + recycling:glass: not null + recycling:hazardous_waste: not null diff --git a/osm_fieldwork/data_models/waterpoints.yaml b/osm_fieldwork/data_models/waterpoints.yaml index 59c7f59c..dc6fac7d 100644 --- a/osm_fieldwork/data_models/waterpoints.yaml +++ b/osm_fieldwork/data_models/waterpoints.yaml @@ -5,9 +5,8 @@ from: - ways_poly where: tags: - - join_or: - - { - drinking_water: not null, - amenity: [drinking_water, water_point], - man_made: [water_tap], - } + - drinking_water: not null + amenity: + - drinking_water + - water_point + man_made: water_tap diff --git a/osm_fieldwork/data_models/waterways.yaml b/osm_fieldwork/data_models/waterways.yaml index b4865fc7..5fe1d742 100644 --- a/osm_fieldwork/data_models/waterways.yaml +++ b/osm_fieldwork/data_models/waterways.yaml @@ -5,8 +5,8 @@ from: - ways_line where: tags: - - join_or: - - { waterway: not null } + - waterway: not null + keep: - name - intermittent From a1118e7a9147d84da0a9b054fcda23986a8720f5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:18:56 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/about/make_data_extract.md | 6 +++--- tests/test_yaml.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/about/make_data_extract.md b/docs/about/make_data_extract.md index 81c46657..b6e72cc3 100644 --- a/docs/about/make_data_extract.md +++ b/docs/about/make_data_extract.md @@ -24,15 +24,15 @@ ways, but needed to be automated to be used for FMTM. ## Examples -Make\*data_extract uses a Postgres database to extract OSM data. By +Make\*data*extract uses a Postgres database to extract OSM data. By default, the program uses **localhost** as the database host. If you use \**underpass*as the data base name, this will remotely access the [Humanitarian OpenStreetMap Team(HOT)](https://www.hotosm.org) maintained OSM database that covers the entire planet, and is updated every minute. The name of the database can be specified using the -_--uri\*\* option. The program extracts the buildings category of OSM +*--uri\*\* option. The program extracts the buildings category of OSM data by default. The size of the extracted data can be limited using -the _--boundary\* option. The program outputs the data in GeoJSON +the \_--boundary\* option. The program outputs the data in GeoJSON format. For raw OSM data, the existing country data is downloaded from [GeoFabrik](https://download.geofabrik.de/index.html), and imported using a diff --git a/tests/test_yaml.py b/tests/test_yaml.py index d4ad080c..24932889 100755 --- a/tests/test_yaml.py +++ b/tests/test_yaml.py @@ -19,10 +19,10 @@ # import argparse +import logging from osm_fieldwork.xlsforms import xlsforms_path from osm_fieldwork.yamlfile import YamlFile -import logging log = logging.getLogger(__name__)