KML bug fixing. Support inline Styles

MKergall · Dec 31, 2013 · 5acbe33 · 5acbe33
1 parent e4c8ce3
commit 5acbe33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/OSMBonusPack/src/org/osmdroid/bonuspack/kml/KmlDocument.java b/OSMBonusPack/src/org/osmdroid/bonuspack/kml/KmlDocument.java
@@ -315,7 +315,15 @@ public void endElement(String uri, String localName, String name)
 				if (mCurrentStyle != null && mCurrentStyle.iconColorStyle != null)
 					mCurrentStyle.iconHref = mString;
 			} else if (localName.equals("Style")){
-				putStyle(mCurrentStyleId, mCurrentStyle);
+				if (mCurrentStyleId != null)
+					putStyle(mCurrentStyleId, mCurrentStyle);
+				else {
+					mCurrentStyleId = addStyle(mCurrentStyle);
+					if (mKmlCurrentObject != null){
+						//this is an inline style. Set its style id to the KmlObject container:
+						mKmlCurrentObject.mStyle = mCurrentStyleId;
+					}
+				}
 				mCurrentStyle = null;
 			}
 		}

diff --git a/OSMBonusPack/src/org/osmdroid/bonuspack/kml/KmlObject.java b/OSMBonusPack/src/org/osmdroid/bonuspack/kml/KmlObject.java
@@ -298,7 +298,7 @@ public Overlay buildOverlays(Context context, MapView map, Drawable marker, KmlD
 			polygonOverlay.setPoints(mCoordinates);
 			polygonOverlay.setTitle(mName);
 			polygonOverlay.setSnippet(mDescription);
-			if (!mName.equals("") || !mDescription.equals("")){
+			if ((mName!=null && !"".equals(mName)) || (mDescription!=null && !"".equals(mDescription))){
 				String packageName = context.getPackageName();
 				int layoutResId = context.getResources().getIdentifier("layout/bonuspack_bubble", null, packageName);
 				polygonOverlay.setInfoWindow(layoutResId, map);