From cdfb9d4cc6a1db4b3913a07f98fce0fdf2ab550a Mon Sep 17 00:00:00 2001
From: Scott Shie <sshie@aerisweather.com>
Date: Mon, 28 Aug 2017 13:41:31 -0500
Subject: [PATCH] Final checkin for v2.1.0: Added sample code for using an
 undocumented AMP layer. Updated version to 2.1.0 Updated build tools to
 25.0.1 Removed references to staging repo Cleaned up manifest permissions

---
 AerisDemo/AerisDemo.iml                       | 32 +++++++++----------
 AerisDemo/AndroidManifest.xml                 |  2 --
 AerisDemo/build.gradle                        | 14 ++++----
 .../com/example/fragment/MyMapFragment.java   | 29 ++++++++++-------
 4 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/AerisDemo/AerisDemo.iml b/AerisDemo/AerisDemo.iml
index a2fe0c80..fc786a14 100644
--- a/AerisDemo/AerisDemo.iml
+++ b/AerisDemo/AerisDemo.iml
@@ -92,34 +92,34 @@
     <orderEntry type="library" exported="" name="runner-0.5" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
-    <orderEntry type="library" exported="" name="play-services-tasks-10.2.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
-    <orderEntry type="library" exported="" name="play-services-base-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-core-ui-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-maps-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="aeris-maps-lib-2.0.1" level="project" />
+    <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="aeris-maps-lib-2.1.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-basement-11.0.4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
-    <orderEntry type="library" exported="" name="support-core-utils-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-fragment-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="aeris-core-lib-2.0.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-11.0.4" level="project" />
+    <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="aeris-core-lib-2.1.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" />
+    <orderEntry type="library" exported="" name="play-services-maps-11.0.4" level="project" />
     <orderEntry type="library" exported="" name="exposed-instrumentation-api-publish-0.5" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="rules-0.5" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
     <orderEntry type="library" exported="" name="gson-2.7" level="project" />
-    <orderEntry type="library" exported="" name="play-services-basement-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-compat-25.2.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" name="support-media-compat-25.2.0" level="project" />
     <orderEntry type="library" exported="" name="junit-4.12" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-vector-drawable-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="animated-vector-drawable-25.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-tasks-11.0.4" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="android-android-25" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/AerisDemo/AndroidManifest.xml b/AerisDemo/AndroidManifest.xml
index cfb0b6ae..e7bbf151 100644
--- a/AerisDemo/AndroidManifest.xml
+++ b/AerisDemo/AndroidManifest.xml
@@ -7,9 +7,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_COURSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
diff --git a/AerisDemo/build.gradle b/AerisDemo/build.gradle
index f1efb6bc..af7bab64 100644
--- a/AerisDemo/build.gradle
+++ b/AerisDemo/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion "25.0.1"
     defaultConfig {
         minSdkVersion 19
         applicationId "com.example.demoaerisproject"
         versionCode 5
-        versionName "2.0.0"
+        versionName "2.1.0"
         //multiDexEnabled true
         signingConfigs {
             config {
@@ -57,7 +57,7 @@ buildscript {
     repositories {
         mavenCentral()
         jcenter()
-        maven { url "https://oss.sonatype.org/content/repositories/comaerisweather-1431" }
+        //maven { url "https://oss.sonatype.org/content/repositories/comaerisweather-1434" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.0'
@@ -67,16 +67,16 @@ buildscript {
 repositories {
     mavenCentral()
     jcenter()
-    maven { url "https://oss.sonatype.org/content/repositories/comaerisweather-1431" }
+    //maven { url "https://oss.sonatype.org/content/repositories/comaerisweather-1434" }
 }
 dependencies {
     testCompile 'junit:junit:4.12'
-    compile ('com.aerisweather:aeris-maps-lib:2.0.1@aar') {
+    compile ('com.aerisweather:aeris-maps-lib:2.1.0@aar') {
         transitive true
     }
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.google.android.gms:play-services-maps:10.2.0'
-    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.google.android.gms:play-services-maps:11.0.4'
+    compile 'com.android.support:appcompat-v7:25.3.1'
 }
\ No newline at end of file
diff --git a/AerisDemo/src/com/example/fragment/MyMapFragment.java b/AerisDemo/src/com/example/fragment/MyMapFragment.java
index 17131fc3..8afa69a3 100644
--- a/AerisDemo/src/com/example/fragment/MyMapFragment.java
+++ b/AerisDemo/src/com/example/fragment/MyMapFragment.java
@@ -250,29 +250,36 @@ private void initMap()
 
 		m_aerisMapView.getMap().setMapType(m_mapOptions.getMapType());
 
+        //amp layer(s)
+		AerisAmp aerisAmp = m_mapOptions.getAerisAMP();
 		/**
-		 * SAMPLE: DAY TWO CONVECTIVE
+		 * CUSTOM / UNDOCUMENTED LAYER
 		 */
 		/*
-		AerisPolygonData aerisPolygonData = m_mapOptions.getPolygon();
-		aerisPolygonData.setConvectiveOutlookParameters(new ParameterBuilder().
-				withFilter(Filter.DAY_TWO.getCode() + "," + Filter.GEO_POLY.getCode()).
-				withCustomParameter("from", "today"));
-        m_aerisMapView.addLayer(aerisPolygonData);
-        */
+		AerisAmpLayer customAmpLayer = new AerisAmpLayer("pressure-msl-nam", "pressure-msl-nam", 80);
+		aerisAmp.setLayer(customAmpLayer);
+		*/
 
-        //amp
-		AerisAmp aerisAmp = m_mapOptions.getAerisAMP();
 		if (aerisAmp.getActiveMapLayers().size() < 1)
 		{
 			aerisAmp.setDefaultLayers();
 		}
 		m_aerisMapView.addLayer(aerisAmp);
 
-        //point data
+        //point data layer(s)
 		m_aerisMapView.addLayer(m_mapOptions.getPointData());
 
-		//polygons
+		//polygon layer(s)
+		/**
+		 * SAMPLE: DAY TWO CONVECTIVE
+		 */
+		/*
+		AerisPolygonData aerisPolygonData = m_mapOptions.getPolygon();
+		aerisPolygonData.setConvectiveOutlookParameters(new ParameterBuilder().
+				withFilter(Filter.DAY_TWO.getCode() + "," + Filter.GEO_POLY.getCode()).
+				withCustomParameter("from", "today"));
+        m_aerisMapView.addLayer(aerisPolygonData);
+        */
 		m_aerisMapView.addLayer(m_mapOptions.getPolygonData());
 
 		//get a new marker option object