Merge pull request #293 from stephenmcd/kml-draw-order

Kml draw order
googlemaps · Jul 11, 2016 · 92987df · 92987df
2 parents b153c67 + 56426b7
commit 92987df
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -4,7 +4,7 @@ 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-maps:8.4.0'
+    compile 'com.google.android.gms:play-services-maps:9.2.0'
 }
 
 android {

diff --git a/library/build.gradle b/library/build.gradle
@@ -6,7 +6,7 @@ archivesBaseName = 'android-maps-utils'
 group = 'com.google.maps.android'
 
 dependencies {
-    compile 'com.google.android.gms:play-services-maps:8.4.0'
+    compile 'com.google.android.gms:play-services-maps:9.2.0'
 }
 
 

diff --git a/library/src/com/google/maps/android/kml/KmlFeatureParser.java b/library/src/com/google/maps/android/kml/KmlFeatureParser.java
@@ -24,7 +24,7 @@
 
     private final static int LATITUDE_INDEX = 1;
 
-    private final static String PROPERTY_REGEX = "name|description|visibility|open|address|phoneNumber";
+    private final static String PROPERTY_REGEX = "name|description|drawOrder|visibility|open|address|phoneNumber";
 
     private final static String BOUNDARY_REGEX = "outerBoundaryIs|innerBoundaryIs";
 

diff --git a/library/src/com/google/maps/android/kml/KmlRenderer.java b/library/src/com/google/maps/android/kml/KmlRenderer.java
@@ -325,8 +325,8 @@ private void addPlacemarksToMap(HashMap<KmlPlacemark, Object> placemarks) {
      * @return Google Map Object of the placemark geometry after it has been added to the map.
      */
     private Object addPlacemarkToMap(KmlPlacemark placemark, boolean placemarkVisibility) {
-        //If the placemark contains a geometry, then we add it to the map
-        //If it doesnt contain a geometry, we do not add anything to the map and just store values
+        // If the placemark contains a geometry, then we add it to the map. If it doesn't
+        // contain a geometry, we do not add anything to the map, and just store values.
         if (placemark.getGeometry() != null) {
             String placemarkId = placemark.getStyleId();
             KmlGeometry geometry = placemark.getGeometry();
@@ -482,17 +482,37 @@ private Object addToMap(KmlPlacemark placemark, KmlGeometry geometry, KmlStyle s
             KmlStyle inlineStyle, boolean isVisible) {
 
         String geometryType = geometry.getGeometryType();
+        boolean hasDrawOrder = placemark.hasProperty("drawOrder");
+        float drawOrder = 0;
+
+        if (hasDrawOrder) {
+            try {
+                drawOrder = Float.parseFloat(placemark.getProperty("drawOrder"));
+            } catch (NumberFormatException e) {
+                hasDrawOrder = false;
+            }
+        }
+
         if (geometryType.equals("Point")) {
             Marker marker = addPointToMap(placemark, (KmlPoint) geometry, style, inlineStyle);
             marker.setVisible(isVisible);
+            if (hasDrawOrder) {
+                marker.setZIndex(drawOrder);
+            }
             return marker;
         } else if (geometryType.equals("LineString")) {
             Polyline polyline = addLineStringToMap((KmlLineString) geometry, style, inlineStyle);
             polyline.setVisible(isVisible);
+            if (hasDrawOrder) {
+                polyline.setZIndex(drawOrder);
+            }
             return polyline;
         } else if (geometryType.equals("Polygon")) {
             Polygon polygon = addPolygonToMap((KmlPolygon) geometry, style, inlineStyle);
             polygon.setVisible(isVisible);
+            if (hasDrawOrder) {
+                polygon.setZIndex(drawOrder);
+            }
             return polygon;
         } else if (geometryType.equals("MultiGeometry")) {
             return addMultiGeometryToMap(placemark, (KmlMultiGeometry) geometry, style, inlineStyle,