f7d23dd576
#154 Gemini schematron 1.3 has been accepted, so loses the "a" suffix.
2013-02-08 17:38:41 +00:00
aa080e9f75
#noticket No functionality has changed! Factored out responsible_organisation stuff into a separate method to add tests to show what it does.
2013-02-08 17:38:05 +00:00
9daff6a5b2
#noticket Tests added to clarify license URL extraction.
2013-02-08 17:36:34 +00:00
e20080e69d
Latest schematron added. FCSC is a good test of it.
2013-02-08 17:35:31 +00:00
6e23ae55c8
Relaxed "Multiplicity Check" so that it does not raise Exceptions any more - just log errors. This is because they are simply duplicates of the Gemini Schematron. Adria agreed these will be deleted anyway in 2.0.
2013-02-08 17:34:43 +00:00
779e00cd75
[xs] Improve docstrings and error messages.
2013-02-08 17:33:42 +00:00
5bcffdf14b
More debug logging added to WAF harvester.
2013-02-08 17:33:16 +00:00
44728f12f7
Add XSL for converting Gemini XML to nice HTML, used in controllers/api.py.
2013-02-08 17:31:34 +00:00
bcdf360b01
Spatial query can now be ordered. Does not play nicely with SOLR options - just uses that to get the facets counts and return each result. Have added performance tests for two alternative queries.
...
- Added a config option ('ckanext.spatial.use_postgis_sorting') to
activate this as this behaviour will be deprecated in the future
in favour of Solr 4 spatial sorting capabilities.
Also fixed the tests
Conflicts:
ckanext/spatial/plugin.py
2013-02-08 17:28:37 +00:00
fb4b041b30
Adding Parslow constraints schema previously missed.
2013-02-08 16:41:44 +00:00
8e0f7c7148
Added lower level tests for bbox search (at the lib level), complementing the API level ones.
...
Conflicts:
ckanext/spatial/plugin.py
2013-02-08 16:41:02 +00:00
46fb0030a5
Comments about on cardinality/multiplicity.
2013-02-08 16:38:14 +00:00
d2c97fe3cc
Added new Parslow Constraints Schematron to test. Added command to validate on the command-line.
2013-02-08 16:37:44 +00:00
9ea3295b46
Get the validation XML to be included in the distribution.
2013-02-08 16:36:36 +00:00
892b44a3b3
Added useful logging to the validation report. Useful to have the date (i.e. version) in the name of the Eden schema.
2013-02-08 16:35:59 +00:00
c6ac9494a2
Revert " #276 Coupled resources - first iteration."
...
Reverting changes for "#276 Coupled Resource" on master as it is INSPIRE-specific. Moving to datagovuk/ckanext-spatial branch dgu.
This reverts commit 91e547a622
2013-02-04 16:07:19 +00:00
f4e3cfad00
Revert " #276 Coupled resources - second iteration. Just need to update harvester now."
...
Reverting changes for "#276 Coupled Resource" on master as it is INSPIRE-specific. Moving to datagovuk/ckanext-spatial branch dgu.
This reverts commit ecd6036efe
2013-02-04 16:07:03 +00:00
c771a76e3d
Revert " #276 Coupled Resource table now gets updated during harvest."
...
Reverting changes for "#276 Coupled Resource" on master as it is INSPIRE-specific. Moving to datagovuk/ckanext-spatial branch dgu.
This reverts commit 01536873b9
2013-02-04 16:03:50 +00:00
84b75ea759
Revert " #276 Coupled Resource - fix to not show withdrawn packages in list of coupled resources."
...
Reverting changes for "#276 Coupled Resource" on master as it is INSPIRE-specific. Moving to datagovuk/ckanext-spatial branch dgu.
This reverts commit 3f627d9700
2013-02-04 16:00:34 +00:00
27c4ee81e2
#287 Avoid doing extra validation for WAF in the gather stage.
2013-02-02 00:06:33 +00:00
3f627d9700
#276 Coupled Resource - fix to not show withdrawn packages in list of coupled resources.
2013-02-01 23:10:58 +00:00
3eee0be135
#noticket Bugfix - diff (when harvest content changed without timestamp change) displayed raw html.
2013-02-01 18:09:12 +00:00
cdabab12cd
#154 Gemini schematron 1.3 has been accepted, so loses the "a" suffix.
2013-02-01 14:00:51 +00:00
73af616b81
#noticket No functionality has changed! Factored out responsible_organisation stuff into a separate method to add tests to show what it does.
2013-02-01 12:04:50 +00:00
01536873b9
#276 Coupled Resource table now gets updated during harvest.
2013-01-31 18:05:48 +00:00
2cef9d6dae
#noticket Tests added to clarify license URL extraction.
2013-01-31 14:32:19 +00:00
ecd6036efe
#276 Coupled resources - second iteration. Just need to update harvester now.
2013-01-28 23:56:12 +00:00
91e547a622
#276 Coupled resources - first iteration.
2013-01-28 21:53:15 +00:00
775a57d1f5
Latest schematron added. FCSC is a good test of it.
2013-01-24 11:30:23 +00:00
70c3eccdf5
Relaxed "Multiplicity Check" so that it does not raise Exceptions any more - just log errors. This is because they are simply duplicates of the Gemini Schematron. Adria agreed these will be deleted anyway in 2.0.
2013-01-21 17:22:24 +00:00
461607f06f
Merge branch 'release-v2.0' into 2.0-validation-changes
2013-01-21 16:30:59 +00:00
fd1071959e
[ #6 ] Move to Leaflet for dataset map widget
...
For this particular use case Leaflet offered the best option. Also
solves the issue when showing extent covering the whole world.
2013-01-18 15:12:09 +00:00
66b72163d5
Remove stuff from html.py
...
The rest will eventually go when we migrate the spatial search snippet.
2013-01-18 15:11:06 +00:00
70f7f6144b
Factor out DGU code from the dataset map
...
It now lives in the DGU extension:
https://github.com/datagovuk/ckanext-dgu/blob/master/ckanext/dgu/theme/public/scripts/dgu-dataset-map.js
2013-01-18 13:32:30 +00:00
3da5807eb4
[ #6 ] Update dataset map to be a pure snippet
...
No need to load an extension.
2013-01-18 13:07:26 +00:00
1622223a38
[xs] Improve docstrings and error messages.
2013-01-16 22:22:39 +00:00
7841691fc3
More debug logging added to WAF harvester.
2013-01-16 13:10:32 +00:00
348c1c4dc1
Add XSL for converting Gemini XML to nice HTML, used in controllers/api.py.
2013-01-16 13:08:28 +00:00
21a85a6b3f
[ #4 ] Register resources only once for all plugins
...
spatial_metadata will load the resources (public, templates and
resources) for all plugins to use, as it needs to be loaded anyway.
2013-01-15 20:00:46 +00:00
7abfb4eb61
Use plugins toolkit whenver possible on plugin.py
2013-01-15 19:57:31 +00:00
da7bb48eb5
Merge branch 'release-v2.0' into 2.0-validation-changes
2013-01-14 14:03:04 +00:00
711391e971
[ #4 ] Rewrtie WMS preview plugin for ResourcePreview interface
...
Much simplified plugin for previewing WMS. It requires the
resource_proxy plugin to work.
Also clean up public and template dir to mimic core layout.
2013-01-14 13:59:15 +00:00
4e47141717
add extra resource locator
2012-12-24 10:43:44 +00:00
c927d8b6ab
Add method for adding custom validators
...
This probably needs to be done properly, adding them once on startup
somehow.
2012-12-20 18:26:40 +00:00
6fcbf878c2
Spatial query can now be ordered. Does not play nicely with SOLR options - just uses that to get the facets counts and return each result. Have added performance tests for two alternative queries.
2012-12-06 18:17:45 +00:00
36905eed17
Adding Parslow constraints schema previously missed.
2012-12-05 15:02:27 +00:00
68f22147bc
Added lower level tests for bbox search (at the lib level), complementing the API level ones.
2012-12-05 15:01:16 +00:00
df884bdd3d
Comments about on cardinality/multiplicity.
2012-12-05 12:05:45 +00:00
20e1a59227
Added new Parslow Constraints Schematron to test. Added command to validate on the command-line.
2012-12-05 11:42:57 +00:00
615a58ce93
Reduce log level for harvest object errors
2012-11-21 16:22:55 +00:00
9ea721e256
Encode remote documents from CSW servers as unicode
2012-11-20 15:42:07 +00:00
6cf7f79942
Save line if present when storing object errors
2012-11-20 11:47:04 +00:00
7113466760
Update harvesters to new validator outputs
2012-11-19 18:12:40 +00:00
e12e38cab0
Improvements on the validation code
...
To make easier to filter and display errors on the UI, the validators
have been modified to return the message and line number separately. The
return format for validators is now:
(is_valid, [(error_message_string, error_line_number)])
Also the XSD based validators were returning only the last error found on
the document, instead of iterating the whole error log. Harvesters should
create a harvest object error for each of this validation errors.
Tests have been adapted to these changes.
2012-11-19 17:15:16 +00:00
0379852fe0
Merge branch '2641-spatial-widgets-new-theme' into release-v2.0
2012-11-12 16:44:05 +00:00
b82dd4a9c0
Merge branch 'csw-harvester-enhancements' into release-v2.0
2012-11-12 16:43:52 +00:00
ccbac9c3c5
Get the validation XML to be included in the distribution.
2012-11-07 16:23:27 +00:00
a84268abf6
Don't trust the number of records returned by the remote server
...
Sometimes, even when requesting 10 records, the CSW server returns less
of them (see eg http://goo.gl/b7Rdj , only 9 records returned). The
current check made the process stop on this case, missing other
identifiers.
2012-11-02 11:12:46 +00:00
0444c14da2
Better check for config object
2012-10-30 16:40:32 +00:00
99dc2a7c55
Allow to define the validation profiles via source config
...
The profiles used are decided as follows:
1. 'validator_profiles' property of the harvest source config
object
2. 'ckan.spatial.validator.profiles' configuration option in
the ini file
3. Default value as defined in DEFAULT_VALIDATOR_PROFILES
2012-10-30 14:18:01 +00:00
a45ff0c75f
Merge branch 'master' of github.com:okfn/ckanext-spatial
2012-10-30 09:34:48 +00:00
ee543df158
Added useful logging to the validation report. Useful to have the date (i.e. version) in the name of the Eden schema.
2012-10-30 09:34:40 +00:00
ac7947549e
Remove unused imports
2012-10-29 16:35:52 +00:00
9e9048c272
Add validator for FGDC XSD schema
2012-10-29 14:34:29 +00:00
9488ecd5a9
Add validator for ISO 19139 NGDC XSD schema
2012-10-29 14:28:58 +00:00
c1d2a479f2
Add traceback to exception when getting CSW identifiers
2012-10-23 18:57:11 +01:00
92b781d0f1
Minor model tweaks to support parsing generic ISO documents
2012-10-23 13:03:53 +01:00
aeb7d27bab
Fix failing tests
...
The WMS one is just skipped, until we have a more clear way of how the
previews will work.
2012-10-22 19:44:33 +01:00
7f58374ac7
Enable command line interface for validation, useful for debug
2012-10-22 19:39:07 +01:00
d95602eaff
Fix wrong resource paths on validation
2012-10-22 19:37:54 +01:00
019cb3b45f
Fix wrong imports and docs
2012-10-22 19:36:03 +01:00
d90114cf07
Added ability to produce report into validation errors, for when changing validation. Added report infrastructure.
2012-10-19 18:20:32 +01:00
0e8a62fe1e
Reorganise XML test files into more sensible directory names. Add lower level validation tests.
2012-10-19 14:23:34 +01:00
2d6f497720
Missed off some files from the previous commit.,
2012-10-19 12:14:09 +01:00
20e8f12615
Merged in ckanext-inspire.
...
Tests are passing, apart from a couple which didn't work before:
* test_functional.py -> functional/test_package.py (3 failures in 4)
* functional/test_dataset_map.py (1 fail in 1)
There may be some code errors still untested.
Renamed Validator -> Validators to make more sense.
2012-10-19 11:19:01 +01:00
58fa06051d
Added EDEN ISO10139 schema that was missed off before.
2012-10-17 17:08:20 +01:00
8181b3d3bf
Merged in ckanext-csw @44d5a04656dff084e6bca57dda7b63deec69778c. Not tested yet.
2012-10-17 16:59:02 +01:00
a84034d902
Merge branch '2641-spatial-widgets-new-theme' of github.com:okfn/ckanext-spatial into 2641-spatial-widgets-new-theme
2012-10-17 13:03:11 +01:00
3bb174d56d
Update WMS viewer prototype to work with the new iframe on resource read page
2012-10-17 13:02:57 +01:00
80b8bc33c6
Update jquery path
2012-09-28 12:20:37 +01:00
efa2307ee5
[wms] Fix small bug
2012-08-14 12:48:39 +01:00
d841bb2c17
[wms] Fix typo
2012-08-13 18:52:30 +01:00
231f5806e9
[wms] Support for map param
2012-08-13 17:50:33 +01:00
917ce0124e
Merge branch '2641-spatial-widgets-new-theme' of github.com:okfn/ckanext-spatial into 2641-spatial-widgets-new-theme
2012-08-13 17:09:32 +01:00
4ca61fd48b
[wms] First go at adapting the WMS previewer to the new theme
2012-08-13 17:09:08 +01:00
01d6441886
[wms] More flexible wms format check
2012-08-13 17:07:59 +01:00
100b54d119
Merge branch 'master' into 2641-spatial-widgets-new-theme
2012-08-09 11:05:14 +01:00
b784be8f9e
Do not use repo.are_tables_created
...
When checking whether the core tables have been alredy created it is
best to use package_table.exists(), as are_tables_created reflects the
tables, causing conflicts with other extensions.
This allows ckanext-harvest and ckanext-spatial to be used together on
ckan 1.8 onwards.
2012-08-09 11:02:13 +01:00
9bc3759bd1
Update tests for auth changes in core ( #2388 )
2012-07-12 19:13:21 +01:00
a42dcd632f
[ #2641 ] Move snippet template to follow new convention
2012-07-12 11:59:35 +01:00
87de1280f2
[ #2641 ] Adapt dataset map to new theme
...
The new theme is based on Jinja2 templates. Extensions can define their
own snippets, which can used when creating custom themes. In this case
two snippets have been created, one showing the map on the primary area
and the other on the sidebar.
2012-07-11 18:24:49 +01:00
493589aaf1
[ #2399 ] Fixes for CKAN 1.8
...
* Fix broken imports in model after cleanup
* Minor CSS glitch on the spatial filter widget
2012-06-25 19:27:18 +01:00
745bed4e77
Customising extent map for dgu.
2012-05-22 10:51:44 +01:00
1ffe6f42d1
[ui] Fix alignment and button classes (update to latest bootstrap)
2012-05-08 14:19:28 +01:00
e18f3210b8
[ui] Update button classes to bootstrap
2012-05-08 14:00:19 +01:00
cafc0b9644
[tests] Fix test for changes in logic layer
2012-04-29 18:17:13 +01:00
8010c1e16b
Stray comma caused IE7 to barf.
2012-04-27 15:04:22 +01:00
e19227fe61
Added option for OS tiles (subject to licence).
2012-04-27 13:06:20 +01:00
8f4ae04570
Allow extent map to be shown on configurable routes.
2012-04-27 10:44:15 +01:00
23f392bb4c
Merge branch 'master' of github.com:okfn/ckanext-spatial
2012-04-16 10:33:11 +02:00
60bc030e7d
[tests] Update package create functions to logic refactor
2012-04-13 10:59:21 +01:00
82e3f90fb3
[cli] Srid param was not passed from the cli
2012-04-13 10:58:39 +01:00
2ecb8498bf
Geographic extent now looks for id="dataset" because DGU templates use multiple classes for the root dataset div (as might other customised templates), yet having only one value for id is a reasonable assumption. Also works for core CKAN templates.
2012-04-12 21:35:38 +01:00
7280bc8d06
Tweaked instructions.
2012-04-12 19:49:12 +01:00
a68d31abf7
[wms_preview] Fix url generation bug
2012-04-03 13:52:40 +01:00
939e4e4efa
[plugin] Fix import from the core logic layer
2012-03-07 15:07:37 +00:00
0c6d0f7e48
[search] Maintain previous extent when filtering by area
2012-02-22 17:25:06 +00:00
25470e3a43
[tests] Add tests for spatial search integration and search widget
2012-02-22 12:26:52 +00:00
a77e0ef2c3
[plugins, docs] Rearrange plugins
...
Separate different features to make it more flexible for users
to load different stuff depending on their needs and the CKAN
version they are using.
2012-02-21 12:00:47 +00:00
1f829b3031
[search] Add option to define a default extent
2012-02-21 11:05:13 +00:00
1d1f88195f
Merge from master
2012-02-20 18:13:33 +00:00
43c997dee7
[model,tests] Better handling of model initialization on startup
2012-02-07 16:50:46 +00:00
51a8dfa857
[dataset_map] Use MapQuest tiles instead of OSM ones
...
Because of http://wiki.openstreetmap.org/wiki/Tile_usage_policy
2012-01-20 16:19:08 +00:00
a20688a453
[search][ #1469 ] Map widget for the spatial search UI
...
TODO: integrate better with the general look and feel.
2012-01-18 11:03:21 +00:00
03fd4c2b3c
[search] Use before_search approach to integrate with Solr search
...
If filtering the results after the search, recalculating the facets
is too complicated, so we use the alternative approach of doing the
spatial search first and adding the ids as a filter in the Solr query.
2012-01-17 17:20:16 +00:00
95b6db2cfe
[search] Update search plugin hook name
2012-01-17 10:44:25 +00:00
203558e97b
[search] Integrate spatial search with the default CKAN search
...
Search results coming from the default CKAN search (which are received
via the `search` method of the `IPackageController` interface) are
filtered to only contain the ones intersecting the provided bbox.
The search form temporarily shows a text field, which will be replaced
by a nice map widget.
2011-12-13 17:40:47 +00:00
6f2b15f5ea
[api] Return only packages with state = active
2011-11-14 18:00:56 +00:00
ab52106f20
Separate non-GEOS/PostGIS plugins to avoid needing to install them if not needed
...
I.e for the WMS preview plugin. Also add tests for the WMS preview plugin and
use dataset instead of package on the UI.
2011-10-28 13:03:31 +01:00
571a27a274
[tests] Add tests
2011-10-16 23:40:19 +01:00
0b7808cd4b
Use datasets instead of packages
2011-10-03 13:39:18 +01:00
e5dbeb9ff8
[wms_preview] Remove sysadmin check for WMS preview
2011-09-30 14:38:11 +01:00
1798f63a08
[wms_preview] Fix for #1166 (Less stringent filters for WMS preview)
...
If one of the dataset resources has a 'WMS' format, the link will be
displayed. Also support for URLs with query params.
2011-09-30 12:15:53 +01:00
9b0d00786a
Update and cleanup for WMS previewer. It is still very unstable and should be
...
considered alpha stage.
2011-09-30 11:57:09 +01:00
0ac18ba0a9
New Dataset Map Widget plugin.
...
When enabled, if the dataset has an 'spatial' extra, it shows a map on the
details page. It uses OpenLayers and supports all types of geometries.
2011-09-30 11:33:36 +01:00
40bddb0005
Use GeoAlchemy on the spatial query controller
2011-09-29 15:41:45 +01:00
fddc7db2c7
Support for automatic indexing of spatial extent ( #1272 )
...
The spatial_query plugin now automatically checks for the existance of an
'spatial' extra when creating, updating or deleting a package and syncs its
value (in GeoJSON format) with the geometry column of the package_extent
table. The extension now uses GeoAlchemy, that makes performing spatial
operation extremely easy. The geometry field has been updated to support
multiple geometry types (Polygons, Points, MultiPolygons...) and the default
srid has been set as WGS 84 lat/lon (EPSG:4326).
2011-09-29 15:40:49 +01:00
33235748b0
Update imports for the API controller
2011-05-26 15:34:21 +01:00
b5c83ab578
[packaging] Working paths config
2011-04-20 11:59:00 +01:00
6b5d260b0a
[packaging] Moving the resources into the module, no resources need when deployed should ever be outside
2011-04-20 11:44:55 +01:00
e3f27aeea7
Don't use the spatial-reference-system extra as all bbox will be in lat/lon
2011-04-14 14:45:32 +01:00
5e1ab19dfc
Fix bug in params binding
2011-04-14 09:56:12 +01:00
70976340da
Add a command to create the necessary DB tables
2011-04-13 12:05:59 +01:00
1710205cf9
Moving the spatial query. You can enable it loading the spatial_query plugin in the ini file.
2011-04-11 18:04:28 +01:00
76183b6f23
Moving the WMS previewer. You can enable it loading the wms_preview plugin in the ini file
2011-04-11 17:23:27 +01:00
6ae23e4116
Initial commit. This extension will hold geo-related functionalities moved from ckanext-harvest.
2011-04-11 16:53:47 +01:00
David Read
amercader
kindly
David Read
james gardner