Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
917ecec
Added KML Demo Activity. At the current moment it only displays a map.
Dec 1, 2014
7879865
Added a button for the GeoJSON Demo
juliawong Dec 1, 2014
9d56248
Renamed JSONDemoActivity to GeoJSONDemoActivity to become more relevant.
juliawong Dec 1, 2014
7d1f997
Retrieves co-ordinates from a KML file and plots them onto the map. C…
Dec 1, 2014
57f6b0c
Made code neater, seperated methods
Dec 1, 2014
f60789b
Added the GeoJSON importer file with method declarations and comments.
juliawong Dec 2, 2014
161dd1e
Extended BaseDemoActivity to gain access to helper functions
juliawong Dec 3, 2014
f59b401
Seeing if I can push changes
Dec 3, 2014
68609ef
Replaced play-services dependency with play-services-maps
commonsguy Dec 17, 2014
593bc64
Merge pull request #137 from commonsguy/master
broady Dec 17, 2014
85258de
Update build tools version
broady Dec 17, 2014
7e97ab6
Tag 0.3.4
broady Dec 17, 2014
85385ca
Prepare for 0.4 development
broady Dec 17, 2014
0637237
Track gradle versions
rfay Dec 20, 2014
bfb99ad
Merge pull request #140 from rfay/20141220_update_build_gradle_again
broady Dec 20, 2014
0f8cb95
Revert "Prepare for next version"
juliawong Feb 9, 2015
5d526ba
Revert "Revert "Prepare for next version""
juliawong Feb 9, 2015
87c142e
Merge https://github.com/googlemaps/android-maps-utils
juliawong Feb 9, 2015
a88e81a
Revert "Seeing if I can push changes"
juliawong Feb 9, 2015
872c6ac
Revert "Extended BaseDemoActivity to gain access to helper functions"
juliawong Feb 9, 2015
75c7049
Revert "Added the GeoJSON importer file with method declarations and …
juliawong Feb 9, 2015
eb7db2f
Revert "Made code neater, seperated methods"
juliawong Feb 9, 2015
6e9f891
Revert "Retrieves co-ordinates from a KML file and plots them onto th…
juliawong Feb 9, 2015
96bcb9e
Revert "Renamed JSONDemoActivity to GeoJSONDemoActivity to become mor…
juliawong Feb 9, 2015
9f1be6c
Revert "Added a button for the GeoJSON Demo"
juliawong Feb 9, 2015
d51a86c
Revert "Added KML Demo Activity. At the current moment it only displa…
juliawong Feb 9, 2015
a975eb2
Revert "Added a comment to see if the repository is working"
juliawong Feb 9, 2015
c71c155
Added comments
lchans Feb 11, 2015
db99720
Removed geojson
lchans Feb 11, 2015
45f54e3
Removed GeoJSON demo and xml file
lchans Feb 11, 2015
7e105b3
Changed names of methods
lchans Feb 11, 2015
e53a1e2
Revert back to "Update build scripts"
lchans Feb 11, 2015
5e39087
Refactored addLayer and clearLayer
lchans Feb 11, 2015
8295034
Merge into master
lchans Feb 11, 2015
8cbf128
Fixed bug: Placemarks are still stored even if they do not contain a …
lchans Feb 12, 2015
cf40caf
Fixedd error: Do not fetch from URL if image does not exist
lchans Feb 12, 2015
4beda30
Cleaned up demo code
lchans Feb 12, 2015
d7157bd
LatLonBox for demo
lchans Feb 12, 2015
b9d9c22
Changed demo source file to Google Campus file
lchans Feb 12, 2015
2a609ba
Deleted unused KML files
lchans Feb 12, 2015
84a2661
Deleted unused tests, changed android manifest
lchans Feb 13, 2015
900b9e7
Replaced API key
lchans Feb 13, 2015
63f74aa
Revert back to original API key
lchans Feb 13, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions demo/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

<meta-data
android:name="com.google.android.maps.v2.API_KEY"
android:value="AIzaSyDe3Ivf9_tRPzoxzSKIWxJxH6uCLB6H9ww"/>
android:value="AIzaSyDCa5WRSMk3CrNSf3y5xbyQTvp1_zwuTtE"/>

<activity
android:name=".MainActivity"
Expand All @@ -58,7 +58,6 @@
<activity android:name=".HeatmapsDemoActivity"/>
<activity android:name=".HeatmapsPlacesDemoActivity"/>
<activity android:name=".KmlDemoActivity"/>
<activity android:name=".GeoJsonDemoActivity"/>

</application>

Expand Down
4 changes: 2 additions & 2 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ dependencies {
compile project(':library')
// Or, fetch from Maven:
// compile 'com.google.maps.android:android-maps-utils:0.3+'
compile 'com.google.android.gms:play-services:6.+'
compile 'com.google.android.gms:play-services-maps:6.+'
}

android {
compileSdkVersion 19
buildToolsVersion "21.1.1"
buildToolsVersion "21.1.2"

sourceSets {
main {
Expand Down
18 changes: 0 additions & 18 deletions demo/res/layout/geojson_demo.xml

This file was deleted.

24 changes: 23 additions & 1 deletion demo/res/layout/heatmaps_demo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,29 @@
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content">

<Button
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="Radius"
android:onClick="changeRadius" />

<Button
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="Gradient"
android:onClick="changeGradient" />


<Button
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="Opacity"
android:onClick="changeOpacity" />

</LinearLayout>

<Spinner
Expand All @@ -28,5 +51,4 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center" />

</LinearLayout>
194 changes: 194 additions & 0 deletions demo/res/raw/campus.kml
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
<?xml version="1.0" encoding="UTF-8"?>
<kml xmlns="http://www.opengis.net/kml/2.2">
<Document>
<name>KmlFile</name>
<Style id="transGreenPoly">
<LineStyle>
<width>1.5</width>
</LineStyle>
<PolyStyle>
<color>7d00ff00</color>
</PolyStyle>
</Style>
<Style id="transRedPoly">
<LineStyle>
<width>1.5</width>
</LineStyle>
<PolyStyle>
<color>7d0000ff</color>
</PolyStyle>
</Style>
<Style id="transBluePoly">
<LineStyle>
<width>1.5</width>
</LineStyle>
<PolyStyle>
<color>7dff0000</color>
</PolyStyle>
</Style>
<Style id="transYellowPoly">
<LineStyle>
<width>1.5</width>
</LineStyle>
<PolyStyle>
<color>7d00ffff</color>
</PolyStyle>
</Style>
<Folder>
<name>Google Campus</name>
<visibility>1</visibility>
<description>A collection showing how easy it is to create 3-dimensional
buildings</description>
<Placemark>
<name>Building 40</name>
<visibility>1</visibility>
<styleUrl>#transRedPoly</styleUrl>
<Polygon>
<extrude>1</extrude>
<altitudeMode>relativeToGround</altitudeMode>
<outerBoundaryIs>
<LinearRing>
<coordinates>
-122.0848938459612,37.42257124044786,17
-122.0849580979198,37.42211922626856,17
-122.0847469573047,37.42207183952619,17
-122.0845725380962,37.42209006729676,17
-122.0845954886723,37.42215932700895,17
-122.0838521118269,37.42227278564371,17
-122.083792243335,37.42203539112084,17
-122.0835076656616,37.42209006957106,17
-122.0834709464152,37.42200987395161,17
-122.0831221085748,37.4221046494946,17
-122.0829247374572,37.42226503990386,17
-122.0829339169385,37.42231242843094,17
-122.0833837359737,37.42225046087618,17
-122.0833607854248,37.42234159228745,17
-122.0834204551642,37.42237075460644,17
-122.083659133885,37.42251292011001,17
-122.0839758438952,37.42265873093781,17
-122.0842374743331,37.42265143972521,17
-122.0845036949503,37.4226514386435,17
-122.0848020460801,37.42261133916315,17
-122.0847882750515,37.42256395055121,17
-122.0848938459612,37.42257124044786,17
</coordinates>
</LinearRing>
</outerBoundaryIs>
</Polygon>
</Placemark>
<Placemark>
<name>Building 41</name>
<visibility>1</visibility>
<styleUrl>#transBluePoly</styleUrl>
<Polygon>
<extrude>1</extrude>
<altitudeMode>relativeToGround</altitudeMode>
<outerBoundaryIs>
<LinearRing>
<coordinates>
-122.0857412771483,37.42227033155257,17
-122.0858169768481,37.42231408832346,17
-122.085852582875,37.42230337469744,17
-122.0858799945639,37.42225686138789,17
-122.0858860101409,37.4222311076138,17
-122.0858069157288,37.42220250173855,17
-122.0858379542653,37.42214027058678,17
-122.0856732640519,37.42208690214408,17
-122.0856022926407,37.42214885429042,17
-122.0855902778436,37.422128290487,17
-122.0855841672237,37.42208171967246,17
-122.0854852065741,37.42210455874995,17
-122.0855067264352,37.42214267949824,17
-122.0854430712915,37.42212783846172,17
-122.0850990714904,37.42251282407603,17
-122.0856769818632,37.42281815323651,17
-122.0860162273783,37.42244918858722,17
-122.0857260327004,37.42229239604253,17
-122.0857412771483,37.42227033155257,17
</coordinates>
</LinearRing>
</outerBoundaryIs>
</Polygon>
</Placemark>
<Placemark>
<name>Building 42</name>
<visibility>1</visibility>
<styleUrl>#transGreenPoly</styleUrl>
<Polygon>
<extrude>1</extrude>
<altitudeMode>relativeToGround</altitudeMode>
<outerBoundaryIs>
<LinearRing>
<coordinates>
-122.0857862287242,37.42136208886969,25
-122.0857312990603,37.42136935989481,25
-122.0857312992918,37.42140934910903,25
-122.0856077073679,37.42138390166565,25
-122.0855802426516,37.42137299550869,25
-122.0852186221971,37.42137299504316,25
-122.0852277765639,37.42161656508265,25
-122.0852598189347,37.42160565894403,25
-122.0852598185499,37.42168200156,25
-122.0852369311478,37.42170017860346,25
-122.0852643957828,37.42176197982575,25
-122.0853239032746,37.42176198013907,25
-122.0853559454324,37.421852864452,25
-122.0854108752463,37.42188921823734,25
-122.0854795379357,37.42189285337048,25
-122.0855436229819,37.42188921797546,25
-122.0856260178042,37.42186013499926,25
-122.085937287963,37.42186013453605,25
-122.0859428718666,37.42160898590042,25
-122.0859655469861,37.42157992759144,25
-122.0858640462341,37.42147115002957,25
-122.0858548911215,37.42140571326184,25
-122.0858091162768,37.4214057134039,25
-122.0857862287242,37.42136208886969,25
</coordinates>
</LinearRing>
</outerBoundaryIs>
</Polygon>
</Placemark>
<Placemark>
<name>Building 43</name>
<visibility>1</visibility>
<styleUrl>#transYellowPoly</styleUrl>
<Polygon>
<extrude>1</extrude>
<altitudeMode>relativeToGround</altitudeMode>
<outerBoundaryIs>
<LinearRing>
<coordinates>
-122.0844371128284,37.42177253003091,19
-122.0845118855746,37.42191111542896,19
-122.0850470999805,37.42178755121535,19
-122.0850719913391,37.42143663023161,19
-122.084916406232,37.42137237822116,19
-122.0842193868167,37.42137237801626,19
-122.08421938659,37.42147617161496,19
-122.0838086419991,37.4214613409357,19
-122.0837899728564,37.42131306410796,19
-122.0832796534698,37.42129328840593,19
-122.0832609819207,37.42139213944298,19
-122.0829373621737,37.42137236399876,19
-122.0829062425667,37.42151569778871,19
-122.0828502269665,37.42176282576465,19
-122.0829435788635,37.42176776969635,19
-122.083217411188,37.42179248552686,19
-122.0835970430103,37.4217480074456,19
-122.0839455556771,37.42169364237603,19
-122.0840077894637,37.42176283815853,19
-122.084113587521,37.42174801104392,19
-122.0840762473784,37.42171341292375,19
-122.0841447047739,37.42167881534569,19
-122.084144704223,37.42181720660197,19
-122.0842503333074,37.4218170700446,19
-122.0844371128284,37.42177253003091,19
</coordinates>
</LinearRing>
</outerBoundaryIs>
</Polygon>
</Placemark>
</Folder>
</Document>
</kml>
36 changes: 0 additions & 36 deletions demo/res/raw/kml_demo.kml

This file was deleted.

14 changes: 0 additions & 14 deletions demo/res/raw/point.kml

This file was deleted.

Loading