Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
f5bfffcea1
1 changed files with 2 additions and 10 deletions
|
@ -72,14 +72,6 @@ public class PointDescription {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLat(double lat) {
|
|
||||||
this.lat = lat;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLon(double lon) {
|
|
||||||
this.lon = lon;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTypeName(String typeName){
|
public void setTypeName(String typeName){
|
||||||
this.typeName = typeName;
|
this.typeName = typeName;
|
||||||
}
|
}
|
||||||
|
@ -348,8 +340,8 @@ public class PointDescription {
|
||||||
pd = new PointDescription(POINT_TYPE_LOCATION, "");
|
pd = new PointDescription(POINT_TYPE_LOCATION, "");
|
||||||
}
|
}
|
||||||
if(pd.isLocation() && l != null) {
|
if(pd.isLocation() && l != null) {
|
||||||
pd.setLat(l.getLatitude());
|
pd.lat = l.getLatitude();
|
||||||
pd.setLon(l.getLongitude());
|
pd.lon = l.getLongitude();
|
||||||
}
|
}
|
||||||
return pd;
|
return pd;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue