Skip to content

Commit

Permalink
Minor code improvements.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MKergall
MKergall committed Sep 17, 2016
1 parent d1aca34 commit 7aa0302
Show file tree
Hide file tree
Showing 14 changed files with 98 additions and 98 deletions.
3 changes: 1 addition & 2 deletions OSMBonusPack/src/main/java/org/osmdroid/bonuspack/clustering/GridMarkerClusterer.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.osmdroid.bonuspack.clustering;

import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
Expand Down Expand Up @@ -40,7 +39,7 @@
/** anchor point to draw the number of markers inside the cluster icon */
public float mTextAnchorU = Marker.ANCHOR_CENTER, mTextAnchorV = Marker.ANCHOR_CENTER;

public GridMarkerClusterer(Context ctx) {
public GridMarkerClusterer() {
super();
mTextPaint = new Paint();
mTextPaint.setColor(Color.WHITE);
Expand Down
4 changes: 2 additions & 2 deletions OSMBonusPack/src/main/java/org/osmdroid/bonuspack/kml/HotSpot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
*/
public class HotSpot implements Parcelable {

public static enum Units {
public enum Units {
fraction, pixels, insetPixels;
private static Units[] allValues = values();
public static Units fromOrdinal(int n) {return allValues[n];}
};
}

public float mx, my;
public Units mXUnits, mYUnits;
Expand Down
100 changes: 50 additions & 50 deletions OSMBonusPack/src/main/java/org/osmdroid/bonuspack/kml/KmlDocument.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,60 +378,60 @@ else if (kmzContainer == null){

public void startElement(String uri, String localName, String name,
Attributes attributes) throws SAXException {
if (localName.equals("Document")){
if (name.equals("Document")) {
mKmlCurrentFeature = mKmlRoot; //If there is a Document, it will be the root.
mKmlCurrentFeature.mId = attributes.getValue("id");
} else if (localName.equals("Folder")){
} else if (name.equals("Folder")) {
mKmlCurrentFeature = new KmlFolder();
mKmlCurrentFeature.mId = attributes.getValue("id");
mKmlFeatureStack.add(mKmlCurrentFeature); //push on stack
} else if (localName.equals("NetworkLink")){
} else if (name.equals("NetworkLink")) {
mKmlCurrentFeature = new KmlFolder();
mKmlCurrentFeature.mId = attributes.getValue("id");
mKmlFeatureStack.add(mKmlCurrentFeature); //push on stack
mIsNetworkLink = true;
} else if (localName.equals("GroundOverlay")){
} else if (name.equals("GroundOverlay")) {
mKmlCurrentGroundOverlay = new KmlGroundOverlay();
mKmlCurrentFeature = mKmlCurrentGroundOverlay;
mKmlCurrentFeature.mId = attributes.getValue("id");
mKmlFeatureStack.add(mKmlCurrentFeature); //push on stack
} else if (localName.equals("Placemark")) {
} else if (name.equals("Placemark")) {
mKmlCurrentFeature = new KmlPlacemark();
mKmlCurrentFeature.mId = attributes.getValue("id");
mKmlFeatureStack.add(mKmlCurrentFeature); //push on Feature stack
} else if (localName.equals("Point")){
} else if (name.equals("Point")) {
mKmlCurrentGeometry = new KmlPoint();
mKmlGeometryStack.add(mKmlCurrentGeometry); //push on Geometry stack
} else if (localName.equals("LineString")){
} else if (name.equals("LineString")) {
mKmlCurrentGeometry = new KmlLineString();
mKmlGeometryStack.add(mKmlCurrentGeometry);
} else if (name.equals("gx:Track")) {
mKmlCurrentGeometry = new KmlTrack();
mKmlGeometryStack.add(mKmlCurrentGeometry);
} else if (localName.equals("Polygon")){
} else if (name.equals("Polygon")) {
mKmlCurrentGeometry = new KmlPolygon();
mKmlGeometryStack.add(mKmlCurrentGeometry);
} else if (localName.equals("innerBoundaryIs")) {
} else if (name.equals("innerBoundaryIs")) {
mIsInnerBoundary = true;
} else if (localName.equals("MultiGeometry")){
} else if (name.equals("MultiGeometry")) {
mKmlCurrentGeometry = new KmlMultiGeometry();
mKmlGeometryStack.add(mKmlCurrentGeometry);
} else if (localName.equals("Style")) {
} else if (name.equals("Style")) {
mCurrentStyle = new Style();
mCurrentStyleId = attributes.getValue("id");
} else if (localName.equals("StyleMap")) {
} else if (name.equals("StyleMap")) {
mCurrentStyleMap = new StyleMap();
mCurrentStyleId = attributes.getValue("id");
} else if (localName.equals("LineStyle")) {
} else if (name.equals("LineStyle")) {
mCurrentStyle.mLineStyle = new LineStyle();
mColorStyle = mCurrentStyle.mLineStyle;
} else if (localName.equals("PolyStyle")) {
} else if (name.equals("PolyStyle")) {
mCurrentStyle.mPolyStyle = new ColorStyle();
mColorStyle = mCurrentStyle.mPolyStyle;
} else if (localName.equals("IconStyle")) {
} else if (name.equals("IconStyle")) {
mCurrentStyle.mIconStyle = new IconStyle();
mColorStyle = mCurrentStyle.mIconStyle;
} else if (localName.equals("hotSpot")){
} else if (name.equals("hotSpot")) {
if (mCurrentStyle != null && mColorStyle != null && mColorStyle instanceof IconStyle){
mCurrentStyle.mIconStyle.mHotSpot = new HotSpot(
Float.parseFloat(attributes.getValue("x")),
Expand All @@ -446,7 +446,7 @@ public void startElement(String uri, String localName, String name,
mCurrentStyle.mIconStyle.mHotSpotY = Float.parseFloat(attributes.getValue("y"));
*/
}
} else if (localName.equals("Data") || localName.equals("SimpleData")) {
} else if (name.equals("Data") || name.equals("SimpleData")) {
mDataName = attributes.getValue("name");
}
mStringBuilder.setLength(0);
Expand All @@ -459,20 +459,20 @@ public void startElement(String uri, String localName, String name,

public void endElement(String uri, String localName, String name)
throws SAXException {
if (localName.equals("Document")){
if (name.equals("Document")) {
//Document is the root, nothing to do.
} else if (localName.equals("Folder") || localName.equals("Placemark")
|| localName.equals("NetworkLink") || localName.equals("GroundOverlay")) {
} else if (name.equals("Folder") || name.equals("Placemark")
|| name.equals("NetworkLink") || name.equals("GroundOverlay")) {
//this was a Feature:
KmlFolder parent = (KmlFolder)mKmlFeatureStack.get(mKmlFeatureStack.size()-2); //get parent
parent.add(mKmlCurrentFeature); //add current in its parent
mKmlFeatureStack.remove(mKmlFeatureStack.size()-1); //pop current from stack
mKmlCurrentFeature = mKmlFeatureStack.get(mKmlFeatureStack.size()-1); //set current to top of stack
if (localName.equals("NetworkLink"))
if (name.equals("NetworkLink"))
mIsNetworkLink = false;
else if (localName.equals("GroundOverlay"))
else if (name.equals("GroundOverlay"))
mKmlCurrentGroundOverlay = null;
} else if (localName.equals("innerBoundaryIs")){
} else if (name.equals("innerBoundaryIs")) {
mIsInnerBoundary = false;
} else if (name.equals("Point") || name.equals("LineString") || name.equals("Polygon")
|| name.equals("MultiGeometry") || name.equals("gx:Track")) {
Expand All @@ -488,15 +488,15 @@ else if (localName.equals("GroundOverlay"))
mKmlGeometryStack.remove(mKmlGeometryStack.size()-1); //pop current from stack
mKmlCurrentGeometry = mKmlGeometryStack.get(mKmlGeometryStack.size()-1); //set current to top of stack
}
} else if (localName.equals("name")){
} else if (name.equals("name")) {
mKmlCurrentFeature.mName = mStringBuilder.toString();
} else if (localName.equals("description")){
} else if (name.equals("description")) {
mKmlCurrentFeature.mDescription = mStringBuilder.toString();
} else if (localName.equals("visibility")){
} else if (name.equals("visibility")) {
mKmlCurrentFeature.mVisibility = ("1".equals(mStringBuilder.toString()));
} else if (localName.equals("open")){
} else if (name.equals("open")) {
mKmlCurrentFeature.mOpen = ("1".equals(mStringBuilder.toString()));
} else if (localName.equals("coordinates")) {
} else if (name.equals("coordinates")) {
if (mKmlCurrentFeature instanceof KmlPlacemark) {
if (!mIsInnerBoundary) {
mKmlCurrentGeometry.mCoordinates = parseKmlCoordinates(mStringBuilder.toString());
Expand All @@ -511,10 +511,10 @@ else if (localName.equals("GroundOverlay"))
} else if (name.equals("gx:coord")) {
if (mKmlCurrentGeometry != null && mKmlCurrentGeometry instanceof KmlTrack)
((KmlTrack) mKmlCurrentGeometry).addGxCoord(mStringBuilder.toString());
} else if (localName.equals("when")){
} else if (name.equals("when")) {
if (mKmlCurrentGeometry != null && mKmlCurrentGeometry instanceof KmlTrack)
((KmlTrack) mKmlCurrentGeometry).addWhen(mStringBuilder.toString());
} else if (localName.equals("styleUrl")){
} else if (name.equals("styleUrl")) {
String styleUrl;
if (mStringBuilder.charAt(0) == '#')
styleUrl = mStringBuilder.substring(1); //remove the #
Expand All @@ -526,30 +526,30 @@ else if (localName.equals("GroundOverlay"))
} else if (mKmlCurrentFeature != null){
mKmlCurrentFeature.mStyle = styleUrl;
}
} else if (localName.equals("key")){
} else if (name.equals("key")) {
mCurrentStyleKey = mStringBuilder.toString();
} else if (localName.equals("color")){
} else if (name.equals("color")) {
if (mCurrentStyle != null) {
if (mColorStyle != null)
mColorStyle.mColor = ColorStyle.parseKMLColor(mStringBuilder.toString());
} else if (mKmlCurrentGroundOverlay != null){
mKmlCurrentGroundOverlay.mColor = ColorStyle.parseKMLColor(mStringBuilder.toString());
}
} else if (localName.equals("colorMode")){
} else if (name.equals("colorMode")) {
if (mCurrentStyle != null && mColorStyle != null)
mColorStyle.mColorMode = (mStringBuilder.toString().equals("random")?ColorStyle.MODE_RANDOM:ColorStyle.MODE_NORMAL);
} else if (localName.equals("width")){
} else if (name.equals("width")) {
if (mCurrentStyle != null && mColorStyle != null && mColorStyle instanceof LineStyle)
mCurrentStyle.mLineStyle.mWidth = Float.parseFloat(mStringBuilder.toString());
} else if (localName.equals("scale")){
} else if (name.equals("scale")) {
if (mCurrentStyle != null && mColorStyle != null && mColorStyle instanceof IconStyle){
mCurrentStyle.mIconStyle.mScale = Float.parseFloat(mStringBuilder.toString());
}
} else if (localName.equals("heading")){
} else if (name.equals("heading")) {
if (mCurrentStyle != null && mColorStyle != null && mColorStyle instanceof IconStyle){
mCurrentStyle.mIconStyle.mHeading = Float.parseFloat(mStringBuilder.toString());
}
} else if (localName.equals("href")) {
} else if (name.equals("href")) {
if (mCurrentStyle != null && mColorStyle != null && mColorStyle instanceof IconStyle) {
//href of an Icon in an IconStyle:
String href = mStringBuilder.toString();
Expand All @@ -562,13 +562,13 @@ else if (localName.equals("GroundOverlay"))
//href of a GroundOverlay Icon:
mKmlCurrentGroundOverlay.setIcon(mStringBuilder.toString(), mFile, mKMZFile);
}
} else if (localName.equals("LineStyle")){
} else if (name.equals("LineStyle")) {
mColorStyle = null;
} else if (localName.equals("PolyStyle")){
} else if (name.equals("PolyStyle")) {
mColorStyle = null;
} else if (localName.equals("IconStyle")){
} else if (name.equals("IconStyle")) {
mColorStyle = null;
} else if (localName.equals("Style")){
} else if (name.equals("Style")) {
if (mCurrentStyleId != null)
putStyle(mCurrentStyleId, mCurrentStyle);
else {
Expand All @@ -580,32 +580,32 @@ else if (localName.equals("GroundOverlay"))
}
mCurrentStyle = null;
mCurrentStyleId = null;
} else if (localName.equals("StyleMap")){
} else if (name.equals("StyleMap")) {
if (mCurrentStyleId != null)
putStyle(mCurrentStyleId, mCurrentStyleMap);
//TODO: inline StyleMap ???
mCurrentStyleMap = null;
mCurrentStyleId = null;
mCurrentStyleKey = null;
} else if (localName.equals("north")){
} else if (name.equals("north")) {
mNorth = Double.parseDouble(mStringBuilder.toString());
} else if (localName.equals("south")){
} else if (name.equals("south")) {
mSouth = Double.parseDouble(mStringBuilder.toString());
} else if (localName.equals("east")){
} else if (name.equals("east")) {
mEast = Double.parseDouble(mStringBuilder.toString());
} else if (localName.equals("west")){
} else if (name.equals("west")) {
mWest = Double.parseDouble(mStringBuilder.toString());
} else if (localName.equals("rotation")){
} else if (name.equals("rotation")) {
mKmlCurrentGroundOverlay.mRotation = Float.parseFloat(mStringBuilder.toString());
} else if (localName.equals("LatLonBox")){
} else if (name.equals("LatLonBox")) {
if (mKmlCurrentGroundOverlay != null){
mKmlCurrentGroundOverlay.setLatLonBox(mNorth, mSouth, mEast, mWest);
}
} else if (localName.equals("SimpleData")){
} else if (name.equals("SimpleData")) {
//We don't check the schema from SchemaData. We just pick the name and the value from SimpleData:
mKmlCurrentFeature.setExtendedData(mDataName, mStringBuilder.toString());
mDataName = null;
} else if (localName.equals("value")){
} else if (name.equals("value")) {
mKmlCurrentFeature.setExtendedData(mDataName, mStringBuilder.toString());
mDataName = null;
}
Expand Down
6 changes: 3 additions & 3 deletions OSMBonusPack/src/main/java/org/osmdroid/bonuspack/kml/KmlLineString.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ public void applyDefaultStyling(Polyline lineStringOverlay, Style defaultStyle,
return 0;
}

@Override public void writeToParcel(Parcel out, int flags) {
super.writeToParcel(out, flags);
}
//@Override public void writeToParcel(Parcel out, int flags) {
// super.writeToParcel(out, flags);
//}

public static final Creator<KmlLineString> CREATOR = new Creator<KmlLineString>() {
@Override public KmlLineString createFromParcel(Parcel source) {
Expand Down
6 changes: 3 additions & 3 deletions OSMBonusPack/src/main/java/org/osmdroid/bonuspack/kml/KmlPoint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ public void applyDefaultStyling(Marker marker, Style defaultStyle, KmlPlacemark
return 0;
}

@Override public void writeToParcel(Parcel out, int flags) {
super.writeToParcel(out, flags);
}
//@Override public void writeToParcel(Parcel out, int flags) {
// super.writeToParcel(out, flags);
//}

public static final Creator<KmlPoint> CREATOR = new Creator<KmlPoint>() {
@Override public KmlPoint createFromParcel(Parcel source) {
Expand Down
23 changes: 11 additions & 12 deletions OSMBonusPack/src/main/java/org/osmdroid/bonuspack/kml/KmlTrack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import android.content.Context;
import android.os.Parcel;

import com.google.gson.JsonArray;
import com.google.gson.JsonObject;

import org.osmdroid.bonuspack.kml.KmlFeature.Styler;
Expand Down Expand Up @@ -63,7 +62,7 @@ public void addGxCoord(String sGxCoord){
}

/**
* @param sWhen "when" string, in one of the KML dateTime formats. Local time not supported yet.
* @param sWhen "when" string, in one of the KML dateTime formats. Local time format not supported yet.
* @return java Date if success, or null
*/
public Date parseKmlWhen(String sWhen){
Expand All @@ -79,6 +78,9 @@ public Date parseKmlWhen(String sWhen){
case 19:
ft = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
break;
case 20:
ft = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
break;
default:
return null;
}
Expand All @@ -97,12 +99,6 @@ public void addWhen(String sWhen){
mWhen.add(parseKmlWhen(sWhen));
}

public KmlTrack(JsonObject json){
this();
JsonArray coordinates = json.get("coordinates").getAsJsonArray();
mCoordinates = KmlGeometry.parseGeoJSONPositions(coordinates);
}

public void applyDefaultStyling(Polyline lineStringOverlay, Style defaultStyle, KmlPlacemark kmlPlacemark,
KmlDocument kmlDocument, MapView map){
Context context = map.getContext();
Expand Down Expand Up @@ -187,8 +183,11 @@ public void applyDefaultStyling(Polyline lineStringOverlay, Style defaultStyle,
//Cloneable implementation ------------------------------------

@Override public KmlTrack clone(){
return (KmlTrack)super.clone();
//TODO aWhen
KmlTrack cloned = (KmlTrack) super.clone();
cloned.mWhen = new ArrayList<>(mWhen.size());
for (Date d : mWhen)
cloned.mWhen.add((Date) d.clone());
return cloned;
}

//Parcelable implementation ------------
Expand All @@ -199,7 +198,7 @@ public void applyDefaultStyling(Polyline lineStringOverlay, Style defaultStyle,

@Override public void writeToParcel(Parcel out, int flags) {
super.writeToParcel(out, flags);
//TODO aWhen
out.writeList(mWhen);
}

public static final Creator<KmlTrack> CREATOR = new Creator<KmlTrack>() {
Expand All @@ -213,6 +212,6 @@ public void applyDefaultStyling(Polyline lineStringOverlay, Style defaultStyle,

public KmlTrack(Parcel in){
super(in);
//TODO aWhen
mWhen = in.readArrayList(Date.class.getClassLoader());
}
}
9 changes: 4 additions & 5 deletions OSMBonusPack/src/main/java/org/osmdroid/bonuspack/location/GeocoderGisgraphy.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.osmdroid.bonuspack.location;

import android.content.Context;
import android.location.Address;
import android.util.Log;

Expand Down Expand Up @@ -41,13 +40,13 @@ public class GeocoderGisgraphy {
protected Locale mLocale;
protected String mServiceUrl;

public GeocoderGisgraphy(Context context, Locale locale){
public GeocoderGisgraphy(Locale locale) {
mLocale = locale;
setService(GISGRAPHY_SERVICE_URL); //default service
}
public GeocoderGisgraphy(Context context){
this(context, Locale.getDefault());

public GeocoderGisgraphy() {
this(Locale.getDefault());
}

static public boolean isPresent(){
Expand Down
Loading

0 comments on commit 7aa0302

Please sign in to comment.