Skip to content

Commit

Permalink
March 2018 release (v2018.03) (#145)
Browse files Browse the repository at this point in the history 
* Updated copyright date

* Updated Java to Runtime 100.2 (#136)

- Updated Java exercises and solutions to ArcGIS Runtime 100.2.0
- Bumped app version from 2017.09 to 2018.03

* Updated to Runtime 100.2 (#137)

- Updated macOS exercises and solutions to ArcGIS Runtime 100.2.0
- Bumped app version to 2018.03

* Updated macOS to Runtime 100.2 (#138)

Updated macOS exercises and solutions to ArcGIS Runtime 100.2.0

* Updated iOS to Runtime 100.2 (#138)

Updated iOS exercises and solutions to ArcGIS Runtime 100.2.0

* Updated Android to Runtime 100.2 (#139)

- Updated Android exercises and solutions to ArcGIS Runtime 100.2.0
- Bumped app version to 2018.03

* Updated .NET WPF exercises to Runtime 100.2.0 (#141)

* Removed packages directories

These are binaries that don't belong in version control.

* Updated .NET WPF exercises to Runtime 100.2.0

* Disabling lock focus button until 3D is enabled once (#142)

Fixes #140

* Updated Qt Quick to Runtime 100.2.0 (#143)

Fixes #135
  • Loading branch information
Gary Sheppard authored Feb 15, 2018
1 parent b23060c commit 12e14ea
Show file tree
Hide file tree
Showing 1,094 changed files with 197 additions and 465,196 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Lab exercises for Esri GeoDev events held in the Washington, D.C., area.

## Licensing

Copyright 2016-2017 Esri
Copyright 2016-2018 Esri

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

Expand Down
2 changes: 1 addition & 1 deletion runtime-workshop/exercises/Android/Exercise 1 Map and Scene.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ If you need some help, you can refer to [the solution to this exercise](../../so
})
testCompile 'junit:junit:4.12'
// Add the next line
compile 'com.esri.arcgisruntime:arcgis-android:100.1.0'
compile 'com.esri.arcgisruntime:arcgis-android:100.2.0'
}
```
Expand Down
10 changes: 5 additions & 5 deletions runtime-workshop/exercises/Java/Exercise 1 Map and Scene.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ If you need some help, you can refer to [the solution to this exercise](../../so
## Add ArcGIS Runtime to the app
You have three options for adding ArcGIS Runtime 100.1.0 to your Java application project. Choose one of the following:
You have three options for adding ArcGIS Runtime 100.2.0 to your Java application project. Choose one of the following:
1. **Use Gradle**: you can use Gradle if you started the exercise by creating a Gradle project. Open `build.gradle` and add ArcGIS dependencies. See [Develop your first map app with Gradle](https://developers.arcgis.com/java/latest/guide/develop-your-first-map-app-with-gradle.htm) for details.
Expand All @@ -96,7 +96,7 @@ You have three options for adding ArcGIS Runtime 100.1.0 to your Java applicatio
dependencies { classpath 'com.esri.arcgisruntime:gradle-arcgis-java-plugin:1.0.0' }
}
arcgis.version = '100.1.0'
arcgis.version = '100.2.0'
// download javadoc
eclipse.classpath.downloadJavadoc = true
Expand All @@ -123,7 +123,7 @@ You have three options for adding ArcGIS Runtime 100.1.0 to your Java applicatio
<dependency>
<groupId>com.esri.arcgisruntime</groupId>
<artifactId>arcgis-java</artifactId>
<version>100.1.0</version>
<version>100.2.0</version>
</dependency>
</dependencies>
Expand All @@ -134,7 +134,7 @@ You have three options for adding ArcGIS Runtime 100.1.0 to your Java applicatio
<artifactId>arcgis-java-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
<version>100.1.0</version>
<version>100.2.0</version>
</configuration>
</plugin>
</plugins>
Expand All @@ -143,7 +143,7 @@ You have three options for adding ArcGIS Runtime 100.1.0 to your Java applicatio
**Note:** Maven downloads the ArcGIS Runtime install to `<user home>/.arcgis`. ArcGIS Runtime tries to find it there, but that can fail under certain conditions. If it fails, you can go inside that install directory and copy the `jniLibs` and `resources` directories to your app's working directory.
3. **Use the downloaded ArcGIS Runtime SDK**: download the ArcGIS Runtime SDK (version 100.1.0) for Java and unzip it. In your Java project, reference the JAR files in the SDK's `libs` directory. You must also copy the SDK's `jniLibs` and `resources` directories to your Java project directory. (There are other ways of referencing ArcGIS Runtime, but copying `jniLibs` and `resources` is the simplest.) See [Develop your first map app using the downloaded SDK](https://developers.arcgis.com/java/latest/guide/develop-your-first-map-app.htm) for details.
3. **Use the downloaded ArcGIS Runtime SDK**: download the ArcGIS Runtime SDK (version 100.2.0) for Java and unzip it. In your Java project, reference the JAR files in the SDK's `libs` directory. You must also copy the SDK's `jniLibs` and `resources` directories to your Java project directory. (There are other ways of referencing ArcGIS Runtime, but copying `jniLibs` and `resources` is the simplest.) See [Develop your first map app using the downloaded SDK](https://developers.arcgis.com/java/latest/guide/develop-your-first-map-app.htm) for details.
## Add a 2D map to the app
Expand Down
2 changes: 1 addition & 1 deletion runtime-workshop/exercises/Qt/Qt Quick/Exercise 1 Map and Scene.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This exercise walks you through the following:
Prerequisites:
- Meet [the system requirements for the ArcGIS Runtime SDK for Qt](https://developers.arcgis.com/qt/latest/qml/guide/arcgis-runtime-sdk-for-qt-system-requirements.htm), including the need for OpenSSL. **_Important: use OpenSSL 1.0.2 with Qt 5.6 through 5.9! OpenSSL 1.1.0 does not work with those releases of Qt!_**
- Install Qt Creator. Refer to the ArcGIS Runtime system requirements for supported versions of Qt and Qt Creator. If you use Windows, you need to use a Qt kit for Visual Studio, rather than a Qt kit for MinGW, and you need to open Qt Creator from a Visual Studio command prompt.
- Install the ArcGIS Runtime SDK 100.1.0 for Qt. Go to [the ArcGIS Runtime SDK for Qt guide](https://developers.arcgis.com/qt/latest/qml/guide/arcgis-runtime-sdk-for-qt.htm) and expand **Get started** to see links to the install instructions. On that page, there is a button in the upper right corner to go to [the downloads page](https://developers.arcgis.com/downloads/). Follow all of the applicable install instructions in order to configure Runtime with Qt Creator. (Note: there is no need to follow the Android portion of the instructions if you're not deploying to Android for this workshop.)
- Install the ArcGIS Runtime SDK 100.2.0 for Qt. Go to [the ArcGIS Runtime SDK for Qt home page](https://developers.arcgis.com/qt/latest/) and click **Download SDK** if you haven't downloaded the SDK. Go to [the ArcGIS Runtime SDK for Qt guide](https://developers.arcgis.com/qt/latest/qml/guide/arcgis-runtime-sdk-for-qt.htm) and expand **Get started** to see links to the install instructions. Follow all of the applicable install instructions in order to configure Runtime with Qt Creator. (Note: there is no need to follow the Android portion of the instructions if you're not deploying to Android for this workshop.)
- This exercise was developed for Windows. If you would like to deploy to a different platform, such as Linux, Mac, Android, or iOS, additional setup may be required.

If you need some help, you can refer to [the solution to this exercise](../../../solutions/Qt/Qt%20Quick/Ex1_MapAndScene), available in this repository.
Expand Down
6 changes: 3 additions & 3 deletions runtime-workshop/exercises/dotNETWPF/Exercise 1 Map and Scene.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This exercise walks you through the following:
Prerequisites:

- Install Visual Studio 2015
- [Install ArcGIS Runtime SDK for .NET (Version 100.1.0)](https://developers.arcgis.com/net/quartz/])
- [Install ArcGIS Runtime SDK for .NET (Version 100.2.0)](https://developers.arcgis.com/net/latest/)

If you need some help, you can refer to [the solution to this exercise](../../solutions/dotNETWPF/Ex1_MapAndScene), available in this repository.

Expand Down Expand Up @@ -109,7 +109,7 @@ ArcGIS Runtime also supports 3D visualization. Everyone loves 3D! To conclude th
private bool threeD = false;
```
11. In MainWindow.xaml we need to add a click event to the button to toggle to a 3D view. Visual Studio will create the for you when start typeing the Click= and you can tab to have the event handler created automatically.
11. In MainWindow.xaml we need to add a click event to the button to toggle to a 3D view. Visual Studio will create the for you when start typing the Click= and you can tab to have the event handler created automatically.
```
<Button x:Name="ViewButton" Click="ViewButton_Click" Width="50" Height="50" Padding="1" Margin="0,5,5,5" HorizontalAlignment="Right" RenderTransformOrigin="4.054,-0.693" Content="{DynamicResource 3D}"/>
Expand All @@ -120,7 +120,7 @@ ArcGIS Runtime also supports 3D visualization. Everyone loves 3D! To conclude th
{
}
```
12. Next let's add the code to change the image on the button and toogle the the threeD variable to be true or false:
12. Next let's add the code to change the image on the button and toggle the threeD variable to be true or false:
```
private void ViewButton_Click(object sender, RoutedEventArgs e)
{
Expand Down
19 changes: 14 additions & 5 deletions runtime-workshop/exercises/dotNETWPF/Exercise 2 Zoom Buttons.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,24 @@ This portion of the exercise will teach you how to use _camera controllers_ in A
<Image x:Key="LockFocusSelected" Source="images/lock_selected.png" Stretch="Fill"/>
```
1. Next we need to creat a new button and put it on the UI. So in MainWindow.xml, in the <Grid></Grid> add a new area to put the next set of buttons in on the UI. We will want a border, stackpanel, and a new button using the images we added above.:
1. Next we need to create a new button and put it on the UI. So in MainWindow.xaml, in the <Grid></Grid> add a new area to put the next set of buttons in on the UI. We will want a border, stackpanel, and a new button using the images we added above. Set the button's `IsEnabled` property to false so that it can't be clicked until the user has toggled to 3D at some point. Here is the code to insert in MainWindow.xaml:
```
<Border VerticalAlignment="Bottom"
Margin="0,0,65,0" Width="67" Height="180" HorizontalAlignment="Right">
<StackPanel Margin="0" Width="72" VerticalAlignment="Top">
<Button x:Name="LockButton" Click="LockButton_Click" Width="50" Height="50" Padding="1" Margin="0,5,5,5" HorizontalAlignment="Right" RenderTransformOrigin="4.054,-0.693" Content="{DynamicResource LockFocus}"/>
</StackPanel>
</Border>
<StackPanel Margin="0" Width="72" VerticalAlignment="Top">
<Button x:Name="LockButton" Click="LockButton_Click" Width="50" Height="50"
Padding="1" Margin="0,5,5,5" HorizontalAlignment="Right"
RenderTransformOrigin="4.054,-0.693"
Content="{DynamicResource LockFocus}" IsEnabled="False"/>
</StackPanel>
</Border>
```
1. In your 2D/3D toggle button listener, which we called `ViewButton_Click` in Exercise 1, you probably have an `if` block that means the user is toggling from 2D to 3D. If it is the first time that 3D has been enabled, you have a code block that creates a new `Scene`. In that same block, enable your new lock focus button:
```
LockButton.IsEnabled = true;
```
1. Add a click event to the button called LockButton_Click and in the MainWindow.cs it looks like this:
Expand Down
12 changes: 6 additions & 6 deletions runtime-workshop/exercises/iOS/Swift/Exercise 1 Map and Scene.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ This exercise walks you through the following:
- Add a 3D scene to the app, and use a toggle button to switch between 2D and 3D

Prerequisites:
- Use a Mac with macOS 10.11 or 10.12.
- (Optional) Use an iPhone, iPad, or iPod touch running iOS 9 or iOS 10. If desired, you can instead complete these exercises using the emulator that comes with Xcode.
- Install iOS SDK 10.
- Install Xcode 8.
- Use a Mac with macOS 10.12 or 10.13.
- (Optional) Use an iPhone, iPad, or iPod touch running iOS 10 or iOS 11. If desired, you can instead complete these exercises using the emulator that comes with Xcode.
- Install iOS SDK 11.
- Install Xcode 9.

If you need some help, you can refer to [the solution to this exercise](../../../solutions/iOS/Swift/Ex1_MapAndScene), available in this repository.

Expand All @@ -37,11 +37,11 @@ If you need some help, you can refer to [the solution to this exercise](../../..
1. In your project directory, create a text file named `Podfile` with the following contents, replacing `WorkshopApp` with the name of your project:

```
platform :ios, '9.0'
platform :ios, '10.0'
use_frameworks!
target 'WorkshopApp' do
pod 'ArcGIS-Runtime-SDK-iOS', '100.1'
pod 'ArcGIS-Runtime-SDK-iOS', '100.2'
end
```
Expand Down
2 changes: 1 addition & 1 deletion runtime-workshop/exercises/macOS/Swift/Exercise 1 Map and Scene.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ If you need some help, you can refer to [the solution to this exercise](../../..
use_frameworks!
target 'WorkshopApp' do
pod 'ArcGIS-Runtime-SDK-macOS', '100.1'
pod 'ArcGIS-Runtime-SDK-macOS', '100.2'
end
```
Expand Down
4 changes: 2 additions & 2 deletions runtime-workshop/solutions/Android/Ex1_MapAndScene/WorkshopApp/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
minSdkVersion 16
targetSdkVersion 26
versionCode 2
versionName "2017.09"
versionName "2018.03"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -22,5 +22,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.esri.arcgisruntime:arcgis-android:100.1.0'
compile 'com.esri.arcgisruntime:arcgis-android:100.2.0'
}
4 changes: 2 additions & 2 deletions runtime-workshop/solutions/Android/Ex2_ZoomButtons/WorkshopApp/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
minSdkVersion 16
targetSdkVersion 26
versionCode 2
versionName "2017.09"
versionName "2018.03"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -22,5 +22,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.esri.arcgisruntime:arcgis-android:100.1.0'
compile 'com.esri.arcgisruntime:arcgis-android:100.2.0'
}
4 changes: 2 additions & 2 deletions runtime-workshop/solutions/Android/Ex3_OpLyrs/WorkshopApp/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
minSdkVersion 16
targetSdkVersion 26
versionCode 2
versionName "2017.09"
versionName "2018.03"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -22,6 +22,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.esri.arcgisruntime:arcgis-android:100.1.0'
compile 'com.esri.arcgisruntime:arcgis-android:100.2.0'
compile 'com.android.support:support-v4:26.0.2'
}
4 changes: 2 additions & 2 deletions runtime-workshop/solutions/Android/Ex4_BufferQuery/WorkshopApp/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
minSdkVersion 16
targetSdkVersion 26
versionCode 2
versionName "2017.09"
versionName "2018.03"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -22,6 +22,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.esri.arcgisruntime:arcgis-android:100.1.0'
compile 'com.esri.arcgisruntime:arcgis-android:100.2.0'
compile 'com.android.support:support-v4:26.0.2'
}
4 changes: 2 additions & 2 deletions runtime-workshop/solutions/Android/Ex5_Routing/WorkshopApp/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
minSdkVersion 16
targetSdkVersion 26
versionCode 2
versionName "2017.09"
versionName "2018.03"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -22,6 +22,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.esri.arcgisruntime:arcgis-android:100.1.0'
compile 'com.esri.arcgisruntime:arcgis-android:100.2.0'
compile 'com.android.support:support-v4:26.0.2'
}
6 changes: 3 additions & 3 deletions runtime-workshop/solutions/Java/Ex1_MapAndScene/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.esri.wdc.geodev</groupId>
<artifactId>Ex1_MapAndScene</artifactId>
<version>2017.09</version>
<version>2018.03</version>

<repositories>
<repository>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.esri.arcgisruntime</groupId>
<artifactId>arcgis-java</artifactId>
<version>100.1.0</version>
<version>100.2.0</version>
</dependency>
</dependencies>

Expand All @@ -34,7 +34,7 @@
<artifactId>arcgis-java-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
<version>100.1.0</version>
<version>100.2.0</version>
</configuration>
</plugin>

Expand Down
6 changes: 3 additions & 3 deletions runtime-workshop/solutions/Java/Ex2_ZoomButtons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.esri.wdc.geodev</groupId>
<artifactId>Ex2_ZoomButtons</artifactId>
<version>2017.09</version>
<version>2018.03</version>

<repositories>
<repository>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.esri.arcgisruntime</groupId>
<artifactId>arcgis-java</artifactId>
<version>100.1.0</version>
<version>100.2.0</version>
</dependency>
</dependencies>

Expand All @@ -34,7 +34,7 @@
<artifactId>arcgis-java-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
<version>100.1.0</version>
<version>100.2.0</version>
</configuration>
</plugin>

Expand Down
6 changes: 3 additions & 3 deletions runtime-workshop/solutions/Java/Ex3_OperationalLayers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.esri.wdc.geodev</groupId>
<artifactId>Ex3_OperationalLayers</artifactId>
<version>2017.09</version>
<version>2018.03</version>

<repositories>
<repository>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.esri.arcgisruntime</groupId>
<artifactId>arcgis-java</artifactId>
<version>100.1.0</version>
<version>100.2.0</version>
</dependency>
</dependencies>

Expand All @@ -34,7 +34,7 @@
<artifactId>arcgis-java-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
<version>100.1.0</version>
<version>100.2.0</version>
</configuration>
</plugin>

Expand Down
6 changes: 3 additions & 3 deletions runtime-workshop/solutions/Java/Ex4_BufferAndQuery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.esri.wdc.geodev</groupId>
<artifactId>Ex4_BufferAndQuery</artifactId>
<version>2017.09</version>
<version>2018.03</version>

<repositories>
<repository>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.esri.arcgisruntime</groupId>
<artifactId>arcgis-java</artifactId>
<version>100.1.0</version>
<version>100.2.0</version>
</dependency>
</dependencies>

Expand All @@ -34,7 +34,7 @@
<artifactId>arcgis-java-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
<version>100.1.0</version>
<version>100.2.0</version>
</configuration>
</plugin>

Expand Down
6 changes: 3 additions & 3 deletions runtime-workshop/solutions/Java/Ex5_Routing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.esri.wdc.geodev</groupId>
<artifactId>Ex5_Routing</artifactId>
<version>2017.09</version>
<version>2018.03</version>

<repositories>
<repository>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.esri.arcgisruntime</groupId>
<artifactId>arcgis-java</artifactId>
<version>100.1.0</version>
<version>100.2.0</version>
</dependency>
</dependencies>

Expand All @@ -34,7 +34,7 @@
<artifactId>arcgis-java-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
<version>100.1.0</version>
<version>100.2.0</version>
</configuration>
</plugin>

Expand Down
2 changes: 1 addition & 1 deletion runtime-workshop/solutions/Qt/Qt Quick/Ex1_MapAndScene/WorkshopApp/WorkshopApp.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CONFIG += c++11

QT += core gui opengl network positioning sensors qml quick

ARCGIS_RUNTIME_VERSION = 100.1
ARCGIS_RUNTIME_VERSION = 100.2
include($$PWD/arcgisruntime.pri)

TEMPLATE = app
Expand Down
Loading

0 comments on commit 12e14ea

Please sign in to comment.