Skip to content

Commit

Permalink
Final checkin for v2.1.0:
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@sshie
sshie committed Aug 28, 2017
1 parent 8ce2fe1 commit cdfb9d4
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 36 deletions.
32 changes: 16 additions & 16 deletions AerisDemo/AerisDemo.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 0 additions & 2 deletions AerisDemo/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions AerisDemo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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'
Expand All @@ -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'
}
29 changes: 18 additions & 11 deletions AerisDemo/src/com/example/fragment/MyMapFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cdfb9d4

Please sign in to comment.