mapreader 1.8.1.post0.dev5__tar.gz → 1.8.1.post0.dev15__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/PKG-INFO +2 -1
  2. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/_version.py +3 -3
  3. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/annotate/annotator.py +6 -1
  4. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader.egg-info/PKG-INFO +2 -1
  5. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader.egg-info/requires.txt +1 -0
  6. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/setup.py +1 -1
  7. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/LICENSE +0 -0
  8. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/README.md +0 -0
  9. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/__init__.py +0 -0
  10. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/__main__.py +0 -0
  11. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/annotate/__init__.py +0 -0
  12. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/classify/__init__.py +0 -0
  13. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/classify/classifier.py +0 -0
  14. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/classify/custom_models.py +0 -0
  15. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/classify/datasets.py +0 -0
  16. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/classify/load_annotations.py +0 -0
  17. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/download/__init__.py +0 -0
  18. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/download/data_structures.py +0 -0
  19. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/download/downloader.py +0 -0
  20. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/download/downloader_utils.py +0 -0
  21. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/download/iiif_downloader.py +0 -0
  22. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/download/sheet_downloader.py +0 -0
  23. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/download/tile_loading.py +0 -0
  24. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/download/tile_merging.py +0 -0
  25. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/load/__init__.py +0 -0
  26. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/load/geo_utils.py +0 -0
  27. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/load/images.py +0 -0
  28. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/load/loader.py +0 -0
  29. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/process/__init__.py +0 -0
  30. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/process/context_post_process.py +0 -0
  31. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/process/occlusion_analysis.py +0 -0
  32. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/process/process.py +0 -0
  33. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/spot_text/__init__.py +0 -0
  34. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/spot_text/dataclasses.py +0 -0
  35. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/spot_text/deepsolo_runner.py +0 -0
  36. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/spot_text/dptext_detr_runner.py +0 -0
  37. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/spot_text/maptext_runner.py +0 -0
  38. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/spot_text/runner_base.py +0 -0
  39. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/utils/__init__.py +0 -0
  40. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/utils/compute_and_save_stats.py +0 -0
  41. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/utils/load_frames.py +0 -0
  42. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader/utils/slice_parallel.py +0 -0
  43. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader.egg-info/SOURCES.txt +0 -0
  44. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader.egg-info/dependency_links.txt +0 -0
  45. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader.egg-info/entry_points.txt +0 -0
  46. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader.egg-info/not-zip-safe +0 -0
  47. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/mapreader.egg-info/top_level.txt +0 -0
  48. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/setup.cfg +0 -0
  49. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/tests/test_geo_pipeline.py +0 -0
  50. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/tests/test_import.py +0 -0
  51. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/tests/test_utils_load_frames.py +0 -0
  52. {mapreader-1.8.1.post0.dev5 → mapreader-1.8.1.post0.dev15}/versioneer.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mapreader
3
- Version: 1.8.1.post0.dev5
3
+ Version: 1.8.1.post0.dev15
4
4
  Summary: A computer vision pipeline for the semantic exploration of maps/images at scale
5
5
  Home-page: https://github.com/Living-with-machines/MapReader
6
6
  Download-URL: https://github.com/Living-with-machines/MapReader/archive/refs/heads/main.zip
@@ -62,6 +62,7 @@ Requires-Dist: opencv-python<5.0.0.0,>=4.8.1.78
62
62
  Requires-Dist: folium<1.0.0,>=0.12
63
63
  Requires-Dist: mapclassify<3.0.0,>=2.0.0
64
64
  Requires-Dist: xyzservices==2024.9.0
65
+ Requires-Dist: piffle>=0.7.0
65
66
  Requires-Dist: lxml
66
67
  Provides-Extra: dev
67
68
  Requires-Dist: pytest<9.0.0; extra == "dev"
@@ -8,11 +8,11 @@ import json
8
8
 
9
9
  version_json = '''
10
10
  {
11
- "date": "2025-09-19T17:39:24+0100",
11
+ "date": "2025-12-19T16:13:11+0000",
12
12
  "dirty": false,
13
13
  "error": null,
14
- "full-revisionid": "b47925e094a14daa6614cb41480a534abb4cd911",
15
- "version": "1.8.1.post0.dev5"
14
+ "full-revisionid": "a4d302f15a8d7d2ee06cfc30c86a5c2a735ba858",
15
+ "version": "1.8.1.post0.dev15"
16
16
  }
17
17
  ''' # END VERSION_JSON
18
18
 
@@ -512,7 +512,12 @@ class Annotator:
512
512
  queue_df["eligible"] = queue_df.apply(check_eligibility, axis=1)
513
513
 
514
514
  if self._sortby is not None:
515
- queue_df.sort_values(self._sortby, ascending=self._ascending, inplace=True)
515
+ queue_df.sort_values(
516
+ by=[self._sortby, "min_y"],
517
+ ascending=[self._ascending, True],
518
+ kind="mergesort",
519
+ inplace=True,
520
+ )
516
521
  queue_df = queue_df[queue_df.eligible]
517
522
  else:
518
523
  queue_df = queue_df[queue_df.eligible].sample(frac=1) # shuffle
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mapreader
3
- Version: 1.8.1.post0.dev5
3
+ Version: 1.8.1.post0.dev15
4
4
  Summary: A computer vision pipeline for the semantic exploration of maps/images at scale
5
5
  Home-page: https://github.com/Living-with-machines/MapReader
6
6
  Download-URL: https://github.com/Living-with-machines/MapReader/archive/refs/heads/main.zip
@@ -62,6 +62,7 @@ Requires-Dist: opencv-python<5.0.0.0,>=4.8.1.78
62
62
  Requires-Dist: folium<1.0.0,>=0.12
63
63
  Requires-Dist: mapclassify<3.0.0,>=2.0.0
64
64
  Requires-Dist: xyzservices==2024.9.0
65
+ Requires-Dist: piffle>=0.7.0
65
66
  Requires-Dist: lxml
66
67
  Provides-Extra: dev
67
68
  Requires-Dist: pytest<9.0.0; extra == "dev"
@@ -33,6 +33,7 @@ opencv-python<5.0.0.0,>=4.8.1.78
33
33
  folium<1.0.0,>=0.12
34
34
  mapclassify<3.0.0,>=2.0.0
35
35
  xyzservices==2024.9.0
36
+ piffle>=0.7.0
36
37
  lxml
37
38
 
38
39
  [dev]
@@ -63,7 +63,7 @@ setuptools.setup(
63
63
  "folium>=0.12,<1.0.0",
64
64
  "mapclassify>=2.0.0,<3.0.0",
65
65
  "xyzservices==2024.9.0",
66
- # "piffle @ git+https://github.com/rwood-97/piffle.git@iiif_dataclasses",
66
+ "piffle>=0.7.0",
67
67
  "lxml",
68
68
  ],
69
69
  extras_require={