Skip to content

Commit

Permalink
Merge pull request #556 from Esri/v.next
Browse files Browse the repository at this point in the history
Merge v.next into master
  • Loading branch information
nCastle1 authored Oct 18, 2018
2 parents 0f5c1f1 + 6bc1194 commit 2f493eb
Show file tree
Hide file tree
Showing 451 changed files with 8,072 additions and 5,689 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<NuGetPackageImportStamp>
Expand Down Expand Up @@ -59,11 +58,11 @@
</PropertyGroup>
<!-- References -->
<ItemGroup>
<Reference Include="Esri.ArcGISRuntime, Version=100.3.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.3.0\lib\MonoAndroid10\Esri.ArcGISRuntime.dll</HintPath>
<Reference Include="Esri.ArcGISRuntime, Version=100.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.4.0\lib\MonoAndroid10\Esri.ArcGISRuntime.dll</HintPath>
</Reference>
<Reference Include="Esri.ArcGISRuntime.Hydrography, Version=100.3.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.3.0\lib\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.dll</HintPath>
<Reference Include="Esri.ArcGISRuntime.Hydrography, Version=100.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.4.0\lib\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.dll</HintPath>
</Reference>
<Reference Include="Java.Interop" />
<Reference Include="Mono.Android" />
Expand Down Expand Up @@ -113,8 +112,12 @@
<HintPath>..\..\..\packages\Xamarin.Auth.1.5.0.3\lib\MonoAndroid10\Xamarin.Auth.dll</HintPath>
</Reference>
</ItemGroup>
<!-- Screenshots -->
<ItemGroup>
<!-- Screenshots -->
<None Include="Samples\Layers\ListKmlContents\ListKmlContents.jpg" />
<None Include="Samples\Layers\IdentifyKmlFeatures\IdentifyKmlFeatures.jpg" />
<None Include="Samples\Layers\DisplayKmlNetworkLinks\DisplayKmlNetworkLinks.jpg" />
<None Include="Samples\Layers\DisplayKml\DisplayKml.jpg" />
<None Include="Samples\Network Analysis\ClosestFacilityStatic\ClosestFacilityStatic.jpg" />
<None Include="Samples\Analysis\DistanceMeasurement\DistanceMeasurement.jpg" />
<None Include="Samples\Analysis\LineOfSightGeoElement\LineOfSightGeoElement.jpg" />
Expand Down Expand Up @@ -239,9 +242,14 @@
<None Include="Samples\Symbology\RenderUniqueValues\RenderUniqueValues.jpg" />
<None Include="Samples\Symbology\SimpleRenderers\SimpleRenderers.jpg" />
<None Include="Samples\Symbology\UseDistanceCompositeSym\UseDistanceCompositeSym.jpg" />
<None Include="Samples\Security\IntegratedWindowsAuth\readme.md" />
</ItemGroup>
<!-- Sample Code -->
<ItemGroup>
<!-- Sample Code -->
<Compile Include="Samples\Layers\ListKmlContents\ListKmlContents.cs" />
<Compile Include="Samples\Layers\IdentifyKmlFeatures\IdentifyKmlFeatures.cs" />
<Compile Include="Samples\Layers\DisplayKmlNetworkLinks\DisplayKmlNetworkLinks.cs" />
<Compile Include="Samples\Layers\DisplayKml\DisplayKml.cs" />
<Compile Include="Samples\Analysis\DistanceMeasurement\DistanceMeasurement.cs" />
<Compile Include="Samples\Analysis\LineOfSightGeoElement\LineOfSightGeoElement.cs" />
<Compile Include="Samples\Analysis\LineOfSightLocation\LineOfSightLocation.cs" />
Expand Down Expand Up @@ -363,13 +371,13 @@
<Compile Include="Samples\Search\FindPlace\FindPlace.cs" />
<Compile Include="Samples\Security\OAuth\OAuth.cs" />
<Compile Include="Samples\Security\TokenSecuredChallenge\TokenSecuredChallenge.cs" />
<Compile Include="Samples\Security\TokenSecuredKnownUser\TokenSecuredKnownUser.cs" />
<Compile Include="Samples\Symbology\FeatureLayerExtrusion\FeatureLayerExtrusion.cs" />
<Compile Include="Samples\Symbology\RenderPictureMarkers\RenderPictureMarkers.cs" />
<Compile Include="Samples\Symbology\RenderSimpleMarkers\RenderSimpleMarkers.cs" />
<Compile Include="Samples\Symbology\RenderUniqueValues\RenderUniqueValues.cs" />
<Compile Include="Samples\Symbology\SimpleRenderers\SimpleRenderers.cs" />
<Compile Include="Samples\Symbology\UseDistanceCompositeSym\UseDistanceCompositeSym.cs" />
<Compile Include="Samples\Security\IntegratedWindowsAuth\IntegratedWindowsAuth.cs" />
</ItemGroup>
<!-- Sample Manager Code -->
<ItemGroup>
Expand Down Expand Up @@ -427,18 +435,23 @@
<ItemGroup>
<None Include="Samples\Security\OAuth\OAuth.jpg" />
<None Include="Samples\Security\TokenSecuredChallenge\TokenSecuredChallenge.jpg" />
<None Include="Samples\Security\TokenSecuredKnownUser\TokenSecuredKnownUser.jpg" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\ListKmlContents.axml">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<!-- Imports -->
<Import Project="..\..\ArcGISRuntime.Samples.Shared\ArcGISRuntime.Samples.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets" Condition="Exists('..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets')" />
<Import Project="..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets" Condition="Exists('..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets'))" />
<Error Condition="!Exists('..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets'))" />
<Error Condition="!Exists('..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Esri.ArcGISRuntime.Xamarin.Android.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Xamarin.Android.targets'))" />
<Error Condition="!Exists('..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets'))" />
</Target>
<Import Project="..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets" Condition="Exists('..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.3.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets')" />
<Import Project="..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets" Condition="Exists('..\..\..\packages\Esri.ArcGISRuntime.Hydrography.100.4.0\build\MonoAndroid10\Esri.ArcGISRuntime.Hydrography.targets')" />
</Project>
2 changes: 1 addition & 1 deletion src/Android/Xamarin.Android/Properties/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" android:installLocation="auto" package="ArcGISRuntimeSDK_Xamarin_Android">
<uses-sdk android:minSdkVersion="16" />
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/Animate3DGraphicLayout">
<Esri.ArcGISRuntime.UI.SceneView
<Esri.ArcGISRuntime.UI.Controls.SceneView
android:id="@+id/PrimarySceneView"
android:layout_width="0dp"
android:layout_height="0dp"
Expand Down Expand Up @@ -51,7 +51,7 @@
style="@android:style/Widget.Material.Button.Borderless.Colored" />
</TableRow>
</TableLayout>
<Esri.ArcGISRuntime.UI.MapView
<Esri.ArcGISRuntime.UI.Controls.MapView
android:id="@+id/insetMap"
android:layout_width="120dp"
android:layout_height="120dp"
Expand Down
2 changes: 1 addition & 1 deletion src/Android/Xamarin.Android/Resources/layout/Buffer.axml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<Esri.ArcGISRuntime.UI.MapView
<Esri.ArcGISRuntime.UI.Controls.MapView
android:id="@+id/buffer_mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<Esri.ArcGISRuntime.UI.SceneView
<Esri.ArcGISRuntime.UI.Controls.SceneView
android:id="@+id/distanceMeasurement_sceneView"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:text="Static:"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<Esri.ArcGISRuntime.UI.MapView
<Esri.ArcGISRuntime.UI.Controls.MapView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
Expand All @@ -16,7 +16,7 @@
android:text="Dynamic:"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<Esri.ArcGISRuntime.UI.MapView
<Esri.ArcGISRuntime.UI.Controls.MapView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
Expand Down
4 changes: 2 additions & 2 deletions src/Android/Xamarin.Android/Resources/layout/GeoViewSync.axml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<Esri.ArcGISRuntime.UI.MapView
<Esri.ArcGISRuntime.UI.Controls.MapView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:id="@+id/GeoViewSync_MyMapView" />
<Esri.ArcGISRuntime.UI.SceneView
<Esri.ArcGISRuntime.UI.Controls.SceneView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
Expand Down
31 changes: 31 additions & 0 deletions src/Android/Xamarin.Android/Resources/layout/ListKmlContents.axml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_weight="1"
android:layout_width="fill_parent"
android:layout_height="0dp">
<ListView
android:layout_width="fill_parent"
android:layout_height="wrap_content"

android:id="@+id/ListKmlContents_ContentList" />
</LinearLayout>

<LinearLayout
android:layout_weight="1"
android:layout_width="fill_parent"
android:layout_height="0dp">
<Esri.ArcGISRuntime.UI.Controls.SceneView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentBottom="true"
android:id="@+id/ListKmlContents_MySceneView" />
</LinearLayout>
</LinearLayout>




Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public class DistanceMeasurement : Activity
// URLs to various services used to provide an interesting scene for the sample.
private readonly Uri _buildingService =
new Uri(
"http://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0");
"https://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0");

private readonly Uri _worldElevationService =
new Uri("http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer");
new Uri("https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer");

// Reference to the measurement used.
private LocationDistanceMeasurement _distanceMeasurement;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class LineOfSightGeoElement : Activity
private SeekBar _myHeightSlider;

// URL of the elevation service - provides elevation component of the scene
private readonly Uri _elevationUri = new Uri("http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer");
private readonly Uri _elevationUri = new Uri("https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer");

// URL of the building service - provides builidng models
private readonly Uri _buildingsUri = new Uri("https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/New_York_LoD2_3D_Buildings/SceneServer/layers/0");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class LineOfSightLocation : Activity
private SceneView _mySceneView = new SceneView();

// URL for an image service to use as an elevation source
private string _elevationSourceUrl = @"http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer";
private string _elevationSourceUrl = @"https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer";

// Location line of sight analysis
private LocationLineOfSight _lineOfSightAnalysis;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ public class ViewshedCamera : Activity
private SceneView _mySceneView = new SceneView();

// URL for a scene service of buildings in Brest, France
private string _buildingsServiceUrl = @"http://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0";
private string _buildingsServiceUrl = @"https://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0";

// URL for an image service to use as an elevation source
private string _elevationSourceUrl = @"http://scene.arcgis.com/arcgis/rest/services/BREST_DTM_1M/ImageServer";
private string _elevationSourceUrl = @"https://scene.arcgis.com/arcgis/rest/services/BREST_DTM_1M/ImageServer";

// Location viewshed analysis to show visible and obstructed areas from the camera
private LocationViewshed _viewshedForCamera;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ private void HandleSettingsChange(object sender, EventArgs e)
_viewshed.Pitch = _pitchSlider.Progress;
_viewshed.HorizontalAngle = _horizontalAngleSlider.Progress;
_viewshed.VerticalAngle = _verticalAngleSlider.Progress;
_viewshed.MinDistance = _minimumDistanceSlider.Progress;
_viewshed.MinDistance = _minimumDistanceSlider.Progress + 5;
_viewshed.MaxDistance = _maximumDistanceSlider.Progress;

// Update visibility of the viewshed analysis.
Expand Down Expand Up @@ -211,7 +211,7 @@ private void CreateLayout()

// Minimum Distance
TextView minimumDistanceLabel = new TextView(this) { Text = "Minimum Distance:" };
_minimumDistanceSlider = new SeekBar(this) { Min = 5, Max = 8999 };
_minimumDistanceSlider = new SeekBar(this) { Max = 8994 };
layout.AddView(minimumDistanceLabel);
layout.AddView(_minimumDistanceSlider);
layout.SetHorizontalGravity(GravityFlags.FillHorizontal);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,16 @@ private void Initialize()
// Create a new renderer for the States Feature Layer.
SimpleLineSymbol lineSymbol = new SimpleLineSymbol(SimpleLineSymbolStyle.Solid, Color.Black, 1);
SimpleFillSymbol fillSymbol = new SimpleFillSymbol(SimpleFillSymbolStyle.Solid, Color.Transparent, lineSymbol);
_featureLayer.SelectionColor = Color.Cyan;
_featureLayer.SelectionWidth = 4.0;

// Set States feature layer renderer
_featureLayer.Renderer = new SimpleRenderer(fillSymbol);

// Add feature layer to the map
myMap.OperationalLayers.Add(_featureLayer);

// Update the selection color
_myMapView.SelectionProperties.Color = Color.Cyan;

// Assign the map to the MapView
_myMapView.Map = myMap;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,8 @@ private async void Initialize()
// Get the feature layer from the map
_myFeatureLayer = (FeatureLayer)myMap.OperationalLayers.First();

// Make the selection color yellow and the width thick
_myFeatureLayer.SelectionColor = System.Drawing.Color.Yellow;
_myFeatureLayer.SelectionWidth = 5;
// Update the selection color
_myMapView.SelectionProperties.Color = System.Drawing.Color.Yellow;

// Listen for GeoViewTapped events
_myMapView.GeoViewTapped += MyMapViewOnGeoViewTapped;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private void Initialize()

// Create uri to the used feature service
Uri serviceUri = new Uri(
"http://sampleserver6.arcgisonline.com/arcgis/rest/services/PoolPermits/FeatureServer/0");
"https://sampleserver6.arcgisonline.com/arcgis/rest/services/PoolPermits/FeatureServer/0");

// Create feature table for the pools feature service
ServiceFeatureTable poolsFeatureTable = new ServiceFeatureTable(serviceUri)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private void Initialize()

// Create uri to the used feature service
Uri serviceUri = new Uri(
"http://sampleserver6.arcgisonline.com/arcgis/rest/services/SF311/FeatureServer/0");
"https://sampleserver6.arcgisonline.com/arcgis/rest/services/SF311/FeatureServer/0");

// Create feature table for the incident feature service
_incidentsFeatureTable = new ServiceFeatureTable(serviceUri)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private void Initialize()

// Create uri to the used feature service
Uri serviceUri = new Uri(
"http://sampleserver6.arcgisonline.com/arcgis/rest/services/PoolPermits/FeatureServer/0");
"https://sampleserver6.arcgisonline.com/arcgis/rest/services/PoolPermits/FeatureServer/0");

// Create feature table for the pools feature service
ServiceFeatureTable poolsFeatureTable = new ServiceFeatureTable(serviceUri)
Expand Down
Loading

0 comments on commit 2f493eb

Please sign in to comment.