Alexey Pelykh
91ae154dd8
Merge branch 'master' of ssh://github.com/osmandapp/Osmand
2015-02-03 11:13:19 +02:00
Alexey Pelykh
3ec9d6dbd2
Proper gradle
2015-02-03 11:13:11 +02:00
Hans-Christoph Steiner
859595267e
add more kinds of Google URLs for testing
...
This includes some valid Google Maps links that cause problems with the new
`parseGoogleMapsPath()` method.
2015-02-03 00:29:43 +01:00
Hans-Christoph Steiner
34ecdafc5d
GeoParsedPoint normalize query string format as plain, not URL-encoded
...
There were parts of this code that were sticking in a URL-encoded query
string into GeoParsedPoint, and other parts that were putting in a regular
non-URL-encoded String. This meant that URLs with an & in the query string
encoded as %26 were not being properly parsed, since & is used to split up
the query string. That also makes it impossible to output a properly
encoded URI from getGeoUriString().
2015-02-03 00:28:45 +01:00
Hans-Christoph Steiner
124d48cd6e
add various unparsable short links as tests
2015-02-02 22:53:05 +01:00
Hans-Christoph Steiner
7cb58ec540
also parse maps.apple.com links, the query string includes lat/long/zoom/etc
...
https://developer.apple.com/library/ios/featuredarticles/iPhoneURLScheme_Reference/MapLinks/MapLinks.html
2015-02-02 22:53:05 +01:00
Hans-Christoph Steiner
1c4ad908da
handle all Google country-specific domains, i.e. google.at, google.ru, etc.
...
https://en.wikipedia.org/wiki/List_of_Google_domains
2015-02-02 22:53:05 +01:00
Hans-Christoph Steiner
59c34b350a
improve Yandex link parsing
...
* also handle maps.yandex.com URLs
* properly handle unparsable short links (i.e. don't crash or return results)
* include text= as Label
2015-02-02 22:53:05 +01:00
Hans-Christoph Steiner
897d6ba387
only output coords from Yandex URL if the full ll= string matches
...
This just makes sure that there is a full lat/lon match before outputing.
2015-02-02 22:53:04 +01:00
Hans-Christoph Steiner
90c1b8a8e0
only parse query string if it is used
...
Not all location URLs have useful information in the query string, so only
parse it if it is used in the section for a given hostname.
Also, rename queryMap to params for consistency.
2015-02-02 22:53:04 +01:00
Hans-Christoph Steiner
4e5fa43f98
claim location URLs from QQ Map by Tencent
...
closes https://dev.guardianproject.info/issues/4394
2015-02-02 22:53:04 +01:00
Hans-Christoph Steiner
9b77f6fa90
claim location URLs from Nokia HERE
...
closes https://dev.guardianproject.info/issues/4399
2015-02-02 22:53:04 +01:00
Hans-Christoph Steiner
d34d341d65
keep Uri "path" intact during parsing for consistant regexes
...
By not modifying "path" from what Uri.getPath() returns, it keeps the
pattern matching consistent since the contents of "path" will always be the
same as Uri.getPath(), and what is visible in the URI itself.
2015-02-02 22:53:04 +01:00
Hans-Christoph Steiner
2771da35de
GeoPointParserUtil.getQueryParameters() to return Map of all parameters
...
This parses out all of the parameters in the query string for both http:
and geo: URIs. This will only work on URIs with valid syntax, so it will
not work on URIs that do odd things like have a query string in the
fragment, like this one:
http://www.amap.com/#!poi!!q=38.174596,114.995033 |2|%E5%AE%BE%E9%A6%86&radius=1000
2015-02-02 22:53:04 +01:00
Hans-Christoph Steiner
3d106d00b7
support parsing amap.com URLs
...
amap.com aka autonavi is a popular mapping service in China.
2015-02-02 22:53:04 +01:00
Alexey Pelykh
75a0c03e40
Fix build
2015-02-02 18:15:28 +02:00
Alexey Pelykh
ac344f8e20
Merge branch 'master' of ssh://github.com/osmandapp/Osmand
2015-02-02 17:56:08 +02:00
Alexey Pelykh
6d6d3631f3
Fix
2015-02-02 17:54:43 +02:00
Hans-Christoph Steiner
8155e749bb
use Locale.ENGLISH to format numbers for geo: links
...
Some locales do not use 0-9 as the digits, such as Arabic and sometimes
Chinese. Using those numerals in a geo: URI probably would not work.
2015-02-02 16:08:30 +01:00
Hans-Christoph Steiner
3db16680b4
GeoParsedPoint.getGeoUriString() to output the data as a geo: URI
...
Output the data in the GeoParsedPoint as a geo: URI (http://geouri.org )
2015-02-02 16:08:30 +01:00
Hans-Christoph Steiner
58485d8ba9
rename GeoParsedPoint's named point var to "Label" after Google standard
...
This outlines the named point format of a geo: URI:
https://developer.android.com/guide/components/intents-common.html#Maps
2015-02-02 16:08:30 +01:00
Hans-Christoph Steiner
6f2e0029a5
remove debug message from GeoPointParserUtil.areCloseEnough()
2015-02-02 16:08:30 +01:00
Victor Shcherb
567de5806a
Update geo parse utility
2015-02-02 09:25:15 +01:00
Victor Shcherb
015cf7fc47
Update map poi types
2015-01-31 15:28:08 +01:00
vshcherb
cc9f727789
Merge pull request #1045 from eighthave/update-url-parsing
...
Update url parsing
2015-01-27 14:24:06 +01:00
Victor Shcherb
ba358e658f
Merge branch 'master' of github.com:osmandapp/Osmand
2015-01-26 21:45:46 +01:00
Victor Shcherb
755b56a97b
Fix map creator
2015-01-26 21:45:07 +01:00
Denis
4b65f295d6
Added new tab control
2015-01-26 13:30:38 +02:00
Victor Shcherb
1568f9b598
Fix ruler
2015-01-25 22:56:48 +01:00
Hans-Christoph Steiner
9bb03894a5
generate OpenStreetMap shortlinks using current char set (~ instead of @)
...
OpenStreetMap has changed the shortlink charset to use ~ instead of @ to be
support services like Twitter where @ has meaning. OpenStreetMap still will
parse the old format, but only generates new shortlinks using "~". This
commit changes OsmAnd to have the same behavior.
References:
https://wiki.openstreetmap.org/wiki/Shortlink#Code_for_encoding_.26_decoding
e84b2bd22f/app/assets/javascripts/application.js (L188)
---------------- OsmAnd-java/src/net/osmand/util/MapUtils.java ----------------
2015-01-21 11:25:51 +01:00
Hans-Christoph Steiner
50eed92015
parse lat/lon/zoom from OpenStreetMap shortlinks
...
This is a nice format of shortlink since it uses a public, offline algorithm
to generate them. So Osmand can get what it needs from the shortlink
without going online.
https://wiki.openstreetmap.org/wiki/Shortlink
2015-01-21 11:25:51 +01:00
Hans-Christoph Steiner
2537d92a6a
update MapUtils.decodeShortLinkString() to also parse zoom
...
This method is used to parse the custom OpenStreetMap shortlink algorithm
that encodes lat, lon, and zoom. The previous version,
MapUtils.decodeShortLocString(), only parsed lat, lon from the shortlink.
2015-01-21 11:25:51 +01:00
Hans-Christoph Steiner
147f2adf05
add BaiduMap as a URL pattern ( http://map.baidu.com )
...
This is a mapping service that is popular in China.
2015-01-21 11:00:46 +01:00
Hans-Christoph Steiner
baf25cbb14
include test lat/lon to 5 decimal places since that's the common format
...
This makes the test more realistic, since most services are using at least
this much accuracy.
2015-01-21 11:00:46 +01:00
Hans-Christoph Steiner
32f7cccd0f
rework OpenStreetMap URL parsing to handle current formats
...
It seems this code is quite out of date, because none of the URL formats
listed in the tests seem to work. This commit updates the URL formats in
the tests, then makes all of them parse properly. It also changes the
parsing technique, leveraging java.net.URL's built-in parsing abilities to
assist. Also, I plan on adding a lot more URL formats, so the current code
structure made it very difficult to add to. So each service will be split
out into its own section, starting here.
2015-01-21 11:00:46 +01:00
Hans-Christoph Steiner
7729aa7350
remove scheme arg from GeoPointParserUtil.parse(), java.net.URI provides it
...
Since the first step in parse() is to create a URI instance, the scheme
should come from URI.getScheme() instead of an arg.
2015-01-21 11:00:46 +01:00
Hans-Christoph Steiner
01bb7d091f
split geo: URL creation to MapUtils.buildGeoUrl(lat, lon, z)
...
This follow the pattern set by MapUtils.buildShortOsmUrl().
2015-01-21 11:00:46 +01:00
Hans-Christoph Steiner
c54d8d47e8
use HTTPS URL for sharing location
...
In order to maintain privacy when sharing location, this changes the shared
location link to use HTTPS, thereby hiding the location info from anyone
who might be snooping on the WiFi, ISP, internet, etc.
Unfortunately, http://osm.org does not yet work with HTTPS, but the
standard OSM URLs are short enough to fit into a text message. They are
planning on supporting https://osm.org in the future:
https://github.com/openstreetmap/operations/issues/2
2015-01-21 11:00:46 +01:00
Victor Shcherb
0b6738e356
Fix errors
2015-01-20 23:32:35 +01:00
Hans-Christoph Steiner
2da1458999
add a preference to allow user to set a network proxy
...
Some networks require a proxy to get internet beyond the firewall, and
proxies are also useful for channeling all traffic through circumvention
and privacy proxies like Tor, I2P, Psiphon, etc. In places where the
connection to download tiles might be blocked, using a proxy can give the
user access.
2015-01-20 16:18:46 +01:00
Hans-Christoph Steiner
41f356a11a
use HTTPS where supported, and on Gingerbread and above (i.e. not android-9)
...
To increase user privacy, especially with traffic that includes sensitive
information like location and tracking markers, HTTPS should be used
whenever possible. It seems that HTTPS is broken for a lot of sites on
versions older than android-10/Gingerbread, so HTTPS is not used on those
old platforms.
2015-01-20 16:18:46 +01:00
Victor Shcherb
ca4b4e14c8
Update poi filter types
2015-01-19 22:32:27 +01:00
Victor Shcherb
837c1f8f04
Add support restriction via way
2015-01-16 01:53:19 +01:00
Victor Shcherb
660ee62f71
Fix small issues
2015-01-15 03:17:44 +01:00
Victor Shcherb
1756e39616
Update routes
2015-01-15 02:42:33 +01:00
Victor Shcherb
774cf6f92c
Fix addr:flats
2015-01-13 23:14:09 +01:00
Victor Shcherb
80bbf423ca
Reimplement turn:lanes merge
2015-01-13 10:25:56 +01:00
Victor Shcherb
eaa25f3daa
Update zoom animation and add zoom fraction for autozoom (don't change density in autozoom). Add limit autozoom for different drive options
2015-01-13 00:04:08 +01:00
Victor Shcherb
e55a1d7b8f
Update rendering types parser
2015-01-09 00:10:52 +01:00
Victor Shcherb
b442252e0c
Add dependent rendering attribute
2015-01-08 22:53:25 +01:00
Victor Shcherb
95364cb9e7
Rules encoding
2015-01-08 18:36:35 +01:00
Victor Shcherb
356773d6ff
Update rendering additional
2015-01-08 01:15:47 +01:00
Victor Shcherb
e1300b9df7
Fix rendering types issue
2015-01-08 00:19:54 +01:00
Victor Shcherb
38407ae763
Commit poi with name
2015-01-06 21:49:38 +01:00
Victor Shcherb
c95dcf10e4
Commit poi with name
2015-01-06 21:45:58 +01:00
Alexey Pelykh
6627a4d2b5
Merge pull request #1028 from Bars107/master
...
Bugfix for direction drawable and test for buggy geo intent.
2014-12-29 18:41:45 +02:00
Alexey Pelykh
335a629bf1
Fix indent
2014-12-29 17:41:01 +02:00
Alexey Pelykh
9678ca155c
New GEO URI parser
2014-12-29 17:37:28 +02:00
Denis
819a61216e
Added test for buggy geo intent
2014-12-29 12:56:52 +02:00
Victor Shcherb
47d605b4f4
Update core-legacy location
2014-12-21 23:39:14 +01:00
Alexey Pelykh
904c2bf342
Styles
2014-12-18 19:39:50 +02:00
Victor Shcherb
484c951790
Merge branch 'master' of ssh://github.com/osmandapp/Osmand
2014-12-17 11:13:53 +01:00
Victor Shcherb
9eea16efba
Add icon__1 to render
2014-12-17 11:13:19 +01:00
Alexey Pelykh
b7beca8a9b
Initial gradle support
2014-12-16 13:24:33 +02:00
Victor Shcherb
4f37694d41
Add icon2 .. icon5 rendering
2014-12-15 01:03:20 +01:00
Victor Shcherb
30f1920e2e
Add layer __2 and _5 for more complex cases
2014-12-15 00:46:20 +01:00
Alexey Pelykh
f471400e32
Something
2014-12-11 11:24:48 +02:00
Alexey Pelykh
9910e07a68
Blah Blah
2014-12-10 09:57:48 +02:00
Victor Shcherb
d43d5255c1
Use destination:ref where is possible
2014-12-10 00:27:03 +01:00
Victor Shcherb
fa0f4dc4b1
Display lanes for car driving without navigation
2014-12-09 22:34:33 +01:00
Victor Shcherb
e4422db88c
Merge branch 'master' of ssh://github.com/osmandapp/Osmand
2014-12-09 20:21:14 +01:00
Victor Shcherb
6002e7126e
Update cards layout
2014-12-09 20:20:21 +01:00
vshcherb
58f60d7794
Merge pull request #994 from saiarcot895/fix-bits
...
Turn display fix
2014-12-09 12:06:59 +01:00
Saikrishna Arcot
4af103fb02
When setting a new primary or secondary turn, clear the bits from the currently-set turn first.
2014-12-08 12:56:05 -05:00
Victor Shcherb
a5431d2036
Be more verbose
2014-12-07 20:21:42 +01:00
vshcherb
a2c041274b
Merge pull request #952 from saiarcot895/merge-turn-lanes
...
Implement merging nearby turns together.
2014-12-07 00:46:57 +01:00
Victor Shcherb
170aaabfa6
Refactor zoom representation
2014-12-06 14:55:36 +01:00
Victor Shcherb
239184861f
Add strings to translate
2014-12-06 13:17:54 +01:00
Saikrishna Arcot
08dc488850
Fix NullPointerException that occurs if there are no more turns with lanes indicated.
2014-12-05 23:00:12 -05:00
Victor Shcherb
311cb29336
Fix collapsing
2014-12-05 23:33:58 +01:00
Saikrishna Arcot
d527eb4fe9
Fix slight turn definition, and remove redundant lines
2014-12-04 22:51:18 -05:00
Victor Shcherb
edd72827f3
Introduce new property engine_v1
2014-12-03 21:26:15 +01:00
Victor Shcherb
52dd94adc7
Remove unnecessary line
2014-11-28 18:33:04 +01:00
Saikrishna Arcot
cefabcf520
Make local variables to shorten lines.
2014-11-28 08:39:18 -06:00
Saikrishna Arcot
e4a2b38ea4
Remove vim file
2014-11-28 08:19:23 -06:00
Victor Shcherb
da7f23b4ac
Fix routing with needles
2014-11-28 00:58:02 +01:00
Victor Shcherb
9931d436b4
Fix routing with needles
2014-11-28 00:57:34 +01:00
Victor Shcherb
b4db8bdbd9
Display lanes in driving mode
2014-11-25 18:37:09 +01:00
Saikrishna Arcot
2b9c96966e
Update to call new methods.
2014-11-24 20:24:47 -05:00
Saikrishna Arcot
db6d99dc92
Merge remote-tracking branch 'origin/master' into merge-turn-lanes
2014-11-24 19:50:26 -05:00
Victor Shcherb
1fd9841ea6
Merge branch 'master' of ssh://github.com/osmandapp/Osmand
...
Conflicts:
OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
2014-11-23 19:51:47 +01:00
Victor Shcherb
a9b1031ce9
Fix issue with turn type
2014-11-23 19:45:31 +01:00
Saikrishna Arcot
1ebad93158
Split determining which turns to merge into a separate function
2014-11-23 13:28:21 -05:00
Saikrishna Arcot
534d11d544
Update method call to reflect new parameters.
2014-11-23 11:41:07 -05:00
Saikrishna Arcot
9ef86bbe56
Merge branch 'master' into merge-turn-lanes
...
Conflicts:
OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
2014-11-23 11:27:15 -05:00
Saikrishna Arcot
fcee2c6642
Log inconsistencies in lanes and turn:lanes values, and try to adjust lanes array to continue processing.
2014-11-21 11:31:18 -05:00
Saikrishna Arcot
72f8c1e1f4
Remove main lanes restriction
2014-11-21 07:58:15 -05:00
Saikrishna Arcot
751e569208
Refactor countLanes() so that it gets the right number of lanes by itself (similar to getTurnLanesString())
2014-11-21 07:58:15 -05:00
Saikrishna Arcot
984dc80e58
Make a fix to ensure the directional lane is used
2014-11-21 07:51:41 -05:00
Saikrishna Arcot
e1b7f13b5c
Implement merging nearby turns together.
...
When there are multiple turns near each other (< 60m), set the lanes
that are allowed on earlier turns such that staying on that lane will
carry you through the other turns.
For a standard left/right turn at a traffic light at two one-way roads
(dual carriageway), this means that the left and right turns are
correctly highlighted.
2014-11-21 07:51:41 -05:00