Merge lp:~flavour/sahana-eden/adpc into lp:~michael-howden/sahana-eden/adpc

[Fran Boon]

Disabled highlightControl, Clustering (I think: need data), MGRSMousePointer
I adjusted the viewport to allow seeing the whole of the Pacific easily (but this means need to scroll right to find India!)

[lp:~flavour/sahana-eden/adpc]

748. By Michael <Michael@Michael-PC> on 2010-09-02

Fixes and Improvements

749. By Michael <Michael@Michael-PC> on 2010-09-03

Fixes

750. By Michael <Michael@Michael-PC> on 2010-09-06

Fixing some bugs with the List Projects
Google Analytics for live

751. By Michael <Michael@Michael-PC> on 2010-09-08

Disable Truncate for the name field to enable sorting

752. By Michael Howden <Michael Howden@Michael-Laptop> on 2010-10-08

Implemented Authorisation Policy

753. By Michael Howden <Michael Howden@Michael-Laptop> on 2010-10-08

Merged Fran's GIS Code

=== modified file 'VERSION'
--- VERSION	2010-08-30 19:31:47 +0000
+++ VERSION	2010-09-01 19:31:13 +0000
@@ -1,1 +1,1 @@
-r746 (2010-08-30 20:31:46)
 \ No newline at end of file
+r749 (2010-09-01 20:26:02)
 \ No newline at end of file
 
=== modified file 'models/000_config.py'
--- models/000_config.py	2010-08-27 09:42:02 +0000
+++ models/000_config.py	2010-09-01 19:31:13 +0000
@@ -10,8 +10,8 @@
 deployment_settings = s3cfg.S3Config()
 
 # Database settings
-#deployment_settings.database.db_type = "sqlite"
-deployment_settings.database.db_type = "mysql"
+deployment_settings.database.db_type = "sqlite"
+#deployment_settings.database.db_type = "mysql"
 deployment_settings.database.host = "localhost"
 deployment_settings.database.port = "" # use default
 #deployment_settings.database.database = "drrpp_blank"
 
=== modified file 'models/drrpp.py'
--- models/drrpp.py	2010-09-01 16:28:51 +0000
+++ models/drrpp.py	2010-09-01 19:31:13 +0000
@@ -1951,8 +1951,8 @@
                 wms_browser = {"name" : "Risk Maps", 
                                "url" : "http://preview.grid.unep.ch:8080/geoserver/ows?service=WMS&request=GetCapabilities"},
                 width               = 866,
-                lat                 = -6.5,
-                lon                 = 116,
+                lat                 = 1.9,
+                lon                 = -180,
                 zoom                = 2
                 )
 
 
=== modified file 'models/zzz_1st_run.py'
--- models/zzz_1st_run.py	2010-07-19 09:13:32 +0000
+++ models/zzz_1st_run.py	2010-09-01 19:31:13 +0000
@@ -453,9 +453,9 @@
        # We want to start at ID 1
        table.truncate()
        table.insert(
-            lat = "51.8",
-            lon = "-1.3",
-            zoom = 7,
+            lat = "-5",
+            lon = "-160",
+            zoom = 2,
             # Doesn't work on Postgres!
             projection_id = 1,
             marker_id = 1,
 
=== modified file 'modules/s3gis.py'
--- modules/s3gis.py	2010-08-30 19:31:47 +0000
+++ modules/s3gis.py	2010-09-01 19:31:13 +0000
@@ -437,7 +437,8 @@
 
         if layer == "openstreetmap":
             #return ["Mapnik", "Osmarender", "Aerial"]
-            return ["Mapnik", "Osmarender", "Taiwan"]
+            #return ["Mapnik", "Osmarender", "Taiwan"]
+            return ["Mapnik", "Osmarender"]
         elif layer == "google":
             return ["Satellite", "Maps", "Hybrid", "Terrain"]
         elif layer == "yahoo":
@@ -1822,7 +1823,7 @@
         var featureLayer""" + name_safe + """ = new OpenLayers.Layer.Vector(
             '""" + name + """',
             {
-                strategies: [ """ + strategy_cluster + """ ],
+                //strategies: [ """ + strategy_cluster + """ ],
                 styleMap: featureClusterStyleMap
             }
         );
@@ -1983,7 +1984,7 @@
         var featureLayer""" + name_safe + """ = new OpenLayers.Layer.Vector(
             '""" + name + """',
             {
-                strategies: [ """ + strategy_cluster + """ ],
+                //strategies: [ """ + strategy_cluster + """ ],
                 styleMap: featureClusterStyleMap
             }
         );
@@ -2598,7 +2599,8 @@
         addLayers(map);
 
         map.addControl(new OpenLayers.Control.ScaleLine());
-        map.addControl(new OpenLayers.Control.MGRSMousePosition());
+        //map.addControl(new OpenLayers.Control.MGRSMousePosition());
+        map.addControl(new OpenLayers.Control.MousePosition());
         map.addControl(new OpenLayers.Control.Permalink());
         map.addControl(new OpenLayers.Control.OverviewMap({mapOptions: options}));
 
@@ -2623,9 +2625,9 @@
                 }
             }
         );
-        map.addControl(highlightControl);
+        //map.addControl(highlightControl);
         map.addControl(popupControl);
-        highlightControl.activate();
+        //highlightControl.activate();
         popupControl.activate();
 
         """ + mgrs_html + """