Commit Graph

340 Commits

Author SHA1 Message Date
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