ckanext-versioned-tiledmap 2.2.0__tar.gz → 2.3.0__tar.gz

{ckanext-versioned-tiledmap-2.2.0/ckanext_versioned_tiledmap.egg-info → ckanext_versioned_tiledmap-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ckanext-versioned-tiledmap
-Version: 2.2.0
+Version: 2.3.0
 Summary: A CKAN extension with a map view for versioned-datastore backed resources.
 Author-email: Natural History Museum <data@nhm.ac.uk>
 License: GPL-3.0-or-later
@@ -16,11 +16,17 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Provides-Extra: test
 License-File: LICENSE
+Requires-Dist: ckanext-versioned-datastore>=3.7.0
+Requires-Dist: ckantools>=0.3.0
+Provides-Extra: test
+Requires-Dist: mock; extra == "test"
+Requires-Dist: pytest>=4.6.5; extra == "test"
+Requires-Dist: pytest-cov>=2.7.1; extra == "test"
+Requires-Dist: coveralls; extra == "test"
 
 <!--header-start-->
-<img src="https://github.com/NaturalHistoryMuseum/ckanext-versioned-tiledmap/raw/main/.github/nhm-logo.svg" align="left" width="150px" height="100px" hspace="40"/>
+<img src="https://data.nhm.ac.uk/images/nhm_logo.svg" align="left" width="150px" height="100px" hspace="40"/>
 
 # ckanext-versioned-tiledmap
 

{ckanext-versioned-tiledmap-2.2.0 → ckanext_versioned_tiledmap-2.3.0}/README.md

@@ -1,5 +1,5 @@
 <!--header-start-->
-<img src="https://github.com/NaturalHistoryMuseum/ckanext-versioned-tiledmap/raw/main/.github/nhm-logo.svg" align="left" width="150px" height="100px" hspace="40"/>
+<img src="https://data.nhm.ac.uk/images/nhm_logo.svg" align="left" width="150px" height="100px" hspace="40"/>
 
 # ckanext-versioned-tiledmap
 

{ckanext-versioned-tiledmap-2.2.0 → ckanext_versioned_tiledmap-2.3.0}/ckanext/tiledmap/plugin.py

@@ -12,6 +12,14 @@ from ckanext.tiledmap.config import config as plugin_config
 from ckanext.tiledmap.lib import validators
 from ckanext.tiledmap.lib.helpers import mustache_wrapper, dwc_field_title
 from ckanext.tiledmap.lib.utils import get_resource_datastore_fields
+import urllib.request
+
+try:
+    from ckanext.status.interfaces import IStatus
+
+    status_available = True
+except ImportError:
+    status_available = False
 
 boolean_validator = toolkit.get_validator('boolean_validator')
 ignore_empty = toolkit.get_validator('ignore_empty')
@@ -28,6 +36,8 @@ class VersionedTiledMapPlugin(SingletonPlugin):
     implements(interfaces.ITemplateHelpers)
     implements(interfaces.IResourceView, inherit=True)
     implements(interfaces.IConfigurable)
+    if status_available:
+        implements(IStatus)
 
     # from IConfigurer interface
     def update_config(self, config):
@@ -147,3 +157,36 @@ class VersionedTiledMapPlugin(SingletonPlugin):
             'defaults': plugin_config,
             'is_new': resource_view_id is None,
         }
+
+    ## IStatus
+    def modify_status_reports(self, status_reports):
+        tileserver_url = toolkit.config.get('versioned_tilemap.tile_server')
+
+        tileserver_text = toolkit._('unknown')
+        tileserver_state = 'neutral'
+
+        if tileserver_url:
+            try:
+                with urllib.request.urlopen(tileserver_url + '/status') as response:
+                    tileserver_response = response.read().decode()
+            except Exception as e:
+                tileserver_response = ''
+            if tileserver_response == 'OK':
+                tileserver_text = toolkit._('available')
+                tileserver_state = 'good'
+            else:
+                tileserver_text = toolkit._('unavailable')
+                tileserver_state = 'bad'
+
+        status_reports.append(
+            {
+                'label': toolkit._('Maps'),
+                'value': tileserver_text,
+                'help': toolkit._(
+                    'Connection to the server that plots data points on maps'
+                ),
+                'state': tileserver_state,
+            }
+        )
+
+        return status_reports

{ckanext-versioned-tiledmap-2.2.0 → ckanext_versioned_tiledmap-2.3.0/ckanext_versioned_tiledmap.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ckanext-versioned-tiledmap
-Version: 2.2.0
+Version: 2.3.0
 Summary: A CKAN extension with a map view for versioned-datastore backed resources.
 Author-email: Natural History Museum <data@nhm.ac.uk>
 License: GPL-3.0-or-later
@@ -16,11 +16,17 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Provides-Extra: test
 License-File: LICENSE
+Requires-Dist: ckanext-versioned-datastore>=3.7.0
+Requires-Dist: ckantools>=0.3.0
+Provides-Extra: test
+Requires-Dist: mock; extra == "test"
+Requires-Dist: pytest>=4.6.5; extra == "test"
+Requires-Dist: pytest-cov>=2.7.1; extra == "test"
+Requires-Dist: coveralls; extra == "test"
 
 <!--header-start-->
-<img src="https://github.com/NaturalHistoryMuseum/ckanext-versioned-tiledmap/raw/main/.github/nhm-logo.svg" align="left" width="150px" height="100px" hspace="40"/>
+<img src="https://data.nhm.ac.uk/images/nhm_logo.svg" align="left" width="150px" height="100px" hspace="40"/>
 
 # ckanext-versioned-tiledmap
 

{ckanext-versioned-tiledmap-2.2.0 → ckanext_versioned_tiledmap-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ckanext-versioned-tiledmap"
-version = "2.2.0"
+version = "2.3.0"
 description = "A CKAN extension with a map view for versioned-datastore backed resources."
 readme = "README.md"
 requires-python = ">=3.6"
@@ -56,12 +56,13 @@ exclude = ["tests", "docs"]
 
 [tool.commitizen]
 name = "cz_nhm"
-version = "2.2.0"
+version = "2.3.0"
 tag_format = "v$version"
 update_changelog_on_bump = true
 changelog_incremental = true
 version_files = [
-    "pyproject.toml:version"
+    "pyproject.toml:version",
+    "CITATION.cff:^version"
 ]
 
 [tool.black]