Cleanup and final changes for Records point data, and updated Demo proj.

aerisweather · Dec 13, 2016 · 23719ad · 23719ad
1 parent 7871093
commit 23719ad
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/AerisDemo/AerisDemo.iml b/AerisDemo/AerisDemo.iml
@@ -61,14 +61,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -77,6 +69,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />

diff --git a/AerisDemo/build.gradle b/AerisDemo/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     repositories {
         mavenCentral()
-        maven { url "https://oss.sonatype.org/content/repositories/comaerisweather-1013" }
+        maven { url "https://oss.sonatype.org/content/repositories/comaerisweather-1025" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.3'
@@ -49,7 +49,7 @@ android {
 repositories {
     mavenCentral()
     jcenter()
-    maven { url "https://oss.sonatype.org/content/repositories/comaerisweather-1013" }
+    maven { url "https://oss.sonatype.org/content/repositories/comaerisweather-1025" }
 }
 dependencies {
     compile('com.google.android.gms:play-services:9.8.0'){

diff --git a/AerisDemo/res/values/aeris_default_values.xml b/AerisDemo/res/values/aeris_default_values.xml
@@ -11,20 +11,24 @@
     <item name="aerismaps_tile_default_opacity" format="float" type="dimen">.8</item>
     <!-- Time to wait between the end frame of the animation before starting the animiaton over. This is added to normal frame time per animation. -->
     <integer name="aerismaps_animation_end_frame_additional_time">500</integer>
-    <!-- Time to wait for camera to settle before performing new point data queries automitically by aeris. -->
+    <!-- Time to wait for camera to settle before performing new point data queries automatically by aeris. -->
     <integer name="aerismaps_camera_change_millis">1500</integer>
     <!-- Total number of animation tiles to load -->
     <integer name="aerismaps_animation_tiles_to_load">10</integer>
 
     <!-- Storm Cell customization options *************************************** -->
     <!--
      True to display the forecast line for each storm cell on the map. If false, all forecast lines will not be shown
-     for all specific markers
+     for all specific markers
+
+
     -->
     <bool name="aerismaps_show_forecast_line">true</bool>
     <!--
      True to display the forecast wide cone for each storm cell on the map. If false, all forecast cones will not be shown
-     for all specific markers
+     for all specific markers
+
+
     -->
     <bool name="aerismaps_show_forecast_cone">true</bool>
     <!-- True to display the storm cell annotation on marker click -->

diff --git a/AerisDemo/src/com/example/fragment/MyMapFragment.java b/AerisDemo/src/com/example/fragment/MyMapFragment.java
@@ -17,8 +17,17 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.Toast;
 
+import com.aerisweather.aeris.communication.Action;
+import com.aerisweather.aeris.communication.Aeris;
+import com.aerisweather.aeris.communication.AerisCommunicationTask;
+import com.aerisweather.aeris.communication.AerisRequest;
+import com.aerisweather.aeris.communication.Endpoint;
+import com.aerisweather.aeris.communication.parameter.FromParameter;
+import com.aerisweather.aeris.communication.parameter.Parameter;
+import com.aerisweather.aeris.tiles.AerisPointHelper;
 import com.example.db.MyPlace;
 import com.example.db.MyPlacesDb;
 import com.example.demoaerisproject.MapOptionsLocalActivity;
@@ -186,12 +195,14 @@ private void initMap()
             m_mapOptions.withPolygon(AerisPolygonData.NONE);
             m_mapOptions.withTile(AerisTile.RADAR);
 
-			//save the map options
+            //save the map options
             m_mapOptions.setPreference(getActivity());
 		}
 
 		//display the amp with the options we specified
         m_mapView.displayMapWithOptions(m_mapOptions);
+        m_mapView.addLayer(m_mapOptions.getPolygon());
+        m_mapView.addLayer(m_mapOptions.getPointData());
 
 		//get a new marker option object
 		MarkerOptions markerOptions = new MarkerOptions();
@@ -266,6 +277,8 @@ public void onResume()
             {
                 m_mapOptions = AerisMapOptions.getPreference(getActivity());
                 m_mapView.displayMapWithOptions(m_mapOptions);
+                m_mapView.addLayer(m_mapOptions.getPointData());
+                m_mapView.addLayer(m_mapOptions.getPolygon());
             }
 
 			//tell the map to redraw itself