Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream v0.0.19 #5

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
14a6009
Add shapefile preview
u10313335 Sep 6, 2017
3359b06
Add missing statement, otherwise geojson views were not created
amercader Jan 31, 2018
340b8b6
Bump version
amercader Jan 31, 2018
0247f1f
exclude parameters from proxied OGC url
pduchesne Jun 23, 2017
5d01b4b
make OGC parameter exclusion configurable
pduchesne May 18, 2018
8b4683a
add default OSM basemap (fixes ckan/ckanext-geoview#58)
pduchesne May 18, 2018
b3344a6
Merge branch 'master' into ckan_master
pduchesne May 18, 2018
796f841
Integrated bootstrap2 into codebase (#1)
roll Aug 15, 2018
469243e
Use ckantoolkit, remove pylons config
amercader Feb 6, 2019
e25cb4d
Merge branch '2.9-support'
amercader Feb 6, 2019
3a38723
Fixes pduchesne/ckanext-geoview/#11, OL map not showing up
amercader Feb 6, 2019
1bcff31
Merge remote-tracking branch 'upstream/master'
amercader Feb 6, 2019
c029305
flake8 style changes
Mar 14, 2019
95ce361
Fix mimetype for geojson
amercader Apr 9, 2019
f06f744
Allow to define a max size on GeoJSON preview
amercader Oct 30, 2019
422f8ae
Merge branch 'shp_view' of https://github.com/depositar/ckanext-geovi…
amercader Oct 30, 2019
8c91058
Merge branch 'depositar-shp_view'
amercader Oct 30, 2019
31e297c
Merge branch 'master' of https://github.com/vrk-kpa/ckanext-geoview i…
amercader Oct 30, 2019
12ef5d8
Merge branch 'vrk-kpa-master'
amercader Oct 30, 2019
e2022c0
Bump to current release
amercader Oct 30, 2019
82ce623
Merge remote-tracking branch 'upstream/master'
amercader Oct 30, 2019
a103795
Remove deprecated pieces. Add 2.9 support
smotornyuk Dec 17, 2019
8e31b16
Futurize
smotornyuk Dec 17, 2019
b4dec11
Support webassets
smotornyuk Dec 17, 2019
ea3bd33
remove future
smotornyuk Apr 14, 2020
2239f49
Update url_for
smotornyuk Sep 17, 2020
cb03b69
fixes for styling
Engerrs Nov 17, 2020
9234dd6
Remove pyproject file
amercader Nov 23, 2020
623e3df
Improve version check to support 2.10
amercader Nov 23, 2020
3b4ddd2
Merge branch 'DataShades-py3'
amercader Nov 23, 2020
29b7b8b
Release 0.0.17
amercader Nov 23, 2020
e0adac9
fix shp preview
smotornyuk Apr 8, 2021
22478f1
Support CKAN 2.9 WebAssets....
gallexme Apr 21, 2021
c1e6336
Merge pull request #80 from gallexme/patch-1
amercader Jul 29, 2021
1bf1317
Allow Shapefile views on resoures with format ZIP
amercader Jul 29, 2021
ef471d2
Bump version
amercader Jul 29, 2021
a1a1720
Merge branch 'master' of github.com:ckan/ckanext-geoview
amercader Jul 29, 2021
5832ad0
WMTS preview: support webassets
u10313335 Jan 30, 2022
80600dd
Add on_same_domain check to WMTS and Shapefile viewer
u10313335 Jan 31, 2022
f91a9ea
Merge pull request #88 from depositar/on_same_domain_wmts_shp
amercader Mar 23, 2022
d9855c7
Merge pull request #86 from depositar/wmts_webassets
amercader Mar 23, 2022
e2a1cc9
Bump version
amercader Mar 23, 2022
1977ef7
Allow for better layer selection from URLs for WMS/WFS.
CarlQLange Jan 11, 2018
5860519
Remove WMS querystring if we're trying to preview a layer
CarlQLange Jan 11, 2018
a6735ef
a little hacky way to preview kml.zip
CarlQLange Jan 11, 2018
7b86c05
add a few shape/zip formats
CarlQLange Jan 12, 2018
6de9c05
get correct layername for wms
CarlQLange Jan 12, 2018
2702cb8
Change the error message and code for too big
CarlQLange Feb 21, 2018
2ae8695
Don't pass along credential info
mattfullerton Feb 28, 2018
a70e1f9
Cope with another version of bounds in ESRI API
mattfullerton Feb 28, 2018
765131e
adding attribution for openlayers maps
EricSoroos May 3, 2018
3026f44
Fix WMS preview when no layer in the url
EricSoroos Oct 16, 2018
39d5d37
Add timeouts for requests
EricSoroos Oct 12, 2021
222af28
Use io to import StringIO for py3
saj-derilinx Apr 20, 2022
9340495
Fix function references
saj-derilinx Apr 20, 2022
894bf45
reverting attribution: is covered by config: ckanext.spatial.common_m…
EricSoroos May 19, 2022
6882417
Io is good enough for all shipping pythons
EricSoroos May 19, 2022
205fb82
inline requirements
EricSoroos May 19, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove future
  • Loading branch information
smotornyuk committed Apr 14, 2020
commit ea3bd334b0a058ca7aea6c780f3aa690c87e5e02
7 changes: 2 additions & 5 deletions ckanext/geoview/plugin/__init__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
# -*- coding: utf-8 -*-

from future import standard_library
standard_library.install_aliases()
import os
import logging
import mimetypes
import urllib.parse

from six.moves.urllib.parse import urlparse

import ckantoolkit as toolkit

Expand Down Expand Up @@ -129,7 +126,7 @@ def form_template(self, context, data_dict):

def _guess_format_from_extension(self, url):
try:
parsed_url = urllib.parse.urlparse(url)
parsed_url = urlparse(url)
format_lower = (
os.path.splitext(parsed_url.path)[1][1:]
.encode("ascii", "ignore")
Expand Down
10 changes: 3 additions & 7 deletions ckanext/geoview/utils.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
# -*- coding: utf-8 -*-

from future import standard_library
standard_library.install_aliases()
import json
import logging
import urllib.parse
from six.moves.urllib.parse import urlencode, urlsplit, parse_qs

import requests

from urllib.parse import urlencode

import ckan.lib.base as base
import ckan.lib.helpers as h
import ckan.logic as logic
Expand Down Expand Up @@ -57,14 +53,14 @@ def proxy_service_resource(request, context, data_dict):

def proxy_service_url(req, url):

parts = urllib.parse.urlsplit(url)
parts = urlsplit(url)
if not parts.scheme or not parts.netloc:
base.abort(409, detail="Invalid URL.")

try:
method = req.environ["REQUEST_METHOD"]

params = urllib.parse.parse_qs(parts.query)
params = parse_qs(parts.query)

if not p.toolkit.asbool(
base.config.get(
Expand Down