[Opengeoscience-developers] OpenGeoscience branch, update_data_ref, updated. 2ed35dd44ae2b8a1a6a79e1be9fd3b13effae2ff

Aashish Chaudhary aashish.chaudhary at kitware.com
Fri Mar 8 21:11:14 EST 2013


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, update_data_ref has been updated
       via  2ed35dd44ae2b8a1a6a79e1be9fd3b13effae2ff (commit)
       via  17e2b63b7dce74b8cfe8779a3f4bd690d0a29b59 (commit)
      from  f991a5f4aa555c6bb2566534af3baa5f1334fbcb (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/opengeoscience.git;a=commitdiff;h=2ed35dd44ae2b8a1a6a79e1be9fd3b13effae2ff
commit 2ed35dd44ae2b8a1a6a79e1be9fd3b13effae2ff
Author:     Aashish Chaudhary <aashish.chaudhary at kitware.com>
AuthorDate: Fri Mar 8 21:10:47 2013 -0500
Commit:     Aashish Chaudhary <aashish.chaudhary at kitware.com>
CommitDate: Fri Mar 8 21:10:47 2013 -0500

    Removed debug message

diff --git a/web/lib/vgl/pointSource.js b/web/lib/vgl/pointSource.js
index 1f3a27c..869cc79 100644
--- a/web/lib/vgl/pointSource.js
+++ b/web/lib/vgl/pointSource.js
@@ -91,8 +91,6 @@ vglModule.pointSource = function() {
     var indices = [];
     indices.length = numPts;
 
-    console.log(numPts);
-
     for (i = 0; i < numPts; ++i) {
       indices[i] = i;
     }

http://public.kitware.com/gitweb?p=OpenGeoscience/opengeoscience.git;a=commitdiff;h=17e2b63b7dce74b8cfe8779a3f4bd690d0a29b59
commit 17e2b63b7dce74b8cfe8779a3f4bd690d0a29b59
Author:     Aashish Chaudhary <aashish.chaudhary at kitware.com>
AuthorDate: Fri Mar 8 21:10:09 2013 -0500
Commit:     Aashish Chaudhary <aashish.chaudhary at kitware.com>
CommitDate: Fri Mar 8 21:10:09 2013 -0500

    Updated location of data in the source code

diff --git a/web/lib/app.js b/web/lib/app.js
index 8f0c243..631bcce 100644
--- a/web/lib/app.js
+++ b/web/lib/app.js
@@ -45,7 +45,7 @@ function main() {
   var colors = [];
   $.ajax({
     type : "GET",
-    url : "./data/cities.csv",
+    url : "/data/assets/cities.csv",
     dataType : "text",
     success : function(data) {
       table = processCSVData(data);
diff --git a/web/lib/geo/map.js b/web/lib/geo/map.js
index 89f9cfb..49a8536 100644
--- a/web/lib/geo/map.js
+++ b/web/lib/geo/map.js
@@ -290,7 +290,7 @@ geoModule.map = function(node, options) {
                                                     0.0);
     // Setup texture
     var worldImage = new Image();
-    worldImage.src = "./data/assets/land_shallow_topo_2048.png";
+    worldImage.src = "/data/assets/land_shallow_topo_2048.png";
     worldImage.onload = function() {
       var worldTexture = new vglModule.texture();
       worldTexture.updateDimensions();

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

Summary of changes:
 web/lib/app.js             |    2 +-
 web/lib/geo/map.js         |    2 +-
 web/lib/vgl/pointSource.js |    2 --
 3 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
OpenGeoscience



More information about the Opengeoscience-developers mailing list