corrections TerraME#2334.

avancinirodrigo · Mar 26, 2020 · 112579b · 112579b
1 parent d7b75df
commit 112579b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/packages/base/lua/CellularSpace.lua b/packages/base/lua/CellularSpace.lua
@@ -618,7 +618,7 @@ local function setCellsByTerraLibDataSet(self, dSet, geom)
 
 		if geom then
 			for k, v in pairs(dSet[i]) do
-				if (k == geom.name) then
+				if k == geom.name then
 					if self.geometry then
 						cell.geom = gis.TerraLib().castGeomToSubtype(v)
 					end
@@ -1366,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
 

diff --git a/packages/base/tests/database/basics/CellularSpace.lua b/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)

diff --git a/packages/base/tests/functional/basics/CellularSpace.lua b/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()