Skip to content

Commit

Permalink
Merge branch 'master' into lock_screen
Browse files Browse the repository at this point in the history
# Conflicts:
#	OsmAnd/res/values/strings.xml
  • Loading branch information
0xRe1nk0 committed Sep 30, 2024
2 parents 4707981 + eb2a9dd commit 21a0518
Show file tree
Hide file tree
Showing 157 changed files with 2,879 additions and 1,166 deletions.
2 changes: 1 addition & 1 deletion OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ public QuadRect getRectLatLon() {
left = Math.min(left, x);
right = Math.max(right, x);
top = Math.min(top, y);
bottom = Math.max(top, y);
bottom = Math.max(bottom, y);
}
return new QuadRect(MapUtils.get31LongitudeX(left), MapUtils.get31LatitudeY(top), MapUtils.get31LongitudeX(right), MapUtils.get31LatitudeY(bottom));
}
Expand Down
Loading

0 comments on commit 21a0518

Please sign in to comment.