Commit Graph

509 Commits

Author SHA1 Message Date
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
amercader bbe4125257 [#65] Add individualName to ResponsibleParty 2014-03-19 11:59:08 +00:00
amercader 3b1b857efd Merge branch 'master' into 63-extend-spatial-harvesters 2014-03-14 14:12:30 +00:00
amercader 26763218bc [#62] Fix spatial-resolution parsing 2014-03-14 14:12:05 +00:00
amercader 13f03878e2 Merge branch 'master' into 63-extend-spatial-harvesters 2014-03-14 12:36:36 +00:00
amercader 1fa72f4c16 [#64] Fix validation exception when resource-type was missing 2014-03-14 12:36:01 +00:00
amercader badd723259 [#63] Add new ISpatialHarvest interface
Two extension points: ``get_package_dict`` and ``transform_to_iso``,
with the same expected behaviour as the old hooks meant to be overriden.

For ``get_package_dict`` we now pass, apart from the generated
package_dict, the parsed iso_values and the harvest object.

Updated docs and added autodocs.
2014-03-14 11:30:26 +00:00
amercader 60828520ba Merge branch '55_harvest_cql_master' of https://github.com/geosolutions-it/ckanext-spatial into geosolutions-it-55_harvest_cql_master 2014-03-14 10:29:47 +00:00
amercader 4551efdddb [#62] Relax multiplicities 2014-03-14 10:19:57 +00:00
amercader 8b4d23a315 [#62] Add new fields to the ISO parser
* Metadata standard name / version
* Unique resource identifier (reenabled and fixed)
* Presentation form
* Purpose
* Maintenance note
* Access constraints
* Distributor
* Usage
* Aggregation info
2014-03-11 17:05:08 +00:00
amercader ee77800111 [#62] Clean up keywords parsing
Keywords were extracted via 3 different elements
`keyword-inspire-theme`, `keyword-controlled-other` and
`keyword-free-text`. The latter didn't actually do anything and the
second duplicated xpaths from the first and added a non-standard one.

A new `keywords` key has been added which contains all keyword objects,
including type. This is not used to modify the `tags` key right now.
2014-03-11 14:09:55 +00:00
amercader 239b8313e9 [#62] Add links to organization parties 2014-03-11 14:07:01 +00:00
amercader 93e07fe987 [#61] Add media types for GeoJSON and GML 2014-03-07 16:26:50 +00:00
etj 9116a6fd1f [#55] Allow CSW harvesters to define CQL filters (2nd try) 2014-03-02 23:12:54 +01:00
etj f544f41806 [#57] Add default_tags and default_extras handling 2014-02-25 14:55:20 +01:00
amercader e3c35e9927 Merge branch 'tomkralidis-master' 2014-01-24 18:15:52 +00:00
amercader 15461acff7 [#52] Add class for link removed on 2.2 2014-01-09 17:49:18 +00:00
amercader c352fbdadb [#52] Show dataset map correctly on all 2.x versions 2014-01-09 17:46:45 +00:00
Tom Kralidis 3f91a4411b Update csw.py 2013-12-26 18:18:15 -05:00
Tom Kralidis af695826e8 add functionality to set CSW keywords from CKAN tag counts 2013-11-18 16:32:23 -05:00
amercader dac18b69b1 Revert accidental deletion from ffc5121c 2013-10-23 13:02:22 +01:00
amercader ffc5121c6d Fix csw client to properly use getrecords2 2013-10-16 13:58:14 +01:00
Tom Kralidis 1fdf0cde4c s/owslib.csw.getrecords/owslib.csw.getrecords2/g 2013-10-14 09:18:42 -04:00
amercader 45ebb5a13e [#37] Update attributions 2013-10-10 17:56:23 +01:00
amercader 2f28c8c5c7 [#37] Add support for MapBox tiles and others
The common map function has been extended to allow configuring different
options for the base layer. There are default presets for MapQuest and
MapBox, but any XYZ layer can be added configuration options. The
options are passed to the templates via a helper function and to the js
modules via data-module attributes. Full docs included.
2013-10-06 23:22:04 +01:00
amercader 8a48ceb0e7 Merge branch 'master' of git://github.com/FuhuXia/ckanext-spatial into FuhuXia-master 2013-10-04 15:45:44 +01:00
fxia a19010d8e5 for progress, use gemini_values not iso_values 2013-09-10 10:57:15 -04:00
amercader f7f1a72df8 Remove progress field from tests 2013-09-10 11:08:06 +01:00
amercader 8ffc392f40 Merge branch 'master' of git://github.com/FuhuXia/ckanext-spatial into FuhuXia-master 2013-09-10 11:00:15 +01:00
fxia c1fe37647f change progress multiplicity to * 2013-09-09 14:47:14 -04:00
amercader 028d26e6e0 [#37] Common function for initializing maps
This avoids duplication, mkaes all map consistent and makes easier
future support for other base maps.
2013-08-30 17:10:11 +01:00
amercader b371aee381 [#36] Fix spatial query widget for CKAN 2.1 2013-08-30 16:26:02 +01:00
fxia a9414e755d add progress into the iso values 2013-08-29 00:05:24 -04:00
amercader 3f784de737 Merge branch 'master' into 24-pycsw-integration-command
Conflicts:
	README.rst
2013-08-20 14:35:53 +01:00
amercader c6e29ee25f [#35] Ignore auth when using site_user 2013-08-14 12:23:00 +01:00
amercader 5f56877eba Merge branch '29-new-preview-interface' 2013-08-08 17:52:05 +01:00
amercader 063a1b8530 [#26] Fix broken markers on debug mode 2013-08-08 17:33:56 +01:00
amercader 19ea9b1753 [#32] Do not set height to avoid scrollbars if container is less than 600px 2013-08-08 17:31:21 +01:00
amercader 28042d2b6f [#28] Fix function name 2013-07-29 17:25:04 +01:00
amercader 14048a153c [#31] Check if sort parameter exists 2013-07-29 17:23:21 +01:00
Dominik Moritz f0aa5076a0 [#29] Fix missing variable 2013-07-19 23:04:49 +02:00
Dominik Moritz f4ea4da3e0 [#29] Use new precedence feature for previews. 2013-07-19 12:35:35 +02:00
amercader 44e4ae380a [#24] Document CKAN-pycsw integration
Ad overview of how it works, how to set it up and deploy it in a
production server.
2013-06-21 13:21:30 +01:00
amercader 67b0941b3b [#24] Add clear command to empty the pycsw table 2013-06-20 16:45:37 +01:00
amercader 7b65813cba [#24] Add command for pycsw integration
Based on the work by @kindly on https://github.com/kindly/ckan_pycsw_import,
adds a command to the extension that allows to export easily the spatial
datasets to pycsw. This will only work for harvested ISO datasets for the time
being.

The command can be run both via paster (in the context of a CKAN install) or
independently (eg a separate server), as it uses the API to get the datasets.

TODO docs
2013-06-20 16:44:56 +01:00
amercader d8ed7c03cd Merge branch '21-geojson-preview' 2013-06-14 17:56:26 +01:00
amercader e30b662a36 [#21] Make popup table match the rest of CKAN tables 2013-06-14 17:53:38 +01:00
amercader f8dd4c02bd [#21] Fix i18n calls
All the 'self' on the 'showError' function should be 'this', otherwise you
will refer to the window. Also 'this.i18n' assumes an 'i18n' key in the
module options. Looks like you are trying to pass some variables to the
string template, note the sprintf-like syntax.
2013-06-14 17:39:58 +01:00
amercader a4b8ddb7db Merge branch 'master' of github.com:okfn/ckanext-spatial 2013-06-14 16:01:49 +01:00
amercader 9eec88b320 [#15] Check CKAN version when using the Solr Search backend 2013-06-14 15:59:45 +01:00
Dominik Moritz fe8c469c12 [#21] show object in popup, fix layout 2013-06-14 13:23:06 +02:00
Dominik Moritz 6eb180c02a [#21] Add properties information to popup, lighter style 2013-06-13 23:24:01 +02:00
Dominik Moritz 64d1846e90 [#21] Add basic GeoJSON preview and fix set up of wms preview 2013-06-13 22:51:01 +02:00
kindly add78d5931 allow csw to fetch differen output schema 2013-05-18 18:28:25 +01:00
amercader 27521221d6 [#20] Flag datasets created via the spatial harvesters via a generic extra 2013-05-15 16:58:12 +01:00
amercader 8e81d1bd69 [#19] Extract thumbnail from ISO documents 2013-05-15 16:41:36 +01:00
amercader b4a7cf2289 [#15] Reenable the Solr backend on master
It can be used against CKAN core master (eventually 2.1)
2013-05-14 14:34:10 +01:00
amercader ce8747198f Merge branch 'release-v2.0'
Conflicts:
	README.rst
	ckanext/spatial/commands/validation.py
	ckanext/spatial/controllers/api.py
	ckanext/spatial/harvesters/gemini.py
	ckanext/spatial/plugin.py
	ckanext/spatial/tests/lib/test_spatial.py
	ckanext/spatial/tests/model/test_harvested_metadata.py
	ckanext/spatial/tests/test_harvest.py
2013-05-14 14:02:28 +01:00
amercader 7919a19f7c Revert "[#15] Add suport for Solr spatial indexing and querying"
Reverting #15 as CKAN 2.0 does not include the necessary changes.

This reverts commit c7a9cc660f.
2013-05-13 18:55:32 +01:00
amercader 83d903f84f Revert "[#15] Ensure that bounding boxes are defined counter-clockwise"
Reverting #15 as CKAN 2.0 does not include the necessary changes.

This reverts commit fede0b0831.
2013-05-13 18:55:27 +01:00
amercader 5e35ac0fcb Revert "[#15] Read search backend config option once only"
Reverting #15 as CKAN 2.0 does not include the necessary changes.

This reverts commit d11693f076.

Conflicts:

	ckanext/spatial/plugin.py
2013-05-13 18:55:12 +01:00
amercader 17796c4ad0 Revert "[#15] Add a new Solr search backend based on boost function"
Reverting #15 as CKAN 2.0 does not include the necessary changes.

This reverts commit bddfdf6fba.

Conflicts:

	ckanext/spatial/plugin.py
2013-05-13 18:53:09 +01:00
amercader 72127fa151 Revert "[#15] Tweak doc to remove paper"
Reverting #15 as CKAN 2.0 does not include the necessary changes.

This reverts commit cf22017b7d.
2013-05-13 18:51:44 +01:00
amercader 6f3c699311 [#7] Remove old genshi spatial query widget 2013-05-13 17:13:19 +01:00
amercader 7e10eb9c16 [#7] Allow to customize the default extent for the spatial query widget 2013-05-13 16:59:49 +01:00
amercader af253d0f89 [#7] Spatial search widget for 2.0
Adds a new map widget to the 2.0 search templates. It is shown initially
in the sidebar but it is expanded when the user needs to draw an area.
It uses Leaflet and Leaflet.draw.
2013-05-13 16:14:48 +01:00
amercader 45f4f4da57 [#16] Ignore time zones when parsing harvest object modified date
Otherwise you get this exception when the date on the document has time
zone information, as dates as stored without it on the database:

TypeError: can't compare offset-naive and offset-aware datetimes
2013-04-25 17:13:03 +01:00
amercader a4c86d26e3 [#15] Better checks following 27d4d5 2013-04-12 16:44:52 +01:00
Ian Ward 27d4d5b2c9 make spatial field optional 2013-04-12 16:39:38 +01:00
amercader 51a2b20501 Merge branch '15-solr-based-spatial-search' into release-v2.0 2013-04-12 10:56:21 +01:00
amercader 822ddbb1b5 [#8] Don't add object id to error so it can be aggregated 2013-04-12 10:54:02 +01:00
amercader cf22017b7d [#15] Tweak doc to remove paper 2013-04-12 10:06:50 +01:00
amercader bddfdf6fba [#15] Add a new Solr search backend based on boost function
This backend does not use the spatial field on Solr, but indexes the
area and coordinates of the dataset's extent. On query time, a boost
function is used to calculate a ratio between the query area and the
dataset extent, which will give a value of 0 for areas that don't
overlap and 1 for a perfect fit. The same function is used both for
sorting and filtering.
2013-04-11 19:29:41 +01:00
amercader d11693f076 [#15] Read search backend config option once only 2013-04-11 17:13:53 +01:00
amercader 970dfd1b68 Merge branch 'release-v2.0' into 15-solr-based-spatial-search 2013-04-11 12:51:08 +01:00
kindly d1594b3790 do not use kwarg for unicode errors 2013-04-09 12:06:38 +01:00
amercader 65e056d519 Merge branch 'release-v2.0' into 15-solr-based-spatial-search 2013-04-03 12:14:20 +01:00
amercader ff25ff2f2b [#8] Abort import stage if get_package_dict returns nothing 2013-04-02 18:40:03 +01:00
amercader 9760546d13 [#8] Add extra xpath for getting resources
According to the ISO spec gmd:MD_DigitalTransferOptions can be accessed
via a gmd:MD_Distributer tag
2013-03-27 17:39:51 +00:00
amercader 0c98e6ec4c [#8] Minor fix in single doc harvester 2013-03-27 17:38:42 +00:00
amercader fede0b0831 [#15] Ensure that bounding boxes are defined counter-clockwise
To return correct results on a spatial query, rectangle geometries must
be defined in counter-clockwise order [1]. This changeset adds a small
sanity check to before_index when we are dealing with a Polygon geometry
that has 5 coordinate pairs. Shapely is used to generate a LinearRing
from the polygon coordinates and check if they are ccw. If not, they are
reordered and a new polygon is generated so the WKT sent to Solr is
properly ordered.

The GeoJSON template used for extents in the base spatial harvester has
been also updated to define the coordinates counter-clockwise.

[1]
http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4#JTS_.2BAC8_WKT_.2BAC8_Polygon_notes
2013-03-23 19:28:31 +00:00
amercader 40967385b0 [#8] Fix typo in WMS format detection 2013-03-21 17:53:38 +00:00
amercader 0e0b5a2cc2 [#8] Fix bug that prevented setting a default resource name 2013-03-21 14:34:42 +00:00
amercader 627c4c58e0 [#8] Fix bug that prevented setting a default resource name 2013-03-21 14:34:23 +00:00
amercader c7a9cc660f [#15] Add suport for Solr spatial indexing and querying
When the 'ckanext.spatial.search_backend' config option is set to
'solr', the extension will index geometries stored in the 'spatial'
extra on the spatial field of the Solr index (named 'spatial_geom').
This is done on the 'before_index' extension point.

Also, when doing a query, if the same config option is in place, the
necessary fq parameter will be set to pass the spatial query to Solr.
2013-03-20 16:54:55 +00:00
amercader a727aa815b Add helper functions useful to format extras coming from the spatial harvesters 2013-03-18 15:59:20 +00:00
amercader a7fc19768b [#8] Remove print commands from WAF harvester 2013-03-14 17:45:34 +00:00
amercader eb201e1759 [#8] Waf harvester: improve exception and return empty list if no records 2013-03-14 17:35:51 +00:00
amercader 0aafffc8dc [#8] Capture exceptions during request in WAF harvester 2013-03-14 14:56:42 +00:00
amercader d2723c3020 [#8] resource-type not always present 2013-03-14 14:30:16 +00:00
amercader a76a8d2ca7 [#8] Don't use object id so messages can be grouped 2013-03-14 12:37:35 +00:00
amercader 4638b3899f Revert "[#8] Don't use object id so messages can be grouped"
This reverts commit 032cc4d961.
2013-03-14 12:36:39 +00:00
amercader 032cc4d961 [#8] Don't use object id so messages can be grouped 2013-03-14 12:34:20 +00:00
amercader da1dc02c7e [#8] Improve fields returned in the package dict
Make them less uklp specific and more parse friendly. Helper functions
should be used in the UI to format them nicely.
2013-03-08 18:57:30 +00:00
amercader 724ef6ed7c [#8] Fix gemini harvester after change in spatial field 2013-03-08 18:56:03 +00:00
amercader e7f70c4f85 [#8] Fix KeyError in point template 2013-03-05 18:38:55 +00:00
amercader 7c5071bfc2 [#8] Sanitize bbox before creating spatial extra
Some common problems:
* Whitespace, tabs, line feeds and plus signs: should be handled by
  float()
* Text: log error and skip creation of spatial extra
* Same set of 2 coords for extent: create point instead of polygon

Note that the bbox values are stored as they are in the bbox-xx-yy
extras
2013-03-05 18:31:49 +00:00
amercader d158a6c684 [#8] Change 'Resource locator' string for unnamed resources
'Resource locator' was confusing, has been replaced by 'Unnamed
resource' and made translatable. Also don't set description if not
present, set name.
2013-03-04 17:55:34 +00:00
amercader d43cbb8800 [#8] Improve resource format detection
The 'guess_resource_format' function looks for common patterns in popular
geospatial services and file extensions. It just looks at the provided URL,
it does not attempt to perform any remote check. By default, it will use the
mimetypes module if no match was found before to try to guess the format.

On the previous version, all resources in documents of type 'service' were
queried to see if they were actually WMS. This is no longer the case,
but services flagged as 'wms' can be verified if the following setting
is set to True: ckanext.spatial.harvest.validate_wms
2013-03-04 17:44:18 +00:00
amercader da5b37bc45 [#8] Fix typo in GeoJSON template 2013-03-01 17:42:51 +00:00
amercader d5461477aa [#8] Do not add XML declaration when storing the content
Rather than store the XML declaration in the DB, we add it if not present
when outputing the contents (Also in ckanext-harvest's show_object)
2013-03-01 17:33:53 +00:00