[Opengeoscience-developers] OpenGeoscience branch, 54-2-workflow-construction, updated. e23a3633bb032ddac42f9f080f58725153c67d31

[Ben Burnett]

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, 54-2-workflow-construction has been updated
       via  e23a3633bb032ddac42f9f080f58725153c67d31 (commit)
       via  50af05f6763da35b9e36e686e400b014b58c4739 (commit)
       via  d43e350cc7cfac09c11fb36126878d962df42d5b (commit)
       via  a9eba0b4233cba6663efa2026b9eaca21fdea904 (commit)
       via  afa76f3eb60570da9e196bb16f4f37f5354a8639 (commit)
       via  cc86e6b8f450291fe4656014fbb0e859fc042f26 (commit)
       via  8900f38f67e735ed49eb1bae9fce07b46ad39934 (commit)
       via  218b6119137a1ee5a604f1d78d92455706bf1217 (commit)
       via  0ce9e191e972fd057a8dc46b6d5567aeee79cbbb (commit)
       via  5ec2b806812fe85e1edf9c6696b3fbb9424d03b1 (commit)
       via  67499b130243dcf804f80ead11e3b9c16ee3575c (commit)
       via  e05fcdd907e42f6c9bb014152ef3dce5e05c38f4 (commit)
       via  55800f7aeedd247a3cbd1477f5da47b31db43014 (commit)
       via  67be438ff0e75e88fa1026a2004daeb9bd8805e6 (commit)
       via  70234947cbfa8ce3166d755a99e5c0c8521462a8 (commit)
       via  8649fa5c57aa2862d61ada013358052e6c47da9b (commit)
       via  203d66aed46664a98052b781d20b1a8ecab4e3e1 (commit)
       via  ef40be09cea5b00d11ff057cb95f362541591589 (commit)
       via  34132ae6b4348889951e2a06b6b966fecfa81306 (commit)
       via  f70d8c32b84eaafd7e1fac22ae310dfbf40d2ce5 (commit)
       via  fcba375c0dc3eeda53cc02094c59a8d802132516 (commit)
       via  90297cb0d0000bf3a4dbe68d223d087bd0c133aa (commit)
       via  df1c34ee53ae26c77349e7ce3ee301c6a2c47dc5 (commit)
       via  61f4191c9bef94f1a733aaa5025e60db05fd1c15 (commit)
       via  a387ecdc29c9736ebc0bcbfb61ff2a58f3506bb3 (commit)
       via  08d15e2ce6db4ca7c4b8e9fbc96cc8d402295219 (commit)
       via  2771d80c9872bc1df0a67742a66d879317225f85 (commit)
       via  0023083993403c7af3a346ca58a80bc6363a7d31 (commit)
       via  84afa2381dcdb2039dcd9674409c1a8e5205bd5e (commit)
       via  652c95d1e572c97836cde35a9b3103ce50522c2a (commit)
       via  e3e565cd643bbf2f44b3cf5acd5be9da9257859d (commit)
       via  a0100f10a9a57e18bea540af81dd13c57a3b1057 (commit)
       via  e5a113332caea6ecd96a7face9b91c7cbed5a5b8 (commit)
       via  c13f7ba4993e45c78a75707f47067e896bff8578 (commit)
       via  01bca200c0facac095049dea334f09cb3f077fca (commit)
       via  0d17f9aff4fc607dd615d6e4a1c9902e4a020855 (commit)
       via  0c91533541f8bf46437dde610253ae307b1fa1bf (commit)
       via  771a8ed5f5a5c31f5423f17d9e704b9ceb539382 (commit)
       via  09384daae04141097e6e956351c1fe52c62384ec (commit)
       via  d86f7837751b758733e9d7d934f92be6068390f0 (commit)
       via  d9eb915f7118f48972663a53d80da8bc4d47fed3 (commit)
       via  f1ebc04a987b59e2c869e88793f4fb0658b9b1c5 (commit)
       via  0d34472bf79ee7666f3f25fc545375d8184fb234 (commit)
       via  e1998e5672645e27bf557f0e28c9759eeb56aedd (commit)
       via  162eaebe0d97983965bac13ec2ba899e7a8f0831 (commit)
       via  64c39b9639aaaa400b935ed52207a7b6866736f8 (commit)
       via  cf680cca09acbea3a24f1454308999b3a2b30d53 (commit)
       via  8ca2c6b8cbda1629e7d8be2b4b54520976dcf0f3 (commit)
       via  5e591003c661ca550dd42e2bdd185c8f34a691b0 (commit)
       via  18ce0310eb53bbe437bd53166ff688fe1ce9246e (commit)
       via  244b2ec22aec51b7a48c4a4fd8921e2ecca5b668 (commit)
       via  ae98370b09b3f19862e10511352e8cdb6dddc5e6 (commit)
       via  315a7a59bb471782ffaa31e926a4b31c479a0116 (commit)
       via  e7b3fd303e031ffc707072edeba54cada33d15c2 (commit)
       via  0ca314e6a38414b0509a97b1f42b24ec7c2bd5aa (commit)
       via  b715fcca0915df74751ed6ee0013eafacaa21453 (commit)
      from  ce6f73c625ebe60d4a923a903863640a93cc91dc (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=e23a3633bb032ddac42f9f080f58725153c67d31
commit e23a3633bb032ddac42f9f080f58725153c67d31
Merge: ce6f73c 50af05f
Author: Ben Burnett <bburnett at poly.edu>
Date:   Fri Aug 30 14:47:16 2013 -0400

    Merge branch 'master' into 54-2-workflow-construction
    
    Conflicts:
    	web/apps/archive/archive.js

 CMakeLists.txt                    |    1 +
 modules/mongoimp.py               |  215 +++++++++++++++++++++++++++++++
 modules/reader.py                 |   33 ++++-
 modules/standardtime.py           |  102 +++++++++++----
 modules/vtk_reader.py             |   31 ++---
 scripts/mongoimp.py               |  108 ----------------
 web/apps/archive/archive.js       |  149 ++++++++++++++++------
 web/apps/archive/index.html       |   11 ++-
 web/lib/geo/feature.js            |    2 +-
 web/lib/geo/featureCollection.js  |    4 +-
 web/lib/geo/featureLayer.js       |  173 ++++++++++++++++++++++++-
 web/lib/geo/layer.js              |   21 +++-
 web/lib/geo/map.js                |  252 ++++++++++++++++++++++++-------------
 web/lib/geo/mapInteractorStyle.js |   13 ++-
 web/lib/geo/mercator.js           |    6 +-
 web/lib/geo/openStreetMapLayer.js |   41 ++----
 web/lib/geo/time.js               |   16 +++
 web/lib/ui/gis.js                 |  102 +++++++++++++---
 web/lib/vgl/camera.js             |  171 +++++++++++++++----------
 web/lib/vgl/geomData.js           |  137 +++++++++++++++++---
 web/lib/vgl/renderer.js           |    8 +-
 web/lib/vgl/utils.js              |    6 +-
 web/lib/wfl/workflow.js           |    8 +-
 23 files changed, 1162 insertions(+), 448 deletions(-)

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

Summary of changes:
 CMakeLists.txt                    |    1 +
 modules/mongoimp.py               |  215 +++++++++++++++++++++++++++++++
 modules/reader.py                 |   33 ++++-
 modules/standardtime.py           |  102 +++++++++++----
 modules/vtk_reader.py             |   31 ++---
 scripts/mongoimp.py               |  108 ----------------
 web/apps/archive/archive.js       |  149 ++++++++++++++++------
 web/apps/archive/index.html       |   11 ++-
 web/lib/geo/feature.js            |    2 +-
 web/lib/geo/featureCollection.js  |    4 +-
 web/lib/geo/featureLayer.js       |  173 ++++++++++++++++++++++++-
 web/lib/geo/layer.js              |   21 +++-
 web/lib/geo/map.js                |  252 ++++++++++++++++++++++++-------------
 web/lib/geo/mapInteractorStyle.js |   13 ++-
 web/lib/geo/mercator.js           |    6 +-
 web/lib/geo/openStreetMapLayer.js |   41 ++----
 web/lib/geo/time.js               |   16 +++
 web/lib/ui/gis.js                 |  102 +++++++++++++---
 web/lib/vgl/camera.js             |  171 +++++++++++++++----------
 web/lib/vgl/geomData.js           |  137 +++++++++++++++++---
 web/lib/vgl/renderer.js           |    8 +-
 web/lib/vgl/utils.js              |    6 +-
 web/lib/wfl/workflow.js           |    8 +-
 23 files changed, 1162 insertions(+), 448 deletions(-)
 create mode 100755 modules/mongoimp.py
 delete mode 100755 scripts/mongoimp.py
 create mode 100644 web/lib/geo/time.js


hooks/post-receive
-- 
OpenGeoscience