Skip to content

Commit 67fa104

Browse files
authored
Merge pull request #76 from Esri/dev
Update master for v1.1.0
2 parents a50ce0f + 2f19a09 commit 67fa104

File tree

199 files changed

+8865
-2173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+8865
-2173
lines changed

README.md

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,52 @@
11
# Data Collection .NET
22

3-
[Data Collection for .NET](https://developers.arcgis.com/example-apps/data-collection-dotnet/) shows how a robust application can be built around the ArcGIS Platform using the ArcGIS Runtime SDK for .NET and WPF. It demonstrates best practices around some simple but key functionality of the ArcGIS Runtime. Using your organization's web maps, you can use Data Collection as is, or extend it to meet your specific needs.
3+
Data Collection for .NET shows how a robust application can be built with the ArcGIS Platform using the ArcGIS Runtime SDK for .NET, WPF, and UWP. It demonstrates best practices around some simple but key functionality of the ArcGIS Runtime. Using your organization's web maps, you can use Data Collection as-is, or extend it to meet your specific needs.
4+
5+
![Screenshot of the data collection app for WPF, showing the Portland Tree Survey dataset with an identified feature popup](Documentation/img/anatomy-identified-feature.png)
46

57
## Features
6-
* Taking your web map and data offline
7-
* Editing your data both offline and online
8-
* Synchronizing offline edits
9-
* Viewing and editing your data with Popups
10-
* Working with Features, Popups, and PopupManagers
11-
* Editing and querying Feature Tables
12-
* Working with related records
13-
* Identifying map features
14-
* Portal authentication with OAuth
15-
* Using the World Geocoder service
16-
* Using Popup configuration to drive app behavior
17-
18-
## Best Practices
8+
9+
* Take your web map and data offline
10+
* Edit your data both offline and online
11+
* Synchronize offline edits
12+
* View and edit your data with Popups
13+
* Work with Features, Popups, Attachments, and PopupManager
14+
* Edit and query Feature Tables
15+
* Work with related records
16+
* Identify map features
17+
* Authenticate with Portal using OAuth
18+
* Use the World Geocoder service
19+
* Use Popup configuration to drive app behavior
20+
21+
## Best practices
22+
1923
The project also demonstrates some patterns for building real-world apps around the ArcGIS Runtime SDK.
2024

2125
* Map-centric UI design
2226
* ArcGIS asynchronous service pattern
23-
* Cross-platform ready application design
27+
* Cross-platform application design
2428
* Model-View-ViewModel pattern
2529

26-
## Get Started
27-
You will need [Visual Studio 2017](https://visualstudio.microsoft.com/downloads/) and the [ArcGIS Runtime SDK](https://developers.arcgis.com/downloads/apis-and-sdks?product=net) (v100.5 or later) installed locally.
30+
## Get started
31+
32+
You will need [Visual Studio 2017](https://visualstudio.microsoft.com/downloads/) or later. You can use the [ArcGIS Runtime SDK](https://developers.arcgis.com/downloads/apis-and-sdks?product=net) extension (v100.7 or later) installed locally or install the Runtime packages from Nuget.org.
2833

2934
### Fork the repo
30-
**Fork** the [Data Collection](https://github.com/Esri/data-collection-dotnet/fork) repo
35+
36+
**Fork** the [Data Collection](https://github.com/Esri/data-collection-dotnet/fork) repo.
3137

3238
### Clone the repo
39+
3340
Once you have forked the repo, you can make a clone and open `DataCollection.sln` in Visual Studio.
3441

3542
#### Command line Git
43+
3644
1. [Clone Data Collection](https://help.github.com/articles/fork-a-repo/#step-2-create-a-local-clone-of-your-fork)
3745
2. `cd` into into the cloned repository's directory
3846
3. Make your changes and create a [pull request](https://help.github.com/articles/creating-a-pull-request)
3947

4048
### Configuring a Remote for a Fork
49+
4150
If you make changes in the fork and would like to [sync](https://help.github.com/articles/syncing-a-fork/) those changes with the upstream repository, you must first [configure the remote](https://help.github.com/articles/configuring-a-remote-for-a-fork/). This will be required when you have created local branches and would like to make a [pull request](https://help.github.com/articles/creating-a-pull-request) to your upstream branch.
4251

4352
1. In the Terminal (for Mac users) or command prompt (for Windows and Linux users) type `git remote -v` to list the current configured remote repo for your fork.
@@ -52,21 +61,21 @@ If there are changes made in the original repository, you can sync the fork to k
5261

5362
### Configure the app
5463

55-
The app can be run as is, but it's recommended you do some configuration to set up OAuth to be relevant to your users. At minimum, the app should not be deployed without these changes:
64+
The app can be run as-is, but it's recommended you do some configuration to set up OAuth to be relevant to your users. At minimum, the app should not be deployed without these changes:
5665

5766
1. Register an ArcGIS Portal Application.
5867
2. Configure Data Collection project to reference that application.
5968
3. License the app to remove the Developer Mode watermark and for deployment.
6069

61-
#### 1. Register an Application
70+
#### 1. Register an application
6271

6372
For OAuth configuration, create a new Application in your ArcGIS Portal to obtain a `Client ID` and configure a `Redirect URL`. The **Client ID** configures the ArcGIS Runtime to show your users, during the login process, that the application was built by you and can be trusted. The **Redirect URL** configures the OAuth process to then return to your app once authentication is complete.
6473

6574
1. Log in to [https://developers.arcgis.com](https://developers.arcgis.com) with either your ArcGIS Organizational Account or an ArcGIS Developer Account.
6675
2. Register a new Application. ![Register ArcGIS Application](https://user-images.githubusercontent.com/20545379/48228207-6885e500-e359-11e8-99dd-fe528dc50875.png)
6776
3. In the Authentication tab, note the **Client ID** and add a **Redirect URL**, e.g. `data-collection://auth`. We will use this URL in the **Configuring the project** section below. ![Configure ArcGIS Application](https://user-images.githubusercontent.com/20545379/48228212-6de32f80-e359-11e8-9404-aa50858f7cb3.png)
6877

69-
#### 2. Configuring the project
78+
#### 2. Configure the project
7079

7180
1. Open the solution in Visual Studio and browse to the file named `Configuration.xml` located in the `Properties` directory of the `DataCollection.Shared` project.
7281
2. _(Optionally)_ configure the `WebmapURL` to match your organization's webmap.
@@ -75,24 +84,28 @@ For OAuth configuration, create a new Application in your ArcGIS Portal to obtai
7584
4. Configure the Client ID.
7685
* Set the `ClientID` property with the **Client ID** generated when you registered your application (see section above).
7786

78-
## Learn More
79-
Learn more about Esri Example Apps [here](https://developers.arcgis.com/example-apps).
87+
## Learn more
88+
89+
Learn more about Esri Open Source Apps [here](https://developers.arcgis.com/example-apps).
8090

8191
## Requirements
82-
* [Visual Studio 2017](https://visualstudio.microsoft.com/downloads/)
92+
93+
* [Visual Studio 2017](https://visualstudio.microsoft.com/downloads/) or later
8394
* [ArcGIS Runtime SDK for .NET](https://developers.arcgis.com/downloads/apis-and-sdks?product=net)
8495
* To edit records or take a web map offline you will need an ArcGIS Online Organizational account, an ArcGIS Online Developer account or an ArcGIS Online account authenticated using a social login.
8596
* To consume your own web map you will need an ArcGIS Online Organizational account.
8697

87-
## Contributing
98+
## Contribute
99+
88100
Anyone and everyone is welcome to [contribute](CONTRIBUTING.md). We do accept pull requests.
89101

90102
1. Get involved
91103
2. Report issues
92104
3. Contribute code
93105
4. Improve documentation
94106

95-
## Licensing
107+
## License
108+
96109
Copyright 2019 Esri
97110

98111
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
@@ -105,7 +118,9 @@ A copy of the license is available in the repository's [LICENSE](LICENSE) file.
105118

106119
For information about licensing your deployed app, see [License your app](https://developers.arcgis.com/net/latest/wpf/guide/license-your-app.htm).
107120

108-
### 3rd Party Component Licensing
109-
Some great open source components are available out there for .NET developers. The following have been used in this project, with much gratitude to their authors.
121+
### 3rd-party component licensing
122+
123+
This project uses the following 3rd-party components:
110124

111-
* [Extended WPF Toolkit by XCeed](https://github.com/xceedsoftware/wpftoolkit) is licensed under the [Microsoft Public License] (https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md)
125+
* [Extended WPF Toolkit by XCeed](https://github.com/xceedsoftware/wpftoolkit) is licensed under the [Microsoft Public License](https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md)
126+
* [Humanizer](https://github.com/Humanizr/Humanizer) - [MIT License](https://github.com/Humanizr/Humanizer/blob/master/LICENSE)

RELEASE.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
# Release notes
22

3+
## 1.1.0
4+
5+
This is the third release of the Data Collection app for .NET, built on ArcGIS Runtime 100.7.
6+
7+
New features at 1.1.0 include:
8+
9+
* Upgraded to the latest 100.7 ArcGIS Runtime
10+
* Support for viewing, adding, and deleting feature attachments
11+
* UWP implementation of the app, built on the same shared foundation
12+
* Bug fixes and performance improvements
13+
314
## 1.0.1
415

5-
- Comprehensive [app documentation](/docs/index.md) from the ArcGIS for Developers site.
16+
New features at 1.0.1 include:
17+
18+
* Comprehensive [app documentation](/docs/index.md) from the ArcGIS for Developers site.
619

720
## 1.0.0
821

392 KB
Loading
-1000 KB
Loading
78.2 KB
Loading
-328 KB
Loading
418 KB
Loading

docs/images/anatomy-map-view.png

-924 KB
Loading
201 KB
Loading
-175 KB
Loading

0 commit comments

Comments
 (0)