Commit Graph

509 Commits

Author SHA1 Message Date
Taro Matsuzawa 5b744cb5b4 WIP: debug print 2021-01-18 23:04:52 +09:00
Taro Matsuzawa 01ad817444 WIP: debug print 2021-01-18 22:57:47 +09:00
Taro Matsuzawa 487cbc8d53 WIP: debug print 2021-01-18 22:51:13 +09:00
Taro Matsuzawa 7d3dbfcc0f WIP: debug print 2021-01-18 22:43:40 +09:00
Taro Matsuzawa 56b42907d9 WIP: don't set alter view and table, remove test code 2021-01-18 13:29:35 +00:00
Taro Matsuzawa 1e8b223729 WIP: test: copy error function to last test 2021-01-18 13:11:09 +00:00
Taro Matsuzawa 3364ca09ab WIP: don't drop idx_package_extent_the_geom 2021-01-18 12:49:28 +00:00
Taro Matsuzawa 4448fede1b WIP: set fixture each functions 2021-01-18 12:20:30 +00:00
Taro Matsuzawa d919c04da5 WIP: added test for ci 2021-01-18 20:48:07 +09:00
Taro Matsuzawa b0ed33ef89 WIP: remove with_plugins fixture 2021-01-18 11:36:45 +00:00
Taro Matsuzawa 20e7598264 WIP: supports ckan 2.8 2021-01-18 10:43:59 +00:00
Taro Matsuzawa f623dfb568 WIP: use asset instead of resource 2021-01-14 15:11:16 +09:00
Taro Matsuzawa 3477eccefd WIP: call initial_data in each function(autouse=True fixture doesn't work) 2021-01-14 14:09:51 +09:00
Taro Matsuzawa 4ff78e0c17 WIP: remove clean_db 2021-01-14 12:52:39 +09:00
Taro Matsuzawa b0a3290ba8 WIP: added fixture each test 2021-01-14 12:35:57 +09:00
Taro Matsuzawa a1ba3fdee2 WIP: drop package_extent table in clean up postgis 2021-01-08 12:46:09 +09:00
Taro Matsuzawa 075b6d6b89 WIP: drop import sql 2021-01-07 20:50:59 +09:00
Taro Matsuzawa 9f45d31f21 WIP: create postgis extension before check postgis version 2021-01-07 20:44:24 +09:00
Taro Matsuzawa 787cbb5c89 WIP: test: create postgis extension with ckan_default user 2021-01-07 19:06:29 +09:00
Taro Matsuzawa ff9dc44bc0 WIP: create/drop extension postgis in ci 2021-01-07 17:08:27 +09:00
Taro Matsuzawa 23a36d1937 WIP: added if exists option, added spatial_setup fixture to all 2021-01-07 13:55:24 +09:00
Taro Matsuzawa 77558ec3bf WIP: force remove index for package_extent 2021-01-07 13:45:33 +09:00
Taro Matsuzawa 12eb8c05e0 WIP: drop index for package_extent 2021-01-07 13:38:57 +09:00
Taro Matsuzawa 68acc993cd WIP: test: extend_existing flag 2021-01-07 13:11:59 +09:00
Taro Matsuzawa bf29fa0d90 WIP: test: revert package_extent issue 2021-01-07 13:02:39 +09:00
Taro Matsuzawa 1663e93d71 WIP: test: remove package_extent issue 2021-01-07 12:55:43 +09:00
Taro Matsuzawa 6c3c9f4046 WIP: test: added spatial_setup fixture 2021-01-07 12:47:19 +09:00
Taro Matsuzawa d7a2b7ed49 WIP: test: added harvest_setup fixture 2021-01-07 12:39:09 +09:00
Taro Matsuzawa c0626ccbe4 WIP: test: test_api use harvest_setup 2021-01-07 12:28:21 +09:00
Taro Matsuzawa 4cca5822e3 WIP: test: use harvest_setup 2021-01-07 11:52:46 +09:00
Taro Matsuzawa 26286fa385 WIP: test: use clean_db instead of spatial_clean_db 2021-01-07 11:42:53 +09:00
Taro Matsuzawa 14d98bc781 WIP: test: use {} instead of set() 2021-01-07 11:30:55 +09:00
Taro Matsuzawa eece0a89c2 WIP: test: remove package_extent before spatial_db_setup() 2021-01-07 11:08:40 +09:00
Taro Matsuzawa 0820b1929f WIP: test: added with_plugins 2021-01-06 23:03:22 +09:00
Taro Matsuzawa 4681706b83 WIP: remove spatial_ref_sys table in ckan's clean_db 2021-01-06 21:52:42 +09:00
Taro Matsuzawa 468ed052d9 WIP: test: added debug comment 2021-01-06 21:10:00 +09:00
Taro Matsuzawa 6e57837f9b WIP: test: remove spatial_ref_sys from metadata.tables 2021-01-06 20:53:25 +09:00
Taro Matsuzawa c46936a5e7 WIP: drop table spatial_ref_sys when drop extension postgis 2021-01-06 20:45:15 +09:00
Taro Matsuzawa f8e3b70897 WIP: test: setup only create extension 2021-01-06 19:03:55 +09:00
Taro Matsuzawa 50311ac610 WIP: added cascade option 2021-01-06 17:03:39 +09:00
Taro Matsuzawa 44e9ec0afb WIP: close all session before drop postgis extension 2021-01-06 16:32:38 +09:00
Taro Matsuzawa f11101659f WIP: reset_db will fail to drop table spatial_ref_sys, so use drop extension instead of drop table 2021-01-06 16:21:10 +09:00
Sergey Motornyuk 4b7cd9fca7 rename clean_db fixture 2020-05-06 16:21:08 +03:00
Sergey Motornyuk 123fc5a6fd Backport pytests 2020-05-06 15:19:21 +03:00
Sergey Motornyuk e84430a92d Install setuptools 2020-05-06 02:04:34 +03:00
Sergey Motornyuk 2420d62847 Fix import for nose tests 2020-05-06 01:20:21 +03:00
Sergey Motornyuk f7dc2bf40d Update tests 2020-05-03 20:28:33 +03:00
Sergey Motornyuk 63274022fd owslib==0.18.0 2020-04-15 02:34:45 +03:00
Sergey Motornyuk 03272a9cd5 Update tests 2020-04-15 02:20:30 +03:00
Sergey Motornyuk a58510a432 Remove builtins 2020-04-15 00:06:11 +03:00
Sergey Motornyuk 68a872a6cb remove future 2020-04-14 23:11:15 +03:00
Sergey Motornyuk 1e6f68990d Use 1.11 six api 2020-01-21 15:28:30 +02:00
Sergey Motornyuk ca35e7a971 Update encoding 2020-01-21 14:31:34 +02:00
Sergey Motornyuk 6060bc5cb4 Fix encoding for gemini harvester 2020-01-21 14:25:53 +02:00
Sergey Motornyuk a0fc527131 pylons config 2020-01-15 11:08:40 +02:00
Sergey Motornyuk 27057e0a39 IClick support 2019-12-13 16:48:20 +02:00
Sergey Motornyuk 93951db642 Add webassets.yml 2019-12-11 14:34:31 +02:00
Sergey Motornyuk e063522032 Futurize 2019-12-11 14:23:03 +02:00
Sergey Motornyuk 2803729263 Update commands 2019-12-11 14:22:28 +02:00
Sergey Motornyuk 2ab242ed97 Update views 2019-12-11 13:44:09 +02:00
Sergey Motornyuk 75a37f8ce4 Split plugins 2019-12-11 12:31:25 +02:00
Andres Vazquez f9eec070b6
I saw the languaje specified like this
Example [here](https://gitlab.com/datopian/ckan-ng-harvest/blob/develop/harvest/csw/samples/sample2.xml#L5-7).
```
<gmd:language>
    <gco:CharacterString>en</gco:CharacterString>
</gmd:language>
```

I'm not sure if this is ok with ISO but this CSW source is using it.
2019-09-16 09:16:15 -03:00
Jean Pommier 8bfed010c2 [harvest] fixes https://github.com/ckan/ckanext-spatial/issues/225 2019-08-22 11:30:47 +02:00
Bruce Bolt b0b6eebf5a The expected key may not be set - this stops a KeyError 2018-11-14 11:26:48 +00:00
Emanuele Tajariol 2acf66b110 #188 Add clean_tags option in harvester (#189)
* cleanup bad chars from tags in harvester

* cleanup bad chars from tags in harvester - do safer config read

* use munge_tag to clear tags, code cleanup

* restored default tag truncate

* tests for clean tags

* removed hack for IHarvester.info()

* #188 cleanup

* #188 #190 Add doc about harvester JSON config

* clean tags tests updated #188

* #188 test fixes

* #188 test fixes

* #188 test fixes

* #188 test fixes

* removed unused/bad code after review #188
2018-05-12 12:07:43 +02:00
Ross Jones e5da0a15c9
Fix broken tests
Tests were relying on _rest action calls which have now been removed in
master (and 2.8) and therefore tests were failing.

Makes the tests work, although there is probably some effort required in
determining why metadata_modified is not being returned from
package_show calls.

Also caches the pip output, and tests against newer versions of CKAN
2018-05-09 22:51:46 +01:00
Tyler Kennedy ee643094b1 Fix missing import in before_index
[Most] versions of shapely do not have `geometry` imported at the top level. Import it explicitly to prevent indexing errors instead of relying on import side-effects.
2017-09-11 11:03:53 -04:00
Mark Winterbottom d74d331019 Pep-8 2017-05-31 08:53:52 +01:00
Mark Winterbottom 011008b9c5 pep-8 improvements. 2017-05-30 16:57:04 +01:00
Mark Winterbottom b79bf51a05 Updated called to `resource_stream` to use __name__ in validation.py for consistency. 2017-05-30 16:20:22 +01:00
Mark Winterbottom 541e0cb9b9 Fixed relative path issue with resource_stream in api.py. 2017-05-30 16:04:38 +01:00
Mark Winterbottom c695370afc Fixed issue with template path. 2017-05-24 15:34:40 +01:00
Mark Winterbottom 4223cfe62f Fixed package reference for api controller. 2017-05-24 13:53:31 +01:00
Mark Winterbottom 711e9c8d2d Updated package name to 'ckanext.spatial.validation' to fix bug https://github.com/ckan/ckanext-spatial/issues/174 2017-05-24 13:39:32 +01:00
Mark Winterbottom 11ae652df3 PEP-8 improvements. 2017-05-24 13:38:37 +01:00
Mark Winterbottom 91ba363f48 PEP-8 improvements. 2017-05-24 13:38:19 +01:00
Mark Winterbottom 155a6bd252 Pep8 improvemnets. 2017-05-24 12:33:07 +01:00
Mark Winterbottom faee1d4596 Updated usage of `resource_stream` to use 'ckanext.spatial.validation' to fix issue https://github.com/ckan/ckanext-spatial/issues/174. 2017-05-23 17:08:04 +01:00
Mark Winterbottom 63ad6478fb Updated paths for `transforms` which were missed from previous commit. 2017-05-23 16:07:07 +01:00
Mark Winterbottom 5fa5853c3a Made some pep8 improvements. Updated the resource_stream called to use '__name__' in attempt to fix this bug: https://github.com/ckan/ckanext-spatial/issues/174 2017-05-23 15:19:14 +01:00
Adrià Mercader 5040caee85 Merge pull request #164 from torfsen/leaflet-0.7.7-leaflet.draw-0.3.2
Update Leaflet to 0.7.7 and Leaflet.Draw to 0.3.2
2016-10-17 11:34:38 +01:00
Florian Brucker 10878dc168 Update Leaflet.Draw to 0.3.2. 2016-10-12 10:27:02 +02:00
Florian Brucker 1221fe67eb Update Leaflet to 0.7.7. 2016-10-11 15:54:17 +02:00
etj 3d73bc9642 [#162] Allow use of WMS layer in extent map 2016-10-04 16:38:27 +02:00
etj e15838d7f4 [#162] Allow use of WMS layer in extent map 2016-10-04 13:14:39 +02:00
David Read b7a2cee4e0 Remove unused imports. PEP8. 2016-09-19 12:32:55 +01:00
Andy Gross d3c69a1326 Remove import of base.redirect
This function was removed in ckan/ckan@34f3f18
2016-09-18 03:35:56 -07:00
amercader 44f05e181c [#157] Replace MapQuest by Stamen as default tiles 2016-08-03 11:57:10 +01:00
Miguel Gouveia 16fa672a18 Improving log error message.
Improving log error message for invalid geoJSON data.
2016-06-17 15:46:22 +01:00
Adrià Mercader cb9c1294f2 Merge pull request #116 from DataShades/spatial-field-solr-5
#114 solr-spatial-field search Solr 5 compatibility
2016-05-31 15:22:58 +01:00
Tom Kralidis 143250ea9c fix CSW constructor 2016-01-25 10:33:48 -05:00
amercader 918f06fa3c Merge branch 'license' of https://github.com/geosolutions-it/ckanext-spatial into geosolutions-it-license 2016-01-14 12:32:52 +00:00
Tobia Di Pisa 7970f2b656 Metadata license ID check for package: refinements. 2016-01-14 13:17:22 +01:00
amercader 02f01508bf Remove print statement 2016-01-14 12:12:43 +00:00
David Read fc3a364a0f Support new locations for test functions. 2016-01-14 09:55:27 +00:00
David Read 7e2f4f957c Merge pull request #141 from tomkralidis/remove-cswinfo
remove cswinfo
2016-01-14 09:47:12 +00:00
amercader 52a48694b5 Merge branch 'force-sortby' of https://github.com/tomkralidis/ckanext-spatial into tomkralidis-force-sortby 2016-01-13 17:54:40 +00:00
Tom Kralidis fc4c37c4c3 add super to init 2016-01-13 12:49:11 -05:00
Adrià Mercader 11b13cd132 Merge pull request #129 from nbtetreault/patch-1
Set tms option for custom layer
2016-01-13 18:38:10 +01:00
Adrià Mercader 29abbeb1bb Merge pull request #132 from ckan/paster-speedup
Speed up non-spatial paster commands.
2016-01-13 18:36:32 +01:00
Tom Kralidis a28baf4c7e remove cswinfo 2016-01-13 12:33:27 -05:00
Tobia Di Pisa 3a6342cd9d Metadata license ID check for package 2016-01-13 17:43:13 +01:00
Tom Kralidis c2b8f8ea82 update docs, remove code not used 2015-12-30 11:22:23 -05:00
Tom Kralidis e4ffbe611b remove legacy CSW server implementation 2015-12-26 08:40:49 -05:00
Tom Kralidis eb9cd6fc1c force all CSW GetRecords requests to set ogc:SortBy to ensure proper ordering 2015-12-25 14:09:37 -05:00
Ross Jones e6fa57055f Speed up non-spatial paster commands.
Because plugins are loaded for every paster command, regardless of which
paster command is being run, when lots of plugins are installed startup
time can be substantial.

To fix this, making sure that plugin.py in various extensions doesn't
import unnecessary (and potentially slow) modules, this PR moves the
imports of some function into the function where they are called.

This reduces paster startup time (for me) by up to .5 seconds, which
while not significant by itself, contributes to my current 8 second
startup time.
2015-12-02 10:42:28 +00:00
Nicolas Brisebois-Tétreault 3543ebba87 Set tms option for custom layer
Set the L.TileLayer as a TMS. It's required if the base layer specified in custom.url is a TMS. The default value of tms is false in Leaflet.
To use the TMS option, ```ckanext.spatial.common_map.tms = true``` has to be set in the ckan .INI file.

Same as https://github.com/ckan/ckanext-geoview/pull/24
2015-11-06 10:40:34 -05:00
Harald von Waldow aa68ac5bbf fix map attribution 2015-10-23 11:00:55 +02:00
Mark Gregson 259333c6fa [#114] Updates spatial search query for Solr 5 compatibility 2015-10-06 10:40:30 +11:00
amercader efc8b6c80c [#90] Adjust latitudes when doing spatial queries
If the minx falls below -180 or over 180 adjust minx and maxx to ensure
minx stays within bounds
2015-08-21 13:53:50 +01:00
amercader 4a69cbe9da Merge branch '87-attribution' of https://github.com/jqnatividad/ckanext-spatial into jqnatividad-87-attribution 2015-07-24 20:38:22 +01:00
amercader 8645cceed2 Merge branch 'master' of https://github.com/tomkralidis/ckanext-spatial into tomkralidis-master2 2015-07-24 20:36:31 +01:00
fxia b0b71a5438 [#112] bbox fix only kicks in with positive w-long and negative e-long 2015-07-24 11:41:11 -04:00
Tom Kralidis 36ab8d68fe support multiple GML namespaces 2015-06-17 21:24:23 -04:00
amercader 414255e34a [#102] MapBox tiles require access token 2015-05-07 17:59:21 +01:00
amercader 86c4fbdbf7 [#101] Change Mapquest tiles base URL under https 2015-05-07 17:43:03 +01:00
amercader 0886e15ed5 [#107] Remove geojson and wms views
The GeoJSON Leaflet plugin now lives on ckanext-geoview:

https://github.com/ckan/ckanext-geoview

The old WMS preview has been completely removed in favour of the
OpenLayers based geoview:

https://github.com/ckan/ckanext-geoview#openlayers-viewer
2015-05-07 13:43:52 +01:00
etj a5a703445b Fix delete in CSW. Closes #103. 2015-04-24 12:43:58 +02:00
fxia e530017a8a bbox fix, more 2015-04-17 14:11:41 +01:00
fxia cc0d0b14ce bbox fix. make sure w long value is less than e long value 2015-04-17 14:11:38 +01:00
amercader ba2656287d Remove debug call 2015-04-08 10:24:36 +01:00
amercader a96d134f1e [#95] Fix GeoJSON preview for features without properties 2015-04-08 10:01:55 +01:00
amercader 4a142e8377 [#98] Minor tweaks to @u10313335 PR
* Keep old entry points for preview plugins so people does not need to
  do python setup.py develop

* Version checks should be done including the min_version parameter,
  otherwise they will fail for 2.4, 2.5...

* No need to define different methods for different interfaces. If
  running eg 2.3, the IResourcePreview interface methods will simply be
  ignored.

* Simplified same domain checking

* Add note about these being eventually migrated to ckanext-geoviews

* Added docs
2015-04-02 11:41:50 +01:00
amercader c9c40606c2 Merge branch '2.3' of https://github.com/taijiang-tw/ckanext-spatial into taijiang-tw-2.3 2015-04-02 09:28:02 +01:00
amercader bcd7c0e5e6 [#97] Support PostGIS 1.5 when defining the Geometry column
We need to pass management=True when initializing it:

https://github.com/geoalchemy/geoalchemy2/issues/50
2015-04-01 12:49:24 +01:00
amercader 50df9130cf [#97] The tests that ckanext-spatial deserves
Completely reviewed and refactored tests to support both CKAN 2.2/2.3,
geoalchemy 1/2 and PostGIS 1/2 (TODO test on PostGIS 1.5)

Removed all references to legacy ckan tests, and removed old or
incomplete tests.
2015-04-01 11:36:00 +01:00
amercader a23ec96b2b [#97] Rename function to make it Postgis 2.0 compatible 2015-04-01 11:13:54 +01:00
amercader 8d1a731b0a [#97] Saner way of comparing geometries 2015-04-01 11:13:05 +01:00
Sol Lee c291e30a0e make wms and geojson viewer compatible with CKAN 2.3 2015-04-01 18:02:31 +08:00
amercader f41f20c0da [#97] Move all GeoAlchemy(2) related code to a common module
This allows code in lib, model etc to not worry about GeoAlchemy
versions. This assume the correct library installed, as the check has
been done when starting up.
2015-03-27 15:57:55 +00:00
amercader 39373c9144 [#97] Check GeoAlchemy version on startup
If using CKAN>=2.3 and GeoAlchemy2 is not installed an ImportError
will be raised with details about how to proceed. Added a section
on the Troubleshooting.
2015-03-27 15:57:11 +00:00
jqnatividad 89795c4b3d Display map widget custom attribution
Fixes #87
2014-11-03 16:51:46 -05:00
amercader 23a83fac29 Merge branch '57_default_tags_extras' of https://github.com/geosolutions-it/ckanext-spatial into geosolutions-it-57_default_tags_extras 2014-06-27 16:10:13 +01:00
Tom Mortimer-Jones d6896d68c2 Update csw.py
Fix copy paste error
2014-06-20 12:36:04 +01:00
amercader 10bb6a1edb [#69] Fix autodoc in RTD, minor doc tweaks 2014-06-11 12:22:13 +01:00
amercader b428c33ff6 [#69] Add config option to keep old behaviour (not reindex) 2014-06-10 18:08:38 +01:00
amercader dbf139e732 [#63] Added extension point for defining custom validators 2014-05-13 18:07:14 +01:00
amercader 6c55aad223 [#63] Add extra stuff to the get_package_dict extension point
Moved the call to get_site_user higher on base.py so it's available to
extensions. Also added the parsed XML etree so it does not need to be
parsed from the string again.
2014-05-13 18:03:12 +01:00
amercader 5461bebb62 Merge branch 'master' into 63-extend-spatial-harvesters 2014-05-13 17:54:44 +01:00
amercader fa4161af87 [#70] Fix deletion of harvested CSW records
The object id was pushed to the list returned by gather_stage before
being saved on the db, so None was added, causing an exception in the
Redis queue
2014-05-13 17:53:18 +01:00
amercader b25a01029a Merge branch 'master' into 63-extend-spatial-harvesters
Conflicts:
	ckanext/spatial/harvesters/base.py
2014-05-13 15:33:04 +01:00
amercader ab241d2530 Pass defer_commit in context on get_site_user calls
See ckan/ckan#1714. Until that is fixed properly, the `defer_commit`
flag avoids some `DetachedInstanceErrors` happening during the
harvesting.
2014-05-13 15:30:34 +01:00
amercader 57b7e51e5a Merge branch '69-reindex-dataset-no-object-change' into 63-extend-spatial-harvesters 2014-04-30 18:02:15 +01:00
amercader e979d08e77 [#69] Reindex dataset if harvest object did not change
We replace the old harvest object with the new one, and if we don't
reindex the reference to the old harvest object will remain in the
dataset dict
2014-04-30 18:01:42 +01:00
amercader e9be08d8f1 Merge branch 'master' into 63-extend-spatial-harvesters 2014-04-28 18:41:38 +01:00
amercader e19ed8100f [#62] Fix xpath for Alternate Title 2014-04-28 17:25:17 +01:00
amercader 211f3e4a95 [#63] Tweak docs 2014-03-19 13:02:03 +00:00
amercader f960733727 Merge branch 'master' into 63-extend-spatial-harvesters 2014-03-19 12:48:49 +00:00
amercader 0513e360e9 [#63] Add previous_object check
In rare cases (eg if there was a previous error of two objects sharing
a guid) we can have a "changed" state and no previous_object
2014-03-19 12:46:01 +00:00
amercader 119c0fd40c [#63] Add user to delete context to avoid exception 2014-03-19 12:45:49 +00:00