2204 Commits

Author SHA1 Message Date
amercader
0b6840819e [view/map,bugfix] Reapply fix from 5eb65f, lost due to a bad merge 2012-04-25 12:24:43 +01:00
Adrià Mercader
d589596533 Merge pull request #99 from amercader/master
Add tests and various fixes for the map view
2012-04-24 11:10:34 -07:00
amercader
a516fc1deb [view/map][s] Listen to changes in the documents and update the map accordingly 2012-04-24 19:06:51 +01:00
amercader
653eda6f43 [view/map][xs] Small fix in the getBounds method (does not work for multi-geometries) 2012-04-24 18:53:19 +01:00
amercader
3597974469 [view/map] Don't show GeoJSON geometries in the popup as they can be quite big 2012-04-24 18:42:52 +01:00
amercader
6749e38b07 [view/map,tests] Add tests for the Map view 2012-04-24 18:34:36 +01:00
amercader
1655690bc8 [view/map][xs] Fix lat/lon parsing (eg geoms in Greenwich can have lon 0) 2012-04-24 14:19:03 +01:00
Adrià Mercader
80ca673cbe Merge pull request #98 from amercader/master
Make easier to plot GeoJSON geometries, eg from CSV files
2012-04-23 10:34:41 -07:00
amercader
9ed43dfdc6 [view/map] Geometries can be provided as GeoJSON strings (useful e.g. in CSV files) 2012-04-23 18:24:53 +01:00
amercader
7def51b573 [backend/localcsv] Add support for defining the text delimiter on CSV files 2012-04-23 18:23:44 +01:00
Adrià Mercader
de732fd27b Merge pull request #97 from amercader/master
Add auto map zoom when loading datasets or updating rows
2012-04-23 03:40:51 -07:00
amercader
c5da3a820e Merge branch 'master' of github.com:okfn/recline
Conflicts:
	src/view-map.js
2012-04-23 11:37:51 +01:00
Rufus Pollock
8b9f3b4bfd Merge branch 'master' into gh-pages 2012-04-23 02:37:49 +01:00
Rufus Pollock
e5316e03cf [build][s]: regular build of docs and library. 2012-04-23 02:36:11 +01:00
Rufus Pollock
a577866932 [#61,backend/elasticearch][s]: refactor plus support for setting request headers (e.g. Authorization) plus can set backend url on initialization.
* support for headers went into new _makeRequest method on backend base class
* support for setting backend url on initialization (rather than depending on it being on Dataset/Document objects)
* move upsert and delete methods out into distinct methods from being inside backbone sync

The two last of these pave the way for use of ElasticSearch backend standalone (both independent from Recline and independent of Backbone)
2012-04-23 02:30:16 +01:00
Rufus Pollock
1bf64c5f94 [#61,backend/elasticsearch][m]: create, update and delete support in elasticsearch backend -- fixes #61. 2012-04-22 22:17:47 +01:00
Rufus Pollock
d19337eda4 [build][xs]: regular build of recline.js. 2012-04-22 18:23:38 +01:00
Rufus Pollock
5aaa549c9a Merge branch 'master' into gh-pages 2012-04-22 17:33:23 +01:00
Rufus Pollock
1614cf318c [CNAME][xs]: add CNAME (reclinejs.com). 2012-04-22 17:32:59 +01:00
Rufus Pollock
71745dd504 Merge branch 'master' into gh-pages 2012-04-22 00:06:01 +01:00
Rufus Pollock
31d829f53f [#17,backend][s]: add readonly attribute on backends indicating whether they are 'read-only'. 2012-04-22 00:03:59 +01:00
Rufus Pollock
67ff757722 [#68,field][s]: link and markdown format for strings with default formatter. 2012-04-21 23:54:49 +01:00
Rufus Pollock
24295e78a2 [view/map][s]: make map view much more robust regarding bad or missing data in location fields. 2012-04-21 23:52:22 +01:00
Rufus Pollock
793fde4617 [bugfix,view-map][s]: 30m to track down and fix a bug whereby map view was ignoring config passed to it.
* setupGeometryFields was running (and overwriting) even if fields set in state passed in (which I don't think we want).
2012-04-21 23:47:52 +01:00
Rufus Pollock
92ec8d5b3e [backend/memory,bugfix][xs]: fix error on memory filtering when field value is null (cannot call toString). 2012-04-21 22:48:33 +01:00
Rufus Pollock
60b7f19f71 [vendor,refactor][xs]: lay vendor directory in consistent way ({lib}/{version}/{js-file}). 2012-04-17 12:53:11 +01:00
Rufus Pollock
df421e4bee Merge branch 'master' into gh-pages 2012-04-17 11:17:50 +01:00
Rufus Pollock
7973bf1dd4 [build][s]: regular build of docs and consolidated library. 2012-04-17 11:17:39 +01:00
Rufus Pollock
5eb65f2b77 [view-map,bugfix][xs]: only call invalidateMapsize on view:show if map defined.
* this issue arose in case when map is the first view being shown.
2012-04-17 05:27:09 +01:00
Rufus Pollock
bdbfdd7c34 [#67,app][s]: embed support. 2012-04-17 05:24:06 +01:00
Rufus Pollock
27b5cf243f [bugfix,view][xs]: set default view in DataExplorer to first view if no currentView specified. 2012-04-17 05:19:27 +01:00
Rufus Pollock
7ee34f98e9 Merge branch 'master' into gh-pages 2012-04-16 21:06:12 +01:00
Rufus Pollock
9e08d6109b [app][xs]: comment out router stuff which was obsoleted by last commit and is causing problems with online version of app. 2012-04-16 21:05:40 +01:00
Rufus Pollock
7af8541707 Merge branch 'master' into gh-pages 2012-04-16 20:56:16 +01:00
Rufus Pollock
3ef664fe77 [#88,#67,state,view,app][s]: restore was not in fact working correcty for views as we need to pass the state on initialization (we were setting the state later).
* Also turn off url updating since I think that was messing with things and we were planning to do that. (For later: reintroduce this as it supports well-behaved navigation)
2012-04-16 20:47:47 +01:00
amercader
eac494cb84 [merge] from upstream master 2012-04-16 17:45:25 +02:00
Rufus Pollock
0f0fa633a1 [#67,app][s]: first pass at sharable link support in app (though seems rather buggy). 2012-04-16 15:17:19 +01:00
Rufus Pollock
a42840cdf3 [#88,model/state][xs]: can just specify a url instead of full dataset object when restoring from state (easier and good for backwards compatability). 2012-04-16 15:16:28 +01:00
Rufus Pollock
53e099beda [test][xs]: make fixtures dataset same as for demo. 2012-04-16 15:15:59 +01:00
amercader
1dbd8bf957 [view/map] Make auto zoom configurable 2012-04-16 11:04:05 +02:00
Rufus Pollock
40a771c38b [app][s]: refactor app to be a backbone view. 2012-04-16 03:06:31 +01:00
Rufus Pollock
2d636b0eb8 [css/grid.css][xs]: vertical-align top for grid cells. 2012-04-16 03:02:42 +01:00
Rufus Pollock
0ead86d6d7 [#88,view,state][s]: support for setting and getting currentView.
* Also refactor so that dataset view switcher in DataExplorer runs via direct JS rather than routing (as have meant to do for a while). this is important because a) routing stuff is partly going away b) it's cleaner this way.
2012-04-16 00:13:14 +01:00
Rufus Pollock
927bc32647 [#88,view][s]: DataExplorer boots Grid, Graph and Map view by default instead of just Grid.
* This makes DataExplorer.restore substantially more useful.
2012-04-15 23:26:57 +01:00
Rufus Pollock
6a90189b46 [test][xs]: remove console.log. 2012-04-15 23:23:37 +01:00
Rufus Pollock
bcffe67336 [#88,refactor][s]: create recline.Model.Dataset.restore function and move dataset restore stuff there from recline.View.DataExplorer.restore. 2012-04-15 23:08:42 +01:00
Rufus Pollock
3092ef6a8b [test][xs]: micro tidy-up (calling remove on view at end of test in Grid View test). 2012-04-15 23:03:31 +01:00
amercader
ac371773d0 [map/view] Zoom to current features when updating the map view 2012-04-15 23:49:48 +02:00
Rufus Pollock
2a93aeb2c1 [#88,state][s]: (and finally) introduce a recline.View.DataExplorer.restore function that restores from a serialized state.
* remove getState in favour of just using direct access to state object.
2012-04-15 22:47:16 +01:00
Rufus Pollock
7743534eac [#88,backend][s]: add __type__ attribute to all backends to identify them and provide a more robust and generic way to load backends from a string identifier such as that __type__ field.
* Also remove recline.Model.backends registry as can be replaced with this more generic solution.
* This refactoring is necessitated by our need to serialize backend info for save/reload of a dataset and explorer state in #88.
2012-04-15 22:19:43 +01:00