Updated user.

Added Vacuum Analyze on start, and support for 4326 & 3857 for dynamic map services. Also updated ST_Extent query for dynamicMapLanding page.
locana-co · Dec 22, 2013 · c288dd2 · c288dd2
1 parent 4f1b1a1
commit c288dd2
Show file tree

Hide file tree

Showing 84 changed files with 39 additions and 10 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile.txt b/Makefile.txt
diff --git a/README.md b/README.md
diff --git a/app.js b/app.js
@@ -85,11 +85,16 @@ http.createServer(app).listen(app.get('port'), app.get('ipaddr'), function () {
 //Root Request - show table list
 app.get('/', function (req, res) { res.redirect('/services/tables') });
 
+//Redirect /services to table list
+app.get('/services', function (req, res) { res.redirect('/services/tables') });
+
 
 if (mapnik)
 {
     //look thru all tables in PostGres with a geometry column, spin up dynamic map tile services for each one
     //on startup.  Probably move this to a 'startup' module
+    common.vacuumAnalyzeAll();
+
     tables.findSpatialTables(function (error, tables) {
         if (error) {
 
@@ -107,4 +112,6 @@ if (mapnik)
             }
         }
     });
+
+
 }
diff --git a/common.js b/common.js
@@ -71,6 +71,13 @@ common.log = function(message) {
     console.log(message);
 }
 
+common.vacuumAnalyzeAll = function(){
+	var query = { text: "VACUUM ANALYZE;", values: [] };
+	common.executePgQuery(query, function (result) {
+		console.log("Performed VACUUM ANALYZE on ALL;")
+	});
+}
+
 //Determine if a string contains all numbers.
 common.IsNumeric = function (sText) {
     var ValidChars = "0123456789";

diff --git a/docs/OSX_Install.md b/docs/OSX_Install.md
diff --git a/docs/Ubuntu_Install.md b/docs/Ubuntu_Install.md
diff --git a/docs/Windows_Install.md b/docs/Windows_Install.md
diff --git a/docs/screens/dynamic.png b/docs/screens/dynamic.png
diff --git a/docs/screens/gpbuffer.png b/docs/screens/gpbuffer.png
diff --git a/docs/screens/logo.png b/docs/screens/logo.png
diff --git a/docs/screens/query.png b/docs/screens/query.png
diff --git a/docs/screens/query2.png b/docs/screens/query2.png
diff --git a/docs/screens/raster.png b/docs/screens/raster.png
diff --git a/docs/screens/tabledetail.png b/docs/screens/tabledetail.png
diff --git a/docs/screens/tablelist.png b/docs/screens/tablelist.png
diff --git a/docs/screens/wktpreview.png b/docs/screens/wktpreview.png
diff --git a/endpoints/geoprocessing/index.js b/endpoints/geoprocessing/index.js
diff --git a/endpoints/geoprocessing/operations/BufferDissolveZonalStats.js b/endpoints/geoprocessing/operations/BufferDissolveZonalStats.js
diff --git a/endpoints/geoprocessing/operations/BufferPoint.js b/endpoints/geoprocessing/operations/BufferPoint.js
diff --git a/endpoints/geoprocessing/operations/CreateRasterFromArray.js b/endpoints/geoprocessing/operations/CreateRasterFromArray.js
diff --git a/endpoints/geoprocessing/operations/GeoOperation.js.example b/endpoints/geoprocessing/operations/GeoOperation.js.example
diff --git a/endpoints/geoprocessing/operations/index.js b/endpoints/geoprocessing/operations/index.js
diff --git a/endpoints/geoprocessing/views/geoprocessing_operation.jade b/endpoints/geoprocessing/views/geoprocessing_operation.jade
diff --git a/endpoints/geoprocessing/views/geoprocessing_operations.jade b/endpoints/geoprocessing/views/geoprocessing_operations.jade
diff --git a/endpoints/mapnik/cartocss/blueplaid.png b/endpoints/mapnik/cartocss/blueplaid.png
diff --git a/endpoints/mapnik/cartocss/greenplaid.png b/endpoints/mapnik/cartocss/greenplaid.png
diff --git a/endpoints/mapnik/cartocss/grid.png b/endpoints/mapnik/cartocss/grid.png
diff --git a/endpoints/mapnik/cartocss/nigeria_statecapitals.mss b/endpoints/mapnik/cartocss/nigeria_statecapitals.mss
diff --git a/endpoints/mapnik/cartocss/pinkplaid.png b/endpoints/mapnik/cartocss/pinkplaid.png
diff --git a/endpoints/mapnik/cartocss/style.mss b/endpoints/mapnik/cartocss/style.mss
diff --git a/endpoints/mapnik/cartocss/style.xml b/endpoints/mapnik/cartocss/style.xml
diff --git a/endpoints/mapnik/cartocss/uganda_coverage.mss b/endpoints/mapnik/cartocss/uganda_coverage.mss
diff --git a/endpoints/mapnik/cartocss/uganda_hexbins.mss b/endpoints/mapnik/cartocss/uganda_hexbins.mss
diff --git a/endpoints/mapnik/cartocss/uganda_states.mss b/endpoints/mapnik/cartocss/uganda_states.mss
diff --git a/endpoints/mapnik/cartocss/uganda_urbanareas.mss b/endpoints/mapnik/cartocss/uganda_urbanareas.mss
diff --git a/endpoints/mapnik/index.js b/endpoints/mapnik/index.js
@@ -7,7 +7,8 @@ var express = require('express'),
 
 //Module-specific requires:
 var mapnik = require('mapnik'),
-    mercator = require('./utils/sphericalmercator.js'),
+    mercator = require('./utils/sphericalmercator.js'), // 3857
+    geographic = require('./utils/geographic.js'), //4326
     parseXYZ = require('./utils/tile.js').parseXYZ,
     path = require('path'),
     fs = require("fs"),
@@ -40,6 +41,7 @@ exports.createPGTileRenderer = flow.define(
     function (table, geom_field, epsgSRID, cartoFile) {
 
         this.table = table;
+        this.epsg = epsgSRID;
 
         var name;
         var stylepath = __dirname + '/cartocss/';
@@ -97,7 +99,7 @@ exports.createPGTileRenderer = flow.define(
                     try {
                         //create map and layer
                         var map = new mapnik.Map(256, 256, mercator.proj4);
-                        var layer = new mapnik.Layer(_self.table, mercator.proj4);
+                        var layer = new mapnik.Layer(_self.table, ((_self.epsg && (_self.epsg == 3857 || _self.epsg == 3587)) ? mercator.proj4 : geographic.proj4)); //check to see if 3857.  If not, assume WGS84
                         var postgis = new mapnik.Datasource(postgis_settings);
                         var bbox = mercator.xyz_to_envelope(parseInt(params.x),
                                                                parseInt(params.y),
@@ -145,6 +147,7 @@ exports.createPGTileQueryRenderer = flow.define(
 
         this.table = table;
         this.geom_field = geom_field;
+        this.epsg = epsgSRID;
 
         var name;
         var stylepath = __dirname + '/cartocss/';
@@ -242,7 +245,7 @@ exports.createPGTileQueryRenderer = flow.define(
                 try {
                     //create map and layer
                     var map = new mapnik.Map(parseInt(args.width), parseInt(args.height), mercator.proj4); //width, height
-                    var layer = new mapnik.Layer(_self.table, mercator.proj4);
+                    var layer = new mapnik.Layer(_self.table, ((_self.epsg && (_self.epsg == 3857 || _self.epsg == 3587)) ? mercator.proj4 : geographic.proj4)); //check to see if 3857.  If not, assume WGS84
                     var postgis = new mapnik.Datasource(postgis_settings);
 
                     var floatbbox = args.bbox.split(",");

diff --git a/endpoints/mapnik/package.json b/endpoints/mapnik/package.json
diff --git a/endpoints/mapnik/utils/pool.js b/endpoints/mapnik/utils/pool.js
diff --git a/endpoints/mapnik/utils/sphericalmercator.js b/endpoints/mapnik/utils/sphericalmercator.js
diff --git a/endpoints/mapnik/utils/tile.js b/endpoints/mapnik/utils/tile.js
diff --git a/endpoints/services/index.js b/endpoints/services/index.js
diff --git a/endpoints/services/views/services.jade b/endpoints/services/views/services.jade
diff --git a/endpoints/tables/index.js b/endpoints/tables/index.js
@@ -24,7 +24,6 @@ var app = exports.app = express();
 app.set('views', __dirname + '/views');
 app.set('view engine', 'jade');
 
-
 //Add a route and define response
 //Get list of public base tables from postgres
 app.all('/services/tables', function (req, res) {
@@ -827,12 +826,22 @@ if (mapnik) {
             getGeometryFieldNames(this.args.table, this);
 
         }, function (geom_fields_array) {
-
+
+			//This should have a value
+			var srid = app.spatialTables[this.args.table].srid;
+
             //coming back from getGeometryFieldNames
             //for now, assume just 1 geometry.  TODO
             if (geom_fields_array.length > 0) {
                 //Check for layer extent
-                var query = { text: "SELECT ST_Extent(" + geom_fields_array[0] + ") as table_extent FROM " + this.args.table + ";", values: [] };
+                //Transform to 4326 if 3857
+                var query;
+                if(srid && (srid == 3857 || srid == 3587)){
+                	query = { text: "SELECT ST_Extent(ST_Transform(" + geom_fields_array[0] + ", 4326)) as table_extent FROM " + this.args.table + ";", values: [] };
+               	}
+               	else{
+               		query = { text: "SELECT ST_Extent(" + geom_fields_array[0] + ") as table_extent FROM " + this.args.table + ";", values: [] };
+               	}
                 common.executePgQuery(query, this);
             }
             else {
@@ -848,7 +857,7 @@ if (mapnik) {
                 this.args.errorMessage = "Problem getting the extent for this table.";
             }
             else {
-
+				debugger;
                 var bboxArray = result.rows[0].table_extent.replace("BOX(", "").replace(")", "").split(","); //Should be BOX(XMIN YMIN, XMAX YMAX)
                 this.args.xmin = bboxArray[0].split(" ")[0];
                 this.args.ymin = bboxArray[0].split(" ")[1];
@@ -1026,20 +1035,23 @@ function makeGeoJSONFile(table, filename, callback) {
 exports.findSpatialTables = function (callback) {
     var spatialTables = [];
     var error;
-
+    
     var query = { text: "select * from geometry_columns", values: [] }; //TODO - add options to specify schema and database.  Right now it will read all
     common.executePgQuery(query, function (result) {
         if (result.status == "error") {
             //Report error and exit.
             error = result.message;
             console.log("Error in reading spatial tables from DB.  Can't load dynamic tile endopints. Message is: " + result.message);
         } else {
+        	app.spatialTables = {};
             //Add to list of tables.
             result.rows.forEach(function (item) {
-                spatialTables.push({ table: item.f_table_name, geometry_column:item.f_geometry_column, srid: item.srid });
+            	var spTable = { table: item.f_table_name, geometry_column:item.f_geometry_column, srid: item.srid };
+                spatialTables.push(spTable);
+                app.spatialTables[item.f_table_name] = spTable; //Keep a copy in tables for later.
             });
         }
-
+        
         //return to sender
         callback(error, spatialTables);
     });

diff --git a/endpoints/tables/views/rasterops.jade b/endpoints/tables/views/rasterops.jade
diff --git a/endpoints/tables/views/table_details.jade b/endpoints/tables/views/table_details.jade
diff --git a/endpoints/tables/views/table_dynamic_map.jade b/endpoints/tables/views/table_dynamic_map.jade
diff --git a/endpoints/tables/views/table_list.jade b/endpoints/tables/views/table_list.jade
diff --git a/endpoints/tables/views/table_query.jade b/endpoints/tables/views/table_query.jade
diff --git a/endpoints/tables/views/topojson_list.jade b/endpoints/tables/views/topojson_list.jade
diff --git a/endpoints/tables/views/zonalstatistics.jade b/endpoints/tables/views/zonalstatistics.jade
diff --git a/endpoints/tiles/index.js b/endpoints/tiles/index.js
diff --git a/endpoints/tiles/views/tile_list.jade b/endpoints/tiles/views/tile_list.jade
diff --git a/endpoints/utilities/index.js b/endpoints/utilities/index.js
diff --git a/endpoints/utilities/views/utilities.jade b/endpoints/utilities/views/utilities.jade
diff --git a/endpoints/utilities/views/wktpreview.jade b/endpoints/utilities/views/wktpreview.jade
diff --git a/lib/datablaster/blast_config.js b/lib/datablaster/blast_config.js
diff --git a/lib/datablaster/index.js b/lib/datablaster/index.js
diff --git a/lib/datablaster/transformers.js b/lib/datablaster/transformers.js
diff --git a/package.json b/package.json
diff --git a/public/blast_output/Bangladesh_Cico_Count.js b/public/blast_output/Bangladesh_Cico_Count.js
diff --git a/public/blast_output/Bangladesh_Cicos.js b/public/blast_output/Bangladesh_Cicos.js
diff --git a/public/blast_output/Nigeria_Cico_Count.js b/public/blast_output/Nigeria_Cico_Count.js
diff --git a/public/blast_output/Nigeria_Cicos.js b/public/blast_output/Nigeria_Cicos.js
diff --git a/public/blast_output/Tanzania_Cico_Count.js b/public/blast_output/Tanzania_Cico_Count.js
diff --git a/public/blast_output/Tanzania_Cicos.js b/public/blast_output/Tanzania_Cicos.js
diff --git a/public/blast_output/Uganda_Cico_Count.js b/public/blast_output/Uganda_Cico_Count.js
diff --git a/public/blast_output/Uganda_Cicos.js b/public/blast_output/Uganda_Cicos.js
diff --git a/public/blast_output/index.js b/public/blast_output/index.js
diff --git a/public/cached_nodetiles/.gitignore b/public/cached_nodetiles/.gitignore
diff --git a/public/geojson/.gitignore b/public/geojson/.gitignore
diff --git a/public/geojson/output/.gitignore b/public/geojson/output/.gitignore
diff --git a/public/img/bg_thatch.png b/public/img/bg_thatch.png
diff --git a/public/img/favicon.png b/public/img/favicon.png
diff --git a/public/img/logo.png b/public/img/logo.png
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
diff --git a/public/stylesheets/style.less b/public/stylesheets/style.less
diff --git a/public/topojson/.gitignore b/public/topojson/.gitignore
diff --git a/public/topojson/output/.gitignore b/public/topojson/output/.gitignore
diff --git a/settings.js.example b/settings.js.example
diff --git a/shared_views/layout.jade b/shared_views/layout.jade
diff --git a/test/index.js b/test/index.js