Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #5756 from osmandapp/Fix_5595

Browse source 
Add support for offline modifying ways
This commit is contained in:
Alexander Sytnyk 2018-07-31 14:36:17 +03:00 committed by GitHub
commit d9073403f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapLocalUtil.java
View file

@ -79,16 +79,21 @@ public class OpenstreetmapLocalUtil implements OpenstreetmapUtil {
@Override
public Entity loadEntity(Amenity n) {
PoiType poiType = n.getType().getPoiTypeByKeyName(n.getSubType());
if(n.getId() % 2 == 1 || poiType == null){
// that's way id
boolean isWay = n.getId() % 2 == 1; // check if amenity is a way
if (poiType == null) {
return null;
}
long nodeId = n.getId() >> 1;
long entityId = n.getId() >> 1;
// EntityId id = new Entity.EntityId(EntityType.NODE, nodeId);
Node entity = new Node(n.getLocation().getLatitude(),
n.getLocation().getLongitude(),
nodeId);
// EntityId id = new Entity.EntityId(EntityType.NODE, entityId);
Entity entity;
if (isWay) {
entity = new Way(entityId, null, n.getLocation().getLatitude(), n.getLocation().getLongitude());
} else {
entity = new Node(n.getLocation().getLatitude(),
n.getLocation().getLongitude(),
entityId);
}
entity.putTagNoLC(EditPoiData.POI_TYPE_TAG, poiType.getTranslation());
if(poiType.getOsmTag2() != null) {
entity.putTagNoLC(poiType.getOsmTag2(), poiType.getOsmValue2());
@ -111,7 +116,9 @@ public class OpenstreetmapLocalUtil implements OpenstreetmapUtil {
}
// check whether this is node (because id of node could be the same as relation)
if(entity != null && MapUtils.getDistance(entity.getLatLon(), n.getLocation()) < 50){
if (entity instanceof Node && MapUtils.getDistance(entity.getLatLon(), n.getLocation()) < 50) {
return entity;
} else if (entity instanceof Way) {
return entity;
}
return null;