Skip to content

Commit

Permalink
Fix adding wms errors
Browse files Browse the repository at this point in the history 
Add action for create service in qms.nextgis.com
Add icons
  • Loading branch information
@alisovenko
alisovenko committed Dec 25, 2016
1 parent af4db32 commit 39834b1
Show file tree
Hide file tree
Showing 11 changed files with 3,051 additions and 168 deletions.
845 changes: 845 additions & 0 deletions images/mActionSearch.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
470 changes: 334 additions & 136 deletions images/mapservices.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/data_source_serializer.py
View file
Expand Up @@ -124,9 +124,20 @@ def read_from_json(cls, json_data):
if ds.type.lower() == KNOWN_DRIVERS.WMS.lower():
ds.wms_url = json_data['url']
ds.wms_params = json_data['params']
if ds.wms_params is None:
ds.wms_params = ""

ds.wms_layers = json_data['layers']
ds.wms_turn_over = json_data['turn_over']

ds.format = json_data['format']
if ds.format is None:
ds.format = 'image/png'
ds.wms_params += '&format=' + ds.format

epsg = json_data['epsg']
if epsg is not None:
ds.wms_params += '&crs=EPSG:' + str(epsg)

#WFS
if ds.type.lower() == KNOWN_DRIVERS.WFS.lower():
Expand Down
Binary file modified src/i18n/QuickMapServices_ru.qm
View file
Binary file not shown.
45 changes: 30 additions & 15 deletions src/i18n/QuickMapServices_ru.ts
View file
Expand Up @@ -4,12 +4,12 @@
<context>
<name>@default</name>
<message>
<location filename="qgis_map_helpers.py" line="110"/>
<location filename="qgis_map_helpers.py" line="111"/>
<source>Layer %s can&apos;t be added to the map!</source>
<translation>Слой %s невозможно добавить на карту!</translation>
</message>
<message>
<location filename="qgis_map_helpers.py" line="111"/>
<location filename="qgis_map_helpers.py" line="112"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
Expand Down Expand Up @@ -634,17 +634,17 @@ p, li { white-space: pre-wrap; }
<context>
<name>QmsServiceToolbox</name>
<message>
<location filename="qms_service_toolbox.py" line="86"/>
<location filename="qms_service_toolbox.py" line="97"/>
<source>Search string...</source>
<translation>Поиск геосервиса...</translation>
</message>
<message>
<location filename="qms_service_toolbox.py" line="148"/>
<location filename="qms_service_toolbox.py" line="161"/>
<source>Searching...</source>
<translation>Поиск...</translation>
</message>
<message>
<location filename="qms_service_toolbox.py" line="172"/>
<location filename="qms_service_toolbox.py" line="212"/>
<source>No results!</source>
<translation>Нет результатов!</translation>
</message>
Expand All @@ -654,9 +654,9 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">QMS Service</translation>
</message>
<message>
<location filename="qms_service_toolbox.py" line="132"/>
<location filename="qms_service_toolbox.py" line="144"/>
<source>Last used:</source>
<translation>Недавно использовавшийся:</translation>
<translation>Недавно использованы:</translation>
</message>
<message>
<location filename="qms_service_toolbox.ui" line="14"/>
Expand All @@ -666,7 +666,17 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="qms_service_toolbox.ui" line="24"/>
<source>Enter part of service&apos;s name</source>
<translation type="unfinished"></translation>
<translation>Введите часть имени сервиса</translation>
</message>
<message>
<location filename="qms_service_toolbox.py" line="174"/>
<source>No results.</source>
<translation>Ничего не найдено.</translation>
</message>
<message>
<location filename="qms_service_toolbox.py" line="174"/>
<source>You can add a service to become searchable. Start &lt;a href=&apos;{}&apos;&gt;here&lt;/a&gt;.</source>
<translation>Вы можете &lt;a href=&apos;{}&apos;&gt;добавить сервис&lt;/a&gt; самостоятельно, и он станет доступен через поиск.</translation>
</message>
</context>
<context>
Expand All @@ -677,22 +687,22 @@ p, li { white-space: pre-wrap; }
<translation>QuickMapServices</translation>
</message>
<message>
<location filename="quick_map_services.py" line="214"/>
<location filename="quick_map_services.py" line="226"/>
<source>Set proper scale</source>
<translation>Ближайший масштаб</translation>
</message>
<message>
<location filename="quick_map_services.py" line="220"/>
<location filename="quick_map_services.py" line="232"/>
<source>Set SlippyMap scales</source>
<translation>Установить масштабы SlippyMap</translation>
</message>
<message>
<location filename="quick_map_services.py" line="229"/>
<location filename="quick_map_services.py" line="238"/>
<source>Settings</source>
<translation>Настройки</translation>
</message>
<message>
<location filename="quick_map_services.py" line="235"/>
<location filename="quick_map_services.py" line="244"/>
<source>About</source>
<translation>Инфо</translation>
</message>
Expand All @@ -714,22 +724,27 @@ The previous settings will be overwritten!</source>
<translation>Невозможно создать дополнительные директории для %s: %s %s</translation>
</message>
<message>
<location filename="quick_map_services.py" line="314"/>
<location filename="quick_map_services.py" line="321"/>
<source>Search QMS</source>
<translation>Поиск в QMS</translation>
</message>
<message>
<location filename="quick_map_services.py" line="218"/>
<source>Add to Search</source>
<translation>Добавить в Поиск</translation>
</message>
</context>
<context>
<name>SearchThread</name>
<message>
<location filename="qms_service_toolbox.py" line="311"/>
<location filename="qms_service_toolbox.py" line="353"/>
<source>Network error!
{0}</source>
<translation>Сетевая ошибка!
{0}</translation>
</message>
<message>
<location filename="qms_service_toolbox.py" line="315"/>
<location filename="qms_service_toolbox.py" line="357"/>
<source>Error of processing!
{0}: {1}</source>
<translation>Ошибка обработки!
Expand Down

0 comments on commit 39834b1

Please sign in to comment.