Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6040 commits 42 branches 1 tag 605 MiB
Commit graph

1667 commits

Author SHA1 Message Date
Pavol Zibrita
cbfdb0e6c4 Added Croatian language 2012-10-03 07:39:38 +02:00
Victor Shcherb
4c0ff7a027 Fix setup 2012-10-02 22:41:36 +02:00
stephan 75
3285c9bb9f Translated using Weblate. 2012-10-01 12:00:10 +02:00
Pavol Zibrita
c3810fee53 add de translation files for map creator 2012-09-30 22:24:29 +02:00
Victor Shcherb
7442de0c7e Fix tests 2012-09-29 22:52:40 +02:00
Victor Shcherb
58fd91ee04 Fix issue 1413 2012-09-29 22:40:54 +02:00
Victor Shcherb
318e294771 Add color definition to render xml 2012-09-29 22:38:05 +02:00
Victor Shcherb
6a38053226 Merge branch 'preciseRouting' 2012-09-29 14:26:12 +02:00
Victor Shcherb
c3e2aaa193 Fix string values and add option for optimal/non-optimal route calculation 2012-09-29 14:20:58 +02:00
Dušan Kazik
124f0b7c8f Translated using Weblate. 2012-09-29 12:00:11 +02:00
Victor Shcherb
f086a523ed Fix tests 2012-09-29 01:52:28 +02:00
Victor Shcherb
f2b9e9361f Implement native routing 2012-09-29 01:15:58 +02:00
Victor Shcherb
c2f3527824 Adjust unit test 2012-09-28 19:11:55 +02:00
Victor Shcherb
ccb1bcdfdb Speedup route calculation and optimize memory 2012-09-28 18:54:57 +02:00
Victor Shcherb
f8673d5d98 Try different approach loading tiles 2012-09-28 09:31:36 +02:00
Victor Shcherb
44218fbe0a Try different approach loading tiles 2012-09-28 00:40:00 +02:00
Sebastian Spaeth
c1d80219e4 Use existing icon shop_diy for "doityourself". Fix issue #1405 
We used the existing icon shop_diy for shop=hardware but not for shop=doityourself.
There are more than 20,000 dhop=doityourself out there.

I also re-ordered some shop rules to be alphabetical, but the only real
change is the use of icon="shop_diy" for shop=doityourself.

This addresses http://code.google.com/p/osmand/issues/detail?id=1405
 2012-09-27 15:11:31 +02:00
Victor Shcherb
fd34527520 Tweak routing params 2012-09-27 09:46:28 +02:00
Vitaly Ivanov
d01dceebe1 Translated using Weblate. 2012-09-27 07:29:23 +02:00
Vitaly Ivanov
7b8f1b3dd9 Translated using Weblate. 2012-09-26 20:47:51 +02:00
Pavol Zibrita
5bbd882e47 Fixed null pointer exception 2012-09-26 18:27:51 +02:00
vshcherb
80ad668b99 Merge pull request #320 from spaetz/shop_rendering_improvements 
Render some more shops
 2012-09-26 05:34:06 -07:00
Vitaly Ivanov
4d73d4efde Translated using Weblate. 2012-09-26 12:00:26 +02:00
Sebastian Spaeth
0d1e1ba22c Render some more shops 
Render shop names for "electronics, florist, furniture"
and also car_repair (in car mode only) when zoomed in.

Reorder some items to be a little more alphabetically sorted.
 2012-09-26 11:20:09 +02:00
Victor Shcherb
1aac6c9cb7 Implement size limit approach (Java routing) 2012-09-26 00:06:26 +02:00
Vitaly Ivanov
4cff4f8bbd Translated using Weblate. 2012-09-26 00:00:21 +02:00
Pavol Zibrita
980bf31699 add ru language resource for map creator 2012-09-25 15:51:37 +02:00
Victor Shcherb
a64904469f Slightly improve ring validation 2012-09-24 21:50:06 +02:00
vshcherb
3da9366685 Merge pull request #319 from sanderd17/multipolygon 
Multipolygon
 2012-09-24 12:12:00 -07:00
Victor Shcherb
28fc85cf1f Fix colors for highway roads and fix cocolors in rendering 2012-09-23 15:02:42 +02:00
Victor Shcherb
00473cea80 Fix colors for highway roads and fix cocolors in rendering 2012-09-23 14:45:19 +02:00
Rodolfo de Vries
228a8c884c Translated using Weblate. 2012-09-23 00:00:10 +02:00
Ivan Gonzalez
c3fe067b35 Translated using Weblate. 2012-09-22 22:34:30 +02:00
Pavol Zibrita
c190984453 added resources for Slovenian language 2012-09-22 22:32:55 +02:00
Ivan Gonzalez
f038000ea6 Translated using Weblate. 2012-09-22 21:03:30 +02:00
Johan Fitié
0ebae0beda Translated using Weblate. 2012-09-22 20:00:08 +02:00
Johan Fitié
86e3edef4e Translated using Weblate. 2012-09-22 18:20:30 +02:00
Pavol Zibrita
2d7a308a7c Translated using Weblate. 2012-09-22 17:27:37 +02:00
Pavol Zibrita
8383282ff3 add nl translation temp file for map creator 2012-09-22 17:24:06 +02:00
Nicolas Palix
4252a743df Translated using Weblate. 2012-09-22 16:00:08 +02:00
Nicolas Palix
92fac7cdff Translated using Weblate. 2012-09-22 14:48:24 +02:00
Michel Gerday
ba4b22b2b6 Translated using Weblate. 2012-09-22 14:43:49 +02:00
Alexey Polkhirev
2991acba5e Translated using Weblate. 2012-09-21 16:00:31 +02:00
Pavol Zibrita
04053bef2d Add Lithuanian language 2012-09-20 21:46:08 +02:00
Péter Báthory
e7a3d5089e Translated using Weblate. 2012-09-20 20:00:35 +02:00
Péter Báthory
d66c9a473f Translated using Weblate. 2012-09-20 17:17:17 +02:00
Pavol Zibrita
e2a304af8c fix the ... 2012-09-20 16:14:53 +02:00
Pavol Zibrita
e33a952dea Translated using Weblate. 2012-09-20 16:11:17 +02:00
Pavol Zibrita
7570cfee56 Translated using Weblate. 2012-09-20 16:09:10 +02:00
Sander Deryckere
2f74329bd6 cache areas of Rings 2012-09-18 13:01:15 +02:00
Sander Deryckere
a6c5950d31 fix boundary indexing outOfRange error 2012-09-18 12:53:31 +02:00
Sander Deryckere
2d69e80d57 Fix Junit Multipolygon test and make a new one 
Small changes
 2012-09-18 12:08:10 +02:00
Sander Deryckere
e2877d3519 Rings simplify cache, remove obsolete methods and get rid of some 
unexpected behaviours
 2012-09-18 11:06:12 +02:00
Victor Shcherb
02f2b5211e Speedup intermediate point route recalculation 2012-09-18 00:18:55 +02:00
Victor Shcherb
d37a84afe1 Fix traffic_signals penalty 2012-09-17 21:17:28 +02:00
Victor Shcherb
0fc17fcf74 Adjust values for bicycle routing 2012-09-17 18:27:52 +02:00
Victor Shcherb
0ce4b23f2a Fix critical issue with route recalculation 2012-09-17 18:27:52 +02:00
Victor Shcherb
4e99dd0ebf Add basic intermediate support 2012-09-17 18:27:51 +02:00
Sander Deryckere
611e16ecf1 fixing id issue + re-introducing sorting, but via area calculation 2012-09-17 12:36:26 +02:00
Victor Shcherb
7fd28b9d3f Fix font fit text view 2012-09-16 20:34:22 +02:00
Victor Shcherb
f6fc888186 Fix coastlines issues 2012-09-16 19:41:23 +02:00
vshcherb
4c8ca5acf2 Merge pull request #312 from spaetz/bicycle_routing 
Bicycle routing improvments
 2012-09-16 04:04:14 -07:00
Victor Shcherb
7235f8f4c9 Fix interpolation address look up 2012-09-15 02:05:09 +02:00
Victor Shcherb
6ab4130479 Fix motorvehicle restrictions 2012-09-15 02:01:04 +02:00
Victor Shcherb
8277d39a31 Slightly change multipolygons impl 2012-09-14 23:02:12 +02:00
Sebastian Spaeth
b5784fcc83 bicycle routing: punish bad road conditions 
Decrease the priority of unpaved/grass roads or tracks with
bad conditions (tracktype4/5).

Also, we need to slow down to pass cycle_barriers.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
 2012-09-14 10:34:39 +02:00
Sebastian Spaeth
5a863bf8ff bicycle routing: Punish motorways a lot 
You do not want to bike there! Really! (also trunks are really not nice)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
 2012-09-14 10:34:39 +02:00
Sebastian Spaeth
b297155ead bicycle routing: bump residential streets a little 
Residential streets are usually a little quieter, so they should be
a little preferred over primary/secondary/tertiary streets.

Living_streets are quite similar to residential streets for bikes,
they should have the same priority and only be marginally slower.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
 2012-09-14 10:34:39 +02:00
Sebastian Spaeth
5353a5dc6e bicycle routing: Adapt primary priority 
primary_link had a higher priority than primary for bicycle routing,
we surely want to avoid primary_link's when on a bike, so it should
be the same value at least.

Also primary had the same priority than trunk (which is very much
motorway-like, alas horrible for bicycles), adapt priorities a tad
so we prefer primaries over trunks. IMHO, we should rather decrease
the priorities of trunks and motorways further to make them less
attractive. Ever biked on a motorway?

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
 2012-09-14 10:34:39 +02:00
Victor Shcherb
c627bbc27e Refactor poi filters and add new poi filters 2012-09-12 22:14:05 +02:00
Pavol Zibrita
3729c2d6d5 Merge pull request #310 from sanderd18/multipolygon 
Fix Junit tests
 2012-09-12 12:25:59 -07:00
Sander Deryckere
60b088d11d Fix Junit tests 
One test left to fix, commented it temporarily
 2012-09-12 21:12:05 +02:00
Pavol Zibrita
f37049863d Merge pull request #309 from sanderd18/multipolygon 
Fix issue 1265
 2012-09-12 11:08:58 -07:00
Sander Deryckere
107c814dca Fix indexing of multipolygon with multiple outer rings 
issue 1265
 2012-09-12 15:44:11 +02:00
Sander Deryckere
0a8669edae Split concept of multipolygon in two classes: the concept of a ring and 
the concept of a multipolygon which has rings.
 2012-09-11 21:19:38 +02:00
Victor Shcherb
3d9cf54ec3 Upgrade offline poi/bug editing 2012-09-11 01:45:35 +02:00
Victor Shcherb
3c7630b24f Fix non-spoken instructions 2012-09-10 23:12:45 +02:00
Victor Shcherb
f93f869849 Fix issue 1298 with routing restrictions 2012-09-10 22:00:50 +02:00
Victor Shcherb
e79bae2e74 Fix interpolation 2012-09-10 01:58:35 +02:00
Victor Shcherb
66d84dd34c Fix interpolation issue 2012-09-10 01:29:49 +02:00
Victor Shcherb
71797021f4 Fix touchable area for close button 2012-09-09 17:42:24 +02:00
Victor Shcherb
8a608c94ad Add debug rendering coastline 2012-09-09 17:42:24 +02:00
Victor Shcherb
4c59d9d1b4 Fix issue 1327, show relative names for poi subcategories 2012-09-09 17:42:23 +02:00
Victor Shcherb
6ffaaa8bec Fix lots of unnecessary Keep left and keep right 2012-09-06 11:55:23 +02:00
Victor Shcherb
df33571d12 Fix bug with road duplication and many times saying same command (keep left or keep right) 2012-09-06 11:55:23 +02:00
Victor Shcherb
a7d525c02a Commit with comments 2012-09-05 22:24:08 +02:00
sonora
b5cebe9a6b Try solution for Issue 1313 2012-09-04 11:19:56 +02:00
sonora
840c69ed24 revert to former EPA library 2012-09-04 09:29:11 +02:00
sonora
199e879c9b Try solution for Issue 1313 2012-09-04 09:21:39 +02:00
sonora
5fca28374d replace 'never' language-independently 2012-09-04 01:39:10 +02:00
sonora
298b13890a found bug in sunrise / sunset debug display 2012-09-02 12:29:51 +02:00
Victor Shcherb
5e6fc19588 Avoid motorway 2012-08-31 23:41:35 +02:00
sonora
068e4cb3ba improve translation 2012-08-31 00:22:23 +02:00
Victor Shcherb
dad6254dc3 Rendering types cycleway 2012-08-30 22:25:09 +02:00
Victor Shcherb
83c0cae021 Cycleway display 2012-08-30 21:52:50 +02:00
prqek
0132035122 Fixed some errors in "Implement way propogation" 2012-08-30 15:11:41 +02:00
vshcherb
3793435411 Merge pull request #293 from sanderd17/patch-2 
Indexing rcn_ref and rwn_ref
 2012-08-30 00:56:19 -07:00
sonora
e70bcb2854 better comment 2012-08-30 09:31:26 +02:00
sonora
9383741040 minor re-sorting of def-renderer 2012-08-30 03:11:04 +02:00
sonora
ca80118174 remove remaining displays of Osmand vs. OsmAnd 2012-08-30 01:55:58 +02:00
Victor Shcherb
61e43e7fed Implement way propogation 2012-08-30 00:48:17 +02:00
Victor Shcherb
25f993b517 Adjust night mode 2012-08-29 23:27:19 +02:00
Victor Shcherb
0c5e7cd20a Test time adjusted 2012-08-29 22:39:55 +02:00
Victor Shcherb
d822169cc2 Fix critical issue empty route recalculation 2012-08-29 18:37:13 +02:00
Victor Shcherb
826d28a407 Experiment clustering 2012-08-29 18:12:42 +02:00
Victor Shcherb
144328766e Tweak routing 2012-08-29 18:12:42 +02:00
Victor Shcherb
883fd8c493 Fix detours 2012-08-29 00:29:52 +02:00
Victor Shcherb
3ff4fbcf83 Test clusterization 2012-08-29 00:10:15 +02:00
Victor Shcherb
0295fc5e4c Change to 0.8.3 alpha 2012-08-29 00:03:46 +02:00
Victor Shcherb
f11ebf21e7 Small changes 2012-08-29 00:01:15 +02:00
Victor Shcherb
788d108746 Speedup native load 2012-08-28 20:07:36 +02:00
sonora
b8112b700f include test-road-colors template for easy handling 2012-08-27 17:57:38 +02:00
sonora
13a4057f56 simplify my old high-contrast renderer to easier facilitate color testing 2012-08-27 14:02:15 +02:00
Victor Shcherb
42e9e10fa8 Fix routing issue 2012-08-27 00:16:06 +02:00
Victor Shcherb
f949218eae Fix arabic 2012-08-26 23:26:28 +02:00
Victor Shcherb
cf8e686e60 Improve routing 2012-08-26 18:39:48 +02:00
Victor Shcherb
b112a8a6d3 Speed up resource loading 2012-08-25 20:55:32 +02:00
sonora
3a2307918b fix retail color 2012-08-24 20:49:16 +02:00
Victor Shcherb
c268a1fce9 Fix issue with partial zooms 2012-08-22 21:37:01 +02:00
Victor Shcherb
1cd15df201 Add tests 2012-08-22 19:07:21 +02:00
Victor Shcherb
0c99102235 Fix clustering experiments 2012-08-22 19:07:21 +02:00
vshcherb
437504e30a Update DataExtractionOSM/src/net/osmand/data/Multipolygon.java 
Fix null pointer
 2012-08-22 13:17:00 +03:00
sonora
c3d87dad40 remove remaining ocurences of OsmAnd from strings 2012-08-21 16:38:37 +02:00
Victor Shcherb
1c3c28b661 update settings profiles 2012-08-21 01:39:21 +02:00
sonora
3094b97417 make hmRendered road colors also default colors for now 2012-08-19 18:19:39 +02:00
Pavol Zibrita
19fcfda5b4 move address creation files to separate package 2012-08-19 12:18:52 +02:00
Victor Shcherb
60bca4aba4 Fix text map issue 1252 2012-08-18 21:40:29 +02:00
Victor Shcherb
7689a50bce Fix critical map issue 2012-08-18 21:06:02 +02:00
Victor Shcherb
7a715eb931 Introduce specialization technique for routing. Support avoid features and short way feature 2012-08-18 12:01:49 +02:00
Victor Shcherb
6bb53c0c5d Fix issue 1253 2012-08-17 00:15:14 +02:00
Victor Shcherb
9315a96fe3 Speedup initialization 2012-08-16 23:28:13 +02:00
Victor Shcherb
b7553405f9 Speed up loading 2012-08-16 23:28:13 +02:00
sanderd17
da5d9a8c17 Indexing rcn_ref and rwn_ref for search 2012-08-16 10:36:53 +03:00
sanderd17
fcdb60e85c Indexing rcn_ref and rwn_ref in map file 2012-08-16 10:32:46 +03:00
sonora
821395f53d refine peak and city/town icon strategy a bit for better orientation 2012-08-15 10:16:06 +02:00
Victor Shcherb
234825fbbb Speedup rendering 2012-08-14 00:18:16 +02:00
Victor Shcherb
08ba021591 Refactor router initialization 2012-08-14 00:18:16 +02:00
Victor Shcherb
108edbdf4f Fix turn calculation issues 2012-08-11 01:40:31 +02:00
sonora
8057ba92c2 amend comment 2012-08-10 13:27:51 +02:00
sonora
70df18e3c2 small bit correction yellow 2012-08-10 13:12:23 +02:00
sonora
8f045cddc7 Slightly fix axis approach for hmRendered-colors (v2h): Brightness=100, Saturation=50. 2012-08-10 12:52:41 +02:00
sonora
d30c5e4b47 fix broken tertiary highway tags 2012-08-10 11:46:14 +02:00
sonora
1cc155dba9 fix order of viRendered statements 2012-08-10 10:28:03 +02:00
sonora
18163bcf4c fix typo 2012-08-10 09:58:48 +02:00
sonora
fa27619b78 intensify road colors in hmRendered, save old pattern under PALE-SCHEME 2012-08-10 09:56:53 +02:00
sonora
b7922b0ab0 Fix Victor's experimental color switch 2012-08-10 09:24:21 +02:00
Victor Shcherb
197120af32 Refactor live tracking 2012-08-09 22:32:14 +02:00
vshcherb
9f8279040d Merge pull request #284 from sanderd17/master 
issue #1239 opening hours
 2012-08-09 02:23:51 -07:00
Sander Deryckere
46bca3b1bb Fix nullpointer exception 2012-08-09 10:10:24 +02:00
Victor Shcherb
846b2d8bbf Add experiment map colors 2012-08-09 01:38:05 +02:00
Victor Shcherb
75e7d443fd Add experiment map colors 2012-08-09 01:34:51 +02:00
Victor Shcherb
6bdeccd802 Add experiment map colors 2012-08-09 01:28:54 +02:00
Victor Shcherb
34a6a245f7 Refactor context menu 2012-08-08 22:42:52 +02:00
Sander Deryckere
bb4864eefe Opening hours, better parsing 2012-08-08 17:51:05 +02:00
Sander Deryckere
d6955d50f7 Better parsing of opening hours. First two pages of taginfo are parsed 
correctly.
 2012-08-08 17:44:48 +02:00
sanderd17
1864074f1b Update interface openinghours 2012-08-08 14:37:19 +03:00
sanderd17
344344150f Better parsing, all logic gathered in one class 2012-08-08 14:36:41 +03:00
sanderd17
b140cd3616 fix issue 1233 2012-08-07 11:23:30 +03:00
sonora
2da101f686 comment typo and some surplus blanks 2012-08-05 13:23:51 +02:00
sonora
d6e238e734 enhance comments for future reference 2012-08-05 12:49:01 +02:00
sonora
300bc80b4f clean up pathEffects for better usability 2012-08-05 12:08:27 +02:00
sonora
92c42044a7 consistent 66% coverage for footway/cycleways/bridleways to enhance detecting other surface-related coverages 2012-08-05 11:22:32 +02:00
sonora
013d80be71 consistent pathEffects in ped and bike profiles to make room for sac_scale pathEffects and reserve pathEffect for surface 2012-08-05 09:44:14 +02:00
sonora
18754b6b13 sac_scale for paths - preliminary implementation 2012-08-04 10:48:12 +02:00
sonora
aa9fb74341 color correction: place_of_worship as attractions 2012-08-04 10:07:35 +02:00
sonora
9f5fd7a2ba Issue 1220- pagodas 2012-08-03 10:10:43 +02:00
vshcherb
b11c24d433 Merge pull request #278 from mhamrle/master 
bug 1128: Better support for new public transport specification
 2012-07-23 15:10:01 -07:00
Victor Shcherb
75a6df37e2 Revert fix for residential 2012-07-23 23:27:43 +02:00
Victor Shcherb
62db58c6b3 Fix cycleway limitations 2012-07-23 23:21:01 +02:00
Martin Hamrle
f4901710ec add support for transport master routes 2012-07-23 23:14:32 +02:00
Victor Shcherb
ffaba063cc Add text info 2012-07-23 20:42:28 +02:00
Victor Shcherb
76fb96249f Fix routing 2012-07-22 15:45:41 +02:00
Victor Shcherb
f69a93f6c1 Remove unused test 2012-07-22 15:45:41 +02:00
Victor Shcherb
e48ebd29c3 Remove flooded residentials (islands) 2012-07-21 20:06:31 +02:00
Victor Shcherb
9da7728097 Add route cancellation 2012-07-21 19:37:11 +02:00
Victor Shcherb
3a1aa415c3 Add new test 2012-07-21 17:43:46 +02:00
Victor Shcherb
f86b4eb4f9 Update routing and include tests 2012-07-21 17:21:15 +02:00
sonora
391a118eb9 no separate "bridge" appearance for cycleway=lane 2012-07-21 10:15:18 +02:00
sonora
04f6ab8848 fix that cycle lanes are displayed on bridges (Issue 1202) 2012-07-21 09:51:46 +02:00
Victor Shcherb
bd36a1110d Fix test 2012-07-19 01:14:20 +02:00
Victor Shcherb
85524b2ce7 Improve smart recalculation 2012-07-19 00:46:12 +02:00
Victor Shcherb
18303be61c Add landuse text 2012-07-19 00:31:42 +02:00
Victor Shcherb
507d0a3a16 Fix railway rendering 2012-07-18 01:13:20 +02:00
Pavol Zibrita
9c1f73e2c6 fix issue 1164, processing address with identical street and street2 tag 2012-07-17 04:41:19 +02:00
Pavol Zibrita
ba50378510 fix OutOfMemory problem with multipolygon (stupid cycle mistake...) 2012-07-17 02:41:15 +02:00
Pavol Zibrita
41be54750f fixed java.lang.IndexOutOfBoundsException when first way was without any 
nodes.
 2012-07-17 02:02:12 +02:00
Victor Shcherb
d62472532d Adjust rendering on fly 2012-07-16 22:46:31 +02:00
Victor Shcherb
2d47028aca Fix smart recalculation problem 2012-07-16 00:55:15 +02:00
Victor Shcherb
2520b7cb59 Adjustify follow status and directions to buttons 2012-07-16 00:55:15 +02:00
Victor Shcherb
6005c0a546 Adjustify follow status and directions to buttons 2012-07-16 00:55:15 +02:00
Victor Shcherb
bc7dcfa9d0 Adjust uturn 2012-07-16 00:55:14 +02:00
Pavol Zibrita
b383eb72ff fix build.xml for tests 2012-07-15 05:36:05 +02:00
Pavol Zibrita
16922dffc8 Extracted Multipolygon class from Boundary class and tested with junits. 
This could resolve some address issues, we will need to check. (recreate
maps, etc...)
 2012-07-15 04:53:37 +02:00
Pavol Zibrita
547b156c5b tests moved to separate source directory 2012-07-15 04:52:24 +02:00
Victor Shcherb
f4b7748df9 Fix oneway issue 1165 2012-07-15 00:41:29 +02:00
Victor Shcherb
aa0de671b5 Fix uturn message 2012-07-15 00:41:29 +02:00
vshcherb
deac15395e Revert back 2012-07-15 00:17:46 +03:00
vshcherb
875120fc07 Check bug 1164 2012-07-15 00:08:57 +03:00
Victor Shcherb
2a8f46e46d Fix issue with pedestrian roads 2012-07-14 21:19:17 +02:00
Victor Shcherb
08337f4ccd Fix tests 2012-07-14 17:27:50 +02:00