reup cityseer method with new sequence + fresh FUA results (#213)

* add curated cityseer manual cleaning guide - v4.17.2 * rerun updated cityseer sequence * fresh cityseer result by FUA * pixi-kernel to pyproject.toml & pizi.lock * pixi.lock [2] * temp removal * correction in testing.yml * updated expected edge counts for cityseer method * removed wrong diff from conflict
uscuni · Dec 8, 2024 · bcb2774 · bcb2774
1 parent 863301c
commit bcb2774
Show file tree

Hide file tree

Showing 13 changed files with 4,963 additions and 10,357 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -45,8 +45,8 @@
          run: 'pixi run -e tests python -c "import geopandas; geopandas.show_versions();"'
 
        - name: run tests
-         run:
-           pixi run -e tests pytest -v -r a -n logical --color yes --cov code --cov-append --cov-report term-missing --cov-report xml .
+         run: |
+           pixi run -e tests pytest core -v -r a -n logical --color yes --cov core --cov-append --cov-report term-missing --cov-report xml .
 
        - name: codecov
          uses: codecov/codecov-action@v4

diff --git a/core/tests/test_utils.py b/core/tests/test_utils.py
@@ -27,7 +27,7 @@ def test_read_sample_data():
 xnd2_records = [43_233, 12_439, 16_302, 30_552, 16_554, 13_468, 29_314]
 
 # results records
-cityseer_records = [40591, 10083, 14659, 28940, 14893, 12796, 26070]
+cityseer_records = [39_715, 9740, 14_130, 28_187, 14_325, 12_382, 25_666]
 man_records = [38_772, 8_640, 14_170, 29_252, 13_508, 11_032, 30_225]
 neatnet_records = [39_489, 8_229, 13_587, 29_028, 12_395, 11_059, 16_298]
 osmnx_records = [43_451, 15_770, 24_025, 37_954, 21_755, 17_704, 30_156]

diff --git a/data/1133/cityseer/1133.parquet b/data/1133/cityseer/1133.parquet
diff --git a/data/1656/cityseer/1656.parquet b/data/1656/cityseer/1656.parquet
diff --git a/data/4617/cityseer/4617.parquet b/data/4617/cityseer/4617.parquet
diff --git a/data/4881/cityseer/4881.parquet b/data/4881/cityseer/4881.parquet
diff --git a/data/809/cityseer/809.parquet b/data/809/cityseer/809.parquet
diff --git a/data/869/cityseer/869.parquet b/data/869/cityseer/869.parquet
diff --git a/data/8989/cityseer/8989.parquet b/data/8989/cityseer/8989.parquet
diff --git a/notebooks/methods/cityseer.ipynb b/notebooks/methods/cityseer.ipynb
diff --git a/notebooks/methods/cityseer_4-17-2_Graph-Cleaning-Cityseer-Guide.pdf b/notebooks/methods/cityseer_4-17-2_Graph-Cleaning-Cityseer-Guide.pdf
diff --git a/pixi.lock b/pixi.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -131,7 +131,7 @@ esda = "*"
 geopandas = "*"
 h3-py = "3.7.7.*"
 ipykernel = "*"
-jupyterlab = "*"
+jupyterlab = ">=4.3.2,<5"
 matplotlib = ">=3.9"
 momepy = ">=0.9.0"
 osmnx = "*"
@@ -148,6 +148,7 @@ pre-commit = "*"
 ruff = "*"
 jupyter = "*"
 ipywidgets = "*"
+pixi-kernel = ">=0.5.2,<0.6"
 
 [tool.pixi.pypi-dependencies]
 core = { path = ".", editable = true }