mapreader 1.3.4__tar.gz → 1.3.6__tar.gz

{mapreader-1.3.4 → mapreader-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapreader
-Version: 1.3.4
+Version: 1.3.6
 Summary: A computer vision pipeline for the semantic exploration of maps/images at scale
 Home-page: https://github.com/Living-with-machines/MapReader
 Download-URL: https://github.com/Living-with-machines/MapReader/archive/refs/heads/main.zip
@@ -58,6 +58,7 @@ Requires-Dist: geopandas<1.0.0
 Requires-Dist: pyogrio>=0.7.2
 Requires-Dist: cartopy>=0.22.0
 Requires-Dist: joblib>=1.4.0
+Requires-Dist: opencv-python<5.0.0.0
 Provides-Extra: dev
 Requires-Dist: pytest<9.0.0; extra == "dev"
 Requires-Dist: pytest-cov<6.0.0,>=4.1.0; extra == "dev"
@@ -66,44 +67,46 @@ Requires-Dist: transformers<5.0.0; extra == "dev"
 Requires-Dist: black<25.0.0,>=23.7.0; extra == "dev"
 Requires-Dist: flake8<8.0.0,>=6.0.0; extra == "dev"
 
-<div align="center">
-    <br>
-    <p align="center">
-    <h1>MapReader</h1>
-    <h2>A computer vision pipeline for exploring and analyzing images at scale</h2>
-    </p>
-</div>
-
-<p align="center">
-    <a href="https://pypi.org/project/mapreader/">
-        <img alt="PyPI" src="https://img.shields.io/pypi/v/MapReader">
-    </a>
-    <a href="https://github.com/Living-with-machines/MapReader/blob/main/LICENSE">
-        <img alt="License" src="https://img.shields.io/badge/License-MIT-yellow.svg">
-    </a>
-    <a href="https://github.com/Living-with-machines/MapReader/actions/workflows/mr_ci.yml/badge.svg">
-        <img alt="Integration Tests badge" src="https://github.com/Living-with-machines/MapReader/actions/workflows/mr_ci.yml/badge.svg">
-    </a>
-    <a href="https://zenodo.org/badge/latestdoi/430661738"><img src="https://zenodo.org/badge/430661738.svg" alt="DOI"></a>
-    <br/>
-    <a href="https://codecov.io/github/Living-with-machines/MapReader" >
-    <img src="https://codecov.io/github/Living-with-machines/MapReader/graph/badge.svg?token=38GQ3O1GB5"/>
-    </a>
-</p>
+# MapReader
 
+> [!IMPORTANT] A computer vision pipeline for exploring and analyzing images at scale
 
-## What is MapReader?
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
 
-<div align="center">
-    <figure>
-    <img src="https://raw.githubusercontent.com/Living-with-machines/MapReader/main/figs/river_banner_8bit.png"
-        alt="Annotated Map with Prediction Outputs"
-        width="70%">
-    </figure>
-</div>
+![PyPI](https://img.shields.io/pypi/v/MapReader)
+![License](https://img.shields.io/badge/License-MIT-yellow.svg)
+![Integration Tests badge](https://github.com/Living-with-machines/MapReader/actions/workflows/mr_ci.yml/badge.svg)
+![DOI](https://zenodo.org/badge/430661738.svg)
+![CodeCov](https://codecov.io/github/Living-with-machines/MapReader/graph/badge.svg?token=38GQ3O1GB5)
+
+## Table of Contents
+
+- [MapReader](#mapreader)
+  - [Table of Contents](#table-of-contents)
+  - [What is MapReader?](#what-is-mapreader)
+  - [Overview](#overview)
+    - [MapReader pipeline](#mapreader-pipeline)
+  - [Documentation](#documentation)
+  - [What is included in this repo?](#what-is-included-in-this-repo)
+  - [How to cite MapReader](#how-to-cite-mapreader)
+  - [Acknowledgements](#acknowledgements)
+  - [Contributors](#contributors)
+
+---
+<!--- sphinx-include --->
+
+## What is MapReader?
 
 MapReader is an end-to-end computer vision (CV) pipeline for exploring and analyzing images at scale.
 
+<figure align="center">
+  <img src="https://raw.githubusercontent.com/Living-with-machines/MapReader/main/docs/source/_static/river_banner_8bit.png"
+      alt="Annotated Map with Prediction Outputs"
+      width="70%">
+</figure>
+
 MapReader was developed in the [Living with Machines](https://livingwithmachines.ac.uk/) project to analyze large collections of historical maps but is a _**generalizable**_ computer vision pipeline which can be applied to _**any images**_ in a wide variety of domains.
 
 ## Overview
@@ -112,30 +115,28 @@ MapReader is a groundbreaking interdisciplinary tool that emerged from a specifi
 
 ### MapReader pipeline
 
-<div align="center">
-  <figure>
-  <img src="https://raw.githubusercontent.com/Living-with-machines/MapReader/main/docs/source/figures/pipeline_explained.png"
+The MapReader pipeline consists of a linear sequence of tasks which, together, can be used to train a computer vision (CV) classifier to recognize visual features within maps and identify patches containing these features across entire map collections:
+
+<figure align="center">
+  <img src="https://raw.githubusercontent.com/Living-with-machines/MapReader/main/docs/source/_static/pipeline_explained.png"
         alt="MapReader pipeline"
         width="70%">
-  </figure>
-</div>
-
-The MapReader pipeline consists of a linear sequence of tasks which, together, can be used to train a computer vision (CV) classifier to recognize visual features within maps and identify patches containing these features across entire map collections.
+</figure>
 
-See our [About MapReader](https://mapreader.readthedocs.io/en/latest/About.html) page to learn more.
+See our [Introduction to MapReader](https://mapreader.readthedocs.io/en/latest/introduction-to-mapreader/) page to learn more.
 
 ## Documentation
 
-The MapReader documentation can be found at https://mapreader.readthedocs.io/en/latest/index.html.
+The MapReader documentation can be found at https://mapreader.readthedocs.io/en/latest/.
 
-**New users** should refer to the [Installation instructions](https://mapreader.readthedocs.io/en/latest/Install.html) and [Input guidance](https://mapreader.readthedocs.io/en/latest/Input-guidance.html) for help with the initial set up of MapReader.
+**New users** should refer to the [Installation instructions](https://mapreader.readthedocs.io/en/latest/getting-started/installation-instructions/index.html) and [Input guidance](https://mapreader.readthedocs.io/en/latest/using-mapreader/input-guidance/) for help with the initial set up of MapReader.
 
-**All users** should refer to our [User Guide](https://mapreader.readthedocs.io/en/latest/User-guide/User-guide.html) for guidance on how to use MapReader. This contains end-to-end instructions on how to use the MapReader pipeline, plus a number of worked examples illustrating use cases such as:
+**All users** should refer to our [User Guide](https://mapreader.readthedocs.io/en/latest/using-mapreader/) for guidance on how to use MapReader. This contains end-to-end instructions on how to use the MapReader pipeline, plus a number of worked examples illustrating use cases such as:
 
 - Geospatial images (i.e. maps)
 - Non-geospatial images
 
- **Developers and contributors** may also want to refer to the [API documentation](https://mapreader.readthedocs.io/en/latest/api/index.html) and [Contribution guide](https://mapreader.readthedocs.io/en/latest/Contribution-guide/Contribution-guide.html) for guidance on how to contribute to the MapReader package.
+ **Developers and contributors** may also want to refer to the [API documentation](https://mapreader.readthedocs.io/en/latest/in-depth-resources/api/mapreader/) and [Contribution guide](https://mapreader.readthedocs.io/en/latest/community-and-contributions/contribution-guide/) for guidance on how to contribute to the MapReader package.
 
 **Join our Slack workspace!**
 Please fill out [this form](https://forms.gle/dXjECHZQkwrZ3Xpt9) to receive an invitation to the Slack workspace.
@@ -163,7 +164,6 @@ If you use MapReader in your work, please cite both the MapReader repo and [our
 - Kasra Hosseini, Daniel C. S. Wilson, Kaspar Beelen, and Katherine McDonough. 2022. MapReader: a computer vision pipeline for the semantic exploration of maps at scale. In Proceedings of the 6th ACM SIGSPATIAL International Workshop on Geospatial Humanities (GeoHumanities '22). Association for Computing Machinery, New York, NY, USA, 8–19. https://doi.org/10.1145/3557919.3565812
 - Kasra Hosseini, Rosie Wood, Andy Smith, Katie McDonough, Daniel C.S. Wilson, Christina Last, Kalle Westerling, and Evangeline Mae Corcoran. “Living-with-machines/mapreader: End of Lwm”. Zenodo, July 27, 2023. https://doi.org/10.5281/zenodo.8189653.
 
-
 ## Acknowledgements
 
 This work was supported by Living with Machines (AHRC grant AH/S01179X/1) and The Alan Turing Institute (EPSRC grant EP/N510129/1).
@@ -174,10 +174,6 @@ Maps above reproduced with the permission of the National Library of Scotland ht
 
 ## Contributors
 
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
-<!-- ALL-CONTRIBUTORS-BADGE:END -->
-
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->

{mapreader-1.3.4 → mapreader-1.3.6}/README.md

@@ -1,41 +1,43 @@
-<div align="center">
-    <br>
-    <p align="center">
-    <h1>MapReader</h1>
-    <h2>A computer vision pipeline for exploring and analyzing images at scale</h2>
-    </p>
-</div>
-
-<p align="center">
-    <a href="https://pypi.org/project/mapreader/">
-        <img alt="PyPI" src="https://img.shields.io/pypi/v/MapReader">
-    </a>
-    <a href="https://github.com/Living-with-machines/MapReader/blob/main/LICENSE">
-        <img alt="License" src="https://img.shields.io/badge/License-MIT-yellow.svg">
-    </a>
-    <a href="https://github.com/Living-with-machines/MapReader/actions/workflows/mr_ci.yml/badge.svg">
-        <img alt="Integration Tests badge" src="https://github.com/Living-with-machines/MapReader/actions/workflows/mr_ci.yml/badge.svg">
-    </a>
-    <a href="https://zenodo.org/badge/latestdoi/430661738"><img src="https://zenodo.org/badge/430661738.svg" alt="DOI"></a>
-    <br/>
-    <a href="https://codecov.io/github/Living-with-machines/MapReader" >
-    <img src="https://codecov.io/github/Living-with-machines/MapReader/graph/badge.svg?token=38GQ3O1GB5"/>
-    </a>
-</p>
+# MapReader
 
+> [!IMPORTANT] A computer vision pipeline for exploring and analyzing images at scale
 
-## What is MapReader?
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
 
-<div align="center">
-    <figure>
-    <img src="https://raw.githubusercontent.com/Living-with-machines/MapReader/main/figs/river_banner_8bit.png"
-        alt="Annotated Map with Prediction Outputs"
-        width="70%">
-    </figure>
-</div>
+![PyPI](https://img.shields.io/pypi/v/MapReader)
+![License](https://img.shields.io/badge/License-MIT-yellow.svg)
+![Integration Tests badge](https://github.com/Living-with-machines/MapReader/actions/workflows/mr_ci.yml/badge.svg)
+![DOI](https://zenodo.org/badge/430661738.svg)
+![CodeCov](https://codecov.io/github/Living-with-machines/MapReader/graph/badge.svg?token=38GQ3O1GB5)
+
+## Table of Contents
+
+- [MapReader](#mapreader)
+  - [Table of Contents](#table-of-contents)
+  - [What is MapReader?](#what-is-mapreader)
+  - [Overview](#overview)
+    - [MapReader pipeline](#mapreader-pipeline)
+  - [Documentation](#documentation)
+  - [What is included in this repo?](#what-is-included-in-this-repo)
+  - [How to cite MapReader](#how-to-cite-mapreader)
+  - [Acknowledgements](#acknowledgements)
+  - [Contributors](#contributors)
+
+---
+<!--- sphinx-include --->
+
+## What is MapReader?
 
 MapReader is an end-to-end computer vision (CV) pipeline for exploring and analyzing images at scale.
 
+<figure align="center">
+  <img src="https://raw.githubusercontent.com/Living-with-machines/MapReader/main/docs/source/_static/river_banner_8bit.png"
+      alt="Annotated Map with Prediction Outputs"
+      width="70%">
+</figure>
+
 MapReader was developed in the [Living with Machines](https://livingwithmachines.ac.uk/) project to analyze large collections of historical maps but is a _**generalizable**_ computer vision pipeline which can be applied to _**any images**_ in a wide variety of domains.
 
 ## Overview
@@ -44,30 +46,28 @@ MapReader is a groundbreaking interdisciplinary tool that emerged from a specifi
 
 ### MapReader pipeline
 
-<div align="center">
-  <figure>
-  <img src="https://raw.githubusercontent.com/Living-with-machines/MapReader/main/docs/source/figures/pipeline_explained.png"
+The MapReader pipeline consists of a linear sequence of tasks which, together, can be used to train a computer vision (CV) classifier to recognize visual features within maps and identify patches containing these features across entire map collections:
+
+<figure align="center">
+  <img src="https://raw.githubusercontent.com/Living-with-machines/MapReader/main/docs/source/_static/pipeline_explained.png"
         alt="MapReader pipeline"
         width="70%">
-  </figure>
-</div>
-
-The MapReader pipeline consists of a linear sequence of tasks which, together, can be used to train a computer vision (CV) classifier to recognize visual features within maps and identify patches containing these features across entire map collections.
+</figure>
 
-See our [About MapReader](https://mapreader.readthedocs.io/en/latest/About.html) page to learn more.
+See our [Introduction to MapReader](https://mapreader.readthedocs.io/en/latest/introduction-to-mapreader/) page to learn more.
 
 ## Documentation
 
-The MapReader documentation can be found at https://mapreader.readthedocs.io/en/latest/index.html.
+The MapReader documentation can be found at https://mapreader.readthedocs.io/en/latest/.
 
-**New users** should refer to the [Installation instructions](https://mapreader.readthedocs.io/en/latest/Install.html) and [Input guidance](https://mapreader.readthedocs.io/en/latest/Input-guidance.html) for help with the initial set up of MapReader.
+**New users** should refer to the [Installation instructions](https://mapreader.readthedocs.io/en/latest/getting-started/installation-instructions/index.html) and [Input guidance](https://mapreader.readthedocs.io/en/latest/using-mapreader/input-guidance/) for help with the initial set up of MapReader.
 
-**All users** should refer to our [User Guide](https://mapreader.readthedocs.io/en/latest/User-guide/User-guide.html) for guidance on how to use MapReader. This contains end-to-end instructions on how to use the MapReader pipeline, plus a number of worked examples illustrating use cases such as:
+**All users** should refer to our [User Guide](https://mapreader.readthedocs.io/en/latest/using-mapreader/) for guidance on how to use MapReader. This contains end-to-end instructions on how to use the MapReader pipeline, plus a number of worked examples illustrating use cases such as:
 
 - Geospatial images (i.e. maps)
 - Non-geospatial images
 
- **Developers and contributors** may also want to refer to the [API documentation](https://mapreader.readthedocs.io/en/latest/api/index.html) and [Contribution guide](https://mapreader.readthedocs.io/en/latest/Contribution-guide/Contribution-guide.html) for guidance on how to contribute to the MapReader package.
+ **Developers and contributors** may also want to refer to the [API documentation](https://mapreader.readthedocs.io/en/latest/in-depth-resources/api/mapreader/) and [Contribution guide](https://mapreader.readthedocs.io/en/latest/community-and-contributions/contribution-guide/) for guidance on how to contribute to the MapReader package.
 
 **Join our Slack workspace!**
 Please fill out [this form](https://forms.gle/dXjECHZQkwrZ3Xpt9) to receive an invitation to the Slack workspace.
@@ -95,7 +95,6 @@ If you use MapReader in your work, please cite both the MapReader repo and [our
 - Kasra Hosseini, Daniel C. S. Wilson, Kaspar Beelen, and Katherine McDonough. 2022. MapReader: a computer vision pipeline for the semantic exploration of maps at scale. In Proceedings of the 6th ACM SIGSPATIAL International Workshop on Geospatial Humanities (GeoHumanities '22). Association for Computing Machinery, New York, NY, USA, 8–19. https://doi.org/10.1145/3557919.3565812
 - Kasra Hosseini, Rosie Wood, Andy Smith, Katie McDonough, Daniel C.S. Wilson, Christina Last, Kalle Westerling, and Evangeline Mae Corcoran. “Living-with-machines/mapreader: End of Lwm”. Zenodo, July 27, 2023. https://doi.org/10.5281/zenodo.8189653.
 
-
 ## Acknowledgements
 
 This work was supported by Living with Machines (AHRC grant AH/S01179X/1) and The Alan Turing Institute (EPSRC grant EP/N510129/1).
@@ -106,10 +105,6 @@ Maps above reproduced with the permission of the National Library of Scotland ht
 
 ## Contributors
 
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
-<!-- ALL-CONTRIBUTORS-BADGE:END -->
-
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->

{mapreader-1.3.4 → mapreader-1.3.6}/mapreader/__init__.py

@@ -1,17 +1,25 @@
+# download
+from mapreader.download.sheet_downloader import SheetDownloader
+from mapreader.download.downloader import Downloader
+from mapreader.download.downloader_utils import create_polygon_from_latlons, create_line_from_latlons
+
+
+# load
 from mapreader.load.images import MapImages
 from mapreader.load.loader import loader
 from mapreader.load.loader import load_patches
 
-from mapreader.download.sheet_downloader import SheetDownloader
-from mapreader.download.downloader import Downloader
-from mapreader.download.downloader_utils import create_polygon_from_latlons, create_line_from_latlons
+# annotate
+from mapreader.annotate.annotator import Annotator
 
+# classify
 from mapreader.classify.load_annotations import AnnotationsLoader
 from mapreader.classify.datasets import PatchDataset
 from mapreader.classify.datasets import PatchContextDataset
 from mapreader.classify.classifier import ClassifierContainer
 from mapreader.classify import custom_models
 
+# spot_text
 try:
     from mapreader.spot_text.deepsolo_runner import DeepSoloRunner
 except ImportError:
@@ -22,17 +30,26 @@ try:
 except ImportError:
     pass
 
-from mapreader.process import process
-
-from mapreader.annotate.annotator import Annotator
+try:
+    from mapreader.spot_text.maptext_runner import MapTextRunner
+except ImportError:
+    pass
 
-from . import _version
 
-__version__ = _version.get_versions()["version"]
+# post process
+from mapreader.process.context_post_process import ContextPostProcessor
+from mapreader.process.occlusion_analysis import OcclusionAnalyzer
 
+# utils
 from mapreader.load import geo_utils
 
+
+# version
+from . import _version
+__version__ = _version.get_versions()["version"]
+
 import mapreader
 
 def print_version():
-    print(mapreader.__version__)
+    """Print the current version of mapreader."""
+    print(mapreader.__version__)

{mapreader-1.3.4 → mapreader-1.3.6}/mapreader/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-07-05T11:21:59+0100",
+ "date": "2024-08-09T14:10:51+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "add823a499b1d0763327f9d56962c2a6af0e2d42",
- "version": "1.3.4"
+ "full-revisionid": "5ba6c479346a58dc6d937776c895b30d6c21f833",
+ "version": "1.3.6"
 }
 '''  # END VERSION_JSON
 

{mapreader-1.3.4 → mapreader-1.3.6}/mapreader/annotate/annotator.py

@@ -680,7 +680,8 @@ class Annotator:
 
         Notes
         -----
-        This method is a wrapper for the ``_annotate`` method.
+        This method is a wrapper for the
+        :meth:`~.annotate.annotator.Annotate._annotate` method.
         """
         if sortby is not None:
             self._sortby = sortby

{mapreader-1.3.4 → mapreader-1.3.6}/mapreader/annotate/utils.py

@@ -310,7 +310,10 @@ def annotation_interface(
                     # stream=True so we don't download the whole page, only check if
                     # the page exists
                     response = requests.get(url, stream=True)
-                    assert response.status_code < 400
+                    if not response.status_code < 400:
+                        raise RuntimeError(
+                            f"URL could not get a response: {response.status_code}"
+                        )
                     print()
                     print(f"URL: {url}")
                 except: