+
- {% resource 'ckanext-geoview/wmts' %}
-
{% endblock %}
diff --git a/ckanext/geoview/templates/geoview/snippets/geojson_asset.html b/ckanext/geoview/templates/geoview/snippets/geojson_asset.html
index 84afd901..6c412a70 100644
--- a/ckanext/geoview/templates/geoview/snippets/geojson_asset.html
+++ b/ckanext/geoview/templates/geoview/snippets/geojson_asset.html
@@ -1,6 +1,11 @@
-{% set main_css = h.get_rtl_css() if h.is_rtl_language() else g.main_css %}
-{# strip '/base/' prefix and '.css' suffix #}
-{% asset main_css[6:-4] %}
+{% if h.ckan_version().split('.') | map('int')| list >= [2, 9, 6] %}
+ {% set theme = h.get_rtl_theme() if h.is_rtl_language() else g.theme %}
+ {% asset theme %}
+{% else %}
+ {% set main_css = h.get_rtl_css() if h.is_rtl_language() else g.main_css %}
+ {# strip '/base/' prefix and '.css' suffix #}
+ {% asset main_css[6:-4] %}
+{% endif %}
{% asset 'ckanext-geoview/geojson_js' %}
{% asset 'ckanext-geoview/geojson_css' %}
diff --git a/ckanext/geoview/templates/geoview/snippets/shp_asset.html b/ckanext/geoview/templates/geoview/snippets/shp_asset.html
index ed452bec..71e932db 100644
--- a/ckanext/geoview/templates/geoview/snippets/shp_asset.html
+++ b/ckanext/geoview/templates/geoview/snippets/shp_asset.html
@@ -1,6 +1,11 @@
-{% set main_css = h.get_rtl_css() if h.is_rtl_language() else g.main_css %}
-{# strip '/base/' prefix and '.css' suffix #}
-{% asset main_css[6:-4] %}
+{% if h.ckan_version().split('.') | map('int')| list >= [2, 9, 6] %}
+ {% set theme = h.get_rtl_theme() if h.is_rtl_language() else g.theme %}
+ {% asset theme %}
+{% else %}
+ {% set main_css = h.get_rtl_css() if h.is_rtl_language() else g.main_css %}
+ {# strip '/base/' prefix and '.css' suffix #}
+ {% asset main_css[6:-4] %}
+{% endif %}
{% asset 'ckanext-geoview/shp_js' %}
{% asset 'ckanext-geoview/shp_css' %}
diff --git a/ckanext/geoview/tests/__init__.py b/ckanext/geoview/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/ckanext/geoview/tests/test_geojson.py b/ckanext/geoview/tests/test_geojson.py
new file mode 100644
index 00000000..d1e1e749
--- /dev/null
+++ b/ckanext/geoview/tests/test_geojson.py
@@ -0,0 +1,37 @@
+import pytest
+
+from ckan.tests import factories
+from ckan.plugins import toolkit
+
+from ckanext.geoview.plugin import GeoJSONView
+
+@pytest.mark.ckan_config('ckan.views.default_views', 'geojson_view')
+def test_geojson_view_is_rendered(app):
+ view_default_title = GeoJSONView().info()["title"]
+ dataset = factories.Dataset()
+
+ for format in GeoJSONView.GeoJSON:
+ resource = factories.Resource(
+ name='My Resource',
+ format=format,
+ package_id=dataset['id']
+ )
+
+ if toolkit.check_ckan_version("2.9"):
+ url = toolkit.url_for(
+ "{}_resource.read".format(dataset["type"]),
+ id=dataset["name"],
+ resource_id=resource["id"],
+ )
+ else:
+ url = toolkit.url_for(
+ controller="package",
+ action="resource_read",
+ id=resource["package_id"],
+ resource_id=resource["id"],
+ )
+
+ res = app.get(url)
+ assert 'class="resource-view"' in res.body
+ assert 'data-title="{}"'.format(view_default_title) in res.body
+ assert 'id="view-' in res.body
diff --git a/ckanext/geoview/tests/test_plugin.py b/ckanext/geoview/tests/test_plugin.py
new file mode 100644
index 00000000..f04f0014
--- /dev/null
+++ b/ckanext/geoview/tests/test_plugin.py
@@ -0,0 +1,7 @@
+from ckanext.geoview import plugin
+
+def test_plugin():
+ """This is here just as a sanity test
+ """
+ p = plugin.OLGeoView()
+ assert p
\ No newline at end of file
diff --git a/ckanext/geoview/tests/test_shpview.py b/ckanext/geoview/tests/test_shpview.py
new file mode 100644
index 00000000..242fcab5
--- /dev/null
+++ b/ckanext/geoview/tests/test_shpview.py
@@ -0,0 +1,37 @@
+import pytest
+
+from ckan.tests import factories
+from ckan.plugins import toolkit
+
+from ckanext.geoview.plugin import SHPView
+
+@pytest.mark.ckan_config('ckan.views.default_views', 'shp_view')
+def test_geojson_view_is_rendered(app):
+ view_default_title = SHPView().info()["title"]
+ dataset = factories.Dataset()
+
+ for format in SHPView.SHP:
+ resource = factories.Resource(
+ name='My Resource',
+ format=format,
+ package_id=dataset['id']
+ )
+
+ if toolkit.check_ckan_version("2.9"):
+ url = toolkit.url_for(
+ "{}_resource.read".format(dataset["type"]),
+ id=dataset["name"],
+ resource_id=resource["id"],
+ )
+ else:
+ url = toolkit.url_for(
+ controller="package",
+ action="resource_read",
+ id=resource["package_id"],
+ resource_id=resource["id"],
+ )
+
+ res = app.get(url)
+ assert 'class="resource-view"' in res.body
+ assert 'data-title="{}"'.format(view_default_title) in res.body
+ assert 'id="view-' in res.body
diff --git a/ckanext/geoview/utils.py b/ckanext/geoview/utils.py
index 00671dd4..2fca9be0 100644
--- a/ckanext/geoview/utils.py
+++ b/ckanext/geoview/utils.py
@@ -6,14 +6,8 @@
import requests
-import ckan.lib.base as base
-import ckan.lib.helpers as h
-import ckan.logic as logic
-
-import ckantoolkit as toolkit
-
from ckan import plugins as p
-
+from ckan.plugins import toolkit
log = logging.getLogger(__name__)
@@ -46,7 +40,7 @@ def proxy_service_resource(request, context, data_dict):
than the maximum file size. """
resource_id = data_dict["resource_id"]
log.info("Proxify resource {id}".format(id=resource_id))
- resource = logic.get_action("resource_show")(context, {"id": resource_id})
+ resource = toolkit.get_action("resource_show")(context, {"id": resource_id})
url = resource["url"]
return proxy_service_url(request, url)
@@ -55,7 +49,7 @@ def proxy_service_url(req, url):
parts = urlsplit(url)
if not parts.scheme or not parts.netloc:
- base.abort(409, detail="Invalid URL.")
+ toolkit.abort(409, detail="Invalid URL.")
try:
method = req.environ["REQUEST_METHOD"]
@@ -63,7 +57,7 @@ def proxy_service_url(req, url):
params = parse_qs(parts.query)
if not p.toolkit.asbool(
- base.config.get(
+ toolkit.config.get(
"ckanext.geoview.forward_ogc_request_params", "False"
)
):
@@ -88,7 +82,7 @@ def proxy_service_url(req, url):
cl = r.headers.get("content-length")
if cl and int(cl) > MAX_FILE_SIZE:
- base.abort(
+ toolkit.abort(
409,
(
"""Content is too large to be proxied. Allowed
@@ -101,7 +95,7 @@ def proxy_service_url(req, url):
response = make_response()
else:
- response = base.response
+ response = toolkit.response
response.content_type = r.headers["content-type"]
response.charset = r.encoding
@@ -115,7 +109,7 @@ def proxy_service_url(req, url):
length += len(chunk)
if length >= MAX_FILE_SIZE:
- base.abort(
+ toolkit.abort(
409,
(
"""Content is too large to be proxied. Allowed
@@ -129,17 +123,17 @@ def proxy_service_url(req, url):
error.response.status_code,
error.response.reason,
)
- base.abort(409, detail=details)
+ toolkit.abort(409, detail=details)
except requests.exceptions.ConnectionError as error:
details = (
"""Could not proxy resource because a
connection error occurred. %s"""
% error
)
- base.abort(502, detail=details)
+ toolkit.abort(502, detail=details)
except requests.exceptions.Timeout as error:
details = "Could not proxy resource because the connection timed out."
- base.abort(504, detail=details)
+ toolkit.abort(504, detail=details)
return response
@@ -213,7 +207,7 @@ def get_proxified_service_url(data_dict):
:param data_dict: contains a resource and package dict
:type data_dict: dictionary
"""
- url = h.url_for(
+ url = toolkit.url_for(
action="proxy_service",
controller='service_proxy',
id=data_dict["package"]["name"],
diff --git a/ckanext/geoview/views.py b/ckanext/geoview/views.py
index 9543c355..bfef2c6c 100644
--- a/ckanext/geoview/views.py
+++ b/ckanext/geoview/views.py
@@ -4,9 +4,8 @@
from flask import Blueprint
-import ckan.lib.base as base
-
from ckan import plugins as p
+from ckan.plugins import toolkit
import ckanext.geoview.utils as utils
@@ -17,15 +16,13 @@
def proxy_service(id, resource_id):
data_dict = {"resource_id": resource_id}
context = {
- "model": base.model,
- "session": base.model.Session,
- "user": base.c.user or base.c.author,
+ "user": toolkit.c.user or toolkit.c.author,
}
return utils.proxy_service_resource(p.toolkit.request, context, data_dict)
def proxy_service_url(map_id):
- url = base.config.get("ckanext.spatial.common_map." + map_id + ".url")
+ url = toolkit.config.get("ckanext.spatial.common_map." + map_id + ".url")
req = p.toolkit.request
return utils.proxy_service_url(req, url)
diff --git a/dev-requirements.txt b/dev-requirements.txt
new file mode 100644
index 00000000..172902c4
--- /dev/null
+++ b/dev-requirements.txt
@@ -0,0 +1 @@
+pytest-ckan
\ No newline at end of file
diff --git a/pip-requirements.txt b/pip-requirements.txt
deleted file mode 100644
index 53808bbe..00000000
--- a/pip-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-requests>=1.1.0
-ckantoolkit
diff --git a/setup.py b/setup.py
index 18638620..400b5103 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = '0.0.18'
+version = '0.1.0'
setup(
name='ckanext-geoview',
diff --git a/test.ini b/test.ini
new file mode 100644
index 00000000..3aa377ce
--- /dev/null
+++ b/test.ini
@@ -0,0 +1,45 @@
+[DEFAULT]
+debug = false
+smtp_server = localhost
+error_email_from = ckan@localhost
+
+[app:main]
+use = config:../ckan/test-core.ini
+
+# Insert any custom config settings to be used when running your extension's
+# tests here. These will override the one defined in CKAN core's test-core.ini
+ckan.plugins = resource_proxy geo_view geojson_view shp_view
+
+
+# Logging configuration
+[loggers]
+keys = root, ckan, sqlalchemy
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+
+[logger_ckan]
+qualname = ckan
+handlers =
+level = WARN
+
+[logger_sqlalchemy]
+handlers =
+qualname = sqlalchemy.engine
+level = WARN
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
\ No newline at end of file
New OneMap | Map data © contributors, Singapore Land Authority'
+ },
+ variants: {
+ Default: 'Default',
+ Night: 'Night',
+ Original: 'Original',
+ Grey: 'Grey',
+ LandLot: 'LandLot'
+ }
+ },
+ USGS: {
+ url: 'https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/{z}/{y}/{x}',
+ options: {
+ maxZoom: 20,
+ attribution: 'Tiles courtesy of the U.S. Geological Survey'
+ },
+ variants: {
+ USTopo: {},
+ USImagery: {
+ url: 'https://basemap.nationalmap.gov/arcgis/rest/services/USGSImageryOnly/MapServer/tile/{z}/{y}/{x}'
+ },
+ USImageryTopo: {
+ url: 'https://basemap.nationalmap.gov/arcgis/rest/services/USGSImageryTopo/MapServer/tile/{z}/{y}/{x}'
+ }
+ }
+ },
+ WaymarkedTrails: {
+ url: 'https://tile.waymarkedtrails.org/{variant}/{z}/{x}/{y}.png',
+ options: {
+ maxZoom: 18,
+ attribution: 'Map data: {attribution.OpenStreetMap} | Map style: © waymarkedtrails.org (CC-BY-SA)'
+ },
+ variants: {
+ hiking: 'hiking',
+ cycling: 'cycling',
+ mtb: 'mtb',
+ slopes: 'slopes',
+ riding: 'riding',
+ skating: 'skating'
+ }
+ },
+ OpenAIP: {
+ url: 'https://{s}.tile.maps.openaip.net/geowebcache/service/tms/1.0.0/openaip_basemap@EPSG%3A900913@png/{z}/{x}/{y}.{ext}',
+ options: {
+ attribution: 'openAIP Data (CC-BY-NC-SA)',
+ ext: 'png',
+ minZoom: 4,
+ maxZoom: 14,
+ tms: true,
+ detectRetina: true,
+ subdomains: '12'
+ }
+ },
+ OpenSnowMap: {
+ url: 'https://tiles.opensnowmap.org/{variant}/{z}/{x}/{y}.png',
+ options: {
+ minZoom: 9,
+ maxZoom: 18,
+ attribution: 'Map data: {attribution.OpenStreetMap} & ODbL, © www.opensnowmap.org CC-BY-SA'
+ },
+ variants: {
+ pistes: 'pistes',
+ }
+ },
+ AzureMaps: {
+ url:
+ 'https://atlas.microsoft.com/map/tile?api-version={apiVersion}'+
+ '&tilesetId={variant}&x={x}&y={y}&zoom={z}&language={language}'+
+ '&subscription-key={subscriptionKey}',
+ options: {
+ attribution: 'See https://docs.microsoft.com/en-us/rest/api/maps/render-v2/get-map-tile for details.',
+ apiVersion: '2.0',
+ variant: 'microsoft.imagery',
+ subscriptionKey: '