[Opengeoscience-developers] OpenGeoscience branch, update_data_ref, created. f991a5f4aa555c6bb2566534af3baa5f1334fbcb

[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, update_data_ref has been created
        at  f991a5f4aa555c6bb2566534af3baa5f1334fbcb (commit)

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

    Added custom command to copy data and rm data

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 482dc8e..0aa4e1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,7 +179,7 @@ if (NOT  "${DATA_ROOT}" STREQUAL "")
     "${CMAKE_BINARY_DIR}/${DEPLOY_DIR}/data"
   )
 
-  add_custom_target(rm_data
+  add_custom_target(clean_data
     COMMAND ${CMAKE_COMMAND} -E remove_directory
     "${CMAKE_BINARY_DIR}/${DEPLOY_DIR}/data"
   )

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

    Added custom command to copy data and rm data

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0dfd70e..482dc8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,12 @@ set(MINIFY ON CACHE BOOL "Minify the JavaScript files prior to concatenating.")
 set(MANGLE ON CACHE BOOL "When minifying, also mangle non-public symbol names.")
 set(DOCUMENT OFF CACHE BOOL "Generate documentation for JavaScript files.")
 set(SERVER_LOGS ON CACHE BOOL "Write cherrypy server access and error logs in deploy/logs")
+set(DATA_ROOT "" CACHE PATH "Root directory for the data")
 
 # Non-cache variables.
 set(DEPLOY_DIR deploy)
+set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${DEPLOY_DIR})
+
 if(SERVER_LOGS)
     file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DEPLOY_DIR}/logs)
     set(LOG_ERROR_FILE "logs/error.log")
@@ -168,6 +171,20 @@ if(NOT EXISTS "${CMAKE_BINARY_DIR}/${DEPLOY_DIR}/web/lib")
   execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/${DEPLOY_DIR}/web/lib")
 endif()
 
+# Copy data to the deploy directory
+if (NOT  "${DATA_ROOT}" STREQUAL "")
+  add_custom_target(copy_data
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    "${DATA_ROOT}"
+    "${CMAKE_BINARY_DIR}/${DEPLOY_DIR}/data"
+  )
+
+  add_custom_target(rm_data
+    COMMAND ${CMAKE_COMMAND} -E remove_directory
+    "${CMAKE_BINARY_DIR}/${DEPLOY_DIR}/data"
+  )
+endif()
+
 add_custom_command(
     OUTPUT ${MIN_JS_FILE}
     COMMAND ${UglifyJS_EXECUTABLE} -o ${MIN_JS_FILE} ${JS_UGLIFY_FILES} ${MINIFY_FLAG} ${MANGLE_FLAG}

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

    Updated pointer to the raw data

diff --git a/web/lib/app.js b/web/lib/app.js
index 8fd2a79..8f0c243 100644
--- a/web/lib/app.js
+++ b/web/lib/app.js
@@ -65,13 +65,12 @@ function main() {
           }
         }
 
-        var pointLayer = ogs.geo
-            .featureLayer({
-              "opacity" : 1,
-              "showAttribution" : 1,
-              "visible" : 1
-            }, ogs.geo.pointSpritesFeature('/data/spark.png', citieslatlon,
-                                           colors));
+        var pointLayer = ogs.geo.featureLayer({
+          "opacity" : 1,
+          "showAttribution" : 1,
+          "visible" : 1
+        }, ogs.geo.pointSpritesFeature('/data/assets/spark.png', citieslatlon,
+                                       colors));
 
         myMap.addLayer(pointLayer);
       }
diff --git a/web/lib/geo/map.js b/web/lib/geo/map.js
index 5802b92..89f9cfb 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/land_shallow_topo_2048.png";
+    worldImage.src = "./data/assets/land_shallow_topo_2048.png";
     worldImage.onload = function() {
       var worldTexture = new vglModule.texture();
       worldTexture.updateDimensions();

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


hooks/post-receive
-- 
OpenGeoscience