Use mapnik to generate map thumbnails

.travis.yml

@@ -1,9 +1,25 @@
 language: python
+sudo: required
+dist: trusty
 python:
   - "2.7"
 before_script:
   - psql -c 'create database bot;' -U postgres
-install: "pip install -r requirements.txt"
+  - psql -c 'CREATE TABLE users (id int, mode varchar(30),zoom int,format varchar(30),language varchar(10))' -d bot -U postgres
+  - psql -c 'CREATE TABLE "render_cache" (bbox text, filename text)' -d bot -U postgres
+  - psql -c "INSERT INTO \"render_cache\" VALUES ('1,1,1,1', 'ok')" -d bot -U postgres
+  - psql -c "SELECT * FROM  \"render_cache\"; " -d bot -U postgres
+  - sudo apt-get install -y python-software-properties
+  - sudo add-apt-repository -y ppa:mapnik/nightly-2.3
+  - sudo apt-get update
+  - sudo apt-get install -y python-mapnik
+install: 
+  - pip install -r requirements.txt
+  - pip install coveralls
+  - pip install six
 script:  PYTHONPATH="." python test/test.py
+after_success:
+  - PYTHONPATH="." coverage2 run --source=.  test/test.py
+  - coveralls
 services:
-  - postgresql
+  - postgresql

README.md

@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/Xevib/osmbot.svg?branch=master)](https://travis-ci.org/Xevib/osmbot)
-
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0)
+[![Coverage Status](https://coveralls.io/repos/github/Xevib/osmbot/badge.svg?branch=master)](https://coveralls.io/github/Xevib/osmbot?branch=master)
 OSMbot: OpenStreetMap bot for Telegram
 ======================================
 **OSMbot** is a project maintained by the OpenStreetMap Catalan Community. See [WikiProject Catalan/OSMbot](http://wiki.openstreetmap.org/wiki/Ca:WikiProject_Catalan/OSMbot).

app.py

@@ -20,11 +20,9 @@
     sentry.captureMessage('OSMBot started', level=logging.INFO)
     application.sentry = sentry
 
-f = open('nginx.crt', 'r')
-
 webhook = os.path.join(config['webhook'], config['token'])
 application.logger.debug('webhook:%s', config['webhook'])
-result = telegram_api.setWebhook(webhook, f)
+result = telegram_api.setWebhook(webhook)
 if result:
     application.logger.debug('Webhook set')
 

bot/locales/cs/LC_MESSAGES/messages.po

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OSMbot\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-07-18 08:53+0200\n"
-"PO-Revision-Date: 2016-07-18 08:42+0000\n"
-"Last-Translator: Albert F <[email protected]>\n"
+"POT-Creation-Date: 2016-07-21 22:05+0200\n"
+"PO-Revision-Date: 2016-08-18 21:31+0000\n"
+"Last-Translator: Roman Horník <[email protected]>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/osm-catala/osmbot/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,177 +60,170 @@ msgstr "Můžete zkusit jiné ohraničení, nebo jiné měřítko (úroveň při
 msgid "Good luck! "
 msgstr "Hodně štěstí!"
 
-#: bot/osmbot_blueprint.py:195
+#: bot/osmbot.py:249
 msgid "Results for"
 msgstr "Výsledky pro"
 
-#: bot/osmbot_blueprint.py:218
+#: bot/osmbot.py:272 bot/templates/inline_article.md:198
 msgid "Map"
 msgstr "Mapa"
 
-#: bot/osmbot_blueprint.py:221 bot/osmbot_blueprint.py:223
-#: bot/osmbot_blueprint.py:225 bot/osmbot_blueprint.py:227
-#: bot/osmbot_blueprint.py:232 bot/osmbot_blueprint.py:234
-#: bot/osmbot_blueprint.py:236 bot/osmbot_blueprint.py:238
+#: bot/osmbot.py:275 bot/osmbot.py:277 bot/osmbot.py:279 bot/osmbot.py:281
+#: bot/osmbot.py:286 bot/osmbot.py:288 bot/osmbot.py:290 bot/osmbot.py:292
 msgid "More info"
 msgstr "Více informací"
 
-#: bot/osmbot_blueprint.py:228
+#: bot/osmbot.py:282
 msgid "Phone"
 msgstr "Telefon"
 
-#: bot/osmbot_blueprint.py:240 bot/osmbot_blueprint.py:398
-#: bot/osmbot_blueprint.py:653 bot/osmbot_blueprint.py:662
-#: bot/templates/details_message.md:200 bot/templates/inline_article.md:197
+#: bot/osmbot.py:294 bot/osmbot.py:451 bot/osmbot.py:730 bot/osmbot.py:739
+#: bot/templates/details_message.md:199 bot/templates/inline_article.md:200
 msgid "OpenStreetMap contributors"
 msgstr "Přispěvatelé OpenStreetMap"
 
-#: bot/osmbot_blueprint.py:298 bot/osmbot_blueprint.py:301
-#: bot/osmbot_blueprint.py:303 bot/templates/details_message.md:2
-#: bot/templates/details_message.md:4 bot/templates/details_message.md:6
-#: bot/templates/inline_article.md:2 bot/templates/inline_article.md:4
-#: bot/templates/inline_article.md:6
+#: bot/osmbot.py:351 bot/osmbot.py:354 bot/osmbot.py:356
+#: bot/templates/details_message.md:2 bot/templates/details_message.md:4
+#: bot/templates/details_message.md:6 bot/templates/inline_article.md:2
+#: bot/templates/inline_article.md:4 bot/templates/inline_article.md:6
 msgid "Tags for"
 msgstr "Značky pro"
 
-#: bot/osmbot_blueprint.py:305 bot/osmbot_blueprint.py:307
-#: bot/templates/details_message.md:10 bot/templates/details_message.md:12
-#: bot/templates/inline_article.md:10 bot/templates/inline_article.md:12
+#: bot/osmbot.py:358 bot/osmbot.py:360 bot/templates/details_message.md:10
+#: bot/templates/details_message.md:12 bot/templates/inline_article.md:11
+#: bot/templates/inline_article.md:13
 msgid "European country"
 msgstr "Evropu"
 
-#: bot/osmbot_blueprint.py:309 bot/templates/details_message.md:14
-#: bot/templates/inline_article.md:14
+#: bot/osmbot.py:362 bot/templates/details_message.md:14
+#: bot/templates/inline_article.md:15
 msgid "African country"
 msgstr "Afriku"
 
-#: bot/osmbot_blueprint.py:311 bot/osmbot_blueprint.py:313
-#: bot/osmbot_blueprint.py:315 bot/templates/details_message.md:16
-#: bot/templates/details_message.md:18 bot/templates/details_message.md:20
-#: bot/templates/inline_article.md:16 bot/templates/inline_article.md:18
-#: bot/templates/inline_article.md:20
+#: bot/osmbot.py:364 bot/osmbot.py:366 bot/osmbot.py:368
+#: bot/templates/details_message.md:16 bot/templates/details_message.md:18
+#: bot/templates/details_message.md:20 bot/templates/inline_article.md:17
+#: bot/templates/inline_article.md:19 bot/templates/inline_article.md:21
 msgid "South american country"
 msgstr "Jižní Ameriku"
 
-#: bot/osmbot_blueprint.py:317 bot/osmbot_blueprint.py:319
-#: bot/templates/details_message.md:22 bot/templates/details_message.md:24
-#: bot/templates/inline_article.md:22 bot/templates/inline_article.md:24
+#: bot/osmbot.py:370 bot/osmbot.py:372 bot/templates/details_message.md:22
+#: bot/templates/details_message.md:24 bot/templates/inline_article.md:23
+#: bot/templates/inline_article.md:25
 msgid "North american country"
 msgstr "Severní Ameriku"
 
-#: bot/osmbot_blueprint.py:321 bot/templates/details_message.md:26
-#: bot/templates/inline_article.md:26
+#: bot/osmbot.py:374 bot/templates/details_message.md:26
+#: bot/templates/inline_article.md:27
 msgid "Central american country"
 msgstr "Střední Ameriku"
 
-#: bot/osmbot_blueprint.py:323 bot/osmbot_blueprint.py:325
-#: bot/templates/details_message.md:28 bot/templates/details_message.md:30
-#: bot/templates/inline_article.md:28 bot/templates/inline_article.md:30
+#: bot/osmbot.py:376 bot/osmbot.py:378 bot/templates/details_message.md:28
+#: bot/templates/details_message.md:30 bot/templates/inline_article.md:29
+#: bot/templates/inline_article.md:31
 msgid "American country"
 msgstr "Americký kontinent"
 
-#: bot/osmbot_blueprint.py:327 bot/templates/details_message.md:32
-#: bot/templates/inline_article.md:32
+#: bot/osmbot.py:380 bot/templates/details_message.md:32
+#: bot/templates/inline_article.md:33
 msgid "Asian country"
 msgstr "Asii"
 
-#: bot/osmbot_blueprint.py:329 bot/osmbot_blueprint.py:331
-#: bot/templates/details_message.md:34 bot/templates/details_message.md:36
-#: bot/templates/inline_article.md:34 bot/templates/inline_article.md:36
+#: bot/osmbot.py:382 bot/osmbot.py:384 bot/templates/details_message.md:34
+#: bot/templates/details_message.md:36 bot/templates/inline_article.md:35
+#: bot/templates/inline_article.md:37
 msgid "Oceanian country"
 msgstr "Oceánii"
 
-#: bot/osmbot_blueprint.py:333 bot/osmbot_blueprint.py:335
-#: bot/templates/details_message.md:38 bot/templates/details_message.md:40
-#: bot/templates/inline_article.md:38 bot/templates/inline_article.md:40
+#: bot/osmbot.py:386 bot/osmbot.py:388 bot/templates/details_message.md:38
+#: bot/templates/details_message.md:40 bot/templates/inline_article.md:39
+#: bot/templates/inline_article.md:41
 msgid "Eurasian country"
 msgstr "Eurasijský kontinent"
 
-#: bot/osmbot_blueprint.py:372 bot/osmbot_blueprint.py:374
-#: bot/templates/details_message.md:182 bot/templates/details_message.md:184
-#: bot/templates/inline_article.md:182 bot/templates/inline_article.md:184
+#: bot/osmbot.py:425 bot/osmbot.py:427 bot/templates/details_message.md:182
+#: bot/templates/details_message.md:184 bot/templates/inline_article.md:183
+#: bot/templates/inline_article.md:185
 msgid "inhabitants"
 msgstr "obyvatel"
 
-#: bot/osmbot_blueprint.py:372 bot/templates/details_message.md:182
-#: bot/templates/inline_article.md:182
+#: bot/osmbot.py:425 bot/templates/details_message.md:182
+#: bot/templates/inline_article.md:183
 msgid "at"
 msgstr "na"
 
-#: bot/osmbot_blueprint.py:377 bot/templates/details_message.md:187
-#: bot/templates/inline_article.md:187
+#: bot/osmbot.py:430 bot/templates/details_message.md:187
+#: bot/templates/inline_article.md:188
 msgid "meters"
 msgstr "metrech"
 
-#: bot/osmbot_blueprint.py:390 bot/templates/details_message.md:198
+#: bot/osmbot.py:443 bot/templates/details_message.md:197
 msgid "Raw data:"
 msgstr "Surová data:"
 
-#: bot/osmbot_blueprint.py:417 bot/osmbot_blueprint.py:419
-#: bot/osmbot_blueprint.py:464 bot/osmbot_blueprint.py:467
-#: bot/osmbot_blueprint.py:492 bot/osmbot_blueprint.py:495
-#: bot/osmbot_blueprint.py:510
+#: bot/osmbot.py:492 bot/osmbot.py:543 bot/osmbot.py:546 bot/osmbot.py:567
+#: bot/osmbot.py:591
 msgid "OSM contributors"
 msgstr "Přispěvatelé OSM"
 
-#: bot/osmbot_blueprint.py:428 bot/templates/send_location_message.md:1
+#: bot/osmbot.py:507 bot/templates/send_location_message.md:1
 msgid "Please send me your location"
 msgstr "Prosím, sdělte mi svou pozici"
 
-#: bot/osmbot_blueprint.py:429
+#: bot/osmbot.py:508
 msgid "to receive the map"
 msgstr "pro přijetí mapy"
 
-#: bot/osmbot_blueprint.py:430 bot/templates/send_location_message.md:2
+#: bot/osmbot.py:509 bot/templates/send_location_message.md:2
 msgid "You can do it with the Telegram paperclip button"
 msgstr "Můžete tak učunit tlačítkem sponky Telegramu"
 
-#: bot/osmbot_blueprint.py:636 bot/templates/not_recognized_message.md:1
+#: bot/osmbot.py:713 bot/templates/not_recognized_message.md:1
 msgid ""
 "Sorry, but now I can't recognize tags for this element, perhaps with my new "
 "features I will do it"
 msgstr "Omlouvám se, ale zrovna se mi nedaří rozpoznat značku tohoto elementu, možná tak budu moci udělat s mými novými vlastnostmi"
 
-#: bot/osmbot_blueprint.py:644 bot/osmbot_blueprint.py:659
+#: bot/osmbot.py:721 bot/osmbot.py:736
 msgid "Raw data for"
 msgstr "Surová data pro"
 
-#: bot/osmbot_blueprint.py:646 bot/osmbot_blueprint.py:661
+#: bot/osmbot.py:723 bot/osmbot.py:738
 msgid "Raw data"
 msgstr "Surová data"
 
-#: bot/osmbot_blueprint.py:809
+#: bot/osmbot.py:897
 msgid ""
 "Please indicate what are you searching with command /search <search_term>"
 msgstr "Prosím, uveďte co hledáte příkazem /search <vyhledávaný_termín>"
 
-#: bot/osmbot_blueprint.py:815
+#: bot/osmbot.py:903
 msgid "Use /search <search_term> command to indicate what you are searching"
 msgstr "Použijte příkaz /search <vyhledávaný_termín> pro vyhledávání"
 
-#: bot/osmbot_blueprint.py:899
+#: bot/osmbot_blueprint.py:97
 msgid ""
 "OpenStreetMap bot finds any location in world from the Nominatim OSM "
 "database and can send links and maps from OSM"
 msgstr "OpenStreetMap bot hledá jakékoliv místo na světě z OSM databáze Nominatim a může odesílat odkazy a mapy z OSM"
 
-#: bot/osmbot_blueprint.py:900
+#: bot/osmbot_blueprint.py:98
 msgid ""
 "OpenStreetMap bot finds any location in the world from the Nominatim OSM "
 "database"
 msgstr "OpenStreetMap bot vyhledává jakékoliv místo na světě z OSM databáze Nominatim"
 
-#: bot/osmbot_blueprint.py:901
+#: bot/osmbot_blueprint.py:99
 msgid "The bot can send links and maps (jpg, png or pdf) from OSM"
 msgstr "Bot umí z OSM posílat odkazy a mapy (jpg, png, nebo pdf)"
 
-#: bot/osmbot_blueprint.py:902
+#: bot/osmbot_blueprint.py:100
 msgid ""
 "Data for all the world (cities and towns, shops -with phone number, "
 "email...-, Wikipedia links, etc)"
 msgstr "Údaje pro celý svět (města a obce, obchody - s telefonními čísly, emailovou adresou, odkazy z Wikipedie atd.)"
 
-#: bot/osmbot_blueprint.py:903
+#: bot/osmbot_blueprint.py:101
 msgid "OSMbot is multilingual and speaks *your language here*"
 msgstr "OSMbot je vícejazyčný, umí i česky"
 
@@ -268,19 +261,19 @@ msgstr "Lokalizace"
 
 #: bot/templates/about_answer.md:9
 msgid "DOCUMENTATION"
-msgstr ""
+msgstr "DOKUMENTACE"
 
 #: bot/templates/about_answer.md:10
 msgid "OSMbot wiki"
-msgstr ""
+msgstr "Wiki OSMbot"
 
 #: bot/templates/about_answer.md:12
 msgid "NEWS"
 msgstr "NOVINKY"
 
 #: bot/templates/about_answer.md:13
 msgid "Twitter account"
-msgstr ""
+msgstr "Účet Twitteru"
 
 #: bot/templates/about_answer.md:14
 msgid "Telegram channel"
@@ -330,15 +323,15 @@ msgstr "Možná vám pomohu příkazem /help"
 msgid "What do you want to configure?"
 msgstr "Co si přejete nastavit?"
 
-#: bot/templates/details_message.md:42 bot/templates/inline_article.md:42
+#: bot/templates/details_message.md:42 bot/templates/inline_article.md:43
 msgid "Flag"
-msgstr ""
+msgstr "Vlajka"
 
-#: bot/templates/details_message.md:191 bot/templates/inline_article.md:191
+#: bot/templates/details_message.md:191 bot/templates/inline_article.md:192
 msgid "Wikidata"
 msgstr "Wikidata"
 
-#: bot/templates/details_message.md:194 bot/templates/inline_article.md:194
+#: bot/templates/details_message.md:194 bot/templates/inline_article.md:195
 msgid "Wikipedia"
 msgstr "Wikipedie"
 
@@ -473,10 +466,6 @@ msgstr "Nyní budu odpovídat při zmínce"
 msgid "Should I answer without a mention?"
 msgstr "Mohu odpovídat bez zmínky?"
 
-#: bot/templates/question_only_mention.md:1
-msgid "Answer only when mention?"
-msgstr ""
-
 #: bot/templates/send_location_message.md:1
 msgid "and I'll send you the nearest element"
 msgstr "a pošlu vám nejbližší element"