Reviewing terralib release 5.5 updating

build/scripts/linux/terralib-conf.cmake

@@ -79,3 +79,5 @@ set(TERRALIB_QTPROPERTYBROWSER_ENABLED OFF CACHE BOOL "Qt?" FORCE)
 set(TERRALIB_MOD_WS_OGC_WMS_QT_ENABLED OFF CACHE BOOL "Build Qt Components for OGC WMS?" FORCE)
 set(TERRALIB_MOD_WS_OGC_WCS_CLIENT_ENABLED OFF CACHE BOOL "Build OGC WCS Client Support?" FORCE)
 set(TERRALIB_MOD_METADATA_ENABLED OFF CACHE BOOL "Build Metadata?" FORCE)
+set(TERRALIB_MOD_PROCESS_QT_ENABLED OFF CACHE BOOL "Build Process Qt module?" FORCE)
+set(TERRALIB_MOD_PROCESS_ENABLED OFF CACHE BOOL "Build Process module?" FORCE)

build/scripts/mac/terralib-conf.cmake

@@ -77,3 +77,5 @@ set(TERRALIB_QHELP_ENABLED OFF CACHE BOOL "QHelp?" FORCE)
 set(TERRALIB_MOD_WS_OGC_WMS_QT_ENABLED OFF CACHE BOOL "Build Qt Components for OGC WMS?" FORCE)
 set(TERRALIB_MOD_WS_OGC_WCS_CLIENT_ENABLED OFF CACHE BOOL "Build OGC WCS Client Support?" FORCE)
 set(TERRALIB_MOD_METADATA_ENABLED OFF CACHE BOOL "Build Metadata?" FORCE)
+set(TERRALIB_MOD_PROCESS_QT_ENABLED OFF CACHE BOOL "Build Process Qt module?" FORCE)
+set(TERRALIB_MOD_PROCESS_ENABLED OFF CACHE BOOL "Build Process module?" FORCE)

build/scripts/win/terralib-conf.cmake

@@ -75,3 +75,5 @@ set(TERRALIB_QHELP_ENABLED OFF CACHE BOOL "QHelp?" FORCE)
 set(TERRALIB_MOD_WS_OGC_WMS_QT_ENABLED OFF CACHE BOOL "Build Qt Components for OGC WMS?" FORCE)
 set(TERRALIB_MOD_WS_OGC_WCS_CLIENT_ENABLED OFF CACHE BOOL "Build OGC WCS Client Support?" FORCE)
 set(TERRALIB_MOD_METADATA_ENABLED OFF CACHE BOOL "Build Metadata?" FORCE)
+set(TERRALIB_MOD_PROCESS_QT_ENABLED OFF CACHE BOOL "Build Process Qt module?" FORCE)
+set(TERRALIB_MOD_PROCESS_ENABLED OFF CACHE BOOL "Build Process module?" FORCE)

jenkins/linux/terrame-package-test-ubuntu.sh

@@ -65,10 +65,10 @@ fi
 
 # Executing unittest
 if [ -f "$(pwd)/test.lua" ]; then
-	terrame -color $TERRAME_COMMANDS -test test.lua 2> /dev/null
+	terrame -color $TERRAME_COMMANDS -test test.lua
 	RESULT=$?
 else
-	terrame -color $TERRAME_COMMANDS -test 2> /dev/null
+	terrame -color $TERRAME_COMMANDS -test
 	RESULT=$?
 fi
 

packages/base/lua/CellularSpace.lua

@@ -547,7 +547,7 @@ local function loadPGM(self)
 	self.ydim = self.yMax
 end
 
-local function setCellsByTerraLibDataSet(self, dSet)
+local function setCellsByTerraLibDataSet(self, dSet, geom)
 	self.xMax = 0
 	self.yMin = 0
 	self.yMax = 0
@@ -616,12 +616,18 @@ local function setCellsByTerraLibDataSet(self, dSet)
 		local cell = Cell{id = tostring(i), x = col, y = row}
 		self.cObj_:addCell(cell.x, cell.y, cell.cObj_)
 
-		for k, v in pairs(dSet[i]) do
-			if (k == "OGR_GEOMETRY") or (k == "geom") or (k == "ogr_geometry") then
-				if self.geometry then
-					cell.geom = gis.TerraLib().castGeomToSubtype(v)
+		if geom then
+			for k, v in pairs(dSet[i]) do
+				if k == geom.name then
+					if self.geometry then
+						cell.geom = gis.TerraLib().castGeomToSubtype(v)
+					end
+				else
+					cell[k] = v
 				end
-			else
+			end
+		else
+			for k, v in pairs(dSet[i]) do
 				cell[k] = v
 			end
 		end
@@ -648,7 +654,14 @@ local function loadDataSet(self)
 		self.cObj_:setLayer(self.layer)
 	end
 
-	setCellsByTerraLibDataSet(self, dset)
+	local data = {
+		project = self.project,
+		layer = self.layer.name,
+		file = self.file
+	}
+	local geom = gis.TerraLib().getGeometryInfo(data)
+
+	setCellsByTerraLibDataSet(self, dset, geom)
 end
 
 local function loadVector(self)
@@ -1353,22 +1366,15 @@ CellularSpace_ = {
 			mandatoryArgument(1, "string", newLayerName)
 
 			local dset = gis.TerraLib().getDataSet{project = self.project, layer = self.layer.name, missing = self.missing}
+			local geomAttrName = self.layer.geometry
 			if not self.geometry then
 				for i = 0, #dset do
-					for k, v in pairs(dset[i]) do
-						if (k == "OGR_GEOMETRY") or (k == "geom") or (k == "ogr_geometry") then
-							self.cells[i + 1][k] = v
-						end
-					end
+					self.cells[i + 1][geomAttrName] = dset[i][geomAttrName]
 				end
-			elseif dset[0].OGR_GEOMETRY or dset[0].ogr_geometry then
+			elseif dset[0][geomAttrName] then
 				for i = 0, #dset do
-					for k, v in pairs(dset[i]) do
-						if (k == "OGR_GEOMETRY") or (k == "ogr_geometry") then
-							self.cells[i + 1].geom = nil
-							self.cells[i + 1][k] = v
-						end
-					end
+					self.cells[i + 1].geom = nil
+					self.cells[i + 1][geomAttrName] = dset[i][geomAttrName]
 				end
 			end
 

packages/base/tests/database/basics/CellularSpace.lua

@@ -188,7 +188,7 @@ return{
 
 			forEachCell(cs, function(c)
 				unitTest:assertNotNil(c.geom)
-				unitTest:assertNil(c.OGR_GEOMETRY)
+				unitTest:assertNotNil(c[layer1.geometry])
 			end)
 
 			cs = CellularSpace{
@@ -199,7 +199,7 @@ return{
 
 			forEachCell(cs, function(c)
 				unitTest:assertNil(c.geom)
-				unitTest:assertNil(c.OGR_GEOMETRY)
+				unitTest:assertNil(c[layer1.geometry])
 			end)
 
 			unitTest:assertEquals(303, #cs.cells)

packages/base/tests/functional/basics/CellularSpace.lua

@@ -250,7 +250,7 @@ return{
 
 			forEachCell(cs, function(c)
 				unitTest:assertNil(c.geom)
-				unitTest:assertNil(c.OGR_GEOMETRY)
+				unitTest:assertNil(c[layer.geometry])
 			end)
 
 			cs = CellularSpace{
@@ -261,7 +261,7 @@ return{
 
 			forEachCell(cs, function(c)
 				unitTest:assertNil(c.geom)
-				unitTest:assertNil(c.OGR_GEOMETRY)
+				unitTest:assertNil(c[layer.geometry])
 			end)
 
 			proj.file:delete()

packages/gis/data.lua

@@ -28,7 +28,7 @@ data{
 }
 
 data{
-	file = {"amazonia-prodes.tif", "amazonia-prodes.jgw", "amazonia-prodes.xml", "amazonia-prodes.tif.aux.xml"},
+	file = {"amazonia-prodes.tif", "amazonia-prodes.jgw"},
 	summary = "PRODES data with resolution of 5km. This is a simplified version of the data and must be used only for educational purposes.",
 	source = "http://www.obt.inpe.br/prodes",
 	attributes = {
@@ -65,7 +65,7 @@ data{
 -- Emas
 
 data{
-	file = {"emas-accumulation.tif", "emas-accumulation.xml"},
+	file = "emas-accumulation.tif",
 	summary = "Land cover accumulation from November 94 to May 2000.",
 	source = "Rodolfo Almeida (see Reference)",
 	reference = "Almeida et al. (2008). Simulando padroes de incendios no Parque Nacional das Emas, Estado de Goias, Brasil. In: X Simposio Brasileiro de Geoinformatica, Rio de Janeiro, Brazil",
@@ -108,7 +108,7 @@ data{
 }
 
 data{
-	file = {"itaituba-deforestation.tif", "itaituba-deforestation.xml"},
+	file = "itaituba-deforestation.tif",
 	summary = "Deforestation in Itaituba.",
 	source = "PRODES/INPE",
 	attributes = {
@@ -117,7 +117,7 @@ data{
 }
 
 data{
-	file = {"itaituba-elevation.tif", "itaituba-elevation.xml"},
+	file = "itaituba-elevation.tif",
 	summary = "SRTM data within Itaituba.",
 	source = "HAND (derived from SRTM/NASA)",
 	attributes = {

packages/gis/data/test/es_limit_epsg4326.cpg

@@ -0,0 +1 @@
+UTF-8

packages/gis/data/test/es_limit_epsg4326.prj

@@ -0,0 +1 @@
+PROJCS["SIRGAS_2000_Brazil_Polyconic",GEOGCS["GCS_SIRGAS 2000",DATUM["D_SIRGAS_2000",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Polyconic"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-54],PARAMETER["false_easting",5000000],PARAMETER["false_northing",10000000],UNIT["Meter",1]]

packages/gis/data/test/es_limit_epsg4326.qpj

@@ -0,0 +1 @@
+PROJCS["SIRGAS 2000 / Brazil Polyconic",GEOGCS["SIRGAS 2000",DATUM["Sistema_de_Referencia_Geocentrico_para_las_AmericaS_2000",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6674"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4674"]],PROJECTION["Polyconic"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-54],PARAMETER["false_easting",5000000],PARAMETER["false_northing",10000000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],AUTHORITY["EPSG","5880"]]

packages/gis/data/test/es_protected_areas_epsg4326.cpg

@@ -0,0 +1 @@
+UTF-8

packages/gis/data/test/es_protected_areas_epsg4326.prj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

packages/gis/data/test/es_protected_areas_epsg4326.qpj

@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]