Hides big area

Vizzuality · May 25, 2012 · 75a802e · 75a802e
1 parent d17d580
commit 75a802e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/index.html b/index.html
@@ -277,6 +277,26 @@ <h4>More info</h4>
             <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
             <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.7.2.min.js"><\/script>')</script>
               <script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?v=3.8&amp;key=AIzaSyCbRutFCciUBrk1yMRPJEV59kq5ZgrJwEc&amp;sensor=false&amp;libraries=places&amp;v=3.7"> </script>
-              <script type="text/javascript" src="js/all.js?v=1.0"></script>
+              <!--<script type="text/javascript" src="js/all.js"></script>-->
+              <script type="text/javascript" src="js/vendor/jquery-ui-1.8.18.custom.min.js"> </script>
+              <script type="text/javascript" src="js/vendor/selectivizr-min.js"> </script>
+              <script type="text/javascript" src="js/vendor/jquery.geocomplete.js"> </script>
+              <script type="text/javascript" src="js/vendor/date.js"> </script>
+              <script type="text/javascript" src="js/vendor/jquery.jscrollpane.min.js"> </script>
+              <script type="text/javascript" src="js/vendor/jquery.mousewheel.js"> </script>
+              <script type="text/javascript" src="js/vendor/mwheelIntent.js"> </script>
+              <script type="text/javascript" src="js/vendor/underscore.string.js"> </script>
+              <script type="text/javascript" src="js/vendor/lodash.min.js"> </script>
+              <script type="text/javascript" src="js/vendor/backbone.js"> </script>
+              <script type="text/javascript" src="js/vendor/GeoJSON.js"> </script>
+              <script type="text/javascript" src="js/vendor/accounting.min.js"> </script>
+              <script type="text/javascript" src="js/vendor/spin.min.js"> </script>
+              <script type="text/javascript" src="js/backbone.cartodb.js"> </script>
+              <script type="text/javascript" src="js/plugins.js"> </script>
+              <script type="text/javascript" src="js/helpers.js"> </script>
+              <script type="text/javascript" src="js/infowindow.js"> </script>
+              <script type="text/javascript" src="js/NexsoMarker.js"> </script>
+              <script type="text/javascript" src="js/circle.js"> </script>
+              <script type="text/javascript" src="js/app.js"> </script>
             </body>
           </html>
diff --git a/js/app.js b/js/app.js
@@ -796,7 +796,7 @@ $(function () {
 
           setTimeout(function() {
 
-            mapView.removeOverlay("ashokas");
+            that.removeOverlay("ashokas");
             $("#ashokas").removeClass("selected");
 
           }, 500);

diff --git a/js/helpers.js b/js/helpers.js
@@ -116,15 +116,16 @@ var queries = {
    "            LEFT JOIN v1_topics AS T ON (P.topic_id = T.cartodb_id),  " +
    "            v3_project_work_areas AS PWA " +
    "        WHERE  " +
-   "            P.cartodb_id = PWA.project_id AND <%= topicsCondition %> <%= solutionCondition %>" +
+   "            P.nexso_code != 'RG-M1016' AND P.cartodb_id = PWA.project_id AND <%= topicsCondition %> <%= solutionCondition %>" +
    "            (EXTRACT(YEAR FROM P.fixed_approval_date) >= <%= startYear %> AND  " +
    "            EXTRACT(YEAR FROM P.fixed_approval_date) <= <%= endYear %> OR (EXTRACT(YEAR FROM P.fixed_approval_date) < 2002)) " +
    "        GROUP BY  " +
    "            P.nexso_code, P.cartodb_id, title, approval_date, fixed_approval_date,  " +
    "            external_project_url, location_verbatim, topic_name, solution_id, budget, A.external_url, A.name, " +
    "            solution_name, solution_url, agency_position" +
    "    )  " +
-   "    SELECT *, ST_ConvexHull(the_geom), CASE WHEN nexso_code IN (SELECT distinct on (ST_SnapToGrid(ST_Centroid(the_geom), 100)) nexso_code FROM hull) THEN ST_ConvexHull(the_geom) ELSE ST_Buffer(ST_ConvexHull(the_geom),ceil(30*random())/10.0) END as hull_geom FROM hull " +
+   "    SELECT *, ST_ConvexHull(the_geom) AS hull_geom FROM hull " +
+   //"    SELECT *, ST_ConvexHull(the_geom), CASE WHEN nexso_code IN (SELECT distinct on (ST_SnapToGrid(ST_Centroid(the_geom), 100)) nexso_code FROM hull) THEN ST_ConvexHull(the_geom) ELSE ST_Buffer(ST_ConvexHull(the_geom),ceil(30*random())/10.0) END as hull_geom FROM hull " +
    " " +
    ")  " +
    "SELECT  " +