Changes of Revision b63a08a694559df962440a7561b65b45
| [-] [+] | Changed | _service:tar_git:harbour-osmscout-server.spec |
| [-] [+] | Changed | _service:tar_git:harbour-osmscout-server-1.12.0.tar.bz2/scripts/import/valhalla/tiles2packs/main.cpp ^ |
| @@ -9,7 +9,7 @@ const double tol = 1e-3; -std::string leaf(std::vector<int> levels, double lng, double lat, std::deque<double> steps) +std::string leaf(std::vector<int> levels, bool transit, double lng, double lat, std::deque<double> steps) { std::ostringstream ss; double step = steps.front(); @@ -21,16 +21,23 @@ midgard::AABB2<midgard::PointLL> bbox(lng+tol, lat+tol, lng+step-tol, lat+step-tol); std::vector<baldr::GraphId> ids; + std::vector<baldr::GraphId> transit_ids; for (int i: levels) { std::vector<baldr::GraphId> a = baldr::TileHierarchy::GetGraphIds(bbox, i); ids.insert( ids.end(), a.begin(), a.end() ); + if (transit && i == 2) transit_ids.insert( transit_ids.end(), a.begin(), a.end() ); } { std::ostringstream s1; for (const baldr::GraphId &gid: ids) s1 << "\"" << baldr::GraphTile::FileSuffix(gid) << "\", "; + for (const baldr::GraphId &gid: transit_ids) { + std::string t = baldr::GraphTile::FileSuffix(gid); + s1 << "\"" << 3 << t.substr(1) << "\", "; + } + std::string s = s1.str(); ss << s.substr(0, s.length()-2) << " ]"; @@ -43,7 +50,7 @@ double nstep = steps.front(); for (double nlat=lat; nlat < lat+step-tol; nlat += nstep) for (double nlng=lng; nlng < lng+step-tol; nlng += nstep) - s1 << leaf(levels, nlng, nlat, steps) << ", "; + s1 << leaf(levels, transit, nlng, nlat, steps) << ", "; std::string s = s1.str(); ss << s.substr(0, s.length()-2) << " ]"; } @@ -58,13 +65,15 @@ std::ostringstream ss; ss << "[ "; - for (int hier=0; hier < 2; hier++) + for (int hier=1; hier < 2; hier++) { std::vector<int> levels; std::deque<double> steps; + bool transit = false; if (hier > 0) { steps = {36,12,4,2,1}; levels = {1,2}; + transit = true; } else { steps = {36,12,4}; @@ -75,7 +84,7 @@ for (double lat=-90; lat < 90-tol; lat += step) for (double lng=-180; lng < 180-tol; lng += step) { - ss << leaf(levels, lng, lat, steps) << ",\n"; + ss << leaf(levels, transit, lng, lat, steps) << ",\n"; } } | ||
| [-] [+] | Changed | _service:tar_git:harbour-osmscout-server-1.12.0.tar.bz2/translations/harbour-osmscout-server-nl.ts ^ |
| @@ -43,7 +43,7 @@ <location filename="../qml/qtcontrols/AboutPage.qml" line="69"/> <location filename="../qml/silica/pages/AboutPage.qml" line="64"/> <source>UK postal codes downloaded from <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. These data contain: Ordnance Survey data © Crown copyright and database right 2017; Royal Mail data © Royal Mail copyright and database right 2017; National Statistics data © Crown copyright and database right 2017.</source> - <translation type="unfinished"></translation> + <translation>Postcodes voor het VK gedownload van <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. Deze gegevens bevatten: Ordnance Survey data © Crown copyright and database right 2017; Royal Mail data © Royal Mail copyright and database right 2017; National Statistics data © Crown copyright and database right 2017.</translation> </message> <message> <location filename="../qml/qtcontrols/AboutPage.qml" line="75"/> | ||
| [-] [+] | Changed | _service:tar_git:harbour-osmscout-server-1.12.0.tar.bz2/translations/harbour-osmscout-server-nl_BE.ts ^ |
| @@ -43,7 +43,7 @@ <location filename="../qml/qtcontrols/AboutPage.qml" line="69"/> <location filename="../qml/silica/pages/AboutPage.qml" line="64"/> <source>UK postal codes downloaded from <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. These data contain: Ordnance Survey data © Crown copyright and database right 2017; Royal Mail data © Royal Mail copyright and database right 2017; National Statistics data © Crown copyright and database right 2017.</source> - <translation type="unfinished"></translation> + <translation>Postcodes voor het VK gedownload van <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. Deze gegevens bevatten: Ordnance Survey data © Crown copyright and database right 2017; Royal Mail data © Royal Mail copyright and database right 2017; National Statistics data © Crown copyright and database right 2017.</translation> </message> <message> <location filename="../qml/qtcontrols/AboutPage.qml" line="75"/> | ||
| [-] [+] | Changed | _service:tar_git:harbour-osmscout-server-1.12.0.tar.bz2/translations/harbour-osmscout-server-ru.ts ^ |
| @@ -43,7 +43,7 @@ <location filename="../qml/qtcontrols/AboutPage.qml" line="69"/> <location filename="../qml/silica/pages/AboutPage.qml" line="64"/> <source>UK postal codes downloaded from <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. These data contain: Ordnance Survey data © Crown copyright and database right 2017; Royal Mail data © Royal Mail copyright and database right 2017; National Statistics data © Crown copyright and database right 2017.</source> - <translation type="unfinished"></translation> + <translation>Почтовые индексы Великобритании загружаются с <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. Эти данные содержат: данные Государственной топографической службы © копирайт государства и права на базу данных 2017; данные Royal Mail © копирайт Royal Mail и права на базу данных 2017; Национальные статистические данные © копирайт государства и права на базу данных 2017.</translation> </message> <message> <location filename="../qml/qtcontrols/AboutPage.qml" line="75"/> | ||
| [-] [+] | Changed | _service:tar_git:harbour-osmscout-server-1.12.0.tar.bz2/translations/harbour-osmscout-server-sv.ts ^ |
| @@ -43,7 +43,7 @@ <location filename="../qml/qtcontrols/AboutPage.qml" line="69"/> <location filename="../qml/silica/pages/AboutPage.qml" line="64"/> <source>UK postal codes downloaded from <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. These data contain: Ordnance Survey data © Crown copyright and database right 2017; Royal Mail data © Royal Mail copyright and database right 2017; National Statistics data © Crown copyright and database right 2017.</source> - <translation type="unfinished"></translation> + <translation>Engelska postnummer nerladdade från <a href='https://www.freemaptools.com/download-uk-postcode-lat-lng.htm'>FreeMapTools</a>. Dessa data innehåller: Ordnance Survey data © Crown copyright och databasrättighet 2017; Royal Mail data © Royal Mail copyright och databasrättighet 2017; National Statistics data © Crown copyright och databasrättighet 2017.</translation> </message> <message> <location filename="../qml/qtcontrols/AboutPage.qml" line="75"/> | ||
| [-] [+] | Changed | _service:tar_git:harbour-osmscout-server.yaml ^ |
| @@ -1,6 +1,6 @@ Name: harbour-osmscout-server Summary: OSM Scout Server -Version: 1.11.0 +Version: 1.12.0 Release: 1 # The contents of the Group field should be one of the groups listed here: # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS | ||