Merge pull request #171 from mfunk/v10.2.2.2

Changes to Build Elevation Tools from Nat C for 10.3 bacported to 10.2

environment/test/test_build_elevation/TestBuildElevationMosaic.py

@@ -38,7 +38,7 @@ class LicenseError(Exception):
     #inputPercentSlopeFunctionTemplateFile = os.path.join(TestUtilities.toolboxesPath,"Raster Functions","PercentSlope.rft.xml")
     #inputHillshadeFunctionTemplateFile = os.path.join(TestUtilities.toolboxesPath,"Raster Functions","Hillshade.rft.xml")
     inputAspectFunctionTemplateFile = os.path.join(TestUtilities.toolboxesPath,"Raster Functions","AspectNumericValues.rft.xml")
-    inputPercentSlopeFunctionTemplateFile = os.path.join(TestUtilities.toolboxesPath,"Raster Functions","SlopePercent.rft.xml")
+    inputPercentSlopeFunctionTemplateFile = os.path.join(TestUtilities.toolboxesPath,"Raster Functions","SlopePercentRise.rft.xml")
     inputHillshadeFunctionTemplateFile = os.path.join(TestUtilities.toolboxesPath,"Raster Functions","GreyScaleHillshade.rft.xml")
     outputDTMMosaic = "DigitalTerrainModel"
     outputHillshadeMosaic = os.path.join(TestUtilities.outputGDB, "Hillshade")

environment/toolboxes/Raster Functions/AspectNumericValues.rft.xml

@@ -1 +1 @@
-<XmlRasterFunctionTemplate xsi:type='typens:RasterFunctionTemplate' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:typens='http://www.esri.com/schemas/ArcGIS/10.1'><Name>AspectNumericValues</Name><Description>A raster function template.</Description><Function xsi:type='typens:AspectFunction'><Name>Aspect Function</Name><Description>Identifies the downslope direction of the maximum rate of change in value from each cell to its neighbors.</Description><PixelType>U16</PixelType></Function><Arguments xsi:type='typens:RasterFunctionVariable'><Name>Raster</Name><Description></Description><Value></Value><IsDataset>true</IsDataset></Arguments><Help></Help></XmlRasterFunctionTemplate>
+<XmlRasterFunctionTemplate xsi:type='typens:RasterFunctionTemplate' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:typens='http://www.esri.com/schemas/ArcGIS/10.3'><Name>Aspect Numeric Values</Name><Description>Identifies the downslope direction of the maximum rate of change in value from each cell to its neighbours. Numeric values are given and displayed as a greyscale raster.  A reproject function to Web Mercator has also been applied to derive correct aspect values. </Description><Function xsi:type='typens:AspectFunction'><Name>Aspect Function</Name><Description>Identifies the downslope direction of the maximum rate of change in value from each cell to its neighbors.</Description><PixelType>U16</PixelType></Function><Arguments xsi:type='typens:RasterFunctionTemplate'><Name>Raster Function Template</Name><Description>A raster function template.</Description><Function xsi:type='typens:ReprojectFunction'><Name>Reproject Function</Name><Description>Sets a new spatial reference and cell sizes</Description><PixelType>UNKNOWN</PixelType></Function><Arguments xsi:type='typens:ReprojectFunctionArguments'><Names xsi:type='typens:ArrayOfString'><String>Raster</String><String>SpatialReference</String><String>XCellsize</String><String>YCellsize</String><String>XOrigin</String><String>YOrigin</String></Names><Values xsi:type='typens:ArrayOfAnyType'><AnyType xsi:type='typens:RasterFunctionVariable'><Name>Raster</Name><Description></Description><Value></Value><IsDataset>true</IsDataset></AnyType><AnyType xsi:type='typens:ProjectedCoordinateSystem'><WKT>PROJCS[&quot;WGS_1984_Web_Mercator_Auxiliary_Sphere&quot;,GEOGCS[&quot;GCS_WGS_1984&quot;,DATUM[&quot;D_WGS_1984&quot;,SPHEROID[&quot;WGS_1984&quot;,6378137.0,298.257223563]],PRIMEM[&quot;Greenwich&quot;,0.0],UNIT[&quot;Degree&quot;,0.0174532925199433]],PROJECTION[&quot;Mercator_Auxiliary_Sphere&quot;],PARAMETER[&quot;False_Easting&quot;,0.0],PARAMETER[&quot;False_Northing&quot;,0.0],PARAMETER[&quot;Central_Meridian&quot;,0.0],PARAMETER[&quot;Standard_Parallel_1&quot;,0.0],PARAMETER[&quot;Auxiliary_Sphere_Type&quot;,0.0],UNIT[&quot;Meter&quot;,1.0],AUTHORITY[&quot;EPSG&quot;,3857]]</WKT><XOrigin>-20037700</XOrigin><YOrigin>-30241100</YOrigin><XYScale>148923141.92838538</XYScale><ZOrigin>-100000</ZOrigin><ZScale>10000</ZScale><MOrigin>-100000</MOrigin><MScale>10000</MScale><XYTolerance>0.001</XYTolerance><ZTolerance>0.001</ZTolerance><MTolerance>0.001</MTolerance><HighPrecision>true</HighPrecision><WKID>102100</WKID><LatestWKID>3857</LatestWKID></AnyType><AnyType xsi:type='xs:double'>0</AnyType><AnyType xsi:type='xs:double'>0</AnyType><AnyType xsi:type='xs:double'>0</AnyType><AnyType xsi:type='xs:double'>0</AnyType></Values></Arguments><Help></Help><Type>0</Type><Thumbnail></Thumbnail><Definition></Definition><Group></Group><Tag></Tag></Arguments><Help></Help><Type>0</Type><Thumbnail></Thumbnail><Definition></Definition><Group></Group><Tag></Tag></XmlRasterFunctionTemplate>