Hello community, here is the log from the commit of package gnome-maps for openSUSE:Factory checked in at 2019-06-03 18:49:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-maps (Old) and /work/SRC/openSUSE:Factory/.gnome-maps.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-maps" Mon Jun 3 18:49:36 2019 rev:46 rq:704774 version:3.32.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-maps/gnome-maps.changes 2019-05-10 09:16:40.572175860 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-maps.new.5148/gnome-maps.changes 2019-06-03 18:49:56.980545842 +0200 @@ -1,0 +2,10 @@ +Wed May 22 13:04:03 UTC 2019 - Bjørn Lie <bjorn....@gmail.com> + +- Update to version 3.32.2.1: + + Make the shape layer renderer use the tile size specified in + the dynamic service file, fixing an issue with misaligned shape + layer (GeoJSON, GPX, KML) rendering with the new 512 pixel + tiles. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-maps-3.32.2.tar.xz New: ---- gnome-maps-3.32.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-maps.spec ++++++ --- /var/tmp/diff_new_pack.rdfJuX/_old 2019-06-03 18:49:57.892545529 +0200 +++ /var/tmp/diff_new_pack.rdfJuX/_new 2019-06-03 18:49:57.896545527 +0200 @@ -17,7 +17,7 @@ Name: gnome-maps -Version: 3.32.2 +Version: 3.32.2.1 Release: 0 Summary: Maps Application for GNOME License: GPL-2.0-or-later ++++++ gnome-maps-3.32.2.tar.xz -> gnome-maps-3.32.2.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.32.2/NEWS new/gnome-maps-3.32.2.1/NEWS --- old/gnome-maps-3.32.2/NEWS 2019-05-06 20:48:27.000000000 +0200 +++ new/gnome-maps-3.32.2.1/NEWS 2019-05-21 23:08:12.000000000 +0200 @@ -1,3 +1,18 @@ +3.32.2.1 - May 21, 2019 +========================= + +Changes since 3.32.2 + - Make the shape layer renderer use the tile size specified in the dynamic + service file, fixing an issue with misaligned shape layer (GeoJSON, GPX, KML) + rendering with the new 512 pixel tiles + +Added/updated/fixed translations + - Chinese (China) + +All contributors to this release +Dz Chen <wsxy...@gmail.com> +Marcus Lundblad <m...@update.uu.se> + 3.32.2 - May 6, 2019 ========================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.32.2/data/org.gnome.Maps.appdata.xml.in new/gnome-maps-3.32.2.1/data/org.gnome.Maps.appdata.xml.in --- old/gnome-maps-3.32.2/data/org.gnome.Maps.appdata.xml.in 2019-05-06 20:48:27.000000000 +0200 +++ new/gnome-maps-3.32.2.1/data/org.gnome.Maps.appdata.xml.in 2019-05-21 23:08:12.000000000 +0200 @@ -39,6 +39,13 @@ </screenshot> </screenshots> <releases> + <release date="2019-05-21" version="3.32.2.1"> + <description> + <ul> + <li>Fix misaligned rendering of shape layers with the new map tiles</li> + </ul> + </description> + </release> <release date="2019-05-06" version="3.32.2"> <description> <ul> @@ -103,3 +110,4 @@ </content_rating> </component> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.32.2/meson.build new/gnome-maps-3.32.2.1/meson.build --- old/gnome-maps-3.32.2/meson.build 2019-05-06 20:48:27.000000000 +0200 +++ new/gnome-maps-3.32.2.1/meson.build 2019-05-21 23:08:12.000000000 +0200 @@ -1,5 +1,5 @@ project('gnome-maps', 'c', - version: '3.32.2', + version: '3.32.2.1', license: 'GPL2+' ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.32.2/po/zh_CN.po new/gnome-maps-3.32.2.1/po/zh_CN.po --- old/gnome-maps-3.32.2/po/zh_CN.po 2019-05-06 20:48:27.000000000 +0200 +++ new/gnome-maps-3.32.2.1/po/zh_CN.po 2019-05-21 23:08:12.000000000 +0200 @@ -1,25 +1,25 @@ # Chinese (China) translation for gnome-maps. -# Copyright (C) 2013-2018 gnome-maps's COPYRIGHT HOLDER +# Copyright (C) 2013-2019 gnome-maps's COPYRIGHT HOLDER # This file is distributed under the same license as the gnome-maps package. # tuhaihe <113232173...@gmail.com>, 2013. # Tong Hui <tongh...@gmail.com>, 2014. # YunQiang Su <wzss...@gmail.com>, 2015, 2016. # Mingcong Bai <jeff...@aosc.xyz>, 2015, 2016, 2017, 2018. -# Dingzhong Chen <wsxy162@@gmail.com>, 2015-2018. +# Dingzhong Chen <wsxy...@gmail.com>, 2015, 2016, 2017, 2018, 2019. # msgid "" msgstr "" -"Project-Id-Version: gnome-maps master\n" +"Project-Id-Version: gnome-maps 3.32\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-maps/issues\n" -"POT-Creation-Date: 2018-05-21 18:57+0000\n" -"PO-Revision-Date: 2018-05-23 22:20+0800\n" -"Last-Translator: Mingcong Bai <jeff...@aosc.xyz>\n" +"POT-Creation-Date: 2019-04-08 19:15+0000\n" +"PO-Revision-Date: 2019-04-13 21:41+0800\n" +"Last-Translator: Dingzhong Chen <wsxy...@gmail.com>\n" "Language-Team: Chinese (China) <i18n...@googlegroups.com>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.2.1\n" "Plural-Forms: nplurals=1; plural=0;\n" #: data/org.gnome.Maps.appdata.xml.in:6 @@ -57,8 +57,15 @@ "near Alexanderplatz, Berlin”。" #. Translators: This is the program name. -#: data/org.gnome.Maps.desktop.in:4 data/ui/main-window.ui:8 -#: src/application.js:85 src/mainWindow.js:514 +#. for some reason, setting the title of the window through the .ui +#. * template does not work anymore (maybe has something to do with +#. * setting a custom title on the headerbar). Setting it programmatically +#. * here works though. And yields a proper label in the gnome-shell +#. * overview. +#. +#. Translators: This is the program name. +#: data/org.gnome.Maps.desktop.in:4 data/ui/main-window.ui:26 +#: src/application.js:83 src/mainWindow.js:138 src/mainWindow.js:508 msgid "Maps" msgstr "地图" @@ -66,11 +73,6 @@ msgid "A simple maps application" msgstr "一款简单的地图应用程序" -#. Translators: Do NOT translate or transliterate this text (this is an icon file name)! -#: data/org.gnome.Maps.desktop.in:8 -msgid "org.gnome.Maps" -msgstr "org.gnome.Maps" - #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! #: data/org.gnome.Maps.desktop.in:14 msgid "Maps;" @@ -94,7 +96,7 @@ #: data/org.gnome.Maps.gschema.xml:17 msgid "Window size (width and height)." -msgstr "窗口大小(宽度和高度)。" +msgstr "窗口大小(宽度和高度)。" #: data/org.gnome.Maps.gschema.xml:21 msgid "Window position" @@ -102,7 +104,7 @@ #: data/org.gnome.Maps.gschema.xml:22 msgid "Window position (X and Y)." -msgstr "窗口位置(水平和竖直)。" +msgstr "窗口位置(水平和竖直)。" #: data/org.gnome.Maps.gschema.xml:26 msgid "Window maximized" @@ -197,22 +199,6 @@ msgid "Last used transportation type for routing" msgstr "载入用过的交通类型来规划路线" -#: data/ui/app-menu.ui:7 -msgid "Set up OpenStreetMap Account" -msgstr "建立 OpenStreetMap 帐号" - -#: data/ui/app-menu.ui:12 -msgid "_Keyboard Shortcuts" -msgstr "键盘快捷键(_K)" - -#: data/ui/app-menu.ui:17 -msgid "About" -msgstr "关于" - -#: data/ui/app-menu.ui:21 -msgid "Quit" -msgstr "退出" - #: data/ui/check-in-dialog.ui:250 data/ui/check-in-dialog.ui:299 msgid "Visibility" msgstr "可见性" @@ -362,64 +348,81 @@ msgstr "打开图形图层" #. Translators: This string uses ellipsis character -#: data/ui/layers-popover.ui:71 +#: data/ui/layers-popover.ui:69 msgid "Open Shape Layer…" msgstr "打开形状图层…" -#: data/ui/location-service-notification.ui:13 +#: data/ui/location-service-dialog.ui:16 msgid "Turn on location services to find your location" msgstr "开启定位服务来获取您的位置" -#: data/ui/location-service-notification.ui:20 +#: data/ui/location-service-dialog.ui:28 data/ui/osm-edit-dialog.ui:283 +#: data/ui/zoom-in-dialog.ui:28 +msgid "Cancel" +msgstr "取消" + +#: data/ui/location-service-dialog.ui:38 msgid "Location Settings" msgstr "地点设置" +#: data/ui/main-window.ui:8 +msgid "Set up OpenStreetMap Account" +msgstr "建立 OpenStreetMap 帐号" + +#: data/ui/main-window.ui:13 +msgid "_Keyboard Shortcuts" +msgstr "键盘快捷键(_K)" + +#: data/ui/main-window.ui:18 +msgid "About Maps" +msgstr "关于地图" + #. Translators: This is a tooltip -#: data/ui/main-window.ui:23 +#: data/ui/main-window.ui:41 msgid "Go to current location" msgstr "转到当前位置" #. Translators: This is a tooltip -#: data/ui/main-window.ui:44 +#: data/ui/main-window.ui:62 msgid "Choose map type" msgstr "选择地图类型" #. Translators: This is a tooltip -#: data/ui/main-window.ui:69 +#: data/ui/main-window.ui:87 msgid "Zoom out" msgstr "缩小" #. Translators: This is a tooltip -#: data/ui/main-window.ui:85 +#: data/ui/main-window.ui:103 msgid "Zoom in" msgstr "放大" #. Translators: This is a tooltip -#: data/ui/main-window.ui:103 +#: data/ui/main-window.ui:142 msgid "Toggle route planner" msgstr "切换路线规划器" #. Translators: This is a tooltip -#: data/ui/main-window.ui:124 +#: data/ui/main-window.ui:163 msgid "Toggle favorites" msgstr "切换喜爱" #. Translators: This is a tooltip -#: data/ui/main-window.ui:144 +#: data/ui/main-window.ui:183 msgid "Print Route" msgstr "打印路线" -#: data/ui/main-window.ui:202 +#: data/ui/main-window.ui:246 msgid "Maps is offline!" msgstr "地图应用处于离线!" -#: data/ui/main-window.ui:212 +#: data/ui/main-window.ui:256 msgid "" "Maps need an active internet connection to function properly, but one can’t " "be found." msgstr "地图应用需要有效的网络连接才能正常运行,但是未发现有效连接。" -#: data/ui/main-window.ui:221 +#: data/ui/main-window.ui:265 msgid "Check your connection and proxy settings." msgstr "请检查您的网络连接和代理设置。" @@ -560,10 +563,6 @@ msgid "Edit on OpenStreetMap" msgstr "在 OpenStreetMap 上编辑" -#: data/ui/osm-edit-dialog.ui:283 -msgid "Cancel" -msgstr "取消" - #: data/ui/osm-edit-dialog.ui:310 src/osmEditDialog.js:512 msgid "Next" msgstr "下一步" @@ -599,7 +598,7 @@ msgid "_Open" msgstr "打开(_O)" -#: data/ui/shape-layer-file-chooser.ui:4 src/mainWindow.js:62 +#: data/ui/shape-layer-file-chooser.ui:4 src/mainWindow.js:61 msgid "Open Shape Layer" msgstr "打开图形图层" @@ -608,15 +607,15 @@ msgid "Toggle visible" msgstr "切换可见" -#: data/ui/sidebar.ui:266 +#: data/ui/sidebar.ui:275 msgid "Route search by GraphHopper" msgstr "通过 GraphHopper 搜索路线" -#: data/ui/sidebar.ui:287 +#: data/ui/sidebar.ui:296 msgid "Route search by OpenTripPlanner" msgstr "通过 OpenTripPlanner 搜索路线" -#: data/ui/sidebar.ui:360 +#: data/ui/sidebar.ui:369 msgid "" "Routing itineraries for public transit is provided by GNOME\n" "using timetable data obtained from transit companies or agencies.\n" @@ -694,13 +693,13 @@ msgid "Accuracy: %s" msgstr "位置精度:%s" -#: data/ui/zoom-in-notification.ui:12 +#: data/ui/zoom-in-dialog.ui:16 msgid "Zoom in to add location!" msgstr "放大以添加地点!" -#: data/ui/zoom-in-notification.ui:19 -msgid "OK" -msgstr "确定" +#: data/ui/zoom-in-dialog.ui:38 +msgid "Zoom In" +msgstr "放大" #: lib/maps-file-tile-source.c:303 lib/maps-file-tile-source.c:379 #: lib/maps-file-tile-source.c:459 @@ -711,19 +710,19 @@ msgid "Failed to parse XML document" msgstr "解析 XML 文档失败" -#: lib/maps-osm.c:252 lib/maps-osm.c:405 +#: lib/maps-osm.c:249 lib/maps-osm.c:402 msgid "Missing required attributes" msgstr "缺失需要的属性" -#: lib/maps-osm.c:453 +#: lib/maps-osm.c:450 msgid "Could not find OSM element" msgstr "找不到 OSM 元素" -#: src/application.js:98 +#: src/application.js:96 msgid "A path to a local tiles directory structure" msgstr "指向本地区块目录结构的路径" -#: src/application.js:102 +#: src/application.js:100 msgid "Show the version of the program" msgstr "显示该程序的版本" @@ -785,23 +784,23 @@ "this account" msgstr "证书已过期,请打开“在线帐号”登录并启用此帐号" -#: src/contextMenu.js:95 +#: src/contextMenu.js:98 msgid "Route from here" msgstr "从此处出发的路径" -#: src/contextMenu.js:97 +#: src/contextMenu.js:100 msgid "Add destination" msgstr "添加目的地" -#: src/contextMenu.js:99 +#: src/contextMenu.js:102 msgid "Route to here" msgstr "前往此处的路径" -#: src/contextMenu.js:128 +#: src/contextMenu.js:131 msgid "Nothing found here!" msgstr "这里什么都没有找到!" -#: src/contextMenu.js:185 +#: src/contextMenu.js:192 msgid "" "Location was added to the map, note that it may take a while before it shows " "on the map and in search results." @@ -848,27 +847,27 @@ msgid "unknown geometry" msgstr "未知几何方位" -#: src/graphHopper.js:89 src/openTripPlanner.js:656 +#: src/graphHopper.js:93 src/openTripPlanner.js:652 msgid "Route request failed." msgstr "路线请求失败。" -#: src/graphHopper.js:97 src/openTripPlanner.js:619 +#: src/graphHopper.js:100 src/openTripPlanner.js:615 msgid "No route found." msgstr "没有找到路线。" -#: src/graphHopper.js:189 +#: src/graphHopper.js:188 msgid "Start!" msgstr "开始!" -#: src/mainWindow.js:59 +#: src/mainWindow.js:58 msgid "All Layer Files" msgstr "全部图层文件" -#: src/mainWindow.js:452 +#: src/mainWindow.js:441 msgid "Failed to connect to location service" msgstr "无法连接到定位服务" -#: src/mainWindow.js:512 +#: src/mainWindow.js:506 msgid "translator-credits" msgstr "" "tuhaihe <113232173...@gmail.com>, 2013\n" @@ -876,15 +875,15 @@ "Mingcong Bai <jeff...@aosc.xyz>, 2015, 2016, 2017, 2018\n" "Dingzhong Chen <wsxy...@gmail.com>, 2015-2018" -#: src/mainWindow.js:515 +#: src/mainWindow.js:509 msgid "A map application for GNOME" msgstr "一款 GNOME 地图应用程序" -#: src/mainWindow.js:526 -msgid "Copyright © 2011 – 2017 Red Hat, Inc. and The GNOME Maps authors" -msgstr "Copyright © 2011 – 2017 Red Hat, Inc. 和 GNOME 地图作者" +#: src/mainWindow.js:520 +msgid "Copyright © 2011 – 2019 Red Hat, Inc. and The GNOME Maps authors" +msgstr "版权所有 © 2011 – 2019 红帽公司和 GNOME 地图作者" -#: src/mainWindow.js:545 +#: src/mainWindow.js:539 #, javascript-format msgid "Map data by %s and contributors" msgstr "地图数据来自 %s 和贡献者" @@ -894,32 +893,24 @@ #. * the bare name of the tile provider, or a linkified URL if one #. * is available #. -#: src/mainWindow.js:561 +#: src/mainWindow.js:555 #, javascript-format msgid "Map tiles provided by %s" msgstr "地图图块由 %s 提供" -#: src/mapView.js:350 +#: src/mapView.js:358 msgid "File type is not supported" msgstr "文件类型未支持" -#: src/mapView.js:357 +#: src/mapView.js:365 msgid "Failed to open layer" msgstr "打开图层失败" -#: src/mapView.js:393 +#: src/mapView.js:401 msgid "Failed to open GeoURI" msgstr "打开 GeoURI 失败" -#: src/openTripPlanner.js:613 -msgid "No earlier alternatives found." -msgstr "找不到上一个替代方案。" - -#: src/openTripPlanner.js:614 -msgid "No later alternatives found." -msgstr "找不到下一个替代方案。" - -#: src/openTripPlanner.js:652 +#: src/openTripPlanner.js:648 msgid "No timetable data found for this route." msgstr "找不到该路线的时间表信息。" @@ -989,7 +980,7 @@ "电话号码。使用国际格式,以 + 加号开头。留心当地的隐私法律,特别是对于私人电话" "号码。" -#: src/osmEditDialog.js:136 src/placeBubble.js:173 +#: src/osmEditDialog.js:136 src/placeBubble.js:191 msgid "Wikipedia" msgstr "维基百科" @@ -1184,35 +1175,35 @@ msgid "Done" msgstr "完成" -#: src/placeBubble.js:125 +#: src/placeBubble.js:143 msgid "Population:" msgstr "人口总数:" -#: src/placeBubble.js:131 +#: src/placeBubble.js:149 msgid "Altitude:" msgstr "海拔:" -#: src/placeBubble.js:136 +#: src/placeBubble.js:154 msgid "Opening hours:" msgstr "开放时间:" -#: src/placeBubble.js:141 +#: src/placeBubble.js:159 msgid "Internet access:" msgstr "网络接入:" -#: src/placeBubble.js:146 +#: src/placeBubble.js:164 msgid "Religion:" msgstr "宗教:" -#: src/placeBubble.js:151 +#: src/placeBubble.js:169 msgid "Toilets:" msgstr "洗手间:" -#: src/placeBubble.js:156 +#: src/placeBubble.js:174 msgid "Wheelchair access:" msgstr "轮椅通行:" -#: src/placeBubble.js:162 src/placeBubble.js:166 +#: src/placeBubble.js:180 src/placeBubble.js:184 msgid "Phone:" msgstr "电话:" @@ -1278,21 +1269,21 @@ msgstr "中止打印" #. Translators: this is add via location tooltip -#: src/routeEntry.js:72 +#: src/routeEntry.js:74 msgid "Add via location" msgstr "通过位置添加" #. Translators: this is remove via location tooltip -#: src/routeEntry.js:78 +#: src/routeEntry.js:84 msgid "Remove via location" msgstr "通过位置移除" #. Translators: this is reverse route tooltip -#: src/routeEntry.js:84 +#: src/routeEntry.js:90 msgid "Reverse route" msgstr "反向路线" -#: src/sendToDialog.js:176 +#: src/sendToDialog.js:175 msgid "Failed to open URI" msgstr "打开 URI 失败" @@ -1301,7 +1292,7 @@ msgstr "载入文件失败" #. Translators: %s is a time expression with the format "%f h" or "%f min" -#: src/sidebar.js:292 +#: src/sidebar.js:293 #, javascript-format msgid "Estimated time: %s" msgstr "估计时间:%s" @@ -1358,6 +1349,14 @@ msgid "Load later alternatives" msgstr "载入下一个替代方案" +#: src/transitMoreRow.js:54 +msgid "No earlier alternatives found." +msgstr "找不到上一个替代方案。" + +#: src/transitMoreRow.js:56 +msgid "No later alternatives found." +msgstr "找不到下一个替代方案。" + #. #. * Translators: this is a format string giving the equivalent to #. * "may 29" according to the current locale's convensions. @@ -1372,7 +1371,7 @@ #. * "12:00 – 13:03" where the placeholder %s are the actual times, #. * these could be rearranged if needed. #. -#: src/transitPlan.js:249 +#: src/transitPlan.js:254 #, javascript-format msgid "%s – %s" msgstr "%s - %s" @@ -1381,7 +1380,7 @@ #. * less than an hour, with only the minutes part, using plural forms #. * as appropriate #. -#: src/transitPlan.js:276 +#: src/transitPlan.js:281 #, javascript-format msgid "%d minute" msgid_plural "%d minutes" @@ -1391,7 +1390,7 @@ #. * where the duration is an exact number of hours (i.e. no #. * minutes part), using plural forms as appropriate #. -#: src/transitPlan.js:287 +#: src/transitPlan.js:292 #, javascript-format msgid "%d hour" msgid_plural "%d hours" @@ -1401,7 +1400,7 @@ #. * where the duration contains an hour and minute part, it's #. * pluralized on the hours part #. -#: src/transitPlan.js:293 +#: src/transitPlan.js:298 #, javascript-format msgid "%d:%02d hour" msgid_plural "%d:%02d hours" @@ -1413,7 +1412,7 @@ #. * "12:00–13:03" where the placeholder %s are the actual times, #. * these could be rearranged if needed. #. -#: src/transitPlan.js:642 +#: src/transitPlan.js:651 #, javascript-format msgid "%s–%s" msgstr "%s-%s" @@ -1567,54 +1566,66 @@ msgstr "服务" #. Translators: Accuracy of user location information -#: src/utils.js:226 +#: src/utils.js:227 msgid "Unknown" msgstr "未知" #. Translators: Accuracy of user location information -#: src/utils.js:229 +#: src/utils.js:230 msgid "Exact" msgstr "准确" -#: src/utils.js:287 +#: src/utils.js:288 #, javascript-format msgid "%f h" msgstr "%f 小时" -#: src/utils.js:289 +#: src/utils.js:290 #, javascript-format msgid "%f min" msgstr "%f 分钟" -#: src/utils.js:291 +#: src/utils.js:292 #, javascript-format msgid "%f s" msgstr "%f 秒" #. Translators: This is a distance measured in kilometers -#: src/utils.js:302 +#: src/utils.js:303 #, javascript-format msgid "%s km" msgstr "%s 千米" #. Translators: This is a distance measured in meters -#: src/utils.js:305 +#: src/utils.js:306 #, javascript-format msgid "%s m" msgstr "%s 米" #. Translators: This is a distance measured in miles -#: src/utils.js:313 +#: src/utils.js:314 #, javascript-format msgid "%s mi" msgstr "%s 英里" #. Translators: This is a distance measured in feet -#: src/utils.js:316 +#: src/utils.js:317 #, javascript-format msgid "%s ft" msgstr "%s 英尺" +#~ msgid "The GNOME Project" +#~ msgstr "GNOME 项目" + +#~ msgid "org.gnome.Maps" +#~ msgstr "org.gnome.Maps" + +#~ msgid "Quit" +#~ msgstr "退出" + +#~ msgid "OK" +#~ msgstr "确定" + #~ msgid "Open Shape Layer…" #~ msgstr "打开图形图层…" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.32.2/src/geoJSONSource.js new/gnome-maps-3.32.2.1/src/geoJSONSource.js --- old/gnome-maps-3.32.2/src/geoJSONSource.js 2019-05-06 20:48:27.000000000 +0200 +++ new/gnome-maps-3.32.2.1/src/geoJSONSource.js 2019-05-21 23:08:12.000000000 +0200 @@ -28,13 +28,11 @@ const Location = imports.location; const Place = imports.place; const PlaceMarker = imports.placeMarker; +const Service = imports.service; const Utils = imports.utils; const GeoJSONStyle = imports.geoJSONStyle; const MapView = imports.mapView; - -const TILE_SIZE = 256; - const TileFeature = { POINT: 1, LINESTRING: 2, POLYGON: 3 }; @@ -48,6 +46,7 @@ this._mapView = params.mapView; this._markerLayer = params.markerLayer; this._bbox = new Champlain.BoundingBox(); + this._tileSize = Service.getService().tiles.street.tile_size; } get bbox() { @@ -55,7 +54,7 @@ } vfunc_get_tile_size() { - return TILE_SIZE; + return this._tileSize; } vfunc_get_max_zoom_level() { @@ -211,17 +210,17 @@ parse(json) { this._parseInternal(json); - this._tileIndex = Geojsonvt.geojsonvt(json, { extent: TILE_SIZE, + this._tileIndex = Geojsonvt.geojsonvt(json, { extent: this._tileSize, maxZoom: 20 }); this._clampBBox(); } _renderTile(tile) { let tileJSON = this._tileIndex.getTile(tile.zoom_level, tile.x, tile.y); - let content = new Clutter.Canvas({ width: TILE_SIZE, - height: TILE_SIZE }); - tile.content = new Clutter.Actor({ width: TILE_SIZE, - height: TILE_SIZE, + let content = new Clutter.Canvas({ width: this._tileSize, + height: this._tileSize }); + tile.content = new Clutter.Actor({ width: this._tileSize, + height: this._tileSize, content: content }); content.connect('draw', (canvas, cr) => {