[Opengeoscience-developers] OpenGeoscience branch, next, updated. 4e32d14e9055d1c461451692c7894ce71bffd1c0

[Aashish Chaudhary]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenGeoscience".

The branch, next has been updated
       via  4e32d14e9055d1c461451692c7894ce71bffd1c0 (commit)
       via  75bd67d5254623b9fb7a718ec9fab0f0c94e7861 (commit)
       via  c5a605532ece69123c9ce28ff1b8af2a07e0f935 (commit)
       via  cf45453358602806fb451ae848eabec35a904240 (commit)
       via  d19306f6befa08493f6ae283caa2d6ed779a34ca (commit)
       via  a3a83ed2482058b3f479ccab8b6c127dc7d042e6 (commit)
       via  648c0b45ce83d10c00cc0e8a188868530efe3996 (commit)
       via  b6451518c804b13d8a0fd36894ead8246ba82b05 (commit)
       via  c7facf8164db210fa54a3d630be1c06b69a26d54 (commit)
       via  f926eeaca112ce2aa5031693379e8e506b12d617 (commit)
       via  e654660913f501dfda04f663d9957b6ee6eeadeb (commit)
       via  c5f846b1fcef7c763699cbf8c84202a082c858d5 (commit)
       via  2ac5672dd73b8c0643d52abba13e754d5dd3cb40 (commit)
       via  0049149831c95a78db1b71e081df604993ca47a9 (commit)
       via  eb58a7362477488691439e1b2fc1b8eee3c3ffc3 (commit)
       via  db38a25560075c1919fc872f822667bf066d7bb8 (commit)
       via  5f346722a58456b90ad62f947e09978d3c764d42 (commit)
       via  e3420decbf8d1594066eeb956aa1f7ded89e21ad (commit)
       via  1b0f161b9199d35f7f14d22020e649399ef4965f (commit)
       via  2972cc9a837bd5ad592342ecf4d7f99ea9b61654 (commit)
      from  a9c2070e0c9d720374db85e06d858c061eb16f35 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=4e32d14e9055d1c461451692c7894ce71bffd1c0
commit 4e32d14e9055d1c461451692c7894ce71bffd1c0
Merge: a9c2070 75bd67d
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Fri Mar 29 09:58:46 2013 -0400

    Merge remote-tracking branch 'origin/client_side_rendering' into next
    
    * origin/client_side_rendering:
      align clt.nc data
      get data file from configured data directory not an absolute path
      mention color tests in options
      fix merge conflict
      change from the sphere source to the clt.nc file and add isocontour
      handle attribute data in the form of point associated colors
      use write to buffer
      make default page helpful
      add tests of vtkgeojson point and line data
      enable feature collection type
      fix regression in vtk rendering
      More work on geojson rendering.
      add tests for primary geojson options and fix easy bugs
      start on geojson parsing for real
      Clean up and fill in missing portions of vtk adapter
      rendering first geojson data
      rendering first geojson data nearing geojsoned vtk
      demonstrating connecting server side data with client side rendering
    
    Conflicts:
    	CMakeLists.txt
    	ogs.py

 CMakeLists.txt               |    4 +
 ogs.py                       |    4 +
 ogsvtk.py                    |  464 ++++++++++++++++++++++++++++++++++++++++++
 server.conf.in               |    1 +
 web/lib/sphere.js            |    1 -
 web/lib/vgl/geoJSONUnpack.js |  416 +++++++++++++++++++++++++++++++++++++
 web/lib/vgl/geomData.js      |   28 +++-
 web/lib/vgl/vtkUnpack.js     |  291 ++++++++++++++-------------
 8 files changed, 1068 insertions(+), 141 deletions(-)

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt               |    4 +
 ogs.py                       |    4 +
 ogsvtk.py                    |  464 ++++++++++++++++++++++++++++++++++++++++++
 server.conf.in               |    1 +
 web/lib/sphere.js            |    1 -
 web/lib/vgl/geoJSONUnpack.js |  416 +++++++++++++++++++++++++++++++++++++
 web/lib/vgl/geomData.js      |   28 +++-
 web/lib/vgl/vtkUnpack.js     |  291 ++++++++++++++-------------
 8 files changed, 1068 insertions(+), 141 deletions(-)
 create mode 100644 ogsvtk.py
 delete mode 100644 web/lib/sphere.js
 create mode 100644 web/lib/vgl/geoJSONUnpack.js


hooks/post-receive
-- 
OpenGeoscience