|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -3,7 +3,7 @@
<service name="tar_git">
<param name="url">https://github.com/Karry/osmscout-sailfish.git</param>
<param name="branch">master</param>
- <param name="revision">v2.26</param>
+ <param name="revision">v2.27</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/CMakeLists.txt
^
|
| @@ -6,7 +6,7 @@
# Redistribution and use is allowed according to the terms of the BSD license.
cmake_policy(SET CMP0048 NEW)
-project(osmscout-sailfish VERSION 2.26.0 LANGUAGES C CXX)
+project(osmscout-sailfish VERSION 2.27.0 LANGUAGES C CXX)
# ==================================================================================================
# Information to update before to release this package.
@@ -307,6 +307,7 @@
src/Arguments.h
src/Storage.h
src/CollectionModel.h
+ src/CollectionStatisticsModel.h
src/CollectionListModel.h
src/QVariantConverters.h
src/CollectionTrackModel.h
@@ -381,6 +382,7 @@
qml/pages/RouteDescription.qml
qml/pages/Collections.qml
qml/pages/Collection.qml
+ qml/pages/CollectionStatistics.qml
qml/pages/CollectionTrack.qml
qml/pages/CollectionWaypoint.qml
qml/pages/CollectionOrdering.qml
@@ -405,6 +407,7 @@
src/OSMScout.cpp
src/Storage.cpp
src/CollectionModel.cpp
+ src/CollectionStatisticsModel.cpp
src/CollectionListModel.cpp
src/CollectionTrackModel.cpp
src/CollectionMapBridge.cpp
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Demos/src/LookupText.cpp
^
|
| @@ -154,7 +154,7 @@
// search using the text input as the query
osmscout::TextSearchIndex::ResultsMap results;
- textSearch.Search(osmscout::LocaleStringToUTF8String(searchInput),true,true,true,true,results);
+ textSearch.Search(osmscout::LocaleStringToUTF8String(searchInput),true,true,true,true,true,results);
if(results.empty()) {
std::cout << "No results found." << std::endl;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Demos/src/QtDemoApp.cpp
^
|
| @@ -114,9 +114,9 @@
QtDemoApp::QtDemoApp(QString appName, int &argc, char* argv[]):
app(argc, argv)
{
- app.setOrganizationName("libosmscout");
- app.setOrganizationDomain("libosmscout.sf.net");
- app.setApplicationName(appName);
+ QGuiApplication::setOrganizationName("libosmscout");
+ QGuiApplication::setOrganizationDomain("libosmscout.sf.net");
+ QGuiApplication::setApplicationName(appName);
// setup c++ locale
try {
@@ -151,7 +151,7 @@
}
if (translator.load(locale.name(), translationDir)) {
qDebug() << "Install translator for locale " << locale << "/" << locale.name();
- app.installTranslator(&translator);
+ QGuiApplication::installTranslator(&translator);
}else{
qWarning() << "Can't load translator for locale" << locale << "/" << locale.name() <<
"(" << translationDir << ")";
@@ -182,7 +182,7 @@
QQmlApplicationEngine window;
SetupQmlContext(window.rootContext(), args);
window.load(qmlFileUrl);
- result = app.exec();
+ result = QGuiApplication::exec();
}
osmscout::OSMScoutQt::FreeInstance();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/DumpData/src/DumpData.cpp
^
|
| @@ -558,74 +558,74 @@
if (meta.GetFeature()->HasValue()) {
osmscout::FeatureValue *value=buffer.GetValue(idx);
- if (auto* nameValue = dynamic_cast<osmscout::NameFeatureValue*>(value);
+ if (const auto* nameValue = dynamic_cast<osmscout::NameFeatureValue*>(value);
nameValue != nullptr) {
DumpIndent(indent);
std::cout << "Name: " << nameValue->GetName() << std::endl;
}
- else if (auto* nameAltValue = dynamic_cast<osmscout::NameAltFeatureValue*>(value);
+ else if (const auto* nameAltValue = dynamic_cast<osmscout::NameAltFeatureValue*>(value);
nameAltValue != nullptr) {
DumpIndent(indent);
std::cout << "NameAlt: " << nameAltValue->GetNameAlt() << std::endl;
}
- else if (auto* refValue = dynamic_cast<osmscout::RefFeatureValue*>(value);
+ else if (const auto* refValue = dynamic_cast<osmscout::RefFeatureValue*>(value);
refValue != nullptr) {
DumpIndent(indent);
std::cout << "Ref: " << refValue->GetRef() << std::endl;
}
- else if (auto* locationValue = dynamic_cast<osmscout::LocationFeatureValue*>(value);
+ else if (const auto* locationValue = dynamic_cast<osmscout::LocationFeatureValue*>(value);
locationValue != nullptr) {
DumpIndent(indent);
std::cout << "Location: "<< locationValue->GetLocation() << std::endl;
}
- else if (auto* addressValue = dynamic_cast<osmscout::AddressFeatureValue*>(value);
+ else if (const auto* addressValue = dynamic_cast<osmscout::AddressFeatureValue*>(value);
addressValue != nullptr) {
DumpIndent(indent);
std::cout << "Address: " << addressValue->GetAddress() << std::endl;
}
- else if (auto* accessValue = dynamic_cast<osmscout::AccessFeatureValue*>(value);
+ else if (const auto* accessValue = dynamic_cast<osmscout::AccessFeatureValue*>(value);
accessValue != nullptr) {
DumpAccessFeatureValue(*accessValue,
indent,
false);
}
- else if (auto* accessValue=dynamic_cast<osmscout::AccessRestrictedFeatureValue*>(value);
+ else if (const auto* accessValue=dynamic_cast<osmscout::AccessRestrictedFeatureValue*>(value);
accessValue != nullptr) {
DumpAccessRestrictedFeatureValue(*accessValue,
indent);
}
- else if (auto* layerValue = dynamic_cast<osmscout::LayerFeatureValue*>(value);
+ else if (const auto* layerValue = dynamic_cast<osmscout::LayerFeatureValue*>(value);
layerValue != nullptr) {
DumpIndent(indent);
std::cout << "Layer: " << (int)layerValue->GetLayer() << std::endl;
}
- else if (auto* widthValue = dynamic_cast<osmscout::WidthFeatureValue*>(value);
+ else if (const auto* widthValue = dynamic_cast<osmscout::WidthFeatureValue*>(value);
widthValue != nullptr) {
DumpIndent(indent);
std::cout << "Width: " << (int)widthValue->GetWidth() << std::endl;
}
- else if (auto* maxSpeedValue = dynamic_cast<osmscout::MaxSpeedFeatureValue*>(value);
+ else if (const auto* maxSpeedValue = dynamic_cast<osmscout::MaxSpeedFeatureValue*>(value);
maxSpeedValue != nullptr) {
DumpIndent(indent);
std::cout << "MaxSpeed: " << (int)maxSpeedValue->GetMaxSpeed() << std::endl;
}
- else if (auto* gradeValue = dynamic_cast<osmscout::GradeFeatureValue*>(value);
+ else if (const auto* gradeValue = dynamic_cast<osmscout::GradeFeatureValue*>(value);
gradeValue != nullptr) {
DumpIndent(indent);
std::cout << "Grade: " << (int)gradeValue->GetGrade() << std::endl;
}
- else if (auto* adminLevelValue = dynamic_cast<osmscout::AdminLevelFeatureValue*>(value);
+ else if (const auto* adminLevelValue = dynamic_cast<osmscout::AdminLevelFeatureValue*>(value);
adminLevelValue != nullptr) {
DumpIndent(indent);
@@ -637,18 +637,18 @@
std::cout << std::endl;
}
- else if (auto* isInValue = dynamic_cast<osmscout::IsInFeatureValue*>(value);
+ else if (const auto* isInValue = dynamic_cast<osmscout::IsInFeatureValue*>(value);
isInValue != nullptr) {
DumpIndent(indent);
std::cout << "IsIn: " << isInValue->GetIsIn() << std::endl;
}
- else if (auto* sidewayValue = dynamic_cast<osmscout::SidewayFeatureValue*>(value);
+ else if (const auto* sidewayValue = dynamic_cast<osmscout::SidewayFeatureValue*>(value);
sidewayValue != nullptr) {
DumpSidewayFeatureValue(*sidewayValue,indent);
}
- else if (auto* lanesValue = dynamic_cast<osmscout::LanesFeatureValue*>(value);
+ else if (const auto* lanesValue = dynamic_cast<osmscout::LanesFeatureValue*>(value);
lanesValue != nullptr) {
DumpLanesFeatureValue(*lanesValue,
@@ -773,10 +773,6 @@
IDENT);
for (size_t r=0; r<area->rings.size(); r++) {
- if (!area->rings[r].nodes.empty()) {
- area->rings[r].GetBoundingBox(boundingBox);
- }
-
std::cout << std::endl;
size_t ident;
@@ -809,7 +805,12 @@
DumpIndent(ident);
std::cout << "boundingBox: " << boundingBox.GetDisplayText() << std::endl;
DumpIndent(ident);
- std::cout << "center: " << boundingBox.GetCenter().GetDisplayText() << std::endl;
+ std::cout << "center of bounding box: " << boundingBox.GetCenter().GetDisplayText() << std::endl;
+
+ if (area->rings[r].center) {
+ DumpIndent(ident);
+ std::cout << "visual center: " << area->rings[r].center.value().GetDisplayText() << std::endl;
+ }
}
DumpFeatureValueBuffer(area->rings[r].GetFeatureValueBuffer(),
@@ -852,7 +853,7 @@
try {
std::locale::global(std::locale(""));
}
- catch (std::runtime_error&) {
+ catch (const std::runtime_error&) {
std::cerr << "ERROR: Cannot set locale" << std::endl;
}
@@ -989,7 +990,7 @@
if (!fileOffsetIdMap.empty()) {
std::list<osmscout::FileOffset> offsets;
- for (auto& entry : fileOffsetIdMap) {
+ for (const auto& entry : fileOffsetIdMap) {
if (entry.first.GetType()==osmscout::refWay) {
offsets.push_back(entry.first.GetFileOffset());
}
@@ -1127,7 +1128,7 @@
case osmscout::refNone:
break;
case osmscout::refNode:
- for (auto& node : nodes) {
+ for (const auto& node : nodes) {
if (reference->first.GetFileOffset()==node->GetFileOffset()) {
DumpNode(node,reference->second.GetId());
break;
@@ -1135,7 +1136,7 @@
}
break;
case osmscout::refArea:
- for (auto& area : areas) {
+ for (const auto& area : areas) {
if (reference->first.GetFileOffset()==area->GetFileOffset()) {
DumpArea(area,reference->second.GetId());
break;
@@ -1143,7 +1144,7 @@
}
break;
case osmscout::refWay:
- for (auto& way : ways) {
+ for (const auto& way : ways) {
if (reference->first.GetFileOffset()==way->GetFileOffset()) {
DumpWay(way,reference->second.GetId());
break;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Import/src/Import.cpp
^
|
| @@ -25,6 +25,7 @@
#include <sstream>
#include <string>
#include <vector>
+#include <optional>
#include <osmscout/util/CmdLineParsing.h>
#include <osmscout/util/File.h>
@@ -59,6 +60,20 @@
return result;
}
+std::string TextIndexVariantStr(osmscout::ImportParameter::TextIndexVariant variant)
+{
+ switch (variant) {
+ case osmscout::ImportParameter::TextIndexVariant::original:
+ return "original";
+ case osmscout::ImportParameter::TextIndexVariant::transliterate:
+ return "transliterate";
+ case osmscout::ImportParameter::TextIndexVariant::both:
+ return "both";
+ }
+ assert(false);
+ return "unknown";
+}
+
void DumpHelp(osmscout::ImportParameter& parameter)
{
std::cout << "Import -h -d -s <start step> -e <end step> [*.osm|*.pbf]..." << std::endl;
@@ -95,7 +110,7 @@
std::cout << " --noSort do not sort objects" << std::endl;
std::cout << " --sortBlockSize <number> size of one data block during sorting (default: " << parameter.GetSortBlockSize() << ")" << std::endl;
- std::cout << " --coordDataMemoryMaped true|false memory maped coord data file access (default: " << osmscout::BoolToString(parameter.GetCoordDataMemoryMaped()) << ")" << std::endl;
+ std::cout << " --coordDataMemoryMaped true|false memory mapped coord data file access (default: " << osmscout::BoolToString(parameter.GetCoordDataMemoryMaped()) << ")" << std::endl;
std::cout << " --coordIndexCacheSize <number> coord index cache size (default: " << parameter.GetCoordIndexCacheSize() << ")" << std::endl;
std::cout << " --coordBlockSize <number> number of coords resolved in block (default: " << parameter.GetCoordBlockSize() << ")" << std::endl;
@@ -111,7 +126,7 @@
std::cout << " --routeNodeBlockSize <number> number of route nodes resolved in block (default: " << parameter.GetRouteNodeBlockSize() << ")" << std::endl;
std::cout << std::endl;
std::cout << " --langOrder <#|lang1[,#|lang2]..> language order when parsing lang[:language] and place_name[:language] tags" << std::endl
- << " # is the default language (no :language) (default: #)" << std::endl;
+ << " efault language (no :language) (default: #)" << std::endl;
std::cout << " --altLangOrder <#|lang1[,#|lang2]..> same as --langOrder for a second alternate language (default: none)" << std::endl;
std::cout << std::endl;
std::cout << " --maxAdminLevel <number> maximum admin level evaluated (default: " << parameter.GetMaxAdminLevel() << ")" << std::endl;
@@ -121,6 +136,8 @@
std::cout << " --delete-debugging-files true|false deletes all debugging files after execution of the importer" << std::endl;
std::cout << " --delete-analysis-files true|false deletes all analysis files after execution of the importer" << std::endl;
std::cout << " --delete-report-files true|false deletes all report files after execution of the importer" << std::endl;
+ std::cout << " --textIndexVariant transliterate|original|both" << std::endl;
+ std::cout << " store transliterated, original or both strings to string index (default: " + TextIndexVariantStr(parameter.GetTextIndexVariant()) + ")" << std::endl;
}
osmscout::ImportParameter::RouterRef ParseRouterArgument(int argc,
@@ -228,6 +245,35 @@
return langVec;
}
+std::optional<osmscout::ImportParameter::TextIndexVariant> ParseTextIndexVariant(int argc,
+ char* argv[],
+ int& currentIndex)
+{
+ int parameterIndex=currentIndex;
+ int argumentIndex=currentIndex+1;
+
+ currentIndex+=2;
+
+ if (argumentIndex>=argc) {
+ std::cerr << "Missing parameter after option '" << argv[parameterIndex] << "'" << std::endl;
+ return std::nullopt;
+ }
+
+ std::string argument(argv[argumentIndex]);
+ if (argument == "transliterate") {
+ return std::make_optional(osmscout::ImportParameter::TextIndexVariant::transliterate);
+ }
+ if (argument == "original") {
+ return std::make_optional(osmscout::ImportParameter::TextIndexVariant::original);
+ }
+ if (argument == "both") {
+ return std::make_optional(osmscout::ImportParameter::TextIndexVariant::both);
+ }
+
+ std::cerr << "Uknown '" << argv[parameterIndex] << "' parameter '" << argument << "'" << std::endl;
+ return std::nullopt;
+}
+
static void InitializeLocale(osmscout::Progress& progress)
{
try {
@@ -329,6 +375,9 @@
progress.Info(std::string("Eco: ")+
(parameter.IsEco() ? "true" : "false"));
+
+ progress.Info(std::string("TextIndexVariant: ") +
+ TextIndexVariantStr(parameter.GetTextIndexVariant()));
}
bool DumpDataSize(const osmscout::ImportParameter& parameter,
@@ -869,6 +918,19 @@
parameterError=true;
}
}
+ else if (strcmp(argv[i],"--textIndexVariant")==0) {
+ std::optional<osmscout::ImportParameter::TextIndexVariant> textIndexVariant;
+
+ textIndexVariant = ParseTextIndexVariant(argc,
+ argv,
+ i);
+ if (textIndexVariant) {
+ parameter.SetTextIndexVariant(*textIndexVariant);
+ }
+ else {
+ parameterError=true;
+ }
+ }
else if (strncmp(argv[i],"--",2)==0) {
progress.Error("Unknown option: "+std::string(argv[i]));
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/CMakeLists.txt
^
|
| @@ -50,6 +50,34 @@
message("Skip ThreadedDatabase test, libosmscout-map is missing.")
endif()
+#---- TextLookupTest
+if(MARISA_FOUND)
+ osmscout_demo_project(NAME TextLookupTest SOURCES src/TextLookupTest.cpp TARGET OSMScout::OSMScout OSMScout::OSMScout)
+
+ add_test(NAME TextLookupTest-vysoka
+ COMMAND TextLookupTest
+ --expected-results 5
+ "${CMAKE_CURRENT_SOURCE_DIR}/data/testregion"
+ "vysoka"
+ )
+
+ add_test(NAME TextLookupTest-Vysoká
+ COMMAND TextLookupTest
+ --expected-results 5
+ "${CMAKE_CURRENT_SOURCE_DIR}/data/testregion"
+ "Vysoká"
+ )
+
+ add_test(NAME TextLookupTest-bosyne
+ COMMAND TextLookupTest
+ --expected-results 1
+ "${CMAKE_CURRENT_SOURCE_DIR}/data/testregion"
+ "bosyne"
+ )
+else()
+ message("Skip TextLookupTest test, Marisa library is missing.")
+endif()
+
#---- DrawTextQt
if(${OSMSCOUT_BUILD_MAP_QT} AND TARGET OSMScout::MapQt)
set(src_files src/DrawTextQt.cpp include/DrawWindow.h)
@@ -62,6 +90,13 @@
#---- Geometry
osmscout_test_project(NAME Geometry SOURCES src/Geometry.cpp)
+#---- WaterIndex
+if(${OSMSCOUT_BUILD_IMPORT} AND TARGET OSMScout::Import)
+ osmscout_test_project(NAME WaterIndex SOURCES src/WaterIndex.cpp TARGET OSMScout::Import)
+else()
+ message("Skip WaterIndex test, libosmscout-import is missing.")
+endif()
+
#---- WorkQueue
osmscout_test_project(NAME WorkQueue SOURCES src/WorkQueue.cpp)
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/areaarea.idx
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/areanode.idx
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/arearoute.idx
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/areas.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/areasopt.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/areaway.idx
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/intersections.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/intersections.idx
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/location.idx
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/nodes.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/route.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/router.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/router2.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/textloc.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/textother.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/textpoi.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/textregion.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/types.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/ways.dat
^
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/data/testregion/waysopt.dat
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/meson.build
^
|
| @@ -317,6 +317,13 @@
link_with: [osmscout],
install: false)
+WaterIndex = executable('WaterIndex',
+ 'src/WaterIndex.cpp',
+ include_directories: [testIncDir, osmscoutIncDir, osmscoutimportIncDir],
+ dependencies: [mathDep, openmpDep],
+ link_with: [osmscout, osmscoutimport],
+ install: false)
+
WorkQueue = executable('WorkQueue',
'src/WorkQueue.cpp',
include_directories: [osmscoutIncDir],
@@ -352,6 +359,15 @@
link_with: [osmscoutmap, osmscout],
install: false)
+if marisaDep.found()
+ TextLookupTest = executable('TextLookupTest',
+ 'src/TextLookupTest.cpp',
+ include_directories: [osmscoutIncDir],
+ dependencies: [mathDep],
+ link_with: [osmscout],
+ install: false)
+endif
+
ostandossEnv = environment()
ostandossEnv.set('TESTS_TOP_DIR', meson.current_source_dir())
@@ -375,6 +391,23 @@
meson.current_source_dir() + '/data/testregion',
meson.current_source_dir() + '/../stylesheets/standard.oss'])
+if marisaDep.found()
+ test('Check text lookup - vysoka', TextLookupTest, args : [
+ '--expected-results', '5',
+ meson.current_source_dir() + '/data/testregion',
+ 'vysoka'])
+
+ test('Check text lookup - Vysoká', TextLookupTest, args : [
+ '--expected-results', '5',
+ meson.current_source_dir() + '/data/testregion',
+ 'Vysoká'])
+
+ test('Check text lookup - bosyne', TextLookupTest, args : [
+ '--expected-results', '1',
+ meson.current_source_dir() + '/data/testregion',
+ 'bosyne'])
+endif
+
test('Check SunriseSunset utility', SunriseSunset)
test('Check encoding of numbers', EncodeNumber)
test('Check label formatting', FeatureLabelTest)
@@ -397,6 +430,7 @@
test('Check string utils', StringUtils)
test('Check tiling calculation code', TilingTest)
test('Check polygon transformation code', TransPolygon)
+test('Check water index import code', WaterIndex)
test('Check implementation of work queue', WorkQueue)
test('Check WString<=>String conversion code', WStringStringConversion)
test('Check LabelPath code', LabelPathTest)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/src/TextLookupTest.cpp
^
|
| @@ -0,0 +1,180 @@
+/*
+ LookupText - a test program for libosmscout
+ Copyright (C) 2022 Lukas Karas
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include <algorithm>
+#include <iostream>
+
+#include <osmscout/TextSearchIndex.h>
+#include <osmscout/Database.h>
+
+#include <osmscout/util/CmdLineParsing.h>
+
+struct Arguments
+{
+ bool help=false;
+ std::string databaseDirectory;
+ std::string lookupPhrase;
+ int expectedResults=-1;
+};
+
+void printDetails(const osmscout::FeatureValueBuffer& features)
+{
+ std::cout << " - type: " << features.GetType()->GetName() << std::endl;
+
+ for (const auto& featureInstance :features.GetType()->GetFeatures()) {
+ if (features.HasFeature(featureInstance.GetIndex())) {
+ osmscout::FeatureRef feature=featureInstance.GetFeature();
+
+ if (feature->HasValue() && feature->HasLabel()) {
+ osmscout::FeatureValue *value=features.GetValue(featureInstance.GetIndex());
+ if (value->GetLabel(osmscout::Locale(), 0).empty()) {
+ std::cout << " + feature " << feature->GetName() << std::endl;
+ }
+ else {
+ std::cout << " + feature " << feature->GetName() << ": "
+ << osmscout::UTF8StringToLocaleString(value->GetLabel(osmscout::Locale(), 0))
+ << std::endl;
+ }
+ }
+ else {
+ std::cout << " + feature " << feature->GetName() << std::endl;
+ }
+ }
+ }
+}
+
+int main (int argc, char *argv[])
+{
+ using namespace std::string_literals;
+
+ osmscout::CmdLineParser argParser("TextLookupTest",
+ argc,argv);
+ std::vector<std::string> helpArgs{"h","help"};
+ Arguments args;
+
+ argParser.AddOption(osmscout::CmdLineFlag([&args](const bool& value) {
+ args.help=value;
+ }),
+ helpArgs,
+ "Return argument help",
+ true);
+
+ argParser.AddOption(osmscout::CmdLineUIntOption([&args](unsigned int value) {
+ args.expectedResults=value;
+ }),
+ "expected-results",
+ "Count of expected results. Test is terminated with 1 when result count differs.",
+ false);
+
+ argParser.AddPositional(osmscout::CmdLineStringOption([&args](const std::string& value) {
+ args.databaseDirectory=value;
+ }),
+ "DATABASE",
+ "Directory of the database to use");
+
+ argParser.AddPositional(osmscout::CmdLineStringOption([&args](const std::string& value) {
+ args.lookupPhrase=value;
+ }),
+ "LOOKUP_PHRASE",
+ "Phrase to lookup");
+
+ osmscout::CmdLineParseResult result=argParser.Parse();
+
+ if (result.HasError()) {
+ std::cerr << "ERROR: " << result.GetErrorDescription() << std::endl;
+ std::cout << argParser.GetHelp() << std::endl;
+ return 1;
+ }
+ else if (args.help) {
+ std::cout << argParser.GetHelp() << std::endl;
+ return 0;
+ }
+
+ try {
+ std::locale::global(std::locale(""));
+ }
+ catch (const std::runtime_error& e) {
+ std::cerr << "Cannot set locale: \"" << e.what() << "\"" << std::endl;
+ }
+
+ // load text data files
+ osmscout::TextSearchIndex textSearch;
+
+ if(!textSearch.Load(args.databaseDirectory)) {
+ std::cout << "ERROR: Failed to load text files!"
+ "(are you sure you passed the right path?)"
+ << std::endl;
+ return -1;
+ }
+
+ // search using the text input as the query
+ osmscout::TextSearchIndex::ResultsMap results;
+
+ textSearch.Search(osmscout::LocaleStringToUTF8String(args.lookupPhrase),true,true,true,true,true,results);
+
+ if(results.empty()) {
+ std::cout << "No results found." << std::endl;
+ }
+
+ osmscout::DatabaseParameter databaseParameter;
+ osmscout::DatabaseRef database=std::make_shared<osmscout::Database>(databaseParameter);
+ if (!database->Open(args.databaseDirectory)) {
+ std::cerr << "Cannot open database" << std::endl;
+ return 1;
+ }
+
+ // print out the results
+ osmscout::TextSearchIndex::ResultsMap::iterator it;
+ for(it=results.begin(); it != results.end(); ++it) {
+ std::cout << "\"" <<it->first << "\" -> " << std::endl;
+ std::vector<osmscout::ObjectFileRef> &refs=it->second;
+
+ for(size_t r=0; r < refs.size(); r++) {
+ if(refs[r].GetType() == osmscout::refNode) {
+ std::cout << " * N:" << refs[r].GetFileOffset() << std::endl;
+ osmscout::NodeRef node;
+ if (database->GetNodeByOffset(refs[r].GetFileOffset(), node)){
+ printDetails(node->GetFeatureValueBuffer());
+ }
+ }
+ else if(refs[r].GetType() == osmscout::refWay) {
+ std::cout << " * W:" << refs[r].GetFileOffset() << std::endl;
+ osmscout::WayRef way;
+ if (database->GetWayByOffset(refs[r].GetFileOffset(), way)){
+ printDetails(way->GetFeatureValueBuffer());
+ }
+ }
+ else if(refs[r].GetType() == osmscout::refArea) {
+ std::cout << " * A:" << refs[r].GetFileOffset() << std::endl;
+ osmscout::AreaRef area;
+ if (database->GetAreaByOffset(refs[r].GetFileOffset(), area)){
+ printDetails(area->GetFeatureValueBuffer());
+ }
+ }
+ }
+
+ std::cout << std::endl;
+ }
+
+ if (args.expectedResults >= 0 && size_t(args.expectedResults) != results.size()) {
+ std::cerr << "Number of results (" << results.size() << ") differs from expected (" << args.expectedResults << ")" << std::endl;
+ return 1;
+ }
+ return 0;
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/Tests/src/WaterIndex.cpp
^
|
| @@ -0,0 +1,192 @@
+/*
+ WaterIndex - a test program for libosmscout
+ Copyright (C) 2022 Lukas Karas
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include <cstdlib>
+#include <iostream>
+
+#include <osmscoutimport/WaterIndexProcessor.h>
+
+#include <TestMain.h>
+
+using namespace osmscout;
+
+TEST_CASE("Merge empty vector of coastlines")
+{
+ WaterIndexProcessor processor;
+ SilentProgress progress;
+ std::list<WaterIndexProcessor::CoastRef> coastlines;
+ processor.MergeCoastlines(progress, coastlines);
+ REQUIRE(coastlines.empty());
+}
+
+WaterIndexProcessor::CoastRef MkCoastline(OSMId id,
+ std::vector<Point>&& coords,
+ WaterIndexProcessor::CoastState left=WaterIndexProcessor::CoastState::land,
+ WaterIndexProcessor::CoastState right=WaterIndexProcessor::CoastState::water)
+{
+ if (coords.empty()) {
+ return std::make_shared<WaterIndexProcessor::Coast>(WaterIndexProcessor::Coast{id, false, 0, 0, coords, right, left});
+ }
+ bool isArea=coords.front().IsIdentical(coords.back());
+ Id frontNodeId = coords.front().GetId();
+ Id backNodeId = coords.back().GetId();
+ return std::make_shared<WaterIndexProcessor::Coast>(WaterIndexProcessor::Coast{id, isArea, frontNodeId, backNodeId, coords, left, right});
+}
+
+TEST_CASE("Merge of coastlines should throw out empty one")
+{
+ WaterIndexProcessor processor;
+ SilentProgress progress;
+ std::list<WaterIndexProcessor::CoastRef> coastlines;
+
+ std::vector<Point> coords;
+ coastlines.push_back(MkCoastline(0, std::move(coords)));
+
+ coords.clear();
+ coords.emplace_back(0, GeoCoord(0,0));
+ coords.emplace_back(0, GeoCoord(1,1));
+ coastlines.push_back(MkCoastline(1, std::move(coords)));
+
+ processor.MergeCoastlines(progress, coastlines);
+ REQUIRE(coastlines.size()==1);
+ REQUIRE(coastlines.front()->coast.size()==2);
+}
+
+TEST_CASE("Merge follow-up coastlines")
+{
+ WaterIndexProcessor processor;
+ SilentProgress progress;
+ std::list<WaterIndexProcessor::CoastRef> coastlines;
+
+ std::vector<Point> coords;
+ coords.emplace_back(0, GeoCoord(0,0));
+ coords.emplace_back(0, GeoCoord(1,1));
+ coastlines.push_back(MkCoastline(0, std::move(coords)));
+
+ coords.clear();
+ coords.emplace_back(0, GeoCoord(1,1));
+ coords.emplace_back(0, GeoCoord(1,2));
+ coastlines.push_back(MkCoastline(1, std::move(coords)));
+
+ processor.MergeCoastlines(progress, coastlines);
+ REQUIRE(coastlines.size()==1);
+ REQUIRE(coastlines.front()->coast.size()==3);
+ REQUIRE_FALSE(coastlines.front()->isArea);
+}
+
+TEST_CASE("Merge coastlines to area")
+{
+ WaterIndexProcessor processor;
+ SilentProgress progress;
+ std::list<WaterIndexProcessor::CoastRef> coastlines;
+
+ std::vector<Point> coords;
+ coords.emplace_back(0, GeoCoord(0,0));
+ coords.emplace_back(0, GeoCoord(1,1));
+ coastlines.push_back(MkCoastline(0, std::move(coords)));
+
+ coords.clear();
+ coords.emplace_back(0, GeoCoord(1,1));
+ coords.emplace_back(0, GeoCoord(1,2));
+ coords.emplace_back(0, GeoCoord(0,0));
+ coastlines.push_back(MkCoastline(1, std::move(coords)));
+
+ processor.MergeCoastlines(progress, coastlines);
+ REQUIRE(coastlines.size()==1);
+ REQUIRE(coastlines.front()->coast.size()==3);
+ REQUIRE(coastlines.front()->isArea);
+}
+
+TEST_CASE("Merge with different states")
+{
+ WaterIndexProcessor processor;
+ SilentProgress progress;
+ std::list<WaterIndexProcessor::CoastRef> coastlines;
+
+ std::vector<Point> coords;
+ coords.emplace_back(0, GeoCoord(0,0));
+ coords.emplace_back(0, GeoCoord(1,1));
+ coastlines.push_back(MkCoastline(0, std::move(coords), WaterIndexProcessor::CoastState::land, WaterIndexProcessor::CoastState::water));
+
+ coords.clear();
+ coords.emplace_back(0, GeoCoord(1,1));
+ coords.emplace_back(0, GeoCoord(1,2));
+ coastlines.push_back(MkCoastline(1, std::move(coords), WaterIndexProcessor::CoastState::unknown, WaterIndexProcessor::CoastState::water));
+
+ processor.MergeCoastlines(progress, coastlines);
+ REQUIRE(coastlines.size()==2);
+}
+
+TEST_CASE("Synthetize coastlines")
+{
+ WaterIndexProcessor processor;
+ SilentProgress progress;
+ std::list<WaterIndexProcessor::CoastRef> coastlines;
+
+ // square island
+ std::vector<Point> coords;
+ coords.emplace_back(0, GeoCoord(0,0));
+ coords.emplace_back(0, GeoCoord(0,1));
+ coords.emplace_back(0, GeoCoord(1,1));
+ coords.emplace_back(0, GeoCoord(1,0));
+ coastlines.push_back(MkCoastline(0, std::move(coords)));
+ coastlines.front()->isArea=true;
+
+ // square bounding polygon intersecting island above
+ std::list<WaterIndexProcessor::CoastRef> boundingPolygons;
+ coords.clear();
+ coords.emplace_back(0, GeoCoord(-0.5,-0.5));
+ coords.emplace_back(0, GeoCoord(-0.5,+0.5));
+ coords.emplace_back(0, GeoCoord(+0.5,+0.5));
+ coords.emplace_back(0, GeoCoord(+0.5,-0.5));
+ boundingPolygons.push_back(MkCoastline(1, std::move(coords), WaterIndexProcessor::CoastState::undefined, WaterIndexProcessor::CoastState::unknown));
+ coastlines.front()->isArea=true;
+
+ processor.SynthesizeCoastlines(progress, coastlines, boundingPolygons);
+ REQUIRE(coastlines.size()==3);
+
+ auto it=coastlines.begin();
+ REQUIRE_FALSE((*it)->isArea);
+ REQUIRE((*it)->left==WaterIndexProcessor::CoastState::land);
+ REQUIRE((*it)->right==WaterIndexProcessor::CoastState::unknown);
+ REQUIRE((*it)->coast.size()==3);
+ REQUIRE((*it)->coast[0].GetCoord()==GeoCoord(0, 0.5));
+ REQUIRE((*it)->coast[1].GetCoord()==GeoCoord(0.5, 0.5));
+ REQUIRE((*it)->coast[2].GetCoord()==GeoCoord(0.5, 0));
+
+ ++it;
+ REQUIRE_FALSE((*it)->isArea);
+ REQUIRE((*it)->left==WaterIndexProcessor::CoastState::water);
+ REQUIRE((*it)->right==WaterIndexProcessor::CoastState::unknown);
+ REQUIRE((*it)->coast.size()==5);
+ REQUIRE((*it)->coast[0].GetCoord()==GeoCoord(0.5, 0));
+ REQUIRE((*it)->coast[1].GetCoord()==GeoCoord(0.5, -0.5));
+ REQUIRE((*it)->coast[2].GetCoord()==GeoCoord(-0.5, -0.5));
+ REQUIRE((*it)->coast[3].GetCoord()==GeoCoord(-0.5, 0.5));
+ REQUIRE((*it)->coast[4].GetCoord()==GeoCoord(0, 0.5));
+
+ ++it;
+ REQUIRE_FALSE((*it)->isArea);
+ REQUIRE((*it)->left==WaterIndexProcessor::CoastState::land);
+ REQUIRE((*it)->right==WaterIndexProcessor::CoastState::water);
+ REQUIRE((*it)->coast.size()==3);
+ REQUIRE((*it)->coast[0].GetCoord()==GeoCoord(0.5, 0));
+ REQUIRE((*it)->coast[1].GetCoord()==GeoCoord(0, 0));
+ REQUIRE((*it)->coast[2].GetCoord()==GeoCoord(0, 0.5));
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/CMakeLists.txt
^
|
| @@ -2,7 +2,8 @@
set(CMAKE_AUTORCC ON)
set(HEADER_FILES
- include/osmscoutclientqt/ClientQtImportExport.h
+ include/osmscoutclientqt/AdminRegionInfo.h
+ include/osmscoutclientqt/ClientQtImportExport.h
include/osmscoutclientqt/DBThread.h
include/osmscoutclientqt/DBInstance.h
include/osmscoutclientqt/ElevationChartWidget.h
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/meson.build
^
|
| @@ -1,6 +1,7 @@
osmscoutclientqtIncDir = include_directories('.')
osmscoutclientqtHeader = [
+ 'osmscoutclientqt/AdminRegionInfo.h',
'osmscoutclientqt/ClientQtImportExport.h',
'osmscoutclientqt/DBThread.h',
'osmscoutclientqt/DBInstance.h',
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/AdminRegionInfo.h
^
|
| @@ -0,0 +1,70 @@
+#ifndef OSMSCOUT_CLIENT_QT_ADMINREGIONINFO_H
+#define OSMSCOUT_CLIENT_QT_ADMINREGIONINFO_H
+/*
+ OSMScout - a Qt backend for libosmscout and libosmscout-map
+ Copyright (C) 2017 Lukas Karas
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <QObject>
+#include <QString>
+
+#include <memory>
+
+#include <osmscoutclientqt/ClientQtImportExport.h>
+
+#include <osmscout/Location.h>
+
+namespace osmscout {
+
+/**
+ * \ingroup QtAPI
+ */
+class OSMSCOUT_CLIENT_QT_API AdminRegionInfo
+{
+public:
+ QString database;
+ osmscout::AdminRegionRef adminRegion;
+ QString type; //!< adminRegion->object's type
+ int adminLevel{-1};
+
+public:
+ std::string name() const
+ {
+ return adminRegion->name;
+ }
+
+ QString qStringName() const
+ {
+ return QString::fromStdString(adminRegion->name);
+ }
+
+ std::string altName() const
+ {
+ return adminRegion->altName;
+ }
+
+ QString qStringAltName() const
+ {
+ return QString::fromStdString(adminRegion->altName);
+ }
+};
+
+typedef std::shared_ptr<AdminRegionInfo> AdminRegionInfoRef;
+
+}
+
+#endif //OSMSCOUT_CLIENT_QT_ADMINREGIONINFO_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/AvailableMapsModel.h
^
|
| @@ -261,4 +261,4 @@
Q_DECLARE_METATYPE(osmscout::AvailableMapsModelMap)
-#endif /* OSMSCOUT_CLIENT_QT_AVAILABLEMAPMODEL_H */
+#endif /* OSMSCOUT_CLIENT_QT_AVAILABLEMAPMODEL_H */
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/DBJob.h
^
|
| @@ -43,9 +43,11 @@
protected:
osmscout::BasemapDatabaseRef basemapDatabase; //!< Optional reference to the basemap database
std::list<DBInstanceRef> databases; //!< borrowed databases
- QReadLocker *locker; //!< database locker
QThread *thread; //!< job thread
+private:
+ QReadLocker *locker; //!< database locker
+
public:
DBJob();
~DBJob() override;
@@ -57,7 +59,8 @@
class OSMSCOUT_CLIENT_QT_API DBLoadJob : public DBJob{
Q_OBJECT
-protected:
+
+private:
bool closeOnFinish;
osmscout::BreakerRef breaker;
osmscout::MercatorProjection lookupProjection;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/DBThread.h
^
|
| @@ -132,7 +132,7 @@
*/
void FlushCaches(qint64 idleMs);
-protected:
+private:
QThread *backgroundThread;
MapManagerRef mapManager;
QString basemapLookupDirectory;
@@ -215,7 +215,7 @@
double GetPhysicalDpi() const;
- inline QString GetStylesheetFilename() const
+ QString GetStylesheetFilename() const
{
return stylesheetFilename;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/FileDownloader.h
^
|
| @@ -97,7 +97,7 @@
QObject *parent = nullptr);
~FileDownloader() override;
- operator bool() const { return isOk; }
+ explicit operator bool() const { return isOk; }
QString getFileName() const { return QFileInfo(path).fileName(); }
QString getFilePath() const { return path; }
uint64_t getBytesDownloaded() const;
@@ -183,32 +183,32 @@
virtual uint64_t expectedSize() const = 0;
- inline bool isDone() const
+ bool isDone() const
{
return done;
}
- inline bool isSuccessful() const
+ bool isSuccessful() const
{
return successful;
}
- inline bool isDownloading() const
+ bool isDownloading() const
{
return started && !done;
}
- inline QString getError() const
+ QString getError() const
{
return error;
}
- inline bool isReplaceExisting() const
+ bool isReplaceExisting() const
{
return replaceExisting;
}
- inline QDir getDestinationDirectory() const
+ QDir getDestinationDirectory() const
{
return target;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/InputHandler.h
^
|
| @@ -81,7 +81,7 @@
void onTimeout();
public:
- inline TapRecognizer():
+ TapRecognizer():
state(INACTIVE),
holdIntervalMs(1000),
hold2IntervalMs(500),
@@ -96,7 +96,7 @@
void touch(const QTouchEvent &event);
- inline void setPhysicalDpi(double physicalDpi)
+ void setPhysicalDpi(double physicalDpi)
{
moveTolerance = physicalDpi / 10.0; // ~ 2.5 mm
}
@@ -142,7 +142,7 @@
* @param factor - momentum movement length (vector returned from collect method) will be equal to recorded length * factor
* @param vectorLengthTreshold - movement (between two points) have to be longer than treshold (in pixels) for change move vector
*/
- inline MoveAccumulator(int memory = 100, double factor = 4, double vectorLengthTreshold = 5):
+ MoveAccumulator(int memory = 100, double factor = 4, double vectorLengthTreshold = 5):
memory(memory), factor(factor), vectorLengthTreshold(vectorLengthTreshold)
{
}
@@ -171,39 +171,56 @@
public:
explicit inline MapView(QObject *parent=nullptr): QObject(parent) {}
- inline MapView(QObject *parent,
- const osmscout::GeoCoord ¢er,
- const Bearing &angle,
- const osmscout::Magnification &magnification,
- double mapDpi):
- QObject(parent), center(center), angle(angle), magnification(magnification), mapDpi(mapDpi) {}
-
- inline MapView(const osmscout::GeoCoord ¢er,
- const Bearing &angle,
- const osmscout::Magnification &magnification,
- double mapDpi):
- center(center), angle(angle), magnification(magnification), mapDpi(mapDpi) {}
+ MapView(QObject* parent,
+ const osmscout::GeoCoord& center,
+ const Bearing& angle,
+ const osmscout::Magnification& magnification,
+ double mapDpi)
+ :
+ QObject(parent),
+ center(center),
+ angle(angle),
+ magnification(magnification),
+ mapDpi(mapDpi)
+ {}
+
+ MapView(const osmscout::GeoCoord& center,
+ const Bearing& angle,
+ const osmscout::Magnification& magnification,
+ double mapDpi)
+ :
+ center(center),
+ angle(angle),
+ magnification(magnification),
+ mapDpi(mapDpi)
+ {}
/**
* This copy constructor don't transfer ownership
* in Qt hierarchy - it may cause troubles.
* @param mv
*/
- inline MapView(const MapView &mv):
- QObject(), center(mv.center), angle(mv.angle), magnification(mv.magnification), mapDpi(mv.mapDpi) {}
+ MapView(const MapView& mv)
+ :
+ QObject(),
+ center(mv.center),
+ angle(mv.angle),
+ magnification(mv.magnification),
+ mapDpi(mv.mapDpi)
+ {}
~MapView() override = default;
- inline double GetLat() const{ return center.GetLat(); }
- inline double GetLon() const{ return center.GetLon(); }
- inline double GetAngle() const{ return angle.AsRadians(); }
- inline double GetMag() const{ return magnification.GetMagnification(); }
- inline double GetMagLevel() const{ return magnification.GetLevel(); }
- inline double GetMapDpi() const{ return mapDpi; }
+ double GetLat() const{ return center.GetLat(); }
+ double GetLon() const{ return center.GetLon(); }
+ double GetAngle() const{ return angle.AsRadians(); }
+ double GetMag() const{ return magnification.GetMagnification(); }
+ double GetMagLevel() const{ return magnification.GetLevel(); }
+ double GetMapDpi() const{ return mapDpi; }
- inline bool IsValid() const{ return mapDpi > 0; }
+ bool IsValid() const{ return mapDpi > 0; }
- inline MapView& operator=(const MapView &mv)
+ MapView& operator=(const MapView &mv)
{
center = mv.center;
angle = mv.angle;
@@ -450,7 +467,7 @@
class OSMSCOUT_CLIENT_QT_API LockHandler : public JumpHandler {
Q_OBJECT
public:
- inline LockHandler(const MapView &view, const QSizeF &widgetSize):
+ LockHandler(const MapView &view, const QSizeF &widgetSize):
JumpHandler(view), window(widgetSize)
{};
@@ -490,4 +507,4 @@
Q_DECLARE_METATYPE(osmscout::AccumulatorEvent)
Q_DECLARE_METATYPE(osmscout::MapView)
-#endif /* OSMSCOUT_CLIENT_QT_INPUTHANDLER_H */
+#endif /* OSMSCOUT_CLIENT_QT_INPUTHANDLER_H */
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/LocationEntry.h
^
|
| @@ -30,6 +30,7 @@
#include <osmscout/LocationService.h>
#include <osmscoutclientqt/ClientQtImportExport.h>
+#include <osmscoutclientqt/AdminRegionInfo.h>
namespace osmscout {
@@ -43,6 +44,7 @@
{
Q_OBJECT
Q_PROPERTY(QString label READ getLabel CONSTANT)
+ Q_PROPERTY(QString altName READ getAltName CONSTANT)
Q_PROPERTY(QString type READ getTypeString CONSTANT)
Q_PROPERTY(QString objectType READ getObjectType CONSTANT)
Q_PROPERTY(double lat READ getLat CONSTANT)
@@ -58,8 +60,9 @@
private:
Type type;
QString label;
+ QString altName; // name in alternative language
QString objectType;
- QStringList adminRegionList;
+ QList<AdminRegionInfoRef> adminRegionList;
QString database;
QList<osmscout::ObjectFileRef> references;
osmscout::GeoCoord coord;
@@ -68,8 +71,9 @@
public:
LocationEntry(Type type,
const QString& label,
+ const QString& altName,
const QString& objectType,
- const QStringList& adminRegionList,
+ const QList<AdminRegionInfoRef>& adminRegionList,
const QString database,
const osmscout::GeoCoord coord,
const osmscout::GeoBox bbox,
@@ -103,7 +107,8 @@
QString getTypeString() const;
QString getObjectType() const;
QString getLabel() const;
- QStringList getAdminRegionList() const;
+ QString getAltName() const;
+ QList<AdminRegionInfoRef> getAdminRegionList() const;
QString getDatabase() const;
osmscout::GeoCoord getCoord() const;
osmscout::GeoBox getBBox() const;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/LocationInfoModel.h
^
|
| @@ -57,7 +57,7 @@
void onLocationDescription(const osmscout::GeoCoord location,
const QString database,
const osmscout::LocationDescription description,
- const QStringList regions);
+ const QList<AdminRegionInfoRef> regions);
void onLocationDescriptionFinished(const osmscout::GeoCoord);
void onLocationAdminRegions(const osmscout::GeoCoord,QList<AdminRegionInfoRef>);
@@ -77,7 +77,9 @@
WebsiteRole = Qt::UserRole+9,
PhoneRole = Qt::UserRole+10,
AddressLocationRole = Qt::UserRole+11,
- AddressNumberRole = Qt::UserRole+12
+ AddressNumberRole = Qt::UserRole+12,
+ IndexedAdminRegionRole = Qt::UserRole+13,
+ AltLangName = Qt::UserRole+14
};
Q_ENUM(Roles)
@@ -112,7 +114,7 @@
private:
void addToModel(const QString database,
const osmscout::LocationAtPlaceDescriptionRef description,
- const QStringList regions);
+ const QList<AdminRegionInfoRef> regions);
private:
bool ready;
@@ -122,7 +124,7 @@
QList<ObjectKey> objectSet; // set of objects already inserted to model
QList<QMap<int, QVariant>> model;
LookupModule* lookupModule;
-
+ SettingsRef settings;
};
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/LookupModule.h
^
|
| @@ -30,18 +30,6 @@
namespace osmscout {
-class OSMSCOUT_CLIENT_QT_API AdminRegionInfo {
-public:
- QString database;
- osmscout::AdminRegionRef adminRegion;
- QString name;
- QString altName;
- QString type;
- int adminLevel;
-};
-
-typedef std::shared_ptr<AdminRegionInfo> AdminRegionInfoRef;
-
/**
* \ingroup QtAPI
*/
@@ -49,11 +37,12 @@
Q_OBJECT
friend class SearchRunnable;
+ friend class SearchLocationsRunnable;
public:
/**
- * Common sence of administrative region levels.
+ * Common sense of administrative region levels.
*
* Note that levels may have different meaning in various countries...
* https://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative
@@ -75,11 +64,12 @@
QString type; // node / way / area
QString objectType;
QString name;
+ QString altLangName;
QString phone;
QString website;
QString addressNumber;
LocationDescriptionService::ReverseLookupRef reverseLookupRef;
- QStringList adminRegionList;
+ QList<AdminRegionInfoRef> adminRegionList;
uint64_t id;
osmscout::GeoCoord center;
std::vector<osmscout::Point> points;
@@ -105,7 +95,7 @@
void locationDescription(const osmscout::GeoCoord location,
const QString database,
const osmscout::LocationDescription description,
- const QStringList regions);
+ const QList<AdminRegionInfoRef> regions);
void locationDescriptionFinished(const osmscout::GeoCoord location);
void locationAdminRegions(const osmscout::GeoCoord location,
@@ -144,7 +134,29 @@
public:
LookupModule(QThread *thread,DBThreadRef dbThread);
- virtual ~LookupModule();
+ ~LookupModule();
+
+ /** Helper method that returns list of unique admin region names.
+ * When region list contains two (following) administrative regions
+ * with the same name (for example Prague "district", Prague "city"),
+ * it will return such name just once.
+ *
+ * @param regionList
+ * @return list of admin region names
+ */
+ static QStringList AdminRegionNames(const QList<AdminRegionInfoRef> ®ionList, bool useAltNames);
+
+ /** Helper method that returns names of admin region in indexed array.
+ * Array length is 12. When some level is not present, empty string is used.
+ * Level 2 are counties. Levels > 2 are country specific.
+ * See https://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative for meaning
+ * of individual levels.
+ *
+ * @param regionList
+ * @param useAltNames
+ * @return list of admin region names, indexed by admin region level
+ */
+ static QStringList IndexedAdminRegionNames(const QList<AdminRegionInfoRef> ®ionList, bool useAltNames);
private:
@@ -156,7 +168,7 @@
const osmscout::TypeInfoRef &objectType,
const osmscout::FeatureValueBuffer &features,
const std::map<ObjectFileRef,LocationDescriptionService::ReverseLookupResult> &reverseLookupMap,
- LocationServiceRef &locationService,
+ const DBInstanceRef &db,
std::map<osmscout::FileOffset,osmscout::AdminRegionRef> ®ionMap)
{
ObjectInfo info;
@@ -166,25 +178,28 @@
info.objectType=QString::fromStdString(objectType->GetName());
info.id=ref.GetFileOffset();
- const osmscout::NameFeatureValue *name=features.findValue<osmscout::NameFeatureValue>();
- if (name!=nullptr){
+ if (const osmscout::NameFeatureValue *name=features.findValue<osmscout::NameFeatureValue>(); name!=nullptr){
info.name=QString::fromStdString(name->GetLabel(Locale(), 0));
}
- const osmscout::PhoneFeatureValue *phone=features.findValue<osmscout::PhoneFeatureValue>();
- if (phone!=nullptr){
+
+ if (const osmscout::NameAltFeatureValue *nameAlt=features.findValue<osmscout::NameAltFeatureValue>(); nameAlt!=nullptr){
+ info.altLangName=QString::fromStdString(nameAlt->GetLabel(Locale(), 0));
+ }
+
+ if (const osmscout::PhoneFeatureValue *phone=features.findValue<osmscout::PhoneFeatureValue>(); phone!=nullptr){
info.phone=QString::fromStdString(phone->GetPhone());
}
- const osmscout::WebsiteFeatureValue *website=features.findValue<osmscout::WebsiteFeatureValue>();
- if (website!=nullptr){
+
+ if (const osmscout::WebsiteFeatureValue *website=features.findValue<osmscout::WebsiteFeatureValue>(); website!=nullptr){
info.website=QString::fromStdString(website->GetWebsite());
}
- const osmscout::AddressFeatureValue *address=features.findValue<osmscout::AddressFeatureValue>();
- if (address!=nullptr){
+
+ if (const osmscout::AddressFeatureValue *address=features.findValue<osmscout::AddressFeatureValue>(); address!=nullptr){
info.addressNumber=QString::fromStdString(address->GetAddress());
}
- const auto &it=reverseLookupMap.find(ref);
- if (it!=reverseLookupMap.end()){
- info.adminRegionList=BuildAdminRegionList(locationService, it->second.adminRegion, regionMap);
+
+ if (const auto &it=reverseLookupMap.find(ref); it!=reverseLookupMap.end()){
+ info.adminRegionList=BuildAdminRegionList(db, it->second.adminRegion, regionMap);
info.reverseLookupRef=std::make_shared<LocationDescriptionService::ReverseLookupResult>(it->second);
}
info.center=center;
@@ -200,41 +215,38 @@
const osmscout::GeoCoord ¢er,
const T &o,
const std::map<ObjectFileRef,LocationDescriptionService::ReverseLookupResult> &reverseLookupMap,
- LocationServiceRef &locationService,
+ const DBInstanceRef &db,
std::map<osmscout::FileOffset,osmscout::AdminRegionRef> ®ionMap)
{
- addObjectInfo(objectList,type,ref,points,center,o->GetType(),o->GetFeatureValueBuffer(),reverseLookupMap,locationService,regionMap);
+ addObjectInfo(objectList,type,ref,points,center,o->GetType(),o->GetFeatureValueBuffer(),reverseLookupMap,db,regionMap);
}
void addObjectInfo(QList<ObjectInfo> &objectList, // output
const NodeRef &node,
const std::map<ObjectFileRef,LocationDescriptionService::ReverseLookupResult> &reverseLookupMap,
- LocationServiceRef &locationService,
+ const DBInstanceRef &db,
std::map<osmscout::FileOffset,osmscout::AdminRegionRef> ®ionMap);
void addObjectInfo(QList<ObjectInfo> &objectList, // output
const WayRef &way,
const std::map<ObjectFileRef,LocationDescriptionService::ReverseLookupResult> &reverseLookupMap,
- LocationServiceRef &locationService,
+ const DBInstanceRef &db,
std::map<osmscout::FileOffset,osmscout::AdminRegionRef> ®ionMap);
void addObjectInfo(QList<ObjectInfo> &objectList, // output
const AreaRef &area,
const std::map<ObjectFileRef,LocationDescriptionService::ReverseLookupResult> &reverseLookupMap,
- LocationServiceRef &locationService,
+ const DBInstanceRef &db,
std::map<osmscout::FileOffset,osmscout::AdminRegionRef> ®ionMap);
- AdminRegionInfoRef buildAdminRegionInfo(DBInstanceRef &db,const osmscout::AdminRegionRef ®ion);
-
- QList<AdminRegionInfoRef> BuildAdminRegionInfoList(AdminRegionInfoRef &bottom,
- std::map<osmscout::FileOffset,AdminRegionInfoRef> ®ionInfoMap);
+ static AdminRegionInfoRef buildAdminRegionInfo(const DBInstanceRef &db,const osmscout::AdminRegionRef ®ion);
- static QStringList BuildAdminRegionList(const osmscout::LocationServiceRef& locationService,
- const osmscout::AdminRegionRef& adminRegion,
- std::map<osmscout::FileOffset,osmscout::AdminRegionRef> ®ionMap);
+ static QList<AdminRegionInfoRef> BuildAdminRegionInfoList(AdminRegionInfoRef &bottom,
+ std::map<osmscout::FileOffset,AdminRegionInfoRef> ®ionInfoMap);
- static QStringList BuildAdminRegionList(const osmscout::AdminRegionRef& adminRegion,
- std::map<osmscout::FileOffset,osmscout::AdminRegionRef> regionMap);
+ static QList<AdminRegionInfoRef> BuildAdminRegionList(const DBInstanceRef &db,
+ const osmscout::AdminRegionRef& adminRegion,
+ std::map<osmscout::FileOffset,osmscout::AdminRegionRef> ®ionMap);
void filterObjectInView(const osmscout::MapData &data,
QList<ObjectInfo> &objectList);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/MapManager.h
^
|
| @@ -63,17 +63,17 @@
void start();
- inline QString getMapName() const
+ QString getMapName() const
{
return map.getName();
}
- inline QStringList getMapPath() const
+ QStringList getMapPath() const
{
return map.getPath();
}
- inline uint64_t expectedSize() const override
+ uint64_t expectedSize() const override
{
return map.getSize();
}
@@ -159,17 +159,17 @@
* Time of map import
* @return
*/
- inline QDateTime getCreation() const
+ QDateTime getCreation() const
{
return creation;
}
- inline int getVersion() const
+ int getVersion() const
{
return version;
}
- inline bool operator<(const MapDirectory &o) const
+ bool operator<(const MapDirectory &o) const
{
if (getName() == o.getName()){
return getDir().absolutePath() < o.getDir().absolutePath();
@@ -227,16 +227,16 @@
void downloadMap(AvailableMapsModelMap map, QDir dir, bool replaceExisting = true);
void downloadNext();
- inline QList<MapDownloadJob*> getDownloadJobs() const {
+ QList<MapDownloadJob*> getDownloadJobs() const {
return downloadJobs;
}
- inline QStringList getLookupDirectories() const
+ QStringList getLookupDirectories() const
{
return databaseLookupDirs;
}
- inline QList<MapDirectory> getDatabaseDirectories() const
+ QList<MapDirectory> getDatabaseDirectories() const
{
return databaseDirectories;
}
@@ -249,4 +249,4 @@
}
-#endif /* OSMSCOUT_CLIENT_QT_MAPMANAGER_H */
+#endif /* OSMSCOUT_CLIENT_QT_MAPMANAGER_H */
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/MapObjectInfoModel.h
^
|
| @@ -60,7 +60,8 @@
PostalCodeRole = Qt::UserRole+9,
RegionRole = Qt::UserRole+10,
LatRole = Qt::UserRole+11,
- LonRole = Qt::UserRole+12
+ LonRole = Qt::UserRole+12,
+ AltLangName = Qt::UserRole+13
};
Q_ENUM(Roles)
@@ -118,6 +119,7 @@
QList<osmscout::MapData> mapData;
double mapDpi;
LookupModule* lookupModule;
+ SettingsRef settings;
};
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/MapProvider.h
^
|
| @@ -48,16 +48,16 @@
public:
MapProvider() = default;
- inline MapProvider(const MapProvider &o):
+ MapProvider(const MapProvider &o):
QObject(o.parent()),
valid(o.valid), uri(o.uri), listUri(o.listUri), name(o.name){};
- inline MapProvider(QString name, QString uri, QString listUri):
+ MapProvider(QString name, QString uri, QString listUri):
valid(true), uri(uri), listUri(listUri), name(name) {}
~MapProvider() override = default;
- inline MapProvider& operator=(const MapProvider &o)
+ MapProvider& operator=(const MapProvider &o)
{
valid = o.valid;
uri = o.uri;
@@ -67,22 +67,22 @@
return *this;
}
- inline QString getName() const
+ QString getName() const
{
return name;
}
- inline QString getUri() const
+ QString getUri() const
{
return uri;
}
- inline QUrl getListUri(int fromVersion, int toVersion, QString locale="en") const
+ QUrl getListUri(int fromVersion, int toVersion, QString locale="en") const
{
return listUri.arg(fromVersion).arg(toVersion).arg(locale);
}
- inline bool isValid() const
+ bool isValid() const
{
return valid;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/NearPOIModel.h
^
|
| @@ -85,7 +85,8 @@
LonRole = Qt::UserRole +4,
DistanceRole = Qt::UserRole +5,
BearingRole = Qt::UserRole +6,
- LocationObjectRole = Qt::UserRole +7
+ LocationObjectRole = Qt::UserRole +7,
+ AltLangName = Qt::UserRole +8
};
Q_ENUM(Roles)
@@ -115,6 +116,7 @@
QStringList types;
POILookupModule *poiModule{nullptr};
+ SettingsRef settings;
public:
NearPOIModel();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/OnlineTileProvider.h
^
|
| @@ -43,19 +43,19 @@
public:
OnlineTileProvider() = default;
- inline OnlineTileProvider(const OnlineTileProvider &o):
+ OnlineTileProvider(const OnlineTileProvider &o):
QObject(o.parent()),
valid(o.valid), id(o.id), name(o.name), servers(o.servers),
maximumZoomLevel(o.maximumZoomLevel), copyright(o.copyright){};
- inline OnlineTileProvider(const QString &id, const QString &name, const QStringList &servers, int maximumZoomLevel,
+ OnlineTileProvider(const QString &id, const QString &name, const QStringList &servers, int maximumZoomLevel,
QString copyright):
valid(true), id(id), name(name), servers(servers), maximumZoomLevel(maximumZoomLevel),
copyright(copyright){};
~OnlineTileProvider() override = default;
- inline OnlineTileProvider& operator=(const OnlineTileProvider &o)
+ OnlineTileProvider& operator=(const OnlineTileProvider &o)
{
valid = o.valid;
id = o.id;
@@ -67,23 +67,23 @@
return *this;
}
- inline QString getId() const {
+ QString getId() const {
return id;
}
- inline int getMaximumZoomLevel() const {
+ int getMaximumZoomLevel() const {
return maximumZoomLevel;
}
- inline QString getName() const {
+ QString getName() const {
return name;
}
- inline QStringList getServers() const {
+ QStringList getServers() const {
return servers;
}
- inline bool isValid() const {
+ bool isValid() const {
return valid;
}
@@ -105,4 +105,4 @@
}
-#endif /* OSMSCOUT_CLIENT_QT_ONLINETILEPROVIDER_H */
+#endif /* OSMSCOUT_CLIENT_QT_ONLINETILEPROVIDER_H */
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/OsmTileDownloader.h
^
|
| @@ -67,4 +67,4 @@
}
-#endif /* OSMSCOUT_CLIENT_QT_OSMTILEDOWNLOADER_H */
+#endif /* OSMSCOUT_CLIENT_QT_OSMTILEDOWNLOADER_H */
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/OverlayObject.h
^
|
| @@ -72,7 +72,7 @@
void bboxChanged();
public:
- OverlayObject(QObject *parent=Q_NULLPTR);
+ explicit OverlayObject(QObject *parent=Q_NULLPTR);
explicit OverlayObject(const std::vector<osmscout::Point> &nodes,
QString typeName="_route",
@@ -99,47 +99,47 @@
}
}
- inline QString getTypeName() const
+ QString getTypeName() const
{
QMutexLocker locker(&lock);
return typeName;
}
- inline void setTypeName(const QString &name){
+ void setTypeName(const QString &name){
QMutexLocker locker(&lock);
typeName=name;
}
- inline size_t getSize(){
+ size_t getSize(){
QMutexLocker locker(&lock);
return nodes.size();
}
- inline qint8 getLayer() const
+ qint8 getLayer() const
{
QMutexLocker locker(&lock);
return layer;
}
- inline void setLayer(qint8 l)
+ void setLayer(qint8 l)
{
QMutexLocker locker(&lock);
layer = l;
}
- inline QString getName() const
+ QString getName() const
{
QMutexLocker locker(&lock);
return name;
}
- inline void setName(const QString &n)
+ void setName(const QString &n)
{
QMutexLocker locker(&lock);
name = n;
}
- inline QString getColor() const
+ QString getColor() const
{
QMutexLocker locker(&lock);
return color;
@@ -170,7 +170,7 @@
Q_OBJECT
public:
- OverlayArea(QObject *parent=Q_NULLPTR);
+ explicit OverlayArea(QObject *parent=Q_NULLPTR);
explicit OverlayArea(const std::vector<osmscout::Point> &nodes,
QString typeName="_route",
@@ -191,7 +191,7 @@
Q_OBJECT
public:
- OverlayWay(QObject *parent=Q_NULLPTR);
+ explicit OverlayWay(QObject *parent=Q_NULLPTR);
explicit OverlayWay(const std::vector<osmscout::Point> &nodes,
QString typeName="_route",
@@ -212,7 +212,7 @@
Q_OBJECT
public:
- OverlayNode(QObject *parent=Q_NULLPTR);
+ explicit OverlayNode(QObject *parent=Q_NULLPTR);
explicit OverlayNode(const std::vector<osmscout::Point> &nodes,
QString typeName="_route",
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/QtRouteData.h
^
|
| @@ -67,7 +67,7 @@
QtRouteData& operator=(const QtRouteData&);
QtRouteData& operator=(const QtRouteData&&) = delete;
- inline operator bool() const {
+ explicit operator bool() const {
return (bool)data;
};
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/SearchLocationModel.h
^
|
| @@ -148,6 +148,7 @@
bool searching;
SearchModule* searchModule;
LookupModule* lookupModule;
+ SettingsRef settings;
osmscout::GeoCoord searchCenter;
int resultLimit;
osmscout::BreakerRef breaker;
@@ -165,7 +166,9 @@
LonRole = Qt::UserRole +4,
DistanceRole = Qt::UserRole +5,
BearingRole = Qt::UserRole +6,
- LocationObjectRole = Qt::UserRole +7
+ LocationObjectRole = Qt::UserRole +7,
+ IndexedAdminRegionRole = Qt::UserRole +8,
+ AltLangName = Qt::UserRole +9
};
public:
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/SearchModule.h
^
|
| @@ -43,6 +43,8 @@
protected:
SearchModule *searchModule;
DBInstanceRef db;
+ NameFeatureValueReader nameReader;
+ NameAltFeatureValueReader altNameReader;
QString searchPattern;
int limit;
osmscout::BreakerRef breaker;
@@ -59,28 +61,26 @@
std::future<bool> getFuture();
protected:
- bool BuildLocationEntry(const osmscout::ObjectFileRef& object,
- const QString &title,
- DBInstanceRef &db,
- std::map<osmscout::FileOffset,osmscout::AdminRegionRef> &adminRegionMap,
- QList<LocationEntry> &locations);
-
- bool BuildLocationEntry(const osmscout::LocationSearchResult::Entry &entry,
- DBInstanceRef &db,
- std::map<osmscout::FileOffset,osmscout::AdminRegionRef> &adminRegionMap,
- QList<LocationEntry> &locations);
-
- bool GetObjectDetails(DBInstanceRef &db,
- const osmscout::ObjectFileRef& object,
+ bool GetObjectDetails(const osmscout::ObjectFileRef& object,
+ const std::string &searchKey,
QString &typeName,
+ QString &name,
+ QString &altName,
osmscout::GeoCoord& coordinates,
osmscout::GeoBox& bbox);
- bool GetObjectDetails(DBInstanceRef &db,
- const std::vector<osmscout::ObjectFileRef>& objects,
+ bool GetObjectDetails(const std::vector<osmscout::ObjectFileRef>& objects,
+ const std::string &searchKey,
QString &typeName,
+ QString &name,
+ QString &altName,
osmscout::GeoCoord& coordinates,
osmscout::GeoBox& bbox);
+
+ void GetObjectNames(const FeatureValueBuffer &features,
+ QString &typeName,
+ QString &name,
+ QString &altName);
};
/**
@@ -108,6 +108,10 @@
int limit,
osmscout::BreakerRef &breaker,
std::map<osmscout::FileOffset,osmscout::AdminRegionRef> &adminRegionMap);
+
+ bool BuildLocationEntry(const osmscout::LocationSearchResult::Entry &entry,
+ std::map<osmscout::FileOffset,osmscout::AdminRegionRef> &adminRegionMap,
+ QList<LocationEntry> &locations);
};
/**
@@ -129,6 +133,18 @@
const QString &searchPattern,
int limit,
std::map<osmscout::FileOffset,osmscout::AdminRegionRef> &adminRegionMap);
+
+ /**
+ * @param object
+ * @param searchKey index key matching search query
+ * @param adminRegionMap cached map of administrative regions
+ * @param locations list where new location is added
+ * @return true on success
+ */
+ bool BuildLocationEntry(const osmscout::ObjectFileRef& object,
+ const std::string &searchKey,
+ std::map<osmscout::FileOffset,osmscout::AdminRegionRef> &adminRegionMap,
+ QList<LocationEntry> &locations);
};
/**
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/TileCache.h
^
|
| @@ -96,7 +96,7 @@
void tileRequested(uint32_t zoomLevel, uint32_t x, uint32_t y);
public:
- TileCache(size_t cacheSize);
+ explicit TileCache(size_t cacheSize);
~TileCache() override;
/**
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/VehiclePosition.h
^
|
| @@ -46,20 +46,26 @@
Q_PROPERTY(double bearing READ getBearingRadians CONSTANT)
public:
- inline explicit VehiclePosition(QObject *parent = nullptr) :
+ explicit VehiclePosition(QObject *parent = nullptr) :
QObject(parent)
{}
- inline VehiclePosition(const Vehicle &vehicle,
- const PositionAgent::PositionState &state,
- const GeoCoord &coord,
- const std::optional<Bearing> &bearing,
- const std::optional<GeoCoord> &nextStepCoord,
- QObject *parent = nullptr):
- QObject(parent), vehicle(vehicle), state(state), coord(coord), bearing(bearing), nextStepCoord(nextStepCoord)
+ VehiclePosition(const Vehicle& vehicle,
+ const PositionAgent::PositionState& state,
+ const GeoCoord& coord,
+ const std::optional<Bearing>& bearing,
+ const std::optional<GeoCoord>& nextStepCoord,
+ QObject* parent=nullptr)
+ :
+ QObject(parent),
+ vehicle(vehicle),
+ state(state),
+ coord(coord),
+ bearing(bearing),
+ nextStepCoord(nextStepCoord)
{}
- inline VehiclePosition & operator=(const VehiclePosition &o)
+ VehiclePosition & operator=(const VehiclePosition &o)
{
vehicle=o.vehicle;
state=o.state;
@@ -69,37 +75,37 @@
return *this;
}
- inline double getLat() const
+ double getLat() const
{
return coord.GetLat();
}
- inline double getLon() const
+ double getLon() const
{
return coord.GetLon();
}
- inline GeoCoord getCoord() const
+ GeoCoord getCoord() const
{
return coord;
}
- inline std::optional<Bearing> getBearing() const
+ std::optional<Bearing> getBearing() const
{
return bearing;
}
- inline double getBearingRadians() const
+ double getBearingRadians() const
{
return bearing ? bearing->AsRadians() : 0;
}
- inline std::optional<GeoCoord> getNextStepCoord() const
+ std::optional<GeoCoord> getNextStepCoord() const
{
return nextStepCoord;
}
- inline PositionAgent::PositionState getState() const
+ PositionAgent::PositionState getState() const
{
return state;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/Voice.h
^
|
| @@ -69,41 +69,41 @@
~AvailableVoice() override = default;
- inline VoiceProvider getProvider() const
+ VoiceProvider getProvider() const
{
return provider;
}
- inline QString getLang() const
+ QString getLang() const
{
return lang;
}
- inline QString getGender() const
+ QString getGender() const
{
return gender;
}
- inline QString getName() const
+ QString getName() const
{
return name;
}
- inline QString getLicense() const
+ QString getLicense() const
{
return license;
}
- inline QString getDirectory() const
+ QString getDirectory() const
{
return directory;
}
- inline QString getAuthor() const
+ QString getAuthor() const
{
return author;
}
- inline QString getDescription() const
+ QString getDescription() const
{
return description;
}
- inline bool isValid() const
+ bool isValid() const
{
return valid;
}
@@ -132,37 +132,37 @@
return dir;
}
- inline QString getLang() const
+ QString getLang() const
{
return lang;
}
- inline QString getGender() const
+ QString getGender() const
{
return gender;
}
- inline QString getName() const
+ QString getName() const
{
return name;
}
- inline QString getLicense() const
+ QString getLicense() const
{
return license;
}
- inline QString getAuthor() const
+ QString getAuthor() const
{
return author;
}
- inline QString getDescription() const
+ QString getDescription() const
{
return description;
}
- inline bool isValid() const
+ bool isValid() const
{
return valid;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/VoiceManager.h
^
|
| @@ -49,7 +49,7 @@
void start();
- inline uint64_t expectedSize() const override
+ uint64_t expectedSize() const override
{
return 0;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/VoiceProvider.h
^
|
| @@ -48,39 +48,41 @@
public:
VoiceProvider() = default;
- inline VoiceProvider(const VoiceProvider &o):
+ VoiceProvider(const VoiceProvider &o):
QObject(o.parent()),
valid(o.valid), uri(o.uri), listUri(o.listUri), name(o.name){};
- inline VoiceProvider(const QString &name, const QString &uri, const QString &listUri):
+ VoiceProvider(const QString &name, const QString &uri, const QString &listUri):
valid(true), uri(uri), listUri(listUri), name(name) {}
~VoiceProvider() override = default;
- inline void operator=(const VoiceProvider &o)
+ VoiceProvider& operator=(const VoiceProvider &o)
{
valid = o.valid;
uri = o.uri;
listUri = o.listUri;
name = o.name;
+
+ return *this;
}
- inline QString getName() const
+ QString getName() const
{
return name;
}
- inline QString getUri() const
+ QString getUri() const
{
return uri;
}
- inline QUrl getListUri(QString locale="en") const
+ QUrl getListUri(QString locale="en") const
{
return listUri.arg(locale);
}
- inline bool isValid() const
+ bool isValid() const
{
return valid;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/DBJob.cpp
^
|
| @@ -24,8 +24,8 @@
DBJob::DBJob():
QObject(),
- locker(nullptr),
- thread(QThread::currentThread())
+ thread(QThread::currentThread()),
+ locker(nullptr)
{
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/LocationEntry.cpp
^
|
| @@ -27,8 +27,9 @@
LocationEntry::LocationEntry(Type type,
const QString& label,
+ const QString& altName,
const QString& objectType,
- const QStringList& adminRegionList,
+ const QList<AdminRegionInfoRef>& adminRegionList,
const QString database,
const osmscout::GeoCoord coord,
const osmscout::GeoBox bbox,
@@ -36,6 +37,7 @@
: QObject(parent),
type(type),
label(label),
+ altName(altName),
objectType(objectType),
adminRegionList(adminRegionList),
database(database),
@@ -46,8 +48,8 @@
}
LocationEntry::LocationEntry(const QString& label,
- const osmscout::GeoCoord& coord,
- QObject* parent)
+ const osmscout::GeoCoord& coord,
+ QObject* parent)
: QObject(parent),
type(typeCoordinate),
label(label),
@@ -67,6 +69,7 @@
: QObject(other.parent()), // make copy of Qt ownership
type(other.type),
label(other.label),
+ altName(other.altName),
objectType(other.objectType),
adminRegionList(other.adminRegionList),
database(other.database),
@@ -82,6 +85,7 @@
// Qt ownership is unchanged
type=other.type;
label=other.label;
+ altName=other.altName;
objectType=other.objectType;
adminRegionList=other.adminRegionList;
database=other.database;
@@ -95,6 +99,7 @@
: QObject(other.parent()), // make copy of Qt ownership
type(std::move(other.type)),
label(std::move(other.label)),
+ altName(std::move(other.altName)),
objectType(std::move(other.objectType)),
adminRegionList(std::move(other.adminRegionList)),
database(std::move(other.database)),
@@ -109,6 +114,7 @@
setParent(other.parent()); // make copy of Qt ownership
type=std::move(other.type);
label=std::move(other.label);
+ altName=std::move(other.altName);
objectType=std::move(other.objectType);
adminRegionList=std::move(other.adminRegionList);
database=std::move(other.database);
@@ -166,7 +172,7 @@
return objectType;
}
-QStringList LocationEntry::getAdminRegionList() const
+QList<AdminRegionInfoRef> LocationEntry::getAdminRegionList() const
{
return adminRegionList;
}
@@ -181,6 +187,11 @@
return label;
}
+QString LocationEntry::getAltName() const
+{
+ return altName;
+}
+
osmscout::GeoCoord LocationEntry::getCoord() const
{
return coord;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/LocationInfoModel.cpp
^
|
| @@ -31,6 +31,7 @@
ready(false), setup(false)
{
lookupModule=OSMScoutQt::GetInstance().MakeLookupModule();
+ settings=OSMScoutQt::GetInstance().GetSettings();
connect(lookupModule, &LookupModule::initialisationFinished,
this, &LocationInfoModel::dbInitialized,
@@ -117,6 +118,8 @@
roles[PhoneRole] = "phone";
roles[AddressLocationRole] = "addressLocation";
roles[AddressNumberRole] = "addressNumber";
+ roles[IndexedAdminRegionRole] = "indexedAdminRegion";
+ roles[AltLangName]="altLangName";
return roles;
}
@@ -158,7 +161,7 @@
void LocationInfoModel::addToModel(const QString database,
const osmscout::LocationAtPlaceDescriptionRef description,
- const QStringList regions)
+ const QList<AdminRegionInfoRef> regions)
{
ObjectKey key = {database, description->GetPlace().GetObject()};
if (objectSet.contains(key)){
@@ -199,6 +202,7 @@
QString postalCode;
QString website;
QString phone;
+ QString altName;
if (place.GetObjectFeatures()){
for (const auto& featureInstance :place.GetObjectFeatures()->GetType()->GetFeatures()){
if (place.GetObjectFeatures()->HasFeature(featureInstance.GetIndex())){
@@ -206,19 +210,19 @@
if (feature->HasValue()){
osmscout::FeatureValue *value=place.GetObjectFeatures()->GetValue(featureInstance.GetIndex());
- const osmscout::PostalCodeFeatureValue *postalCodeValue = dynamic_cast<const osmscout::PostalCodeFeatureValue*>(value);
- if (postalCodeValue!=nullptr){
- postalCode = QString::fromStdString(postalCodeValue->GetPostalCode());
- }
- const osmscout::WebsiteFeatureValue *websiteValue = dynamic_cast<const osmscout::WebsiteFeatureValue*>(value);
- if (websiteValue!=nullptr){
+ if (const osmscout::PostalCodeFeatureValue *postalCodeValue = dynamic_cast<const osmscout::PostalCodeFeatureValue*>(value);
+ postalCodeValue!=nullptr){
+ postalCode = QString::fromStdString(postalCodeValue->GetPostalCode());
+ } else if (const osmscout::WebsiteFeatureValue *websiteValue = dynamic_cast<const osmscout::WebsiteFeatureValue*>(value);
+ websiteValue!=nullptr){
website = QString::fromStdString(websiteValue->GetWebsite());
- }
-
- const osmscout::PhoneFeatureValue *phoneValue = dynamic_cast<const osmscout::PhoneFeatureValue*>(value);
- if (phoneValue!=nullptr){
+ } else if (const osmscout::PhoneFeatureValue *phoneValue = dynamic_cast<const osmscout::PhoneFeatureValue*>(value);
+ phoneValue!=nullptr){
phone = QString::fromStdString(phoneValue->GetPhone());
+ } else if (const osmscout::NameAltFeatureValue *altNameValue = dynamic_cast<const osmscout::NameAltFeatureValue*>(value);
+ altNameValue != nullptr){
+ altName = QString::fromStdString(altNameValue->GetNameAlt());
}
}
}
@@ -231,7 +235,7 @@
}
obj[LabelRole] = QString::fromStdString(place.GetDisplayString());
- obj[RegionRole] = regions;
+ obj[RegionRole] = LookupModule::AdminRegionNames(regions, settings->GetShowAltLanguage());
obj[AddressRole] = address;
obj[InPlaceRole] = inPlace;
obj[DistanceRole] = distance.AsMeter();
@@ -243,6 +247,8 @@
obj[PhoneRole] = phone;
obj[AddressLocationRole] = addressLocation;
obj[AddressNumberRole] = addressNumber;
+ obj[IndexedAdminRegionRole] = LookupModule::IndexedAdminRegionNames(regions, settings->GetShowAltLanguage());
+ obj[AltLangName] = altName;
model << obj;
@@ -253,7 +259,7 @@
void LocationInfoModel::onLocationDescription(const osmscout::GeoCoord location,
const QString database,
const osmscout::LocationDescription description,
- const QStringList regions)
+ const QList<AdminRegionInfoRef> regions)
{
if (location != this->location){
return; // not our request
@@ -315,19 +321,11 @@
std::sort(regions.begin(),regions.end(),adminRegionComparator);
const AdminRegionInfoRef bottom=regions.first();
- QStringList regionNames;
- QString lastName=bottom->name;
- for (const auto ®ion:regions){
- // remove duplicate names
- if (region->name!=lastName) {
- regionNames << region->name;
- }
- lastName=region->name;
- }
+ QStringList regionNames=LookupModule::AdminRegionNames(regions, settings->GetShowAltLanguage());
- obj[LabelRole] = bottom->name;
+ obj[LabelRole] = bottom->qStringName();
obj[RegionRole] = regionNames;
- obj[AddressRole] = bottom->name;
+ obj[AddressRole] = bottom->qStringName();
obj[InPlaceRole] = true;
obj[DistanceRole] = 0;
obj[BearingRole] = "";
@@ -338,6 +336,8 @@
obj[PhoneRole] = "";
obj[AddressLocationRole] = "";
obj[AddressNumberRole] = "";
+ obj[IndexedAdminRegionRole] = QStringList();
+ obj[AltLangName] = bottom->qStringAltName();
model << obj;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/LookupModule.cpp
^
|
| @@ -76,7 +76,7 @@
void LookupModule::addObjectInfo(QList<ObjectInfo> &objectList, // output
const NodeRef &n,
const std::map<ObjectFileRef,LocationDescriptionService::ReverseLookupResult> &reverseLookupMap,
- LocationServiceRef &locationService,
+ const DBInstanceRef &db,
std::map<osmscout::FileOffset,osmscout::AdminRegionRef> ®ionMap)
{
std::vector<osmscout::Point> nodes;
@@ -88,15 +88,15 @@
n->GetCoords(),
n,
reverseLookupMap,
- locationService,
+ db,
regionMap);
}
void LookupModule::addObjectInfo(QList<ObjectInfo> &objectList, // output
const WayRef &w,
- const std::map<ObjectFileRef,LocationDescriptionService::ReverseLookupResult> &reverseLookupMap,
- LocationServiceRef &locationService,
- std::map<osmscout::FileOffset,osmscout::AdminRegionRef> ®ionMap)
+ const std::map<ObjectFileRef,LocationDescriptionService::ReverseLookupResult> &reverseLookupMap,
+ const DBInstanceRef &db,
+ std::map<osmscout::FileOffset,osmscout::AdminRegionRef> ®ionMap)
{
addObjectInfo(objectList,
"way",
@@ -105,14 +105,14 @@
w->GetBoundingBox().GetCenter(),
w,
reverseLookupMap,
- locationService,
+ db,
regionMap);
}
void LookupModule::addObjectInfo(QList<ObjectInfo> &objectList, // output
const AreaRef &a,
const std::map<ObjectFileRef,LocationDescriptionService::ReverseLookupResult> &reverseLookupMap,
- LocationServiceRef &locationService,
+ const DBInstanceRef &db,
std::map<osmscout::FileOffset,osmscout::AdminRegionRef> ®ionMap)
{
for (const auto &ring:a->rings) {
@@ -120,7 +120,7 @@
if (type->GetIgnore()) {
continue;
}
- // Master ring don't contains nodes! Use intersection of all outer rings instead
+ // Master ring don't contain nodes! Use intersection of all outer rings instead
osmscout::GeoBox bbox=(ring.nodes.empty() ? a->GetBoundingBox() : ring.GetBoundingBox());
addObjectInfo(objectList,
@@ -131,7 +131,7 @@
type,
ring.GetFeatureValueBuffer(),
reverseLookupMap,
- locationService,
+ db,
regionMap);
}
}
@@ -173,7 +173,6 @@
MapData mapData;
auto database=db->GetDatabase();
- auto locationService=db->GetLocationService();
database->GetAreasByOffset(areaOffsets, mapData.areas);
database->GetWaysByOffset(wayOffsets, mapData.ways);
database->GetNodesByOffset(nodeOffsets, mapData.nodes);
@@ -191,17 +190,17 @@
}
for (auto const &n:mapData.nodes){
- addObjectInfo(objectList,n,reverseLookupMap,locationService,regionMap);
+ addObjectInfo(objectList,n,reverseLookupMap,db,regionMap);
}
//std::cout << "ways: " << d.ways.size() << std::endl;
for (auto const &w:mapData.ways){
- addObjectInfo(objectList,w,reverseLookupMap,locationService,regionMap);
+ addObjectInfo(objectList,w,reverseLookupMap,db,regionMap);
}
//std::cout << "areas: " << d.areas.size() << std::endl;
for (auto const &a:mapData.areas){
- addObjectInfo(objectList,a,reverseLookupMap,locationService,regionMap);
+ addObjectInfo(objectList,a,reverseLookupMap,db,regionMap);
}
}
}
@@ -223,7 +222,7 @@
// TODO: add reverse lookup for objects on the view
std::map<ObjectFileRef,LocationDescriptionService::ReverseLookupResult> reverseLookupMap;
std::map<osmscout::FileOffset,osmscout::AdminRegionRef> regionMap;
- LocationServiceRef locationService;
+ DBInstanceRef db;
double x;
double y;
@@ -234,7 +233,7 @@
for (auto const &n:mapData.nodes){
projection.GeoToPixel(n->GetCoords(),x,y);
if (filterRectangle.contains(x,y)){
- addObjectInfo(objectList,n,reverseLookupMap,locationService,regionMap);
+ addObjectInfo(objectList, n, reverseLookupMap, db, regionMap);
}
}
@@ -245,7 +244,7 @@
projection.GeoToPixel(bbox.GetMinCoord(),x,y);
projection.GeoToPixel(bbox.GetMaxCoord(),x2,y2);
if (filterRectangle.intersects(QRectF(QPointF(x,y),QPointF(x2,y2)))){
- addObjectInfo(objectList,w,reverseLookupMap,locationService,regionMap);
+ addObjectInfo(objectList, w, reverseLookupMap, db, regionMap);
}
}
@@ -256,7 +255,7 @@
projection.GeoToPixel(bbox.GetMinCoord(),x,y);
projection.GeoToPixel(bbox.GetMaxCoord(),x2,y2);
if (filterRectangle.intersects(QRectF(QPointF(x,y),QPointF(x2,y2)))){
- addObjectInfo(objectList,a,reverseLookupMap,locationService,regionMap);
+ addObjectInfo(objectList, a, reverseLookupMap, db, regionMap);
}
}
}
@@ -299,7 +298,7 @@
auto place = description.GetAtAddressDescription()->GetPlace();
emit locationDescription(location, db->path, description,
- BuildAdminRegionList(db->GetLocationService(), place.GetAdminRegion(), regionMap));
+ BuildAdminRegionList(db, place.GetAdminRegion(), regionMap));
}
if (!db->GetLocationDescriptionService()->DescribeLocationByPOI(location, description)) {
@@ -312,7 +311,7 @@
auto place = description.GetAtPOIDescription()->GetPlace();
emit locationDescription(location, db->path, description,
- BuildAdminRegionList(db->GetLocationService(), place.GetAdminRegion(), regionMap));
+ BuildAdminRegionList(db, place.GetAdminRegion(), regionMap));
}
}
@@ -321,19 +320,22 @@
);
}
-AdminRegionInfoRef LookupModule::buildAdminRegionInfo(DBInstanceRef &db,
+AdminRegionInfoRef LookupModule::buildAdminRegionInfo(const DBInstanceRef &db,
const osmscout::AdminRegionRef ®ion){
AdminRegionInfoRef info=std::make_shared<AdminRegionInfo>();
- info->database=db->path;
info->adminRegion=region;
- info->name=QString::fromStdString(region->name);
info->adminLevel=-1;
+ if (!db) {
+ return info;
+ }
+
+ info->database=db->path;
+
// read admin region features
auto database=db->GetDatabase();
osmscout::TypeConfigRef typeConfig=database->GetTypeConfig();
- osmscout::FeatureValueReader<osmscout::NameAltFeature,osmscout::NameAltFeatureValue> altNameReader(*typeConfig);
osmscout::FeatureValueReader<osmscout::AdminLevelFeature,osmscout::AdminLevelFeatureValue> adminLevelReader(*typeConfig);
osmscout::FeatureValueBufferRef objectFeatureBuff;
@@ -341,27 +343,23 @@
osmscout::WayRef way;
osmscout::AreaRef area;
- osmscout::NameAltFeatureValue *altNameValue=nullptr;
osmscout::AdminLevelFeatureValue *adminLevelValue=nullptr;
switch (region->object.GetType()){
case osmscout::refNode:
if (database->GetNodeByOffset(region->object.GetFileOffset(), node)) {
- altNameValue=altNameReader.GetValue(node->GetFeatureValueBuffer());
adminLevelValue=adminLevelReader.GetValue(node->GetFeatureValueBuffer());
info->type=QString::fromStdString(node->GetType()->GetName());
}
break;
case osmscout::refWay:
if (database->GetWayByOffset(region->object.GetFileOffset(), way)) {
- altNameValue=altNameReader.GetValue(way->GetFeatureValueBuffer());
adminLevelValue=adminLevelReader.GetValue(way->GetFeatureValueBuffer());
info->type=QString::fromStdString(way->GetType()->GetName());
}
break;
case osmscout::refArea:
if (database->GetAreaByOffset(region->object.GetFileOffset(), area)) {
- altNameValue=altNameReader.GetValue(area->GetFeatureValueBuffer());
adminLevelValue=adminLevelReader.GetValue(area->GetFeatureValueBuffer());
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/MapObjectInfoModel.cpp
^
|
| @@ -31,7 +31,8 @@
{
lookupModule=OSMScoutQt::GetInstance().MakeLookupModule();
- this->mapDpi=OSMScoutQt::GetInstance().GetSettings()->GetMapDPI();
+ settings=OSMScoutQt::GetInstance().GetSettings();
+ this->mapDpi=settings->GetMapDPI();
connect(lookupModule, &LookupModule::initialisationFinished,
this, &MapObjectInfoModel::dbInitialized,
@@ -95,6 +96,7 @@
roles[RegionRole] = "region";
roles[LatRole] = "lat";
roles[LonRole] = "lon";
+ roles[AltLangName] = "altLangName";
return roles;
}
@@ -151,6 +153,12 @@
return QVariant();
return QVariant::fromValue(obj.name);
}
+ if (role==AltLangName) {
+ if (obj.altLangName.isEmpty()) {
+ return QVariant();
+ }
+ return QVariant::fromValue(obj.altLangName);
+ }
if (role==ObjectRole){
return QVariant::fromValue(createOverlayObject(index.row()));
@@ -178,7 +186,7 @@
return QVariant::fromValue(QString::fromStdString(obj.reverseLookupRef->postalArea->name));
}
if (role==RegionRole){
- return QVariant::fromValue(obj.adminRegionList);
+ return QVariant::fromValue(LookupModule::AdminRegionNames(obj.adminRegionList, settings->GetShowAltLanguage()));
}
if (role==LatRole){
return QVariant::fromValue(obj.center.GetLat());
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/NearPOIModel.cpp
^
|
| @@ -25,6 +25,7 @@
NearPOIModel::NearPOIModel()
{
poiModule=OSMScoutQt::GetInstance().MakePOILookupModule();
+ settings=OSMScoutQt::GetInstance().GetSettings();
connect(this, &NearPOIModel::lookupPOIRequest,
poiModule, &POILookupModule::lookupPOIRequest,
@@ -74,7 +75,7 @@
else
return location->getObjectType();
case RegionRole:
- return location->getAdminRegionList();
+ return LookupModule::AdminRegionNames(location->getAdminRegionList(), settings->GetShowAltLanguage());
case LatRole:
return QVariant::fromValue(location->getCoord().GetLat());
case LonRole:
@@ -95,6 +96,8 @@
case LocationObjectRole:
// QML will take ownership
return QVariant::fromValue(new LocationEntry(*location));
+ case AltLangName:
+ return location->getAltName();
default:
break;
}
@@ -123,6 +126,7 @@
roles[DistanceRole]="distance";
roles[BearingRole]="bearing";
roles[LocationObjectRole]="locationObject";
+ roles[AltLangName]="altLangName";
return roles;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/OverlayObject.cpp
^
|
| @@ -111,7 +111,8 @@
return new LocationEntry(LocationEntry::Type::typeNone,
"bbox",
"bbox",
- QStringList(),
+ "",
+ QList<AdminRegionInfoRef>(),
"",
bbox.GetCenter(),
bbox);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/POILookupModule.cpp
^
|
| @@ -44,9 +44,8 @@
osmscout::GeoCoord coordinates,
osmscout::GeoBox bbox)
{
- QStringList adminRegionList;
-
QString title;
+ QString altName;
QString objectType = QString::fromUtf8(obj->GetType()->GetName().c_str());
const osmscout::FeatureValueBuffer &features=obj->GetFeatureValueBuffer();
@@ -62,7 +61,12 @@
title=QString::fromStdString(ref->GetLabel(osmscout::Locale(), 0));
}
- LocationEntry location(LocationEntry::typeObject, title, objectType, adminRegionList,
+ if (const osmscout::NameAltFeatureValue *name=features.findValue<osmscout::NameAltFeatureValue>();
+ name!=nullptr) {
+ altName = QString::fromStdString(name->GetLabel(osmscout::Locale(), 0));
+ }
+
+ LocationEntry location(LocationEntry::typeObject, title, altName, objectType, QList<AdminRegionInfoRef>(),
dbPath, coordinates, bbox);
location.addReference(obj->GetObjectFileRef());
return LocationEntry(location); // explicit copy. some older compilers (GCC 7.5.0) fails when tries to use deleted move constructor
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/SearchLocationModel.cpp
^
|
| @@ -36,6 +36,7 @@
{
searchModule=OSMScoutQt::GetInstance().MakeSearchModule();
lookupModule=OSMScoutQt::GetInstance().MakeLookupModule();
+ settings=OSMScoutQt::GetInstance().GetSettings();
connect(this, &LocationListModel::SearchRequested,
searchModule, &SearchModule::SearchForLocations,
@@ -254,7 +255,7 @@
!pattern.isEmpty() &&
defaultRegion &&
lastRequestDefaultRegion!=defaultRegion){
- osmscout::log.Debug() << "Search again with new default region: " << defaultRegion->name.toStdString();
+ osmscout::log.Debug() << "Search again with new default region: " << defaultRegion->name();
setPattern(pattern);
}
}
@@ -311,11 +312,11 @@
}
if (searching){
// we are still waiting for previous request, postpone current
- qDebug() << "Clear (" << locations.size() << ") postpone search" << pattern << "(default region:" << (defaultRegion?defaultRegion->name:"NULL") << ")";
+ qDebug() << "Clear (" << locations.size() << ") postpone search" << pattern << "(default region:" << (defaultRegion?defaultRegion->qStringName():"NULL") << ")";
return;
}
- qDebug() << "Clear (" << locations.size() << ") search" << pattern << "(default region:" << (defaultRegion?defaultRegion->name:"NULL") << ")";
+ qDebug() << "Clear (" << locations.size() << ") search" << pattern << "(default region:" << (defaultRegion?defaultRegion->qStringName():"NULL") << ")";
searching = true;
lastRequestPattern = pattern;
lastRequestDefaultRegion=defaultRegion;
@@ -347,7 +348,7 @@
else
return location->getObjectType();
case RegionRole:
- return location->getAdminRegionList();
+ return LookupModule::AdminRegionNames(location->getAdminRegionList(), settings->GetShowAltLanguage());
case LatRole:
return QVariant::fromValue(location->getCoord().GetLat());
case LonRole:
@@ -369,6 +370,10 @@
case LocationObjectRole:
// QML will take ownership
return QVariant::fromValue(new LocationEntry(*location));
+ case IndexedAdminRegionRole:
+ return LookupModule::IndexedAdminRegionNames(location->getAdminRegionList(), settings->GetShowAltLanguage());;
+ case AltLangName:
+ return location->getAltName();
default:
break;
}
@@ -397,6 +402,8 @@
roles[DistanceRole]="distance";
roles[BearingRole]="bearing";
roles[LocationObjectRole]="locationObject";
+ roles[IndexedAdminRegionRole]="indexedAdminRegion";
+ roles[AltLangName]="altLangName";
return roles;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/SearchModule.cpp
^
|
| @@ -33,6 +33,8 @@
osmscout::BreakerRef &breaker):
searchModule(searchModule),
db(db),
+ nameReader(*(db->GetDatabase()->GetTypeConfig())),
+ altNameReader(*(db->GetDatabase()->GetTypeConfig())),
searchPattern(searchPattern),
limit(limit),
breaker(breaker)
@@ -52,7 +54,8 @@
AdminRegionInfoRef &defaultRegionInfo):
SearchRunnable(searchModule, db, searchPattern, limit, breaker),
defaultRegionInfo(defaultRegionInfo)
-{}
+{
+}
void SearchLocationsRunnable::run()
{
@@ -75,7 +78,8 @@
int limit,
osmscout::BreakerRef &breaker):
SearchRunnable(searchModule, db, searchPattern, limit, breaker)
-{}
+{
+}
void FreeTextSearchRunnable::run()
{
@@ -136,7 +140,7 @@
}
for (auto &entry: result.results){
- if (!BuildLocationEntry(entry, db, adminRegionMap, locations)){
+ if (!BuildLocationEntry(entry, adminRegionMap, locations)){
if (breaker) {
breaker->Break();
}
@@ -166,13 +170,14 @@
textSearch.Search(searchPattern.toStdString(),
/*searchPOIs*/ true, /*searchLocations*/ true,
/*searchRegions*/ true, /*searchOther*/ true,
+ /*transliterate*/ true,
resultsTxt);
for(const auto &e: resultsTxt) {
if (locations.size()>=limit) {
break;
}
- QString title=QString::fromStdString(e.first);
+
const std::vector<osmscout::ObjectFileRef> &refs=e.second;
for (const auto &fref:refs){
@@ -185,7 +190,7 @@
}
objectSet << fref;
- BuildLocationEntry(fref, title, db, adminRegionMap, locations);
+ BuildLocationEntry(fref, e.first, adminRegionMap, locations);
}
}
@@ -273,22 +278,25 @@
emit searchFinished(searchPattern, /*error*/ false);
}
-bool SearchRunnable::BuildLocationEntry(const osmscout::ObjectFileRef& object,
- const QString &title,
- DBInstanceRef &db,
- std::map<osmscout::FileOffset,osmscout::AdminRegionRef> &/*adminRegionMap*/,
- QList<LocationEntry> &locations
- )
+bool FreeTextSearchRunnable::BuildLocationEntry(const osmscout::ObjectFileRef& object,
+ const std::string &searchKey,
+ std::map<osmscout::FileOffset,osmscout::AdminRegionRef> &/*adminRegionMap*/,
+ QList<LocationEntry> &locations)
{
- QStringList adminRegionList;
+ QList<AdminRegionInfoRef> adminRegionList;
QString objectType;
+ QString name;
+ QString altName;
osmscout::GeoCoord coordinates;
osmscout::GeoBox bbox;
- if (!GetObjectDetails(db, object, objectType, coordinates, bbox)){
+ if (!GetObjectDetails(object, searchKey, objectType, name, altName, coordinates, bbox)){
return false;
}
- osmscout::log.Debug() << "obj: " << title.toStdString() << " (" << objectType.toStdString() << ")";
+ if (name.isEmpty()) {
+ name = QString::fromStdString(searchKey);
+ }
+ osmscout::log.Debug() << "obj: " << name.toStdString() << " (" << objectType.toStdString() << ")";
// Reverse lookup is slow for all search entries
// TODO: move it to SearchModel and make it asynchronous
@@ -306,7 +314,7 @@
}
*/
- LocationEntry location(LocationEntry::typeObject, title, objectType, adminRegionList,
+ LocationEntry location(LocationEntry::typeObject, name, altName, objectType, adminRegionList,
db->path, coordinates, bbox);
location.addReference(object);
locations.append(location);
@@ -314,18 +322,14 @@
return true;
}
-bool SearchRunnable::BuildLocationEntry(const osmscout::LocationSearchResult::Entry &entry,
- DBInstanceRef &db,
- std::map<osmscout::FileOffset,osmscout::AdminRegionRef> &adminRegionMap,
- QList<LocationEntry> &locations
- )
+bool SearchLocationsRunnable::BuildLocationEntry(const osmscout::LocationSearchResult::Entry &entry,
+ std::map<osmscout::FileOffset,osmscout::AdminRegionRef> &adminRegionMap,
+ QList<LocationEntry> &locations)
{
- if (entry.adminRegion){
- db->GetLocationService()->ResolveAdminRegionHierachie(entry.adminRegion, adminRegionMap);
- }
-
- QStringList adminRegionList=LookupModule::BuildAdminRegionList(entry.adminRegion, adminRegionMap);
+ QList<AdminRegionInfoRef> adminRegionList=LookupModule::BuildAdminRegionList(db, entry.adminRegion, adminRegionMap);
QString objectType;
+ QString name;
+ QString altName;
osmscout::GeoCoord coordinates;
osmscout::GeoBox bbox;
@@ -333,21 +337,21 @@
entry.location &&
entry.address) {
- QString loc=QString::fromUtf8(entry.location->name.c_str());
- QString address=QString::fromUtf8(entry.address->name.c_str());
+ QString loc=QString::fromStdString(entry.location->name);
+ QString address=QString::fromStdString(entry.address->name);
QString label;
label+=loc;
label+=" ";
label+=address;
- if (!GetObjectDetails(db, entry.address->object, objectType, coordinates, bbox)){
+ if (!GetObjectDetails(entry.address->object, entry.location->name, objectType, name, altName, coordinates, bbox)){
return false;
}
osmscout::log.Debug() << "address: " << label.toStdString();
- LocationEntry location(LocationEntry::typeObject, label, objectType, adminRegionList,
+ LocationEntry location(LocationEntry::typeObject, label, altName, objectType, adminRegionList,
db->path, coordinates, bbox);
location.addReference(entry.address->object);
locations.append(location);
@@ -355,14 +359,14 @@
else if (entry.adminRegion &&
entry.location) {
- QString loc=QString::fromUtf8(entry.location->name.c_str());
- if (!GetObjectDetails(db, entry.location->objects, objectType, coordinates, bbox)){
+ QString loc=QString::fromStdString(entry.location->name);
+ if (!GetObjectDetails(entry.location->objects, entry.location->name, objectType, name, altName, coordinates, bbox)){
return false;
}
osmscout::log.Debug() << "loc: " << loc.toStdString();
- LocationEntry location(LocationEntry::typeObject, loc, objectType, adminRegionList,
+ LocationEntry location(LocationEntry::typeObject, loc, altName, objectType, adminRegionList,
db->path, coordinates, bbox);
for (auto object : entry.location->objects) {
@@ -373,29 +377,28 @@
else if (entry.adminRegion &&
entry.poi) {
- QString poi=QString::fromUtf8(entry.poi->name.c_str());
- if (!GetObjectDetails(db, entry.poi->object, objectType, coordinates, bbox)){
+ QString poi=QString::fromStdString(entry.poi->name);
+ if (!GetObjectDetails(entry.poi->object, entry.poi->name, objectType, name, altName, coordinates, bbox)){
return false;
}
osmscout::log.Debug() << "poi: " << poi.toStdString();
- LocationEntry location(LocationEntry::typeObject, poi, objectType, adminRegionList,
+ LocationEntry location(LocationEntry::typeObject, poi, altName, objectType, adminRegionList,
db->path, coordinates, bbox);
location.addReference(entry.poi->object);
locations.append(location);
}
else if (entry.adminRegion) {
- QString objectType;
- if (!GetObjectDetails(db, entry.adminRegion->object, objectType, coordinates, bbox)){
+ if (!GetObjectDetails(entry.adminRegion->object, entry.adminRegion->name, objectType, name, altName, coordinates, bbox)){
return false;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-gpx/include/osmscoutgpx/GpxFile.h
^
|
| @@ -45,4 +45,5 @@
};
}
}
+
#endif //OSMSCOUT_GPX_GPXFILE_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-gpx/include/osmscoutgpx/Import.h
^
|
| @@ -34,7 +34,6 @@
namespace osmscout {
namespace gpx {
-
extern OSMSCOUT_GPX_API bool ImportGpx(const std::string &filePath,
GpxFile &output,
BreakerRef breaker =nullptr,
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-import/include/osmscoutimport/GenLocationIndex.h
^
|
| @@ -39,34 +39,32 @@
namespace osmscout {
- class LocationIndexGenerator CLASS_FINAL : public ImportModule
- {
- public:
- static const char* const FILENAME_LOCATION_REGION_TXT;
- static const char* const FILENAME_LOCATION_FULL_TXT;
- static const char* const FILENAME_LOCATION_METRICS_TXT;
+ namespace locidx {
- private:
+ /**
+ * Holds some metrics regarding names in the given region. These metrics
+ * are input for some heuristics regarding searching.
+ */
struct RegionMetrics CLASS_FINAL
{
- uint32_t minRegionChars;
- uint32_t maxRegionChars;
- uint32_t minRegionWords;
- uint32_t maxRegionWords;
- uint32_t maxPOIWords;
- uint32_t minLocationChars;
- uint32_t maxLocationChars;
- uint32_t minLocationWords;
- uint32_t maxLocationWords;
- uint32_t maxAddressWords;
+ uint32_t minRegionChars=std::numeric_limits<uint32_t>::max();
+ uint32_t maxRegionChars=0;
+ uint32_t minRegionWords=std::numeric_limits<uint32_t>::max();
+ uint32_t maxRegionWords=0;
+ uint32_t maxPOIWords=0;
+ uint32_t minLocationChars=std::numeric_limits<uint32_t>::max();
+ uint32_t maxLocationChars=0;
+ uint32_t minLocationWords=std::numeric_limits<uint32_t>::max();
+ uint32_t maxLocationWords=0;
+ uint32_t maxAddressWords=0;
- RegionMetrics();
+ RegionMetrics() = default;
};
/**
- * An area can contain an number of location nodes. Since they do not have
+ * An region can contain an number of location nodes. Since they do not have
* their own area we define the node name as an alias for the containing
- * area, since this is the best approximation.
+ * region, since this is the best approximation.
*/
struct RegionAlias CLASS_FINAL
{
@@ -84,9 +82,9 @@
ObjectFileRef object; //!< Object
RegionPOI(const std::string& name,
- const ObjectFileRef& object)
- : name(name),
- object(object)
+ const ObjectFileRef& object)
+ : name(name),
+ object(object)
{
// no code
}
@@ -97,6 +95,9 @@
}
};
+ /**
+ * An address within a region (normally a house number)
+ */
struct RegionAddress CLASS_FINAL
{
std::string name; //!< The house number
@@ -104,8 +105,8 @@
RegionAddress(const std::string& name,
const ObjectFileRef& object)
- : name(name),
- object(object)
+ : name(name),
+ object(object)
{
// no code
}
@@ -116,6 +117,10 @@
}
};
+ /**
+ * A location within a region. A location is represented by a number of objects.
+ * A location holds a list of addresses.
+ */
struct RegionLocation CLASS_FINAL
{
std::unordered_map<std::string,
@@ -127,10 +132,9 @@
std::string GetName() const;
};
- class Region;
-
- typedef std::shared_ptr<Region> RegionRef;
-
+ /**
+ * A postal area is a list of locations that are represented by an id.
+ */
struct PostalArea CLASS_FINAL
{
std::string name; //!< name of the postal area
@@ -138,7 +142,7 @@
std::map<std::string,RegionLocation> locations; //!< list of indexed objects in this region
explicit PostalArea(const std::string& name)
- : name(name)
+ : name(name)
{
// no code
}
@@ -147,16 +151,30 @@
const ObjectFileRef& objectRef);
};
+ class Region;
+
+ using RegionRef = std::shared_ptr<Region>;
+
/**
- An area. An area is a administrative region, a city, a country, ...
- An area can have child areas (suburbs, ...).
- An area has a name and also a number of locations, which are possibly
- within the area but area currently also represented by this area.
+ An region is an area. An region represents a administrative region like a city, a country, ...
+
+ The region has a name, is represented by an objects and may have a number of aliases (that also name the region
+ or parts of the region).
+
+ It may also have an admin level.
+
+ A region consists of a number of areas that represent the region. The areas and the region itself
+ have bounding boxes.
+
+ An region can have child regions (suburbs, ...).
+
+ The region may have a list of POIs within its area.
+ An region holds a number of postal areas. There is always an (unnamed9 default postal area.
*/
class Region CLASS_FINAL
{
public:
- typedef std::unordered_map<std::string,PostalArea> PostalAreaMap;
+ using PostalAreaMap = std::unordered_map<std::string, PostalArea>;
private:
std::vector<GeoBox> boundingBoxes; //!< bounding box of each area building up the region (see areas)
@@ -190,21 +208,54 @@
bool Contains(Region& child) const; //! Checks whether child is within this
- inline GeoBox GetBoundingBox() const
+ GeoBox GetBoundingBox() const
{
return boundingBox;
}
- inline const std::vector<GeoBox> GetAreaBoundingBoxes() const
+ std::vector<GeoBox> GetAreaBoundingBoxes() const
{
return boundingBoxes;
}
+ void AddAlias(const RegionAlias& location,
+ const GeoCoord& node);
+
+ void AddPOINode(const FileOffset& fileOffset,
+ const std::string& name,
+ bool& added);
+
+ void AddPOIArea(const FileOffset& fileOffset,
+ const std::string& name,
+ const std::vector<Point>& nodes,
+ const GeoBox& boundingBox,
+ bool& added);
+
+ bool AddPOIWay(const FileOffset& fileOffset,
+ const std::string& name,
+ const std::vector<Point>& nodes,
+ const GeoBox& boundingBox,
+ bool& added);
+
void AddLocationObject(const std::string& name,
const std::string& postalCode,
const ObjectFileRef& objectRef);
- protected:
+ bool AddLocationArea(const Area& area,
+ const std::vector<Point>& nodes,
+ const std::string& name,
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-import/include/osmscoutimport/GenTextIndex.h
^
|
| @@ -66,6 +66,13 @@
const RefType& reftype,
std::string& keyString) const;
+ bool AddKeyStr(const std::string& text,
+ uint8_t offsetSizeBytes,
+ FileOffset offset,
+ const RefType& reftype,
+ marisa::Keyset *keyset,
+ ImportParameter::TextIndexVariant variant) const;
+
// keysets used to store text data and generate tries
marisa::Keyset keysetPoi;
marisa::Keyset keysetLocation;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-import/include/osmscoutimport/ImportParameter.h
^
|
| @@ -100,6 +100,13 @@
automatic = 2, // disable land detection when data polygon is known
};
+ enum class TextIndexVariant
+ {
+ original = 0, // store original names
+ transliterate = 1, // store transliterated form of names
+ both = 2, // store original and transliterated form of names
+ };
+
private:
std::list<std::string> mapfiles; //<! Name of the files containing map data (either *.osm or *.osm.pbf)
std::string typefile; //<! Name and path ff type definition file (map.ost.xml)
@@ -179,14 +186,16 @@
//<! place_name[:lang] tags
std::vector<std::string> altLangOrder; //<! the same as langOrder but for a alt (second) lang
- size_t maxAdminLevel; //<! Maximum admin level that gets evalutated
+ size_t maxAdminLevel; //<! Maximum admin level that gets evaluated
OSMId firstFreeOSMId; //<! first id available for synthetic objects (parsed polygon files)
size_t fillWaterArea; //<! count of tiles around coastlines flooded by water
PreprocessorFactoryRef preprocessorFactory; //<! Optional preprocessor factory to inject custom preprocessors
- public:
+ TextIndexVariant textIndexVariant;
+
+public:
ImportParameter();
virtual ~ImportParameter();
@@ -367,6 +376,9 @@
void SetAreaWayIndexMaxLevel(const MagnificationLevel& areaWayIndexMaxLevel);
+ void SetTextIndexVariant(TextIndexVariant textIndexVariant);
+ TextIndexVariant GetTextIndexVariant() const;
+
static size_t GetDefaultStartStep();
static size_t GetDefaultEndStep();
};
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-import/include/osmscoutimport/WaterIndexProcessor.h
^
|
| @@ -78,12 +78,12 @@
extern void WriteGpx(const std::vector<Point> &path, const std::string& name);
/**
- * Generator that calculates land, water and coast tiles based on passed costline data.
+ * Generator that calculates land, water and coast tiles based on passed coastline data.
* For more details how index is stored look to `WaterIndex` and description of tiles (cells)
* look to `GroundTile` struct.
*
- * For OSM data is usual that land is always left of the coast (in line direction)
- * and water is always right. But this generator don't require it, just Coast rigth/left
+ * For OSM data is land is always on the left of the coast (in line direction)
+ * and water is always on the right. But this generator don't require it, just Coast right/left
* state have to be defined correctly.
*
* See GenWaterIndex for usage. It is expected that methods are
@@ -127,15 +127,14 @@
* There may be two kind of "coastlines":
* - classic coastlines: define border between land and water (see)
* - data polygon: define area where database (and classic coastlines) are defined.
- * It usually have right/left state unknown/udefined
+ * It usually have right/left state unknown/undefined
*/
struct OSMSCOUT_IMPORT_API Coast
{
OSMId id;
bool isArea;
- double sortCriteria;
- Id frontNodeId;
- Id backNodeId;
+ Id frontNodeId; //!< Id of the first coast node (coords.front().GetId())
+ Id backNodeId; //!< Id of the last coast node (coords.back().GetId())
std::vector<Point> coast;
CoastState left;
CoastState right;
@@ -686,7 +685,7 @@
*/
void SynthesizeCoastlines(Progress& progress,
std::list<CoastRef>& coastlines,
- std::list<CoastRef>& boundingPolygons);
+ const std::list<CoastRef>& boundingPolygons);
/**
* Collects, calculates and generates a number of data about a coastline.
@@ -701,7 +700,7 @@
Data& data);
/**
- * Markes a cell as "coast", if one of the coastlines intersects with it.
+ * Marks a cell as "coast", if one of the coastlines intersects with it.
*/
void MarkCoastlineCells(Progress& progress,
StateMap& stateMap,
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-import/src/osmscoutimport/GenLocationIndex.cpp
^
|
| @@ -64,264 +64,271 @@
const char* const LocationIndexGenerator::FILENAME_LOCATION_FULL_TXT = "location_full.txt";
const char* const LocationIndexGenerator::FILENAME_LOCATION_METRICS_TXT = "location_metrics.txt";
- LocationIndexGenerator::RegionMetrics::RegionMetrics()
- : minRegionChars(std::numeric_limits<uint32_t>::max()),
- maxRegionChars(0),
- minRegionWords(std::numeric_limits<uint32_t>::max()),
- maxRegionWords(0),
- maxPOIWords(0),
- minLocationChars(std::numeric_limits<uint32_t>::max()),
- maxLocationChars(0),
- minLocationWords(std::numeric_limits<uint32_t>::max()),
- maxLocationWords(0),
- maxAddressWords(0)
+ /**
+ * Print the given number of spaces to the output to produce an "indent"
+ * @param out output stream
+ * @param indent number of spaces
+ */
+ static void printIndent(std::ostream& out, size_t indent)
{
- // no code
+ for (size_t i=0; i<indent; i++) {
+ out << " ";
+ }
}
- void LocationIndexGenerator::PostalArea::AddLocationObject(const std::string& name,
- const ObjectFileRef& objectRef)
- {
- std::string locationNameNorm=UTF8NormForLookup(name);
+ namespace locidx {
+ void PostalArea::AddLocationObject(const std::string& name,
+ const ObjectFileRef& objectRef)
+ {
+ std::string locationNameNorm=UTF8NormForLookup(name);
- RegionLocation& location=locations[locationNameNorm];
+ RegionLocation& location=locations[locationNameNorm];
- std::unordered_map<std::string,size_t>::iterator nameEntry=location.names.find(name);
+ auto nameEntry=location.names.find(name);
- if (nameEntry!=location.names.end()) {
- nameEntry->second++;
- }
- else {
- location.names[name]=1;
- }
+ if (nameEntry!=location.names.end()) {
+ nameEntry->second++;
+ }
+ else {
+ location.names[name]=1;
+ }
- location.objects.push_back(objectRef);
- }
+ location.objects.push_back(objectRef);
+ }
- LocationIndexGenerator::Region::Region()
- {
- PostalArea postalArea("");
+ Region::Region()
+ {
+ PostalArea postalArea("");
- // Always add a empty postal area for fallback to the index, to avoid "lookup and insert" on demand coast-
- defaultPostalArea=postalAreas.emplace(postalArea.name, postalArea).first;
- }
+ // Always add an empty postal area for fallback to the index, to avoid "lookup and insert" on demand coast-
+ defaultPostalArea=postalAreas.emplace(postalArea.name, postalArea).first;
+ }
- void LocationIndexGenerator::Region::CalculateMinMax()
- {
- bool isStart=true;
+ /**
+ * Calculates the bounding box of each area and the over all bounding box of all
+ * areas.
+ */
+ void Region::CalculateMinMax()
+ {
+ boundingBoxes.reserve(areas.size());
- boundingBoxes.reserve(areas.size());
+ for (const auto& area : areas) {
+ boundingBoxes.push_back(osmscout::GetBoundingBox(area));
+ }
- for (const auto& area : areas) {
GeoBox boundingBox;
- osmscout::GetBoundingBox(area,
- boundingBox);
-
- boundingBoxes.push_back(boundingBox);
-
- if (isStart) {
- this->boundingBox=boundingBox;
- isStart=false;
+ for (const auto& box : boundingBoxes) {
+ boundingBox.Include(box);
}
- else {
- this->boundingBox.Include(boundingBox);
- }
- }
- }
- bool LocationIndexGenerator::Region::CouldContain(const GeoBox& boundingBox) const
- {
- for (const auto& bb : boundingBoxes) {
- if (bb.Intersects(boundingBox)) {
- return true;
- }
+ this->boundingBox=boundingBox;
}
- return false;
- }
-
- bool LocationIndexGenerator::Region::CouldContain(const Region& region, bool strict) const
- {
- if (strict) {
- // test if the region can be fit into *this when the boundingBox
- // is taken into account
- double area_region = region.boundingBox.GetSize(); // reference area
- GeoBox bx(this->boundingBox.Intersection(region.boundingBox));
-
- // 95% of the bounding box has to be covered
- if ( !bx.IsValid() || area_region * 0.95 > bx.GetSize() )
+ bool Region::CouldContain(const GeoBox& boundingBox) const
+ {
+ if (!this->boundingBox.Intersects(boundingBox)) {
return false;
- }
+ }
- for (const auto& bb : boundingBoxes) {
- for (const auto& rbb : region.boundingBoxes) {
- if (bb.Intersects(rbb)) {
- return true;
+ return std::any_of(boundingBoxes.begin(),
+ boundingBoxes.end(),
+ [&boundingBox] (const auto& box) {
+ return box.Intersects(boundingBox);
+ });
+ }
+
+ bool Region::CouldContain(const Region& region, bool strict) const
+ {
+ if (strict) {
+ // test if the region can be fit into *this when the boundingBox
+ // is taken into account
+ double area_region = region.boundingBox.GetSize(); // reference area
+ GeoBox bx(this->boundingBox.Intersection(region.boundingBox));
+
+ // 95% of the bounding box has to be covered
+ if ( !bx.IsValid() || area_region * 0.95 > bx.GetSize() ) {
+ return false;
}
}
- }
- return false;
- }
+ for (const auto& bb : boundingBoxes) {
+ for (const auto& rbb : region.boundingBoxes) {
+ if (bb.Intersects(rbb)) {
+ return true;
+ }
+ }
+ }
- void LocationIndexGenerator::Region::CalculateProbePoints()
- {
- probePoints.clear();
- if ( boundingBoxes.size() != areas.size() ) {
- CalculateMinMax();
+ return false;
}
- for (size_t i=0; i < areas.size(); ++i) {
- CalculateProbePointsForArea(i, 0);
+ void Region::CalculateProbePoints()
+ {
+ probePoints.clear();
+ if ( boundingBoxes.size() != areas.size() ) {
+ CalculateMinMax();
+ }
+
+ size_t areasCount=areas.size();
+ for (size_t i=0; i < areasCount; ++i) {
+ CalculateProbePointsForArea(i, 0);
+ }
}
- }
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-import/src/osmscoutimport/GenTextIndex.cpp
^
|
| @@ -36,6 +36,7 @@
#include <osmscout/util/FileScanner.h>
#include <osmscout/util/FileWriter.h>
#include <osmscout/util/Number.h>
+#include <osmscout/util/String.h>
#include <osmscoutimport/GenTextIndex.h>
@@ -256,28 +257,20 @@
}
if(nameValue!=nullptr) {
- std::string keyString;
-
- if(BuildKeyStr(nameValue->GetName(),
- offsetSizeBytes,
- node.GetFileOffset(),
- refNode,
- keyString)) {
- keyset->push_back(keyString.c_str(),
- keyString.length());
- }
+ AddKeyStr(nameValue->GetName(),
+ offsetSizeBytes,
+ node.GetFileOffset(),
+ refNode,
+ keyset,
+ parameter.GetTextIndexVariant());
}
if(nameAltValue!=nullptr) {
- std::string keyString;
-
- if(BuildKeyStr(nameAltValue->GetNameAlt(),
- offsetSizeBytes,
- node.GetFileOffset(),
- refNode,
- keyString)) {
- keyset->push_back(keyString.c_str(),
- keyString.length());
- }
+ AddKeyStr(nameAltValue->GetNameAlt(),
+ offsetSizeBytes,
+ node.GetFileOffset(),
+ refNode,
+ keyset,
+ parameter.GetTextIndexVariant());
}
}
}
@@ -359,42 +352,30 @@
}
if(nameValue!=nullptr) {
- std::string keyString;
-
- if(BuildKeyStr(nameValue->GetName(),
- offsetSizeBytes,
- way.GetFileOffset(),
- refWay,
- keyString)) {
- keyset->push_back(keyString.c_str(),
- keyString.length());
- }
+ AddKeyStr(nameValue->GetName(),
+ offsetSizeBytes,
+ way.GetFileOffset(),
+ refWay,
+ keyset,
+ parameter.GetTextIndexVariant());
}
if(nameAltValue!=nullptr) {
- std::string keyString;
-
- if(BuildKeyStr(nameAltValue->GetNameAlt(),
- offsetSizeBytes,
- way.GetFileOffset(),
- refWay,
- keyString)) {
- keyset->push_back(keyString.c_str(),
- keyString.length());
- }
+ AddKeyStr(nameAltValue->GetNameAlt(),
+ offsetSizeBytes,
+ way.GetFileOffset(),
+ refWay,
+ keyset,
+ parameter.GetTextIndexVariant());
}
if(refValue!=nullptr) {
- std::string keyString;
-
- if(BuildKeyStr(refValue->GetRef(),
- offsetSizeBytes,
- way.GetFileOffset(),
- refWay,
- keyString)) {
- keyset->push_back(keyString.c_str(),
- keyString.length());
- }
+ AddKeyStr(refValue->GetRef(),
+ offsetSizeBytes,
+ way.GetFileOffset(),
+ refWay,
+ keyset,
+ parameter.GetTextIndexVariant());
}
}
@@ -469,28 +450,20 @@
}
if (nameValue!=nullptr) {
- std::string keyString;
-
- if(BuildKeyStr(nameValue->GetName(),
- offsetSizeBytes,
- area.GetFileOffset(),
- refArea,
- keyString)) {
- keyset->push_back(keyString.c_str(),
- keyString.length());
- }
+ AddKeyStr(nameValue->GetName(),
+ offsetSizeBytes,
+ area.GetFileOffset(),
+ refArea,
+ keyset,
+ parameter.GetTextIndexVariant());
}
if (nameAltValue!=nullptr) {
- std::string keyString;
-
- if(BuildKeyStr(nameAltValue->GetNameAlt(),
- offsetSizeBytes,
- area.GetFileOffset(),
- refArea,
- keyString)) {
- keyset->push_back(keyString.c_str(),
- keyString.length());
- }
+ AddKeyStr(nameAltValue->GetNameAlt(),
+ offsetSizeBytes,
+ area.GetFileOffset(),
+ refArea,
+ keyset,
+ parameter.GetTextIndexVariant());
}
}
}
@@ -566,4 +539,50 @@
return true;
}
+
+ bool TextIndexGenerator::AddKeyStr(const std::string& text,
+ uint8_t offsetSizeBytes,
+ FileOffset offset,
+ const RefType& reftype,
+ marisa::Keyset *keyset,
+ ImportParameter::TextIndexVariant variant) const
+ {
+ std::string textNorm = UTF8NormForLookup(text);
+ if (variant==ImportParameter::TextIndexVariant::transliterate || variant==ImportParameter::TextIndexVariant::both) {
+ std::string textTrans = UTF8Transliterate(textNorm);
+ if (variant==ImportParameter::TextIndexVariant::both && textTrans==textNorm) {
+ // there is no reason to store the same string twice
+ variant = ImportParameter::TextIndexVariant::transliterate;
+ }
+ std::string keyString;
+ if (BuildKeyStr(textTrans,
+ offsetSizeBytes,
+ offset,
+ reftype,
+ keyString)) {
+ keyset->push_back(keyString.c_str(),
+ keyString.length());
+ } else {
+ return false;
+ }
+ }
+
+ if (variant==ImportParameter::TextIndexVariant::original || variant==ImportParameter::TextIndexVariant::both) {
+ std::string keyString;
+ if (BuildKeyStr(textNorm,
+ offsetSizeBytes,
+ offset,
+ reftype,
+ keyString)) {
+ keyset->push_back(keyString.c_str(),
+ keyString.length());
+ } else {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-import/src/osmscoutimport/ImportParameter.cpp
^
|
| @@ -103,7 +103,8 @@
langOrder({"#"}),
maxAdminLevel(10),
firstFreeOSMId(((OSMId)1) << ((sizeof(OSMId)*8)-2)),
- fillWaterArea(20)
+ fillWaterArea(20),
+ textIndexVariant(TextIndexVariant::transliterate)
{
// no code
}
@@ -590,6 +591,16 @@
this->areaWayIndexMaxLevel=areaWayIndexMaxLevel;
}
+void ImportParameter::SetTextIndexVariant(TextIndexVariant textIndexVariant)
+{
+ this->textIndexVariant=textIndexVariant;
+}
+
+ImportParameter::TextIndexVariant ImportParameter::GetTextIndexVariant() const
+{
+ return textIndexVariant;
+}
+
void ImportParameter::SetAreaWayMinMag(MagnificationLevel areaWayMinMag)
{
this->areaWayMinMag=areaWayMinMag;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-import/src/osmscoutimport/SortNodeDat.cpp
^
|
| @@ -268,7 +268,7 @@
}
void SortNodeDataGenerator::GetDescription(const ImportParameter& /*parameter*/,
- ImportModuleDescription& description) const
+ ImportModuleDescription& description) const
{
description.SetName("SortNodeDataGenerator");
description.SetDescription("Sort nodes to improve lookup");
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-import/src/osmscoutimport/WaterIndexProcessor.cpp
^
|
| @@ -2219,7 +2219,7 @@
void WaterIndexProcessor::SynthesizeCoastlines(Progress& progress,
std::list<CoastRef>& coastlines,
- std::list<CoastRef>& boundingPolygons)
+ const std::list<CoastRef>& boundingPolygons)
{
progress.SetAction("Synthetize coastlines");
@@ -2254,7 +2254,7 @@
}
clock.Stop();
- progress.Info(std::to_string(boundingPolygons.size())+" bouding polygon(s), and "+
+ progress.Info(std::to_string(boundingPolygons.size())+" bounding polygon(s), and "+
std::to_string(allCoastlines.size())+" coastline(s) synthesized into "+
std::to_string(synthesized.size())+" coastlines(s), took "+
clock.ResultString() +" s"
@@ -2274,6 +2274,8 @@
size_t wayCoastCount=0;
size_t areaCoastCount=0;
+ mergedCoastlines.reserve(coastlines.size());
+
std::list<WaterIndexProcessor::CoastRef>::iterator c=coastlines.begin();
while (c!=coastlines.end()) {
WaterIndexProcessor::CoastRef coast=*c;
@@ -2305,7 +2307,9 @@
if (other!=coastStartMap.end() &&
blacklist.find(other->second->id)==blacklist.end() &&
- coast->id!=other->second->id) {
+ coast->id!=other->second->id &&
+ coast->right==other->second->right &&
+ coast->left==other->second->left) {
for (size_t i=1; i<other->second->coast.size(); i++) {
coast->coast.push_back(other->second->coast[i]);
}
@@ -2331,7 +2335,9 @@
if (coastline->frontNodeId==coastline->backNodeId) {
coastline->isArea=true;
- coastline->coast.pop_back();
+ if (!coastline->coast.empty()) {
+ coastline->coast.pop_back();
+ }
areaCoastCount++;
}
@@ -2353,7 +2359,10 @@
progress.Info(std::to_string(wayCoastCount)+" way coastline(s), "+std::to_string(areaCoastCount)+" area coastline(s)");
+ coastlines.clear();
std::move(mergedCoastlines.begin(), mergedCoastlines.end(), std::back_inserter(coastlines));
+ // coastlines cannot be empty after merging
+ assert(!std::any_of(coastlines.begin(), coastlines.end(), [](const auto &coastline){ return coastline->coast.empty(); }));
}
void WaterIndexProcessor::SynthesizeCoastlines2(Progress& progress,
@@ -2462,7 +2471,6 @@
part->right=c->right;
part->id=c->id;
- part->sortCriteria=c->sortCriteria;
part->isArea=false;
synthesized.push_back(part);
@@ -2514,13 +2522,13 @@
continue;
}
-if constexpr (debugCoastline) {
- std::cout.precision(5);
- std::cout << " Cut coastline from " <<
- int1.point.GetLat() << " " << int1.point.GetLon() << " to " <<
- int2.point.GetLat() << " " << int2.point.GetLon() <<
- std::endl;
-}
+ if constexpr (debugCoastline) {
+ std::cout.precision(5);
+ std::cout << " Cut coastline from " <<
+ int1.point.GetLat() << " " << int1.point.GetLon() << " to " <<
+ int2.point.GetLat() << " " << int2.point.GetLon() <<
+ std::endl;
+ }
CoastRef part=std::make_shared<Coast>();
@@ -2534,7 +2542,6 @@
part->left=coastline->left;
part->right=coastline->right;
part->id=coastline->id;
- part->sortCriteria=coastline->sortCriteria;
part->isArea=false;
synthesized.push_back(part);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-map-iosx/include/osmscoutmapiosx/MapPainterIOS.h
^
|
| @@ -156,6 +156,9 @@
friend IOSLabelLayouter;
private:
+ const float ProposedWidthExpandRatio = 1.6;
+ const float ProposedWidthMinWidth = 50.0;
+
CGContextRef cg;
CGFloat contentScale;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-map-iosx/src/osmscout/MapPainterIOS.mm
^
|
| @@ -368,18 +368,21 @@
CGRect rect = CGRectZero;
double proposedWidth = -1;
- if (enableWrapping && objectWidth > 50.0) {
- proposedWidth = GetProposedLabelWidth(parameter,
+ if (enableWrapping && objectWidth > ProposedWidthMinWidth) {
+ proposedWidth = ProposedWidthExpandRatio * GetProposedLabelWidth(parameter,
GetAverageCharWidth(projection, parameter, fontSize),
objectWidth,
text.length());
- log.Debug() << "proposedWidth=" << proposedWidth;
+ log.Debug() << "proposedWidth=" << proposedWidth << " for '" << text << "'";
}
- Font *font = GetFont(projection, parameter, fontSize);
+
NSString *str = [NSString stringWithCString:text.c_str() encoding:NSUTF8StringEncoding];
+ // replace hyphen by unicode NON-BREAKING HYPHEN
str = [str stringByReplacingOccurrencesOfString:@"-" withString:@"\u2011"];
+
+ Font *font = GetFont(projection, parameter, fontSize);
NSMutableDictionary<NSAttributedStringKey, id> *attr = [NSMutableDictionary dictionaryWithDictionary: @{}];
if(font){
attr[NSFontAttributeName] = font;
@@ -389,34 +392,38 @@
CFAttributedStringRef cfString = (__bridge CFAttributedStringRef)attrStr;
CTFramesetterRef framesetter = CTFramesetterCreateWithAttributedString(cfString);
- CGPathRef path;
- if (proposedWidth > 0){
- path = CGPathCreateWithRect(CGRectMake(0, 0, proposedWidth, std::numeric_limits<double>::max()), NULL);
- } else {
- path = CGPathCreateWithRect(CGRectMake(0, 0, std::numeric_limits<double>::max(), std::numeric_limits<double>::max()), NULL);
- }
- CTFrameRef frame = CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL);
- CGPathRelease(path);
- CFArrayRef lines = CTFrameGetLines(frame);
- for (int lineNumber = 0; lineNumber< CFArrayGetCount(lines); lineNumber++){
- CTLineRef line = (CTLineRef)CFArrayGetValueAtIndex(lines, lineNumber);
- result->label.line.push_back(line);
- CFArrayRef runArray = CTLineGetGlyphRuns(line);
- if(CFArrayGetCount(runArray) > 0){
- CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runArray, 0);
- result->label.run.push_back(run);
- rect = CGRectUnion(rect, CTRunGetImageBounds(run, cg, CFRangeMake(0, 0)));
+ if (framesetter) {
+ CGPathRef path;
+ if (proposedWidth > 0){
+ path = CGPathCreateWithRect(CGRectMake(0, 0, proposedWidth, std::numeric_limits<double>::max()), NULL);
+ } else {
+ path = CGPathCreateWithRect(CGRectMake(0, 0, std::numeric_limits<double>::max(), std::numeric_limits<double>::max()), NULL);
}
+ CTFrameRef frame = CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL);
+ CGPathRelease(path);
+ CFArrayRef lines = CTFrameGetLines(frame);
+ for (int lineNumber = 0; lineNumber< CFArrayGetCount(lines); lineNumber++){
+ CTLineRef line = (CTLineRef)CFArrayGetValueAtIndex(lines, lineNumber);
+ result->label.line.push_back(line);
+ CFArrayRef runArray = CTLineGetGlyphRuns(line);
+ if(CFArrayGetCount(runArray) > 0){
+ CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runArray, 0);
+ result->label.run.push_back(run);
+ rect = CGRectUnion(rect, CTRunGetImageBounds(run, cg, CFRangeMake(0, 0)));
+ }
+ }
+ result->label.lineWidth = rect.size.width;
+ result->label.lineHeight = GetFontHeight(projection, parameter, fontSize);
+
+ log.Debug() << "Layout '"<<text<<"' width=" << rect.size.width <<" height=" << rect.size.height;
+
+ result->text = text;
+ result->fontSize = fontSize;
+ result->width = rect.size.width;
+ result->height = rect.size.height;
+ } else {
+ log.Warn() << "CTFramesetterCreateFrame returned NULL";
}
- result->label.lineWidth = rect.size.width;
- result->label.lineHeight = GetFontHeight(projection, parameter, fontSize);
-
- log.Debug() << "Layout '"<<text<<"' width=" << rect.size.width <<" height=" << rect.size.height;
-
- result->text = text;
- result->fontSize = fontSize;
- result->width = rect.size.width;
- result->height = rect.size.height;
return result;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-map-opengl/src/osmscoutmapopengl/MapPainterOpenGL.cpp
^
|
| @@ -255,8 +255,7 @@
continue;
}
- osmscout::GeoBox ringBoundingBox;
- ring.GetBoundingBox(ringBoundingBox);
+ osmscout::GeoBox ringBoundingBox=ring.GetBoundingBox();
size_t j = i + 1;
int hasClippings = 0;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-map-qt/src/osmscoutmapqt/MapPainterQt.cpp
^
|
| @@ -576,6 +576,8 @@
double symbolWidth=symbol.GetWidth(projection);
double space=data.symbolSpace;
double offset=data.symbolOffset;
+ assert(space>0);
+ assert(offset>0);
bool isClosed=false;
Vertex2D origin;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-map/include/osmscoutmap/LabelLayouter.h
^
|
| @@ -605,9 +605,9 @@
}
template<class Painter>
- void DrawTextLabels(const Projection& projection,
- const MapParameter& parameter,
- Painter *p)
+ void DrawTextLabels(const Projection& /*projection*/,
+ const MapParameter& /*parameter*/,
+ Painter */*p*/) const
{
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-map/include/osmscoutmap/MapParameter.h
^
|
| @@ -195,222 +195,222 @@
void SetBreaker(const BreakerRef& breaker);
- inline std::string GetFontName() const
+ std::string GetFontName() const
{
return fontName;
}
- inline double GetFontSize() const
+ double GetFontSize() const
{
return fontSize;
}
- inline const std::list<std::string>& GetIconPaths() const
+ const std::list<std::string>& GetIconPaths() const
{
return iconPaths;
}
- inline const std::list<std::string>& GetPatternPaths() const
+ const std::list<std::string>& GetPatternPaths() const
{
return patternPaths;
}
- inline double GetLineMinWidthPixel() const
+ double GetLineMinWidthPixel() const
{
return lineMinWidthPixel;
}
- inline double GetAreaMinDimensionMM() const
+ double GetAreaMinDimensionMM() const
{
return areaMinDimensionMM;
}
- inline double GetSidecarMaxDistanceMM() const
+ double GetSidecarMaxDistanceMM() const
{
return sidecarMaxDistanceMM;
}
- inline double GetSidecarDistance() const
+ double GetSidecarDistance() const
{
return sidecarDistance;
}
- inline double GetSidecarMinDistanceMM() const
+ double GetSidecarMinDistanceMM() const
{
return sidecarMinDistanceMM;
}
- inline TransPolygon::OptimizeMethod GetOptimizeWayNodes() const
+ TransPolygon::OptimizeMethod GetOptimizeWayNodes() const
{
return optimizeWayNodes;
}
- inline TransPolygon::OptimizeMethod GetOptimizeAreaNodes() const
+ TransPolygon::OptimizeMethod GetOptimizeAreaNodes() const
{
return optimizeAreaNodes;
}
- inline double GetOptimizeErrorToleranceMm() const
+ double GetOptimizeErrorToleranceMm() const
{
return optimizeErrorToleranceMm;
}
- inline bool GetDrawFadings() const
+ bool GetDrawFadings() const
{
return drawFadings;
}
- inline bool GetDrawWaysWithFixedWidth() const
+ bool GetDrawWaysWithFixedWidth() const
{
return drawWaysWithFixedWidth;
}
- inline size_t GetLabelLineMinCharCount() const
+ size_t GetLabelLineMinCharCount() const
{
return labelLineMinCharCount;
}
- inline size_t GetLabelLineMaxCharCount() const
+ size_t GetLabelLineMaxCharCount() const
{
return labelLineMaxCharCount;
}
- inline bool GetLabelLineFitToArea() const
+ bool GetLabelLineFitToArea() const
{
return labelLineFitToArea;
}
- inline double GetLabelLineFitToWidth() const
+ double GetLabelLineFitToWidth() const
{
return labelLineFitToWidth;
}
- inline double GetLabelPadding() const
+ double GetLabelPadding() const
{
return labelPadding;
}
- inline double GetPlateLabelPadding() const
+ double GetPlateLabelPadding() const
{
return plateLabelPadding;
}
- inline double GetOverlayLabelPadding() const
+ double GetOverlayLabelPadding() const
{
return overlayLabelPadding;
}
- inline IconMode GetIconMode() const
+ IconMode GetIconMode() const
{
return iconMode;
}
- inline double GetIconSize() const
+ double GetIconSize() const
{
return iconSize;
}
- inline double GetIconPixelSize() const
+ double GetIconPixelSize() const
{
return iconPixelSize;
}
- inline double GetIconPadding() const
+ double GetIconPadding() const
{
return iconPadding;
}
- inline PatternMode GetPatternMode() const
+ PatternMode GetPatternMode() const
{
return patternMode;
}
- inline double GetPatternSize() const
+ double GetPatternSize() const
{
return patternSize;
}
- inline double GetContourLabelPadding() const
+ double GetContourLabelPadding() const
{
return contourLabelPadding;
}
- inline std::string GetRouteLabelSeparator() const
+ std::string GetRouteLabelSeparator() const
{
return routeLabelSeparator;
}
- inline double GetLabelLayouterOverlap() const
+ double GetLabelLayouterOverlap() const
{
return labelLayouterOverlap;
}
- inline double GetContourLabelOffset() const
+ double GetContourLabelOffset() const
{
return contourLabelOffset;
}
- inline double GetContourLabelSpace() const
+ double GetContourLabelSpace() const
{
return contourLabelSpace;
}
- inline bool GetRenderBackground() const
+ bool GetRenderBackground() const
{
return renderBackground;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout-map/src/osmscoutmap/MapPainter.cpp
^
|
| @@ -1033,12 +1033,17 @@
double symbolWidth=symbolBoundingBox.GetWidth()*symbolScale;
double length=data.coordRange.GetLength();
- size_t countSymbols=(length-symbolSpace)/(symbolWidth+symbolSpace);
+ if (length < (symbolWidth+symbolSpace)) {
+ continue; // too short way even for single symbol and required space
+ }
+ assert((symbolWidth+symbolSpace)>0);
+ size_t countSymbols=std::max(size_t(1), size_t((length - symbolSpace) / (symbolWidth + symbolSpace)));
size_t labelCountExp=log2(countSymbols);
countSymbols=pow(2, labelCountExp);
double space = (length-countSymbols*symbolWidth) / (countSymbols+1);
+ assert(space>0);
ContourSymbolData symbolData;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/Area.h
^
|
| @@ -197,7 +197,6 @@
bool GetCenter(GeoCoord& center) const;
- void GetBoundingBox(GeoBox& boundingBox) const;
GeoBox GetBoundingBox() const;
void SetType(const TypeInfoRef& type)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/GroundTile.h
^
|
| @@ -63,27 +63,27 @@
uint16_t y;
bool coast;
- inline Coord() = default;
+ Coord() = default;
- inline Coord(uint16_t x,
- uint16_t y,
- bool coast)
+ Coord(uint16_t x,
+ uint16_t y,
+ bool coast)
: x(x),
y(y),
coast(coast)
{
}
- inline void Set(uint16_t x,
- uint16_t y,
- bool coast)
+ void Set(uint16_t x,
+ uint16_t y,
+ bool coast)
{
this->x=x;
this->y=y;
this->coast=coast;
}
- inline bool operator==(const Coord &coord) const
+ bool operator==(const Coord &coord) const
{
return x==coord.x && y==coord.y && coast==coord.coast;
}
@@ -98,9 +98,9 @@
double cellHeight; //!< Height of cell
std::vector<Coord> coords; //!< Optional coordinates for coastline
- inline GroundTile() = default;
+ GroundTile() = default;
- inline explicit GroundTile(Type type)
+ explicit GroundTile(Type type)
: type(type)
{
// no code
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/Location.h
^
|
| @@ -270,38 +270,38 @@
const LocationRef& location,
const AddressRef& address);
- inline ObjectFileRef GetObject() const
+ ObjectFileRef GetObject() const
{
return object;
}
- inline FeatureValueBufferRef GetObjectFeatures() const
+ FeatureValueBufferRef GetObjectFeatures() const
{
return objectFeatures;
}
- inline AdminRegionRef GetAdminRegion() const
+ AdminRegionRef GetAdminRegion() const
{
return adminRegion;
}
- inline PostalAreaRef GetPostalArea() const
+ PostalAreaRef GetPostalArea() const
{
return postalArea;
}
- inline POIRef GetPOI() const
+ POIRef GetPOI() const
{
return poi;
}
- inline LocationRef GetLocation() const
+ LocationRef GetLocation() const
{
return location;
}
- inline AddressRef GetAddress() const
+ AddressRef GetAddress() const
{
return address;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/LocationDescriptionService.h
^
|
| @@ -63,12 +63,12 @@
double size; //!< The size o the place (size of the geographic bounding box)
public:
- inline LocationDescriptionCandicate(const ObjectFileRef &ref,
- const std::string& name,
- const Distance &distance,
- const Bearing &bearing,
- const bool atPlace,
- const double size)
+ LocationDescriptionCandicate(const ObjectFileRef& ref,
+ const std::string& name,
+ const Distance& distance,
+ const Bearing& bearing,
+ const bool atPlace,
+ const double size)
: ref(ref),
name(name),
distance(distance),
@@ -79,32 +79,32 @@
// no code
}
- inline ObjectFileRef GetRef() const
+ ObjectFileRef GetRef() const
{
return ref;
}
- inline std::string GetName() const
+ std::string GetName() const
{
return name;
}
- inline Distance GetDistance() const
+ Distance GetDistance() const
{
return distance;
}
- inline Bearing GetBearing() const
+ Bearing GetBearing() const
{
return bearing;
}
- inline bool IsAtPlace() const
+ bool IsAtPlace() const
{
return atPlace;
}
- inline double GetSize() const
+ double GetSize() const
{
return size;
}
@@ -132,7 +132,7 @@
/**
* Return the place this information is refering to
*/
- inline Place GetPlace() const
+ Place GetPlace() const
{
return place;
}
@@ -140,7 +140,7 @@
/**
* 'true' if the location is at the place itself (in spite of 'close to...')
*/
- inline bool IsAtPlace() const
+ bool IsAtPlace() const
{
return atPlace;
}
@@ -148,7 +148,7 @@
/**
* Return the distance to the location
*/
- inline Distance GetDistance() const
+ Distance GetDistance() const
{
return distance;
}
@@ -156,7 +156,7 @@
/**
* Return the bearing you have to go to from the place for 'distance' to reach the location
*/
- inline Bearing GetBearing() const
+ Bearing GetBearing() const
{
return bearing;
}
@@ -185,7 +185,7 @@
/**
* Return the place this information is refering to
*/
- inline Place GetWay() const
+ Place GetWay() const
{
return way;
}
@@ -193,7 +193,7 @@
/**
* Return the distance to the location
*/
- inline Distance GetDistance() const
+ Distance GetDistance() const
{
return distance;
}
@@ -228,7 +228,7 @@
/**
* Return the place this information is refering to
*/
- inline std::list<Place> GetWays() const
+ std::list<Place> GetWays() const
{
return ways;
}
@@ -236,7 +236,7 @@
/**
* 'true' if the location is at the place itself (in spite of 'close to...')
*/
- inline bool IsAtPlace() const
+ bool IsAtPlace() const
{
return atPlace;
}
@@ -244,7 +244,7 @@
/**
* Return the distance to the location
*/
- inline Distance GetDistance() const
+ Distance GetDistance() const
{
return distance;
}
@@ -252,12 +252,12 @@
/**
* Return the bearing you have to go to from the place for 'distance' to reach the location
*/
- inline Bearing GetBearing() const
+ Bearing GetBearing() const
{
return bearing;
}
- inline GeoCoord GetCrossing() const
+ GeoCoord GetCrossing() const
{
return crossing;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/LocationIndex.h
^
|
| @@ -202,22 +202,22 @@
bool IsRegionIgnoreToken(const std::string& token) const;
bool IsLocationIgnoreToken(const std::string& token) const;
- inline uint32_t GetRegionMaxWords() const
+ uint32_t GetRegionMaxWords() const
{
return maxRegionWords;
}
- inline uint32_t GetPOIMaxWords() const
+ uint32_t GetPOIMaxWords() const
{
return maxPOIWords;
}
- inline uint32_t GetLocationMaxWords() const
+ uint32_t GetLocationMaxWords() const
{
return maxLocationWords;
}
- inline uint32_t GetAddressMaxWords() const
+ uint32_t GetAddressMaxWords() const
{
return maxAddressWords;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/LocationService.h
^
|
| @@ -266,7 +266,7 @@
* the visitor pattern is used.
*
* Currently the following functionalities are supported:
- * - Visit all region (recursivly)
+ * - Visit all region (recursively)
* - Visit all locations of a region and (optionally) all locations of all
* sub regions.
* - Visit all addresses of a location (non recursive)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/ObjectVariantDataFile.h
^
|
| @@ -52,17 +52,17 @@
bool Load(const TypeConfig& typeConfig,
const std::string& filename);
- inline bool IsLoaded() const
+ bool IsLoaded() const
{
return isLoaded;
}
- inline std::string GetFilename() const
+ std::string GetFilename() const
{
return filename;
}
- inline const std::vector<ObjectVariantData>& GetData() const
+ const std::vector<ObjectVariantData>& GetData() const
{
return data;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/Path.h
^
|
| @@ -48,17 +48,17 @@
bool traversable);
Path(const Path& other);
- inline ObjectFileRef GetObject() const
+ ObjectFileRef GetObject() const
{
return object;
}
- inline size_t GetTargetNodeIndex() const
+ size_t GetTargetNodeIndex() const
{
return targetNodeIndex;
}
- inline bool IsTraversable() const
+ bool IsTraversable() const
{
return traversable;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/Route.h
^
|
| @@ -79,12 +79,12 @@
public:
Route() = default;
- inline FileOffset GetFileOffset() const
+ FileOffset GetFileOffset() const
{
return fileOffset;
}
- inline FileOffset GetNextFileOffset() const
+ FileOffset GetNextFileOffset() const
{
return nextFileOffset;
}
@@ -108,58 +108,58 @@
std::lock_guard<std::mutex> lock(cacheMutex);
return resolvedMembers;
}
-
- // inline ObjectFileRef GetObjectFileRef() const
+
+ // ObjectFileRef GetObjectFileRef() const
// {
// return {fileOffset,refRoute};
// }
- inline GeoBox GetBoundingBox() const
+ GeoBox GetBoundingBox() const
{
return bbox;
}
- inline TypeInfoRef GetType() const
+ TypeInfoRef GetType() const
{
return featureValueBuffer.GetType();
}
- inline size_t GetFeatureCount() const
+ size_t GetFeatureCount() const
{
return featureValueBuffer.GetType()->GetFeatureCount();
}
- inline bool HasFeature(size_t idx) const
+ bool HasFeature(size_t idx) const
{
return featureValueBuffer.HasFeature(idx);
}
- inline const FeatureInstance& GetFeature(size_t idx) const
+ const FeatureInstance& GetFeature(size_t idx) const
{
return featureValueBuffer.GetType()->GetFeature(idx);
}
- inline FeatureValue* GetFeatureValue(size_t idx) const
+ FeatureValue* GetFeatureValue(size_t idx) const
{
return featureValueBuffer.GetValue(idx);
}
- inline void UnsetFeature(size_t idx)
+ void UnsetFeature(size_t idx)
{
featureValueBuffer.FreeValue(idx);
}
- inline const FeatureValueBuffer& GetFeatureValueBuffer() const
+ const FeatureValueBuffer& GetFeatureValueBuffer() const
{
return featureValueBuffer;
}
- inline void SetType(const TypeInfoRef& type)
+ void SetType(const TypeInfoRef& type)
{
featureValueBuffer.SetType(type);
}
- inline void SetFeatures(const FeatureValueBuffer& buffer)
+ void SetFeatures(const FeatureValueBuffer& buffer)
{
featureValueBuffer.Set(buffer);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/SRTM.h
^
|
| @@ -49,7 +49,7 @@
size_t columns;
std::vector<int32_t> heights;
- inline int32_t GetHeight(size_t x, size_t y) const
+ int32_t GetHeight(size_t x, size_t y) const
{
return heights[y*columns+x];
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/Tag.h
^
|
| @@ -80,7 +80,7 @@
public:
explicit TagNotCondition(const TagConditionRef& condition);
- inline bool Evaluate(const TagMap& tagMap) const override
+ bool Evaluate(const TagMap& tagMap) const override
{
return !condition->Evaluate(tagMap);
}
@@ -132,7 +132,7 @@
public:
explicit TagExistsCondition(TagId tag);
- inline bool Evaluate(const TagMap& tagMap) const override
+ bool Evaluate(const TagMap& tagMap) const override
{
return tagMap.find(tag)!=tagMap.end();
}
@@ -212,7 +212,7 @@
TagInfo(TagId id,
const std::string& name);
- inline std::string GetName() const
+ std::string GetName() const
{
return name;
}
@@ -220,7 +220,7 @@
/**
* Returns the unique id of this tag
*/
- inline TagId GetId() const
+ TagId GetId() const
{
return id;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/TextSearchIndex.h
^
|
| @@ -65,6 +65,7 @@
bool searchLocations,
bool searchRegions,
bool searchOther,
+ bool transliterate,
ResultsMap& results) const;
private:
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/Way.h
^
|
| @@ -161,12 +161,8 @@
if (bbox.IsValid() || nodes.empty()) {
return bbox;
}
- GeoBox boundingBox;
- osmscout::GetBoundingBox(nodes,
- boundingBox);
-
- return boundingBox;
+ return osmscout::GetBoundingBox(nodes);
}
/**
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/navigation/SpeedAgent.h
^
|
| @@ -63,7 +63,7 @@
GeoCoord coord;
Timestamp time;
- inline operator bool() const
+ explicit operator bool() const
{
return time.time_since_epoch()!=Timestamp::duration::zero();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/navigation/VoiceInstructionAgent.h
^
|
| @@ -157,7 +157,7 @@
MessageStruct &operator=(const MessageStruct&) = default;
MessageStruct &operator=(MessageStruct&&) = default;
- operator bool() const
+ explicit operator bool() const
{
return type != MessageType::NoMessage;
}
@@ -184,7 +184,7 @@
Distance lastMessagePosition; // where we trigger last message (it is before lastMessage.disntace usually)
public:
- inline VoiceInstructionAgent(DistanceUnitSystem units):
+ explicit VoiceInstructionAgent(DistanceUnitSystem units):
units{units}
{};
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/routing/AbstractRoutingService.h
^
|
| @@ -63,37 +63,37 @@
public:
RoutingResult();
- inline void SetOverallDistance(const Distance &overallDistance)
+ void SetOverallDistance(const Distance &overallDistance)
{
this->overallDistance=overallDistance;
}
- inline void SetCurrentMaxDistance(const Distance ¤tMaxDistance)
+ void SetCurrentMaxDistance(const Distance ¤tMaxDistance)
{
this->currentMaxDistance=currentMaxDistance;
}
- inline Distance GetOverallDistance() const
+ Distance GetOverallDistance() const
{
return overallDistance;
}
- inline Distance GetCurrentMaxDistance() const
+ Distance GetCurrentMaxDistance() const
{
return currentMaxDistance;
}
- inline RouteData& GetRoute()
+ RouteData& GetRoute()
{
return route;
}
- inline const RouteData& GetRoute() const
+ const RouteData& GetRoute() const
{
return route;
}
- inline bool Success() const
+ bool Success() const
{
return !route.IsEmpty();
}
@@ -118,12 +118,12 @@
RoutePointsResult();
explicit RoutePointsResult(const RoutePointsRef& points);
- inline bool Success() const
+ bool Success() const
{
return success;
}
- inline RoutePointsRef GetPoints() const
+ RoutePointsRef GetPoints() const
{
return points;
}
@@ -139,12 +139,12 @@
RouteDescriptionResult();
explicit RouteDescriptionResult(const RouteDescriptionRef& description);
- inline bool Success() const
+ bool Success() const
{
return success;
}
- inline RouteDescriptionRef GetDescription() const
+ RouteDescriptionRef GetDescription() const
{
return description;
}
@@ -160,12 +160,12 @@
RouteWayResult();
explicit RouteWayResult(const WayRef& way);
- inline bool Success() const
+ bool Success() const
{
return success;
}
- inline WayRef GetWay() const
+ WayRef GetWay() const
{
return way;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/routing/DBFileOffset.h
^
|
| @@ -56,22 +56,22 @@
~DBId() = default;
- inline bool IsValid() const
+ bool IsValid() const
{
return id!=0;
}
- inline bool operator==(const DBId& other) const
+ bool operator==(const DBId& other) const
{
return database==other.database && id==other.id;
}
- inline bool operator!=(const DBId& other) const
+ bool operator!=(const DBId& other) const
{
return database!=other.database || id!=other.id;
}
- inline bool operator<(const DBId& other) const
+ bool operator<(const DBId& other) const
{
return std::tie(database, id) < std::tie(other.database, other.id);
}
@@ -104,22 +104,22 @@
{
}
- inline bool IsValid() const
+ bool IsValid() const
{
return offset!=0;
}
- inline bool operator==(const DBFileOffset& other) const
+ bool operator==(const DBFileOffset& other) const
{
return database==other.database && offset==other.offset;
}
- inline bool operator!=(const DBFileOffset& other) const
+ bool operator!=(const DBFileOffset& other) const
{
return database!=other.database || offset!=other.offset;
}
- inline bool operator<(const DBFileOffset& other) const
+ bool operator<(const DBFileOffset& other) const
{
return std::tie(database, offset) < std::tie(other.database, other.offset);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/routing/RouteData.h
^
|
| @@ -54,37 +54,37 @@
void SetObjects(const std::vector<ObjectFileRef>& objects);
- inline Id GetCurrentNodeId() const
+ Id GetCurrentNodeId() const
{
return currentNodeId;
}
- inline DBFileOffset GetDBFileOffset() const
+ DBFileOffset GetDBFileOffset() const
{
return DBFileOffset(GetDatabaseId(),GetPathObject().GetFileOffset());
}
- inline DatabaseId GetDatabaseId() const
+ DatabaseId GetDatabaseId() const
{
return database;
}
- inline size_t GetCurrentNodeIndex() const
+ size_t GetCurrentNodeIndex() const
{
return currentNodeIndex;
}
- inline ObjectFileRef GetPathObject() const
+ ObjectFileRef GetPathObject() const
{
return pathObject;
}
- inline size_t GetTargetNodeIndex() const
+ size_t GetTargetNodeIndex() const
{
return targetNodeIndex;
}
- inline const std::vector<ObjectFileRef>& GetObjects() const
+ const std::vector<ObjectFileRef>& GetObjects() const
{
return objects;
}
@@ -96,7 +96,7 @@
public:
void Clear();
- inline bool IsEmpty() const
+ bool IsEmpty() const
{
return entries.empty();
}
@@ -107,22 +107,22 @@
const ObjectFileRef& pathObject,
size_t targetNodeIndex);
- inline std::list<RouteEntry>& Entries()
+ std::list<RouteEntry>& Entries()
{
return entries;
}
- inline const std::list<RouteEntry>& Entries() const
+ const std::list<RouteEntry>& Entries() const
{
return entries;
}
- inline void Append(RouteData routePart)
+ void Append(RouteData routePart)
{
entries.splice(entries.end(),routePart.Entries());
}
- inline void PopEntry()
+ void PopEntry()
{
entries.pop_back();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/util/Geometry.h
^
|
| @@ -94,46 +94,10 @@
/**
* \ingroup Geometry
- * Calculate the bounding box of the (non empty) vector of geo coords
- *
- * @param nodes
- * The geo coordinates
- * @param minLon
- * @param maxLon
- * @param minLat
- * @param maxLat
- */
- template<typename N>
- void GetBoundingBox(const std::vector<N>& nodes,
- double& minLon,
- double& maxLon,
- double& minLat,
- double& maxLat)
- {
- assert(!nodes.empty());
-
- minLon=nodes[0].GetLon();
- maxLon=nodes[0].GetLon();
- minLat=nodes[0].GetLat();
- maxLat=nodes[0].GetLat();
-
- for (size_t i=1; i<nodes.size(); i++) {
- minLon=std::min(minLon,nodes[i].GetLon());
- maxLon=std::max(maxLon,nodes[i].GetLon());
- minLat=std::min(minLat,nodes[i].GetLat());
- maxLat=std::max(maxLat,nodes[i].GetLat());
- }
- }
-
- /**
- * \ingroup Geometry
* Calculate the bounding box of the (non empty) range of geo coords
*
* @param [first, last) range of geo coords
- * @param minLon
- * @param maxLon
- * @param minLat
- * @param maxLat
+ * @param resulting bounding box
*/
template< class InputIt >
void GetBoundingBox(const InputIt first,
@@ -164,31 +128,83 @@
*
* @param nodes
* The geo coordinates
- * @param minLon
- * @param maxLon
- * @param minLat
- * @param maxLat
+ * @returns
+ * bounding box
*/
template<typename N>
+ GeoBox GetBoundingBox(const std::vector<N>& nodes)
+ {
+ assert(!nodes.empty());
+
+ GeoBox boundingBox;
+
+ for (const auto& node : nodes) {
+ boundingBox.Include(node);
+ }
+
+ return boundingBox;
+ }
+
+ /**
+ * \ingroup Geometry
+ * Calculate the bounding box of the (non empty) vector of geo coords
+ *
+ * @param nodes
+ * The geo coordinates
+ * @returns
+ * bounding box
+ */
+ inline GeoBox GetBoundingBox(const std::vector<Point>& nodes)
+ {
+ assert(!nodes.empty());
+
+ GeoBox boundingBox;
+
+ for (const auto& node : nodes) {
+ boundingBox.Include(node.GetCoord());
+ }
+
+ return boundingBox;
+ }
+
+ /**
+ * \ingroup Geometry
+ * Calculate the bounding box of the (non empty) vector of geo coords
+ *
+ * @param nodes
+ * The geo coordinates
+ * @param
+ * bounding box to fill
+ */
+ template<typename N>
void GetBoundingBox(const std::vector<N>& nodes,
GeoBox& boundingBox)
{
assert(!nodes.empty());
- double minLon=nodes[0].GetLon();
- double maxLon=minLon;
- double minLat=nodes[0].GetLat();
- double maxLat=minLat;
-
- for (size_t i=1; i<nodes.size(); i++) {
- minLon=std::min(minLon,nodes[i].GetLon());
- maxLon=std::max(maxLon,nodes[i].GetLon());
- minLat=std::min(minLat,nodes[i].GetLat());
- maxLat=std::max(maxLat,nodes[i].GetLat());
+ boundingBox.Invalidate();
+ for (const auto& node : nodes) {
+ boundingBox.Include(node);
}
+ }
- boundingBox.Set(GeoCoord(minLat,minLon),
- GeoCoord(maxLat,maxLon));
+ /**
+ * \ingroup Geometry
+ * Calculate the bounding box of the (non empty) vector of geo coords
+ *
+ * @param nodes
+ * The geo coordinates
+ * @param bounding box to fill
+ */
+ inline void GetBoundingBox(const std::vector<Point>& nodes,
+ GeoBox& boundingBox)
+ {
+ assert(!nodes.empty());
+
+ boundingBox.Invalidate();
+ for (const auto& node : nodes) {
+ boundingBox.Include(node.GetCoord());
+ }
}
/**
@@ -1243,6 +1259,7 @@
{
if (path.empty() || from>=to){
boundingBox.Invalidate();
+ return;
}
double minLon=path[from%path.size()].GetLon();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/util/Transformation.h
^
|
| @@ -466,7 +466,7 @@
}
/**
- * Returns the on-screen length of the path fro the first to the llast element
+ * Returns the on-screen length of the path from the first to the last element
* @return length of path
*/
double GetLength() const
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/Area.cpp
^
|
| @@ -93,30 +93,6 @@
return true;
}
- void Area::Ring::GetBoundingBox(GeoBox& boundingBox) const
- {
- assert(!nodes.empty());
- if (bbox.IsValid()) {
- boundingBox = bbox;
- return;
- }
-
- double minLon=nodes[0].GetLon();
- double maxLon=minLon;
- double minLat=nodes[0].GetLat();
- double maxLat=minLat;
-
- for (size_t i=1; i<nodes.size(); i++) {
- minLon=std::min(minLon,nodes[i].GetLon());
- maxLon=std::max(maxLon,nodes[i].GetLon());
- minLat=std::min(minLat,nodes[i].GetLat());
- maxLat=std::max(maxLat,nodes[i].GetLat());
- }
-
- boundingBox.Set(GeoCoord(minLat,minLon),
- GeoCoord(maxLat,maxLon));
- }
-
GeoBox Area::Ring::GetBoundingBox() const
{
assert(!nodes.empty());
@@ -124,20 +100,7 @@
return bbox;
}
- double minLon=nodes[0].GetLon();
- double maxLon=minLon;
- double minLat=nodes[0].GetLat();
- double maxLat=minLat;
-
- for (size_t i=1; i<nodes.size(); i++) {
- minLon=std::min(minLon,nodes[i].GetLon());
- maxLon=std::max(maxLon,nodes[i].GetLon());
- minLat=std::min(minLat,nodes[i].GetLat());
- maxLat=std::max(maxLat,nodes[i].GetLat());
- }
-
- return GeoBox(GeoCoord(minLat,minLon),
- GeoCoord(maxLat,maxLon));
+ return osmscout::GetBoundingBox(nodes);
}
bool Area::GetCenter(GeoCoord& center) const
@@ -194,16 +157,7 @@
for (const auto& ring : rings) {
if (ring.IsTopOuter()) {
- if (!boundingBox.IsValid()) {
- ring.GetBoundingBox(boundingBox);
- }
- else {
- GeoBox ringBoundingBox;
-
- ring.GetBoundingBox(ringBoundingBox);
-
- boundingBox.Include(ringBoundingBox);
- }
+ boundingBox.Include(ring.GetBoundingBox());
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/LocationDescriptionService.cpp
^
|
| @@ -492,8 +492,7 @@
}
}
else {
- GeoBox ringBBox;
- ring.GetBoundingBox(ringBBox);
+ GeoBox ringBBox=ring.GetBoundingBox();
if (!IsAreaAtLeastPartlyInArea(searchEntry.coords,
ring.nodes,
searchEntry.bbox,
@@ -755,7 +754,7 @@
AdminRegionReverseLookupVisitor::SearchEntry searchEntry;
searchEntry.object=object;
- ring.GetBoundingBox(searchEntry.bbox);
+ searchEntry.bbox=ring.GetBoundingBox();
searchEntry.coords.resize(ring.nodes.size());
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/TextSearchIndex.cpp
^
|
| @@ -109,11 +109,17 @@
bool searchLocations,
bool searchRegions,
bool searchOther,
+ bool transliterate,
ResultsMap& results) const
{
results.clear();
- if (query.empty()) {
+ std::string lookupStr=UTF8NormForLookup(query);
+ if (transliterate) {
+ lookupStr=UTF8Transliterate(lookupStr);
+ }
+
+ if (lookupStr.empty()) {
return true;
}
@@ -129,8 +135,8 @@
marisa::Agent agent;
try {
- agent.set_query(query.c_str(),
- query.length());
+ agent.set_query(lookupStr.c_str(),
+ lookupStr.length());
while (tries[i].trie->predictive_search(agent)) {
std::string result(agent.key().ptr(),
agent.key().length());
@@ -169,7 +175,7 @@
std::string& text,
ObjectFileRef& ref) const
{
- // Get the index that marks the end of the
+ // Get the index that marks the end of
// the text and where the FileOffset begins
// Each result has only one offset that occupies
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/util/PolygonCenter.cpp
^
|
| @@ -202,8 +202,7 @@
{
Polygon polygon;
polygon.push_back(&ring);
- GeoBox bbox;
- GetBoundingBox(ring, bbox);
+ GeoBox bbox=osmscout::GetBoundingBox(ring);
return PolygonCenter(polygon, bbox, precision);
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/libosmscout/webpage/layouts/partials/head.html
^
|
| @@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- Switch off any IE compatibility modes -->
<meta content="IE=edge" http-equiv="X-UA-Compatible" />
-{{ .Hugo.Generator }}
+{{ hugo.Generator }}
<title>{{ .Site.Title }}</title>
<link rel="stylesheet" type="text/css" href="/css/global.css">
</head>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/README.md
^
|
| @@ -39,8 +39,8 @@
#### Documentation
-* README (English): https://s-yata.github.io/marisa-trie/docs/readme.en.html
-* README (Japanese): https://s-yata.github.io/marisa-trie/docs/readme.ja.html
+* README (English): https://www.s-yata.jp/marisa-trie/docs/readme.en.html
+* README (Japanese): https://www.s-yata.jp/marisa-trie/docs/readme.ja.html
#### Build instructions
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/docs/readme.en.html
^
|
| @@ -8,7 +8,7 @@
<body>
<div id="header">
<div class="left">MARISA: Matching Algorithm with Recursively Implemented StorAge</div>
- <div class="right">Last modified: 14 Jun 2020</div>
+ <div class="right">Last modified: 26 Jun 2020</div>
<div class="end"></div>
</div><!-- header -->
<div id="body" style="text-align: justify">
@@ -82,7 +82,7 @@
</li>
<li>Source
<ul>
- <li><a href="https://github.com/s-yata/marisa-trie/archive/v0.2.6.tar.gz">marisa-0.2.6.tar.gz</a></li>
+ <li><a href="https://github.com/s-yata/marisa-trie/files/4832504/marisa-0.2.6.tar.gz">marisa-0.2.6.tar.gz</a></li>
</ul>
</li>
</ul>
@@ -486,6 +486,7 @@
<pre class="code">class Key {
public:
char operator[](std::size_t i) const;
+ std::string_view str() const; // C++17
const char *ptr() const;
std::size_t length() const;
std::size_t id() const;
@@ -502,6 +503,7 @@
<pre class="code">class Query {
public:
char operator[](std::size_t i) const;
+ std::string_view str() const; // C++17
const char *ptr() const;
std::size_t length() const;
std::size_t id() const;
@@ -522,6 +524,8 @@
void push_back(const Key &key);
void push_back(const Key &key, char end_marker);
+ void push_back(std::string_view str,
+ float weight = 1.0); // C++17
void push_back(const char *str);
void push_back(const char *ptr,
std::size_t length,
@@ -581,6 +585,7 @@
const Query &query() const;
const Key &key() const;
+ void set_query(std::string_view str); // C++17
void set_query(const char *str);
void set_query(const char *ptr,
std::size_t length);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/docs/readme.ja.html
^
|
| @@ -8,7 +8,7 @@
<body>
<div id="header">
<div class="left">MARISA: Matching Algorithm with Recursively Implemented StorAge</div>
- <div class="right">Last modified: 14 Jun 2020</div>
+ <div class="right">Last modified: 26 Jun 2020</div>
<div class="end"></div>
</div><!-- header -->
<div id="body">
@@ -82,7 +82,7 @@
</li>
<li>ソースコード
<ul>
- <li><a href="https://github.com/s-yata/marisa-trie/archive/v0.2.6.tar.gz">marisa-0.2.6.tar.gz</a></li>
+ <li><a href="https://github.com/s-yata/marisa-trie/files/4832504/marisa-0.2.6.tar.gz">marisa-0.2.6.tar.gz</a></li>
</ul>
</li>
</ul>
@@ -491,6 +491,7 @@
<pre class="code">class Key {
public:
char operator[](std::size_t i) const;
+ std::string_view str() const; // C++17
const char *ptr() const;
std::size_t length() const;
std::size_t id() const;
@@ -507,6 +508,7 @@
<pre class="code">class Query {
public:
char operator[](std::size_t i) const;
+ std::string_view str() const; // C++17
const char *ptr() const;
std::size_t length() const;
std::size_t id() const;
@@ -527,6 +529,8 @@
void push_back(const Key &key);
void push_back(const Key &key, char end_marker);
+ void push_back(std::string_view str,
+ float weight = 1.0); // C++17
void push_back(const char *str);
void push_back(const char *ptr,
std::size_t length,
@@ -586,6 +590,7 @@
const Query &query() const;
const Key &key() const;
+ void set_query(std::string_view str); // C++17
void set_query(const char *str);
void set_query(const char *ptr,
std::size_t length);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/include/marisa/agent.h
^
|
| @@ -1,6 +1,10 @@
#ifndef MARISA_AGENT_H_
#define MARISA_AGENT_H_
+#if __cplusplus >= 201703L
+ #include <string_view>
+#endif // __cplusplus >= 201703L
+
#include "marisa/key.h"
#include "marisa/query.h"
@@ -25,6 +29,11 @@
return key_;
}
+#if __cplusplus >= 201703L
+ void set_query(std::string_view str) {
+ set_query(str.data(), str.length());
+ }
+#endif // __cplusplus >= 201703L
void set_query(const char *str);
void set_query(const char *ptr, std::size_t length);
void set_query(std::size_t key_id);
@@ -36,6 +45,11 @@
return *state_;
}
+#if __cplusplus >= 201703L
+ void set_key(std::string_view str) {
+ set_key(str.data(), str.length());
+ }
+#endif // __cplusplus >= 201703L
void set_key(const char *str) {
MARISA_DEBUG_IF(str == NULL, MARISA_NULL_ERROR);
key_.set_str(str);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/include/marisa/key.h
^
|
| @@ -1,6 +1,10 @@
#ifndef MARISA_KEY_H_
#define MARISA_KEY_H_
+#if __cplusplus >= 201703L
+ #include <string_view>
+#endif // __cplusplus >= 201703L
+
#include "marisa/base.h"
namespace marisa {
@@ -25,6 +29,11 @@
return ptr_[i];
}
+#if __cplusplus >= 201703L
+ void set_str(std::string_view str) {
+ set_str(str.data(), str.length());
+ }
+#endif // __cplusplus >= 201703L
void set_str(const char *str) {
MARISA_DEBUG_IF(str == NULL, MARISA_NULL_ERROR);
std::size_t length = 0;
@@ -49,6 +58,11 @@
union_.weight = weight;
}
+#if __cplusplus >= 201703L
+ std::string_view str() const {
+ return std::string_view(ptr_, length_);
+ }
+#endif // __cplusplus >= 201703L
const char *ptr() const {
return ptr_;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/include/marisa/keyset.h
^
|
| @@ -1,6 +1,10 @@
#ifndef MARISA_KEYSET_H_
#define MARISA_KEYSET_H_
+#if __cplusplus >= 201703L
+ #include <string_view>
+#endif // __cplusplus >= 201703L
+
#include "marisa/key.h"
namespace marisa {
@@ -18,6 +22,11 @@
void push_back(const Key &key);
void push_back(const Key &key, char end_marker);
+#if __cplusplus >= 201703L
+ void push_back(std::string_view str, float weight = 1.0) {
+ push_back(str.data(), str.length(), weight);
+ }
+#endif // __cplusplus >= 201703L
void push_back(const char *str);
void push_back(const char *ptr, std::size_t length, float weight = 1.0);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/include/marisa/query.h
^
|
| @@ -1,6 +1,10 @@
#ifndef MARISA_QUERY_H_
#define MARISA_QUERY_H_
+#if __cplusplus >= 201703L
+ #include <string_view>
+#endif // __cplusplus >= 201703L
+
#include "marisa/base.h"
namespace marisa {
@@ -23,6 +27,11 @@
return ptr_[i];
}
+#if __cplusplus >= 201703L
+ void set_str(std::string_view str) {
+ set_str(str.data(), str.length());
+ }
+#endif // __cplusplus >= 201703L
void set_str(const char *str) {
MARISA_DEBUG_IF(str == NULL, MARISA_NULL_ERROR);
std::size_t length = 0;
@@ -41,6 +50,11 @@
id_ = id;
}
+#if __cplusplus >= 201703L
+ std::string_view str() const {
+ return std::string_view(ptr_, length_);
+ }
+#endif // __cplusplus >= 201703L
const char *ptr() const {
return ptr_;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/include/marisa/scoped-array.h
^
|
| @@ -16,7 +16,7 @@
}
void reset(T *array = NULL) {
- MARISA_THROW_IF((array != NULL) && (array == array_), MARISA_RESET_ERROR);
+ MARISA_DEBUG_IF((array != NULL) && (array == array_), MARISA_RESET_ERROR);
scoped_array(array).swap(*this);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/include/marisa/scoped-ptr.h
^
|
| @@ -16,7 +16,7 @@
}
void reset(T *ptr = NULL) {
- MARISA_THROW_IF((ptr != NULL) && (ptr == ptr_), MARISA_RESET_ERROR);
+ MARISA_DEBUG_IF((ptr != NULL) && (ptr == ptr_), MARISA_RESET_ERROR);
scoped_ptr(ptr).swap(*this);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/lib/marisa/grimoire/vector/bit-vector.cc
^
|
| @@ -1,3 +1,5 @@
+#include <algorithm>
+
#include "marisa/grimoire/vector/pop-count.h"
#include "marisa/grimoire/vector/bit-vector.h"
@@ -337,7 +339,44 @@
return bit_id + SELECT_TABLE[i][byte];
}
+ #else // MARISA_USE_SSE2
+std::size_t select_bit(std::size_t i, std::size_t bit_id,
+ UInt32 unit_lo, UInt32 unit_hi) {
+ UInt32 unit = unit_lo;
+ PopCount count(unit);
+ if (i >= count.lo32()) {
+ bit_id += 32;
+ i -= count.lo32();
+ unit = unit_hi;
+ count = PopCount(unit);
+ }
+
+ if (i < count.lo16()) {
+ if (i >= count.lo8()) {
+ bit_id += 8;
+ unit >>= 8;
+ i -= count.lo8();
+ }
+ } else if (i < count.lo24()) {
+ bit_id += 16;
+ unit >>= 16;
+ i -= count.lo16();
+ } else {
+ bit_id += 24;
+ unit >>= 24;
+ i -= count.lo24();
+ }
+ return bit_id + SELECT_TABLE[i][unit & 0xFF];
+}
#endif // MARISA_USE_SSE2
+
+
+// This is only used by build_index, so don't worry about the small performance
+// penalty from not having version taking only a UInt32.
+inline std::size_t select_bit(std::size_t i, std::size_t bit_id, UInt32 unit) {
+ return select_bit(i, bit_id, /*unit_lo=*/unit, /*unit_hi=*/0);
+}
+
#endif // MARISA_WORD_SIZE == 64
#endif // MARISA_USE_BMI2
@@ -613,36 +652,7 @@
i -= 448 - rank.rel7();
}
-#ifdef MARISA_USE_SSE2
return select_bit(i, unit_id * 32, ~units_[unit_id], ~units_[unit_id + 1]);
-#else // MARISA_USE_SSE2
- UInt32 unit = ~units_[unit_id];
- PopCount count(unit);
- if (i >= count.lo32()) {
- ++unit_id;
- i -= count.lo32();
- unit = ~units_[unit_id];
- count = PopCount(unit);
- }
-
- std::size_t bit_id = unit_id * 32;
- if (i < count.lo16()) {
- if (i >= count.lo8()) {
- bit_id += 8;
- unit >>= 8;
- i -= count.lo8();
- }
- } else if (i < count.lo24()) {
- bit_id += 16;
- unit >>= 16;
- i -= count.lo16();
- } else {
- bit_id += 24;
- unit >>= 24;
- i -= count.lo24();
- }
- return bit_id + SELECT_TABLE[i][unit & 0xFF];
-#endif // MARISA_USE_SSE2
}
std::size_t BitVector::select1(std::size_t i) const {
@@ -704,51 +714,26 @@
i -= rank.rel7();
}
-#ifdef MARISA_USE_SSE2
return select_bit(i, unit_id * 32, units_[unit_id], units_[unit_id + 1]);
-#else // MARISA_USE_SSE2
- UInt32 unit = units_[unit_id];
- PopCount count(unit);
- if (i >= count.lo32()) {
- ++unit_id;
- i -= count.lo32();
- unit = units_[unit_id];
- count = PopCount(unit);
- }
-
- std::size_t bit_id = unit_id * 32;
- if (i < count.lo16()) {
- if (i >= count.lo8()) {
- bit_id += 8;
- unit >>= 8;
- i -= count.lo8();
- }
- } else if (i < count.lo24()) {
- bit_id += 16;
- unit >>= 16;
- i -= count.lo16();
- } else {
- bit_id += 24;
- unit >>= 24;
- i -= count.lo24();
- }
- return bit_id + SELECT_TABLE[i][unit & 0xFF];
-#endif // MARISA_USE_SSE2
}
#endif // MARISA_WORD_SIZE == 64
void BitVector::build_index(const BitVector &bv,
bool enables_select0, bool enables_select1) {
- ranks_.resize((bv.size() / 512) + (((bv.size() % 512) != 0) ? 1 : 0) + 1);
+ const std::size_t num_bits = bv.size();
+ ranks_.resize((num_bits / 512) + (((num_bits % 512) != 0) ? 1 : 0) + 1);
- std::size_t num_0s = 0;
+ std::size_t num_0s = 0; // Only updated if enables_select0 is true.
std::size_t num_1s = 0;
- for (std::size_t i = 0; i < bv.size(); ++i) {
- if ((i % 64) == 0) {
- const std::size_t rank_id = i / 512;
- switch ((i / 64) % 8) {
+ const std::size_t num_units = bv.units_.size();
+ for (std::size_t unit_id = 0; unit_id < num_units; ++unit_id) {
+ const std::size_t bit_id = unit_id * MARISA_WORD_SIZE;
+
+ if ((bit_id % 64) == 0) {
+ const std::size_t rank_id = bit_id / 512;
+ switch ((bit_id / 64) % 8) {
case 0: {
ranks_[rank_id].set_abs(num_1s);
break;
@@ -784,22 +769,45 @@
}
}
- if (bv[i]) {
- if (enables_select1 && ((num_1s % 512) == 0)) {
- select1s_.push_back(static_cast<UInt32>(i));
+ const Unit unit = bv.units_[unit_id];
+ // push_back resizes with 0, so the high bits of the last unit are 0 and
+ // do not affect the 1s count.
+ const std::size_t unit_num_1s = PopCount::count(unit);
+
+ if (enables_select0) {
+ // num_0s is somewhat move involved to compute, so only do it if we
+ // need it. The last word has zeros in the high bits, so that needs
+ // to be accounted for when computing the unit_num_0s from unit_num_1s.
+ const std::size_t bits_remaining = num_bits - bit_id;
+ const std::size_t unit_num_0s =
+ std::min<std::size_t>(bits_remaining, MARISA_WORD_SIZE) - unit_num_1s;
+
+ const std::size_t zero_bit_id = (~num_0s + 1) % 512;
+ if (unit_num_0s > zero_bit_id) {
+ // select0s_ is UInt32, but select_bit returns size_t, so cast to
+ // suppress narrowing conversion warning. push_back checks the
+ // size, so there is no truncation here.
+ select0s_.push_back(
+ static_cast<UInt32>(select_bit(zero_bit_id, bit_id, ~unit)));
}
- ++num_1s;
- } else {
- if (enables_select0 && ((num_0s % 512) == 0)) {
- select0s_.push_back(static_cast<UInt32>(i));
+
+ num_0s += unit_num_0s;
+ }
+
+ if (enables_select1) {
+ const std::size_t one_bit_id = (~num_1s + 1) % 512;
+ if (unit_num_1s > one_bit_id) {
+ select1s_.push_back(
+ static_cast<UInt32>(select_bit(one_bit_id, bit_id, unit)));
}
- ++num_0s;
}
+
+ num_1s += unit_num_1s;
}
- if ((bv.size() % 512) != 0) {
- const std::size_t rank_id = (bv.size() - 1) / 512;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/tests/base-test.cc
^
|
| @@ -87,6 +87,17 @@
ASSERT(key.ptr() == str);
ASSERT(key.length() == 4);
+#if __cplusplus >= 201703L
+ const std::string_view view = "orange";
+ key.set_str(view);
+
+ ASSERT(key.ptr() == view.data());
+ ASSERT(key.length() == 6);
+
+ // Compare string_view, emphasizing that it is not a pointer comparison.
+ ASSERT(key.str() == std::string("orange"));
+#endif // __cplusplus >= 201703L
+
key.set_weight(1.0);
ASSERT(key.weight() == 1.0);
@@ -127,6 +138,27 @@
ASSERT(keyset[i].weight() == 1.0);
}
+#if __cplusplus >= 201703L
+ keyset.clear();
+ total_length = 0;
+ // Same thing again, but now via string_view, and with a weight.
+ for (std::size_t i = 0; i < keys.size(); ++i) {
+ keyset.push_back(keys[i], 2.0);
+ ASSERT(keyset.size() == (i + 1));
+ ASSERT(!keyset.empty());
+
+ total_length += keys[i].length();
+ ASSERT(keyset.total_length() == total_length);
+
+ ASSERT(keyset[i].length() == keys[i].length());
+ ASSERT(keyset[i].str().length() == keys[i].length());
+ ASSERT(std::memcmp(keyset[i].ptr(), keys[i].c_str(),
+ keyset[i].length()) == 0);
+ ASSERT(keyset[i].str() == keys[i]);
+ ASSERT(keyset[i].weight() == 2.0);
+ }
+#endif // __cplusplus >= 201703L
+
keyset.clear();
marisa::Key key;
@@ -232,6 +264,17 @@
ASSERT(query.ptr() == str);
ASSERT(query.length() == 3);
+#if __cplusplus >= 201703L
+ const std::string_view view = "orange";
+ query.set_str(view);
+
+ ASSERT(query.ptr() == view.data());
+ ASSERT(query.length() == 6);
+
+ // Compare string_view, emphasizing that it is not a pointer comparison.
+ ASSERT(query.str() == std::string("orange"));
+#endif // __cplusplus >= 201703L
+
query.set_id(100);
ASSERT(query.id() == 100);
@@ -275,6 +318,23 @@
ASSERT(agent.key().length() == std::strlen(key_str));
ASSERT(agent.key().id() == 234);
+#if __cplusplus >= 201703L
+ const std::string_view query_view = "query2";
+ const std::string_view key_view = "key2";
+
+ agent.set_query(query_view);
+ agent.set_key(key_view);
+
+ ASSERT(agent.query().ptr() == query_view.data());
+ ASSERT(agent.query().length() == 6);
+ // Compare string_view, emphasizing that it is not a pointer comparison.
+ ASSERT(agent.query().str() == std::string("query2"));
+
+ ASSERT(agent.key().ptr() == key_view.data());
+ ASSERT(agent.key().length() == 4);
+ ASSERT(agent.key().str() == std::string("key2"));
+#endif // __cplusplus >= 201703L
+
agent.init_state();
ASSERT(agent.has_state());
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/tools/Makefile.am
^
|
| @@ -1,4 +1,4 @@
-MY_INCLUDE = -I$(top_srcdir)/include -I$(top_srcdir)/lib
+MY_INCLUDE = -I$(top_srcdir)/include
MY_LIBS = $(top_srcdir)/lib/marisa/libmarisa.la libcmdopt.la
AM_CXXFLAGS = -Wall -Weffc++ -Wextra -Wconversion $(MY_INCLUDE)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/tools/marisa-benchmark.cc
^
|
| @@ -17,7 +17,8 @@
marisa::TailMode param_tail_mode = MARISA_DEFAULT_TAIL;
marisa::NodeOrder param_node_order = MARISA_DEFAULT_ORDER;
marisa::CacheLevel param_cache_level = MARISA_DEFAULT_CACHE;
-bool param_with_predict = true;
+bool param_predict_on = true;
+bool param_reuse_on = true;
bool param_print_speed = true;
class Clock {
@@ -46,17 +47,19 @@
" -n, --max-num-tries=[N] limit the number of tries"
" [" << MARISA_MIN_NUM_TRIES << ", " << MARISA_MAX_NUM_TRIES
<< "] (default: 5)\n"
- " -t, --text-tail build a dictionary with text TAIL (default)\n"
- " -b, --binary-tail build a dictionary with binary TAIL\n"
- " -w, --weight-order arrange siblings in weight order (default)\n"
- " -l, --label-order arrange siblings in label order\n"
+ " -t, --text-tail build a dictionary with text TAIL (default)\n"
+ " -b, --binary-tail build a dictionary with binary TAIL\n"
+ " -w, --weight-order arrange siblings in weight order (default)\n"
+ " -l, --label-order arrange siblings in label order\n"
" -c, --cache-level=[N] specify the cache size"
" [1, 5] (default: 3)\n"
- " -P, --with-predict include predictive search (default)\n"
- " -p, --without-predict skip predictive search\n"
- " -S, --print-speed print speed [1000 keys/s] (default)\n"
- " -s, --print-time print time [ns/key]\n"
- " -h, --help print this help\n"
+ " -P, --predict-on include predictive search (default)\n"
+ " -p, --predict-off skip predictive search\n"
+ " -R, --reuse-on reuse agents (default)\n"
+ " -r, --reuse-off don't reuse agents\n"
+ " -S, --print-speed print speed [1000 keys/s] (default)\n"
+ " -s, --print-time print time [ns/key]\n"
+ " -h, --help print this help\n"
<< std::endl;
}
@@ -181,12 +184,23 @@
void benchmark_lookup(const marisa::Trie &trie,
const marisa::Keyset &keyset) {
Clock cl;
- marisa::Agent agent;
- for (std::size_t i = 0; i < keyset.size(); ++i) {
- agent.set_query(keyset[i].ptr(), keyset[i].length());
- if (!trie.lookup(agent) || (agent.key().id() != keyset[i].id())) {
- std::cerr << "error: lookup() failed" << std::endl;
- return;
+ if (param_reuse_on) {
+ marisa::Agent agent;
+ for (std::size_t i = 0; i < keyset.size(); ++i) {
+ agent.set_query(keyset[i].ptr(), keyset[i].length());
+ if (!trie.lookup(agent) || (agent.key().id() != keyset[i].id())) {
+ std::cerr << "error: lookup() failed" << std::endl;
+ return;
+ }
+ }
+ } else {
+ for (std::size_t i = 0; i < keyset.size(); ++i) {
+ marisa::Agent agent;
+ agent.set_query(keyset[i].ptr(), keyset[i].length());
+ if (!trie.lookup(agent) || (agent.key().id() != keyset[i].id())) {
+ std::cerr << "error: lookup() failed" << std::endl;
+ return;
+ }
}
}
print_time_info(keyset.size(), cl.elasped());
@@ -195,16 +209,31 @@
void benchmark_reverse_lookup(const marisa::Trie &trie,
const marisa::Keyset &keyset) {
Clock cl;
- marisa::Agent agent;
- for (std::size_t i = 0; i < keyset.size(); ++i) {
- agent.set_query(keyset[i].id());
- trie.reverse_lookup(agent);
- if ((agent.key().id() != keyset[i].id()) ||
- (agent.key().length() != keyset[i].length()) ||
- (std::memcmp(agent.key().ptr(), keyset[i].ptr(),
- agent.key().length()) != 0)) {
- std::cerr << "error: reverse_lookup() failed" << std::endl;
- return;
+ if (param_reuse_on) {
+ marisa::Agent agent;
+ for (std::size_t i = 0; i < keyset.size(); ++i) {
+ agent.set_query(keyset[i].id());
+ trie.reverse_lookup(agent);
+ if ((agent.key().id() != keyset[i].id()) ||
+ (agent.key().length() != keyset[i].length()) ||
+ (std::memcmp(agent.key().ptr(), keyset[i].ptr(),
+ agent.key().length()) != 0)) {
+ std::cerr << "error: reverse_lookup() failed" << std::endl;
+ return;
+ }
+ }
+ } else {
+ for (std::size_t i = 0; i < keyset.size(); ++i) {
+ marisa::Agent agent;
+ agent.set_query(keyset[i].id());
+ trie.reverse_lookup(agent);
+ if ((agent.key().id() != keyset[i].id()) ||
+ (agent.key().length() != keyset[i].length()) ||
+ (std::memcmp(agent.key().ptr(), keyset[i].ptr(),
+ agent.key().length()) != 0)) {
+ std::cerr << "error: reverse_lookup() failed" << std::endl;
+ return;
+ }
}
}
print_time_info(keyset.size(), cl.elasped());
@@ -213,18 +242,35 @@
void benchmark_common_prefix_search(const marisa::Trie &trie,
const marisa::Keyset &keyset) {
Clock cl;
- marisa::Agent agent;
- for (std::size_t i = 0; i < keyset.size(); ++i) {
- agent.set_query(keyset[i].ptr(), keyset[i].length());
- while (trie.common_prefix_search(agent)) {
- if (agent.key().id() > keyset[i].id()) {
+ if (param_reuse_on) {
+ marisa::Agent agent;
+ for (std::size_t i = 0; i < keyset.size(); ++i) {
+ agent.set_query(keyset[i].ptr(), keyset[i].length());
+ while (trie.common_prefix_search(agent)) {
+ if (agent.key().id() > keyset[i].id()) {
+ std::cerr << "error: common_prefix_search() failed" << std::endl;
+ return;
+ }
+ }
+ if (agent.key().id() != keyset[i].id()) {
std::cerr << "error: common_prefix_search() failed" << std::endl;
return;
}
}
- if (agent.key().id() != keyset[i].id()) {
- std::cerr << "error: common_prefix_search() failed" << std::endl;
- return;
+ } else {
+ for (std::size_t i = 0; i < keyset.size(); ++i) {
+ marisa::Agent agent;
+ agent.set_query(keyset[i].ptr(), keyset[i].length());
+ while (trie.common_prefix_search(agent)) {
+ if (agent.key().id() > keyset[i].id()) {
+ std::cerr << "error: common_prefix_search() failed" << std::endl;
+ return;
+ }
+ }
+ if (agent.key().id() != keyset[i].id()) {
+ std::cerr << "error: common_prefix_search() failed" << std::endl;
+ return;
+ }
}
}
print_time_info(keyset.size(), cl.elasped());
@@ -232,25 +278,43 @@
void benchmark_predictive_search(const marisa::Trie &trie,
const marisa::Keyset &keyset) {
- if (!param_with_predict) {
+ if (!param_predict_on) {
print_time_info(keyset.size(), 0.0);
return;
}
Clock cl;
- marisa::Agent agent;
- for (std::size_t i = 0; i < keyset.size(); ++i) {
- agent.set_query(keyset[i].ptr(), keyset[i].length());
- if (!trie.predictive_search(agent) ||
- (agent.key().id() != keyset[i].id())) {
- std::cerr << "error: predictive_search() failed" << std::endl;
- return;
+ if (param_reuse_on) {
+ marisa::Agent agent;
+ for (std::size_t i = 0; i < keyset.size(); ++i) {
+ agent.set_query(keyset[i].ptr(), keyset[i].length());
+ if (!trie.predictive_search(agent) ||
+ (agent.key().id() != keyset[i].id())) {
+ std::cerr << "error: predictive_search() failed" << std::endl;
+ return;
+ }
+ while (trie.predictive_search(agent)) {
+ if (agent.key().id() <= keyset[i].id()) {
+ std::cerr << "error: predictive_search() failed" << std::endl;
+ return;
+ }
+ }
}
- while (trie.predictive_search(agent)) {
- if (agent.key().id() <= keyset[i].id()) {
+ } else {
+ for (std::size_t i = 0; i < keyset.size(); ++i) {
+ marisa::Agent agent;
+ agent.set_query(keyset[i].ptr(), keyset[i].length());
+ if (!trie.predictive_search(agent) ||
+ (agent.key().id() != keyset[i].id())) {
std::cerr << "error: predictive_search() failed" << std::endl;
return;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/base-test/base-test.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/io-test/io-test.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/libmarisa/libmarisa.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MARISA_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MARISA_EXPORTS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/marisa-benchmark/marisa-benchmark.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/marisa-build/marisa-build.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/marisa-common-prefix-search/marisa-common-prefix-search.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/marisa-dump/marisa-dump.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/marisa-lookup/marisa-lookup.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/marisa-predictive-search/marisa-predictive-search.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/marisa-reverse-lookup/marisa-reverse-lookup.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/marisa-test/marisa-test.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/trie-test/trie-test.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2008/vector-test/vector-test.vcproj
^
|
| @@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="../../lib"
+ AdditionalIncludeDirectories="../../lib;../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/base-test/base-test.vcxproj
^
|
| @@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{9C0CFD54-C5A7-4736-9063-7DCB085B2877}</ProjectGuid>
+ <RootNamespace>basetest</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tests\marisa-assert.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tests\base-test.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/base-test/base-test.vcxproj.filters
^
|
| @@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tests\marisa-assert.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tests\base-test.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/base-test/base-test.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/io-test/io-test.vcxproj
^
|
| @@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{F9C6E136-FE11-4F7E-A113-7A98AACDABC7}</ProjectGuid>
+ <RootNamespace>iotest</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tests\marisa-assert.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tests\io-test.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/io-test/io-test.vcxproj.filters
^
|
| @@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tests\marisa-assert.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tests\io-test.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/io-test/io-test.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/libmarisa/libmarisa.vcxproj
^
|
| @@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\lib\marisa\agent.cc" />
+ <ClCompile Include="..\..\lib\marisa\grimoire\io\mapper.cc" />
+ <ClCompile Include="..\..\lib\marisa\grimoire\io\reader.cc" />
+ <ClCompile Include="..\..\lib\marisa\grimoire\io\writer.cc" />
+ <ClCompile Include="..\..\lib\marisa\grimoire\trie\louds-trie.cc" />
+ <ClCompile Include="..\..\lib\marisa\grimoire\trie\tail.cc" />
+ <ClCompile Include="..\..\lib\marisa\grimoire\vector\bit-vector.cc" />
+ <ClCompile Include="..\..\lib\marisa\keyset.cc" />
+ <ClCompile Include="..\..\lib\marisa\trie.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\marisa.h" />
+ <ClInclude Include="..\..\include\marisa\agent.h" />
+ <ClInclude Include="..\..\include\marisa\base.h" />
+ <ClInclude Include="..\..\include\marisa\exception.h" />
+ <ClInclude Include="..\..\include\marisa\iostream.h" />
+ <ClInclude Include="..\..\include\marisa\key.h" />
+ <ClInclude Include="..\..\include\marisa\keyset.h" />
+ <ClInclude Include="..\..\include\marisa\query.h" />
+ <ClInclude Include="..\..\include\marisa\scoped-array.h" />
+ <ClInclude Include="..\..\include\marisa\scoped-ptr.h" />
+ <ClInclude Include="..\..\include\marisa\stdio.h" />
+ <ClInclude Include="..\..\include\marisa\trie.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\algorithm.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\algorithm\sort.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\intrin.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\io.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\io\mapper.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\io\reader.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\io\writer.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\cache.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\config.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\entry.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\header.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\history.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\key.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\louds-trie.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\range.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\state.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\tail.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector\bit-vector.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector\flat-vector.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector\pop-count.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector\rank-index.h" />
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector\vector.h" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{84009DAF-7FAF-44AC-A6AA-023EF63E3051}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>libmarisa</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ConformanceMode>true</ConformanceMode>
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/libmarisa/libmarisa.vcxproj.filters
^
|
| @@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ <Filter Include="Header Files\lib">
+ <UniqueIdentifier>{6a5e8699-c05a-4222-a73e-ee9a9b69c9bc}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\include">
+ <UniqueIdentifier>{0f1adaef-6e2e-40c0-85db-ebf6dd88d816}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\include\marisa">
+ <UniqueIdentifier>{98dcf8e4-e9d3-4a59-915a-ecf81cf523de}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\lib\marisa">
+ <UniqueIdentifier>{3d912a1c-f709-4a9f-9ec6-71ce4138ff07}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\lib\marisa\grimoire">
+ <UniqueIdentifier>{f583a859-4da1-40b7-92f5-6fe00a24c724}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\lib\marisa\grimoire\algorithm">
+ <UniqueIdentifier>{b4e0e26e-0cf9-47a9-9a41-1846f59ddb03}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\lib\marisa\grimoire\io">
+ <UniqueIdentifier>{5cd51437-40da-4f42-a2f4-1e3c4e969883}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\lib\marisa\grimoire\trie">
+ <UniqueIdentifier>{9ebc8862-4947-47ad-b59b-4099c0e173d9}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\lib\marisa\grimoire\vector">
+ <UniqueIdentifier>{e6553ca1-683f-49d6-8bf5-72ad7d9ca0f5}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\marisa">
+ <UniqueIdentifier>{e2d4a196-6cf8-4cd4-8cee-f26474f1538d}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\marisa\grimoire">
+ <UniqueIdentifier>{b8efd0b8-cb6d-4142-acfa-3f2a5eee0540}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\marisa\grimoire\io">
+ <UniqueIdentifier>{590bea35-0677-4c6e-a766-7d737c2c91e7}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\marisa\grimoire\trie">
+ <UniqueIdentifier>{ba09a25a-f7f4-4c09-a359-7e32b7dd1eba}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\marisa\grimoire\vector">
+ <UniqueIdentifier>{0342abbf-dd98-4720-9df3-7622b39a7efb}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\lib\marisa\grimoire\io\mapper.cc">
+ <Filter>Source Files\marisa\grimoire\io</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\lib\marisa\grimoire\io\reader.cc">
+ <Filter>Source Files\marisa\grimoire\io</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\lib\marisa\grimoire\io\writer.cc">
+ <Filter>Source Files\marisa\grimoire\io</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\lib\marisa\grimoire\trie\louds-trie.cc">
+ <Filter>Source Files\marisa\grimoire\trie</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\lib\marisa\grimoire\trie\tail.cc">
+ <Filter>Source Files\marisa\grimoire\trie</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\lib\marisa\agent.cc">
+ <Filter>Source Files\marisa</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\lib\marisa\keyset.cc">
+ <Filter>Source Files\marisa</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\lib\marisa\trie.cc">
+ <Filter>Source Files\marisa</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\lib\marisa\grimoire\vector\bit-vector.cc">
+ <Filter>Source Files\marisa\grimoire\vector</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\marisa.h">
+ <Filter>Header Files\include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\marisa\agent.h">
+ <Filter>Header Files\include\marisa</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\marisa\base.h">
+ <Filter>Header Files\include\marisa</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\marisa\exception.h">
+ <Filter>Header Files\include\marisa</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\marisa\iostream.h">
+ <Filter>Header Files\include\marisa</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\marisa\key.h">
+ <Filter>Header Files\include\marisa</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\marisa\keyset.h">
+ <Filter>Header Files\include\marisa</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\marisa\query.h">
+ <Filter>Header Files\include\marisa</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\marisa\scoped-array.h">
+ <Filter>Header Files\include\marisa</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\marisa\scoped-ptr.h">
+ <Filter>Header Files\include\marisa</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\marisa\stdio.h">
+ <Filter>Header Files\include\marisa</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\marisa\trie.h">
+ <Filter>Header Files\include\marisa</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\algorithm.h">
+ <Filter>Header Files\lib\marisa\grimoire</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\intrin.h">
+ <Filter>Header Files\lib\marisa\grimoire</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\io.h">
+ <Filter>Header Files\lib\marisa\grimoire</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie.h">
+ <Filter>Header Files\lib\marisa\grimoire</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector.h">
+ <Filter>Header Files\lib\marisa\grimoire</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\algorithm\sort.h">
+ <Filter>Header Files\lib\marisa\grimoire\algorithm</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\io\mapper.h">
+ <Filter>Header Files\lib\marisa\grimoire\io</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\io\reader.h">
+ <Filter>Header Files\lib\marisa\grimoire\io</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\io\writer.h">
+ <Filter>Header Files\lib\marisa\grimoire\io</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector\bit-vector.h">
+ <Filter>Header Files\lib\marisa\grimoire\vector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector\flat-vector.h">
+ <Filter>Header Files\lib\marisa\grimoire\vector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector\pop-count.h">
+ <Filter>Header Files\lib\marisa\grimoire\vector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector\rank-index.h">
+ <Filter>Header Files\lib\marisa\grimoire\vector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\vector\vector.h">
+ <Filter>Header Files\lib\marisa\grimoire\vector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\cache.h">
+ <Filter>Header Files\lib\marisa\grimoire\trie</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\config.h">
+ <Filter>Header Files\lib\marisa\grimoire\trie</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\entry.h">
+ <Filter>Header Files\lib\marisa\grimoire\trie</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\header.h">
+ <Filter>Header Files\lib\marisa\grimoire\trie</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\history.h">
+ <Filter>Header Files\lib\marisa\grimoire\trie</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\key.h">
+ <Filter>Header Files\lib\marisa\grimoire\trie</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\louds-trie.h">
+ <Filter>Header Files\lib\marisa\grimoire\trie</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\range.h">
+ <Filter>Header Files\lib\marisa\grimoire\trie</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\state.h">
+ <Filter>Header Files\lib\marisa\grimoire\trie</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\lib\marisa\grimoire\trie\tail.h">
+ <Filter>Header Files\lib\marisa\grimoire\trie</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/libmarisa/libmarisa.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-benchmark/marisa-benchmark.vcxproj
^
|
| @@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{CCD0AA2B-1461-4937-B3AD-487E541425FD}</ProjectGuid>
+ <RootNamespace>marisabenchmark</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc" />
+ <ClCompile Include="..\..\tools\marisa-benchmark.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-benchmark/marisa-benchmark.vcxproj.filters
^
|
| @@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\marisa-benchmark.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-benchmark/marisa-benchmark.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-build/marisa-build.vcxproj
^
|
| @@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}</ProjectGuid>
+ <RootNamespace>marisabuild</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc" />
+ <ClCompile Include="..\..\tools\marisa-build.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-build/marisa-build.vcxproj.filters
^
|
| @@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\marisa-build.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-build/marisa-build.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-common-prefix-search/marisa-common-prefix-search.vcxproj
^
|
| @@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{DA26209C-2397-4947-A449-26B80E487E32}</ProjectGuid>
+ <RootNamespace>marisacommonprefixsearch</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc" />
+ <ClCompile Include="..\..\tools\marisa-common-prefix-search.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-common-prefix-search/marisa-common-prefix-search.vcxproj.filters
^
|
| @@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\marisa-common-prefix-search.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-common-prefix-search/marisa-common-prefix-search.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-dump/marisa-dump.vcxproj
^
|
| @@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{C74BED4A-E531-48CA-886B-50481E5E7B1C}</ProjectGuid>
+ <RootNamespace>marisadump</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc" />
+ <ClCompile Include="..\..\tools\marisa-dump.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-dump/marisa-dump.vcxproj.filters
^
|
| @@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\marisa-dump.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-dump/marisa-dump.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-lookup/marisa-lookup.vcxproj
^
|
| @@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{6F726B87-D099-4608-86B5-1755E522D9E8}</ProjectGuid>
+ <RootNamespace>marisalookup</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc" />
+ <ClCompile Include="..\..\tools\marisa-lookup.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-lookup/marisa-lookup.vcxproj.filters
^
|
| @@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\marisa-lookup.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-lookup/marisa-lookup.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-predictive-search/marisa-predictive-search.vcxproj
^
|
| @@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{2D8A2745-6B9B-4073-B752-8308C512E372}</ProjectGuid>
+ <RootNamespace>marisapredictivesearch</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc" />
+ <ClCompile Include="..\..\tools\marisa-predictive-search.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-predictive-search/marisa-predictive-search.vcxproj.filters
^
|
| @@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\marisa-predictive-search.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-predictive-search/marisa-predictive-search.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-reverse-lookup/marisa-reverse-lookup.vcxproj
^
|
| @@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{C11C1449-D2A6-4C0F-BCD7-6379F81C5812}</ProjectGuid>
+ <RootNamespace>marisareverselookup</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc" />
+ <ClCompile Include="..\..\tools\marisa-reverse-lookup.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-reverse-lookup/marisa-reverse-lookup.vcxproj.filters
^
|
| @@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\cmdopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\cmdopt.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\marisa-reverse-lookup.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-reverse-lookup/marisa-reverse-lookup.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-test/marisa-test.vcxproj
^
|
| @@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}</ProjectGuid>
+ <RootNamespace>marisatest</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tests\marisa-assert.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tests\marisa-test.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-test/marisa-test.vcxproj.filters
^
|
| @@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tests\marisa-assert.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tests\marisa-test.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/marisa-test/marisa-test.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/trie-test/trie-test.vcxproj
^
|
| @@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{1654861A-6F01-4D7C-830B-A39678093E4C}</ProjectGuid>
+ <RootNamespace>trietest</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tests\marisa-assert.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tests\trie-test.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/trie-test/trie-test.vcxproj.filters
^
|
| @@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tests\marisa-assert.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tests\trie-test.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/trie-test/trie-test.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/vector-test/vector-test.vcxproj
^
|
| @@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>16.0</VCProjectVersion>
+ <ProjectGuid>{8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}</ProjectGuid>
+ <RootNamespace>vectortest</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <AdditionalIncludeDirectories>../../lib;../../include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tests\marisa-assert.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tests\vector-test.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\libmarisa\libmarisa.vcxproj">
+ <Project>{84009daf-7faf-44ac-a6aa-023ef63e3051}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/vector-test/vector-test.vcxproj.filters
^
|
| @@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tests\marisa-assert.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tests\vector-test.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/vector-test/vector-test.vcxproj.user
^
|
| @@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/dependencies/marisa-trie/vs2019/vs2019.sln
^
|
| @@ -0,0 +1,151 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29519.87
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmarisa", "libmarisa\libmarisa.vcxproj", "{84009DAF-7FAF-44AC-A6AA-023EF63E3051}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base-test", "base-test\base-test.vcxproj", "{9C0CFD54-C5A7-4736-9063-7DCB085B2877}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-test", "marisa-test\marisa-test.vcxproj", "{53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io-test", "io-test\io-test.vcxproj", "{F9C6E136-FE11-4F7E-A113-7A98AACDABC7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "trie-test", "trie-test\trie-test.vcxproj", "{1654861A-6F01-4D7C-830B-A39678093E4C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vector-test", "vector-test\vector-test.vcxproj", "{8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-benchmark", "marisa-benchmark\marisa-benchmark.vcxproj", "{CCD0AA2B-1461-4937-B3AD-487E541425FD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-build", "marisa-build\marisa-build.vcxproj", "{3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-common-prefix-search", "marisa-common-prefix-search\marisa-common-prefix-search.vcxproj", "{DA26209C-2397-4947-A449-26B80E487E32}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-dump", "marisa-dump\marisa-dump.vcxproj", "{C74BED4A-E531-48CA-886B-50481E5E7B1C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-lookup", "marisa-lookup\marisa-lookup.vcxproj", "{6F726B87-D099-4608-86B5-1755E522D9E8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-predictive-search", "marisa-predictive-search\marisa-predictive-search.vcxproj", "{2D8A2745-6B9B-4073-B752-8308C512E372}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "marisa-reverse-lookup", "marisa-reverse-lookup\marisa-reverse-lookup.vcxproj", "{C11C1449-D2A6-4C0F-BCD7-6379F81C5812}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Debug|x64.ActiveCfg = Debug|x64
+ {84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Debug|x64.Build.0 = Debug|x64
+ {84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Debug|x86.ActiveCfg = Debug|Win32
+ {84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Debug|x86.Build.0 = Debug|Win32
+ {84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Release|x64.ActiveCfg = Release|x64
+ {84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Release|x64.Build.0 = Release|x64
+ {84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Release|x86.ActiveCfg = Release|Win32
+ {84009DAF-7FAF-44AC-A6AA-023EF63E3051}.Release|x86.Build.0 = Release|Win32
+ {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x64.ActiveCfg = Debug|x64
+ {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x64.Build.0 = Debug|x64
+ {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x86.ActiveCfg = Debug|Win32
+ {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Debug|x86.Build.0 = Debug|Win32
+ {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x64.ActiveCfg = Release|x64
+ {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x64.Build.0 = Release|x64
+ {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x86.ActiveCfg = Release|Win32
+ {9C0CFD54-C5A7-4736-9063-7DCB085B2877}.Release|x86.Build.0 = Release|Win32
+ {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x64.ActiveCfg = Debug|x64
+ {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x64.Build.0 = Debug|x64
+ {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x86.ActiveCfg = Debug|Win32
+ {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Debug|x86.Build.0 = Debug|Win32
+ {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x64.ActiveCfg = Release|x64
+ {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x64.Build.0 = Release|x64
+ {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x86.ActiveCfg = Release|Win32
+ {53731F7C-2EB6-4A9F-A6DF-A49DDAAF613F}.Release|x86.Build.0 = Release|Win32
+ {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x64.ActiveCfg = Debug|x64
+ {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x64.Build.0 = Debug|x64
+ {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x86.ActiveCfg = Debug|Win32
+ {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Debug|x86.Build.0 = Debug|Win32
+ {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x64.ActiveCfg = Release|x64
+ {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x64.Build.0 = Release|x64
+ {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x86.ActiveCfg = Release|Win32
+ {F9C6E136-FE11-4F7E-A113-7A98AACDABC7}.Release|x86.Build.0 = Release|Win32
+ {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x64.ActiveCfg = Debug|x64
+ {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x64.Build.0 = Debug|x64
+ {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x86.ActiveCfg = Debug|Win32
+ {1654861A-6F01-4D7C-830B-A39678093E4C}.Debug|x86.Build.0 = Debug|Win32
+ {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x64.ActiveCfg = Release|x64
+ {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x64.Build.0 = Release|x64
+ {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x86.ActiveCfg = Release|Win32
+ {1654861A-6F01-4D7C-830B-A39678093E4C}.Release|x86.Build.0 = Release|Win32
+ {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x64.ActiveCfg = Debug|x64
+ {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x64.Build.0 = Debug|x64
+ {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x86.ActiveCfg = Debug|Win32
+ {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Debug|x86.Build.0 = Debug|Win32
+ {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x64.ActiveCfg = Release|x64
+ {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x64.Build.0 = Release|x64
+ {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x86.ActiveCfg = Release|Win32
+ {8FAC4D71-7D54-4438-B84C-D6B779AD0EE8}.Release|x86.Build.0 = Release|Win32
+ {CCD0AA2B-1461-4937-B3AD-487E541425FD}.Debug|x64.ActiveCfg = Debug|x64
+ {CCD0AA2B-1461-4937-B3AD-487E541425FD}.Debug|x64.Build.0 = Debug|x64
+ {CCD0AA2B-1461-4937-B3AD-487E541425FD}.Debug|x86.ActiveCfg = Debug|Win32
+ {CCD0AA2B-1461-4937-B3AD-487E541425FD}.Debug|x86.Build.0 = Debug|Win32
+ {CCD0AA2B-1461-4937-B3AD-487E541425FD}.Release|x64.ActiveCfg = Release|x64
+ {CCD0AA2B-1461-4937-B3AD-487E541425FD}.Release|x64.Build.0 = Release|x64
+ {CCD0AA2B-1461-4937-B3AD-487E541425FD}.Release|x86.ActiveCfg = Release|Win32
+ {CCD0AA2B-1461-4937-B3AD-487E541425FD}.Release|x86.Build.0 = Release|Win32
+ {3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}.Debug|x64.ActiveCfg = Debug|x64
+ {3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}.Debug|x64.Build.0 = Debug|x64
+ {3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}.Debug|x86.ActiveCfg = Debug|Win32
+ {3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}.Debug|x86.Build.0 = Debug|Win32
+ {3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}.Release|x64.ActiveCfg = Release|x64
+ {3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}.Release|x64.Build.0 = Release|x64
+ {3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}.Release|x86.ActiveCfg = Release|Win32
+ {3F2BDA56-422C-45F9-B2BC-5C19790E0D9D}.Release|x86.Build.0 = Release|Win32
+ {DA26209C-2397-4947-A449-26B80E487E32}.Debug|x64.ActiveCfg = Debug|x64
+ {DA26209C-2397-4947-A449-26B80E487E32}.Debug|x64.Build.0 = Debug|x64
+ {DA26209C-2397-4947-A449-26B80E487E32}.Debug|x86.ActiveCfg = Debug|Win32
+ {DA26209C-2397-4947-A449-26B80E487E32}.Debug|x86.Build.0 = Debug|Win32
+ {DA26209C-2397-4947-A449-26B80E487E32}.Release|x64.ActiveCfg = Release|x64
+ {DA26209C-2397-4947-A449-26B80E487E32}.Release|x64.Build.0 = Release|x64
+ {DA26209C-2397-4947-A449-26B80E487E32}.Release|x86.ActiveCfg = Release|Win32
+ {DA26209C-2397-4947-A449-26B80E487E32}.Release|x86.Build.0 = Release|Win32
+ {C74BED4A-E531-48CA-886B-50481E5E7B1C}.Debug|x64.ActiveCfg = Debug|x64
+ {C74BED4A-E531-48CA-886B-50481E5E7B1C}.Debug|x64.Build.0 = Debug|x64
+ {C74BED4A-E531-48CA-886B-50481E5E7B1C}.Debug|x86.ActiveCfg = Debug|Win32
+ {C74BED4A-E531-48CA-886B-50481E5E7B1C}.Debug|x86.Build.0 = Debug|Win32
+ {C74BED4A-E531-48CA-886B-50481E5E7B1C}.Release|x64.ActiveCfg = Release|x64
+ {C74BED4A-E531-48CA-886B-50481E5E7B1C}.Release|x64.Build.0 = Release|x64
+ {C74BED4A-E531-48CA-886B-50481E5E7B1C}.Release|x86.ActiveCfg = Release|Win32
+ {C74BED4A-E531-48CA-886B-50481E5E7B1C}.Release|x86.Build.0 = Release|Win32
+ {6F726B87-D099-4608-86B5-1755E522D9E8}.Debug|x64.ActiveCfg = Debug|x64
+ {6F726B87-D099-4608-86B5-1755E522D9E8}.Debug|x64.Build.0 = Debug|x64
+ {6F726B87-D099-4608-86B5-1755E522D9E8}.Debug|x86.ActiveCfg = Debug|Win32
+ {6F726B87-D099-4608-86B5-1755E522D9E8}.Debug|x86.Build.0 = Debug|Win32
+ {6F726B87-D099-4608-86B5-1755E522D9E8}.Release|x64.ActiveCfg = Release|x64
+ {6F726B87-D099-4608-86B5-1755E522D9E8}.Release|x64.Build.0 = Release|x64
+ {6F726B87-D099-4608-86B5-1755E522D9E8}.Release|x86.ActiveCfg = Release|Win32
+ {6F726B87-D099-4608-86B5-1755E522D9E8}.Release|x86.Build.0 = Release|Win32
+ {2D8A2745-6B9B-4073-B752-8308C512E372}.Debug|x64.ActiveCfg = Debug|x64
+ {2D8A2745-6B9B-4073-B752-8308C512E372}.Debug|x64.Build.0 = Debug|x64
+ {2D8A2745-6B9B-4073-B752-8308C512E372}.Debug|x86.ActiveCfg = Debug|Win32
+ {2D8A2745-6B9B-4073-B752-8308C512E372}.Debug|x86.Build.0 = Debug|Win32
+ {2D8A2745-6B9B-4073-B752-8308C512E372}.Release|x64.ActiveCfg = Release|x64
+ {2D8A2745-6B9B-4073-B752-8308C512E372}.Release|x64.Build.0 = Release|x64
+ {2D8A2745-6B9B-4073-B752-8308C512E372}.Release|x86.ActiveCfg = Release|Win32
+ {2D8A2745-6B9B-4073-B752-8308C512E372}.Release|x86.Build.0 = Release|Win32
+ {C11C1449-D2A6-4C0F-BCD7-6379F81C5812}.Debug|x64.ActiveCfg = Debug|x64
+ {C11C1449-D2A6-4C0F-BCD7-6379F81C5812}.Debug|x64.Build.0 = Debug|x64
+ {C11C1449-D2A6-4C0F-BCD7-6379F81C5812}.Debug|x86.ActiveCfg = Debug|Win32
+ {C11C1449-D2A6-4C0F-BCD7-6379F81C5812}.Debug|x86.Build.0 = Debug|Win32
+ {C11C1449-D2A6-4C0F-BCD7-6379F81C5812}.Release|x64.ActiveCfg = Release|x64
+ {C11C1449-D2A6-4C0F-BCD7-6379F81C5812}.Release|x64.Build.0 = Release|x64
+ {C11C1449-D2A6-4C0F-BCD7-6379F81C5812}.Release|x86.ActiveCfg = Release|Win32
+ {C11C1449-D2A6-4C0F-BCD7-6379F81C5812}.Release|x86.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {937EA705-9CAC-4152-A3E2-E1A7C1A51E26}
+ EndGlobalSection
+EndGlobal
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/graphics/cover-2.27.svg
^
|
| @@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ width="845"
+ height="422"
+ id="svg2054"
+ version="1.1"
+ sodipodi:docname="cover-2.17.svg"
+ inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata
+ id="metadata14">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs12">
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect68354"
+ is_visible="true"
+ lpeversion="1" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect67275"
+ is_visible="true"
+ lpeversion="1" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect61307"
+ is_visible="true"
+ lpeversion="1" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect60161"
+ is_visible="true"
+ lpeversion="1" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect58467"
+ is_visible="true"
+ lpeversion="1" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect52944"
+ is_visible="true"
+ lpeversion="1" />
+ <filter
+ inkscape:collect="always"
+ style="color-interpolation-filters:sRGB"
+ id="filter51493"
+ x="-0.2313123"
+ y="-0.37891728"
+ width="1.4626246"
+ height="1.7578346">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="3.0860482"
+ id="feGaussianBlur51495" />
+ </filter>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient21283"
+ gradientUnits="userSpaceOnUse"
+ x="-332.61957"
+ y="814.60327">
+ <meshrow
+ id="meshrow47633">
+ <meshpatch
+ id="meshpatch47635">
+ <stop
+ path="c 5.2076,-5.43232e-05 13.5814,1.93095 18.7891,1.93095"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop47637" />
+ <stop
+ path="c 0.22361,7.77765 -1.84395,8.97825 -1.84406,16.3893"
+ style="stop-color:#a17e34;stop-opacity:1"
+ id="stop47639" />
+ <stop
+ path="c -5.20756,0.000281765 -8.57128,5.84397 -13.779,5.84397"
+ style="stop-color:#a17e34;stop-opacity:1"
+ id="stop47641" />
+ <stop
+ path="c 0,-7.41092 -3.16582,-16.7528 -3.16604,-24.1642"
+ style="stop-color:#a17e34;stop-opacity:1"
+ id="stop47643" />
+ </meshpatch>
+ <meshpatch
+ id="meshpatch47645">
+ <stop
+ path="c 5.2077,0 9.81985,0.929076 15.0274,0.929122"
+ id="stop47647" />
+ <stop
+ path="c 0.000144097,7.41081 0.595604,13.893 0.595604,21.3039"
+ style="stop-color:#5b471d;stop-opacity:1"
+ id="stop47649" />
+ <stop
+ path="c -2.11035,-6.44281 -10.3606,-5.23983 -17.4671,-5.84374"
+ style="stop-color:#a17e34;stop-opacity:1"
+ id="stop47651" />
+ </meshpatch>
+ </meshrow>
+ <meshrow
+ id="meshrow47653">
+ <meshpatch
+ id="meshpatch47655">
+ <stop
+ path="c -1.68717,14.2356 1.43271,21.6624 1.84406,28.0763"
+ id="stop47657" />
+ <stop
+ path="c -5.2077,0 -10.4154,0 -15.6231,1.13687e-13"
+ style="stop-color:#a17e34;stop-opacity:1"
+ id="stop47659" />
+ <stop
+ path="c -5.68434e-14,-7.41092 -5.68434e-14,-14.8218 4e-05,-22.2324"
+ style="stop-color:#cbb55e;stop-opacity:1"
+ id="stop47661" />
+ </meshpatch>
+ <meshpatch
+ id="meshpatch47663">
+ <stop
+ path="c 0,7.41092 -4.3727,6.98682 -4.37276,14.3978"
+ id="stop47665" />
+ <stop
+ path="c -5.20757,-0.000164599 -6.04249,7.83479 -11.2502,7.83478"
+ style="stop-color:#1f180a;stop-opacity:1"
+ id="stop47667" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ <filter
+ inkscape:collect="always"
+ style="color-interpolation-filters:sRGB"
+ id="filter48085"
+ x="-0.011683676"
+ y="-0.0082102014"
+ width="1.0233674"
+ height="1.0164204">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.1521128"
+ id="feGaussianBlur48087" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1136"
+ id="namedview10"
+ showgrid="false"
+ inkscape:zoom="0.87407407"
+ inkscape:cx="353.51695"
+ inkscape:cy="253.98305"
+ inkscape:window-x="1920"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2054"
+ inkscape:pagecheckerboard="0" />
+ <image
+ sodipodi:absref="/home/karry/SailfishOS/projects/osmscout-sailfish/graphics/cover-2.17.jpg"
+ xlink:href="cover-2.17.jpg"
+ y="0"
+ x="0"
+ id="image892"
+ style="image-rendering:optimizeSpeed"
+ preserveAspectRatio="none"
+ height="422"
+ width="845" />
+ <g
+ id="label"
+ transform="matrix(1.4841993,0,0,1.4841993,49.48781,-1166.5396)"
+ style="opacity:1">
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50px;line-height:99%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+ x="263.37292"
+ y="835.81036"
+ id="text4187"><tspan
+ style="fill:#411f11;fill-opacity:0.734982"
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/pics/cover.jpg
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/qml/custom/POIIcon.qml
^
|
| @@ -113,6 +113,8 @@
'shop': 'shop',
'christian_church_building':'religious-christian',
'christian_church': 'religious-christian',
+ 'jewish_synagogue_building': 'religious-jewish',
+ 'muslim_mosque_building': 'religious-muslim',
'landuse_cemetery': 'religious-christian',
'railway_subway_entrance': 'entrance',
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/qml/custom/TrackTypes.qml
^
|
| @@ -22,18 +22,18 @@
Item {
property var types: [
- QT_TR_NOOP('Walk'),
- QT_TR_NOOP('Hike'),
- QT_TR_NOOP('Run'),
- QT_TR_NOOP('Road bike'),
- QT_TR_NOOP('Mountain bike'),
- QT_TR_NOOP('Car'),
- QT_TR_NOOP('Walking the dog'),
- QT_TR_NOOP('Swimming'),
- QT_TR_NOOP('Inline skating'),
- QT_TR_NOOP('Skiing'),
- QT_TR_NOOP('Nordic skiing'),
- QT_TR_NOOP('Horseback riding')
+ QT_TRANSLATE_NOOP("trackType", 'Walk'),
+ QT_TRANSLATE_NOOP("trackType", 'Hike'),
+ QT_TRANSLATE_NOOP("trackType", 'Run'),
+ QT_TRANSLATE_NOOP("trackType", 'Road bike'),
+ QT_TRANSLATE_NOOP("trackType", 'Mountain bike'),
+ QT_TRANSLATE_NOOP("trackType", 'Car'),
+ QT_TRANSLATE_NOOP("trackType", 'Walking the dog'),
+ QT_TRANSLATE_NOOP("trackType", 'Swimming'),
+ QT_TRANSLATE_NOOP("trackType", 'Inline skating'),
+ QT_TRANSLATE_NOOP("trackType", 'Skiing'),
+ QT_TRANSLATE_NOOP("trackType", 'Nordic skiing'),
+ QT_TRANSLATE_NOOP("trackType", 'Horseback riding')
]
property string unknownTypeIcon: 'pics/runner'
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/qml/l10n.qml
^
|
| @@ -83,6 +83,7 @@
QT_TRANSLATE_NOOP("objectType", "amenity"),
QT_TRANSLATE_NOOP("objectType", "amenity_atm"),
QT_TRANSLATE_NOOP("objectType", "amenity_bar"),
+ QT_TRANSLATE_NOOP("objectType", "amenity_bench"),
QT_TRANSLATE_NOOP("objectType", "amenity_cafe"),
QT_TRANSLATE_NOOP("objectType", "amenity_cafe_building"),
QT_TRANSLATE_NOOP("objectType", "amenity_drinking_water"),
@@ -102,7 +103,10 @@
QT_TRANSLATE_NOOP("objectType", "amenity_recycling"),
QT_TRANSLATE_NOOP("objectType", "amenity_restaurant"),
QT_TRANSLATE_NOOP("objectType", "amenity_restaurant_building"),
+ QT_TRANSLATE_NOOP("objectType", "amenity_shelter"),
QT_TRANSLATE_NOOP("objectType", "amenity_toilets"),
+ QT_TRANSLATE_NOOP("objectType", "amenity_waste_basket"),
+ QT_TRANSLATE_NOOP("objectType", "amenity_waste_disposal"),
QT_TRANSLATE_NOOP("objectType", "_highlighted"),
QT_TRANSLATE_NOOP("objectType", "highway_bus_stop"),
QT_TRANSLATE_NOOP("objectType", "highway_mini_roundabout"),
@@ -113,18 +117,25 @@
QT_TRANSLATE_NOOP("objectType", "historic_memorial_building"),
QT_TRANSLATE_NOOP("objectType", "historic_monument"),
QT_TRANSLATE_NOOP("objectType", "historic_monument_building"),
+ QT_TRANSLATE_NOOP("objectType", "christian_cathedral_building"),
+ QT_TRANSLATE_NOOP("objectType", "christian_chapel_building"),
QT_TRANSLATE_NOOP("objectType", "christian_church"),
QT_TRANSLATE_NOOP("objectType", "christian_church_building"),
+ QT_TRANSLATE_NOOP("objectType", "christian_worship"),
+ QT_TRANSLATE_NOOP("objectType", "jewish_synagogue_building"),
QT_TRANSLATE_NOOP("objectType", "leisure_playground"),
QT_TRANSLATE_NOOP("objectType", "natural_cave_entrance"),
QT_TRANSLATE_NOOP("objectType", "natural_peak"),
QT_TRANSLATE_NOOP("objectType", "natural_spring"),
QT_TRANSLATE_NOOP("objectType", "natural_tree"),
+ QT_TRANSLATE_NOOP("objectType", "muslim_mosque_building"),
+ QT_TRANSLATE_NOOP("objectType", "shrine_building"),
QT_TRANSLATE_NOOP("objectType", "railway_halt"),
QT_TRANSLATE_NOOP("objectType", "railway_station"),
QT_TRANSLATE_NOOP("objectType", "railway_subway_entrance"),
QT_TRANSLATE_NOOP("objectType", "railway_tram_stop"),
QT_TRANSLATE_NOOP("objectType", "speed_camera"),
+ QT_TRANSLATE_NOOP("objectType", "temple_building"),
QT_TRANSLATE_NOOP("objectType", "tourism_alpine_hut"),
QT_TRANSLATE_NOOP("objectType", "tourism_alpine_hut_building"),
QT_TRANSLATE_NOOP("objectType", "tourism_artwork"),
@@ -148,7 +159,8 @@
QT_TRANSLATE_NOOP("objectType", "tourism_viewpoint"),
QT_TRANSLATE_NOOP("objectType", "waterway_waterfall"),
QT_TRANSLATE_NOOP("objectType", "waterway_weir"),
- QT_TRANSLATE_NOOP("objectType", "waypoint")
+ QT_TRANSLATE_NOOP("objectType", "waypoint"),
+ QT_TRANSLATE_NOOP("objectType", "worship_building")
]
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/qml/pages/Collection.qml
^
|
| @@ -532,6 +532,16 @@
}
MenuItem {
//: collection pull down menu
+ text: qsTr("Statistics")
+ onClicked: {
+ pageStack.push(Qt.resolvedUrl("CollectionStatistics.qml"),
+ {
+ collectionId: collectionPage.collectionId
+ });
+ }
+ }
+ MenuItem {
+ //: collection pull down menu
text: qsTr("Edit")
onClicked: {
editDialog.itemType = "collection";
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/qml/pages/CollectionStatistics.qml
^
|
| @@ -0,0 +1,175 @@
+/*
+ OSM Scout for Sailfish OS
+ Copyright (C) 2022 Lukas Karas
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Pickers 1.0
+import Sailfish.Share 1.0
+import QtPositioning 5.2
+import QtQml.Models 2.1
+
+import harbour.osmscout.map 1.0
+
+import "../custom"
+import "../custom/Utils.js" as Utils
+
+Page {
+ id: collectionStatisticsPage
+ property string collectionId: "-1"
+
+ RemorsePopup { id: remorse }
+
+ CollectionStatisticsModel {
+ id: statisticsModel
+ collectionId: collectionStatisticsPage.collectionId
+ onError: {
+ remorse.execute(message, function() { }, 10 * 1000);
+ }
+ }
+
+ SilicaListView {
+ anchors.fill: parent
+ spacing: Theme.paddingMedium
+ x: Theme.paddingMedium
+ clip: true
+ model: statisticsModel
+
+ header: Column{
+ id: header
+ width: parent.width
+
+ PageHeader {
+ title: statisticsModel.loading ? qsTr("Loading collection") : statisticsModel.name;
+ }
+ Label {
+ text: statisticsModel.description
+ x: Theme.paddingMedium
+ width: parent.width - 2*Theme.paddingMedium
+ //visible: text != ""
+ color: Theme.secondaryColor
+ wrapMode: Text.WordWrap
+ }
+ Item{
+ width: parent.width
+ height: Theme.paddingMedium
+ }
+ }
+
+ delegate: ListItem {
+ contentHeight: statColumn.height
+
+ TrackTypeIcon {
+ id: typeIcon
+ type: model.type
+
+ width: Theme.iconSizeExtraLarge
+ height: width
+ opacity: 0.2
+
+ icon.fillMode: Image.PreserveAspectFit
+ icon.sourceSize.width: width
+ icon.sourceSize.height: height
+ }
+
+ Column {
+ id: statColumn
+ x: Theme.paddingMedium
+ width: parent.width - 2*Theme.paddingMedium
+
+ function round10(d){
+ return Math.round(d * 10)/10;
+ }
+
+ SectionHeader {
+ id: typeHeader
+ text: model.type != "" ? qsTranslate("trackType", model.type) : qsTr("Unknown type")
+ //width: parent.width
+ }
+
+ DetailItem {
+ id: trackCountItem
+ label: qsTr("Track count")
+ value: model.trackCount
+ }
+ DetailItem {
+ id: distanceItem
+ label: qsTr("Distance")
+ value: model.distance < 0 ? "?" :Utils.humanDistance(model.distance)
+ }
+ DetailItem {
+ id: longestTrackItem
+ label: qsTr("Longest track")
+ value: model.longestTrack < 0 ? "?" :Utils.humanDistance(model.longestTrack)
+ }
+ DetailItem {
+ id: duration
+ visible: model.duration > 0
+ //: Track duration
+ label: qsTr("Time")
+ value: Utils.humanDurationLong(model.duration / 1000)
+ }
+ DetailItem {
+ id: movingDuration
+ visible: model.movingDuration > 0
+ label: qsTr("Moving Time")
+ value: Utils.humanDurationLong(model.movingDuration / 1000)
+ }
+ DetailItem {
+ id: speed
+ visible: model.maxSpeed >= 0
+ label: qsTr("Max speed")
+ value: Utils.distanceUnits == "imperial" ?
+ (qsTr("%1 mi/h")
+ .arg(statColumn.round10((model.maxSpeed*3.6 * 1000) / 1609.344))) :
+ (qsTr("%1 km/h")
+ .arg(statColumn.round10(model.maxSpeed*3.6)))
+ }
+ DetailItem {
+ id: elevation
+ visible: model.minElevation > -100000 && model.maxElevation > -100000
+ label: qsTr("Elevation min/max")
+ value: Utils.distanceUnits == "imperial" ?
+ (qsTr("%1 / %2 ft a.s.l.")
+ .arg(Math.round(model.minElevation * 3.2808))
+ .arg(Math.round(model.maxElevation * 3.2808))):
+ (qsTr("%1 / %2 m a.s.l.")
+ .arg(Math.round(model.minElevation))
+ .arg(Math.round(model.maxElevation)))
+ }
+ DetailItem {
+ id: ascent
+ label: qsTr("Ascent")
+ value: Utils.humanSmallDistance(model.ascent)
+ }
+ DetailItem {
+ id: descent
+ label: qsTr("Descent")
+ value: Utils.humanSmallDistance(model.descent)
+ }
+ }
+ }
+ }
+ BusyIndicator {
+ id: busyIndicator
+ running: statisticsModel.loading
+ size: BusyIndicatorSize.Large
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.verticalCenter: parent.verticalCenter
+ }
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/qml/pages/CollectionTrack.qml
^
|
| @@ -157,7 +157,7 @@
visible: trackModel.type != ""
//: track type
label: qsTr("Type")
- value: qsTr(trackModel.type)
+ value: qsTranslate("trackType", trackModel.type)
}
DetailItem {
id: distanceItem
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/qml/pages/Cover.qml
^
|
| @@ -127,6 +127,10 @@
y: Theme.paddingMedium
height: Theme.fontSizeMedium * 1.5
width: height
+
+ fillMode: Image.PreserveAspectFit
+ sourceSize.width: trackerIcon.width
+ sourceSize.height: trackerIcon.height
}
Label{
id: trackerHeaderText
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/qml/pages/PlaceDetail.qml
^
|
| @@ -236,15 +236,29 @@
height: Theme.iconSizeMedium
}
Column{
- Label {
- id: entryPoi
+ Label {
+ id: entryPoi
+
+ width: locationInfoView.width - poiIcon.width - (2*Theme.paddingSmall)
+
+ // text: label
+ text: settings.showAltLanguage && model.altLangName !== "" ?
+ model.altLangName :
+ model.poi
+
+ font.pixelSize: Theme.fontSizeLarge
+ visible: poi != ""
+ }
+ Label {
+ id: entryPoiAltName
+
+ width: locationInfoView.width - poiIcon.width - (2*Theme.paddingSmall)
- width: locationInfoView.width - poiIcon.width - (2*Theme.paddingSmall)
+ text: "(" + model.poi + ")"
- text: poi // label
- font.pixelSize: Theme.fontSizeLarge
- visible: poi != ""
- }
+ font.pixelSize: Theme.fontSizeLarge
+ visible: poi != "" && model.altLangName != "" && settings.showAltLanguage
+ }
Label {
id: entryAddress
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/qml/pages/Search.qml
^
|
| @@ -111,6 +111,10 @@
}
}
+ Settings {
+ id: settings
+ }
+
onSearchStringChanged: {
if (searchString.length == 0){
highlighRegexp = new RegExp("", 'i')
@@ -495,9 +499,14 @@
width: parent.width
color: highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor
textFormat: Text.StyledText
- text: (type=="coordinate") ?
+
+ property string localizedLabel: settings.showAltLanguage && model.altLangName !== "" ?
+ (model.altLangName + (model.label!=="" ? " (" + model.label +")" : "")) :
+ model.label
+
+ text: (type==="coordinate") ?
Utils.formatCoord(lat, lon, AppSettings.gpsFormat) :
- (label== "" ? qsTr("Unnamed") :(searchString=="" ? label : Theme.highlightText(label, highlighRegexp, Theme.highlightColor)))
+ (localizedLabel === "" ? qsTr("Unnamed") :(searchString=="" ? localizedLabel : Theme.highlightText(localizedLabel, highlighRegexp, Theme.highlightColor)))
}
Label {
id: entryRegion
@@ -874,9 +883,14 @@
wrapMode: Text.Wrap
color: Theme.highlightColor
+ property string localizedLabel: settings.showAltLanguage && (typeof model.altLangName != "undefined") ?
+ (model.altLangName + (model.name!=="" ? " (" + model.name +")" : "")) :
+ model.name
+
text: (previewDialog.selectedLocation.type=="coordinate") ?
Utils.formatCoord(previewDialog.selectedLocation.lat, previewDialog.selectedLocation.lon, AppSettings.gpsFormat) :
- (previewDialog.selectedLocation.label==""? qsTr("Unnamed"):previewDialog.selectedLocation.label);
+ (localizedLabel==""? qsTr("Unnamed"):localizedLabel);
+
}
Label {
id: entryAddress
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/qml/pages/Settings.qml
^
|
| @@ -129,6 +129,20 @@
clicked(mouse);
}
}
+ TextSwitch{
+ id: altLangSwitch
+ width: parent.width
+
+ checked: settings.showAltLanguage
+ text: qsTr("Prefer English names")
+ //: description of "Prefer English names" switch
+ description: qsTr("On the map, search and place info")
+
+ onCheckedChanged: {
+ settings.showAltLanguage = checked;
+ }
+ }
+
SectionHeader{ text: qsTr("Navigation") }
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/qml/pages/Tracker.qml
^
|
| @@ -216,7 +216,7 @@
visible: Global.tracker.type != ""
//: track type
label: qsTr("Type")
- value: qsTr(Global.tracker.type)
+ value: qsTranslate("trackType", Global.tracker.type)
}
SectionHeader{ text: qsTr("Current data") }
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/src/CollectionStatisticsModel.cpp
^
|
| @@ -0,0 +1,221 @@
+/*
+ OSMScout for SFOS
+ Copyright (C) 2022 Lukas Karas
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include "CollectionStatisticsModel.h"
+#include "QVariantConverters.h"
+
+
+
+namespace {
+std::optional<osmscout::Distance> maxOpt(const std::optional<osmscout::Distance> &a,
+ const std::optional<osmscout::Distance> &b) {
+ if (!a) {
+ return b;
+ }
+ if (!b) {
+ return a;
+ }
+ return std::make_optional<osmscout::Distance>(std::max(*a, *b));
+}
+
+std::optional<osmscout::Distance> minOpt(const std::optional<osmscout::Distance> &a,
+ const std::optional<osmscout::Distance> &b) {
+ if (!a) {
+ return b;
+ }
+ if (!b) {
+ return a;
+ }
+ return std::make_optional<osmscout::Distance>(std::min(*a, *b));
+}
+
+double distanceOpt(const std::optional<osmscout::Distance> &d) {
+ if (d.has_value())
+ return d->AsMeter();
+ return -1000000; // JS numeric limits may be different from C++
+}
+} // anonymous namespace
+
+CollectionStatisticsModel::CollectionStatisticsModel()
+{
+ Storage *storage = Storage::getInstance();
+ assert(storage);
+
+ connect(storage, &Storage::initialised,
+ this, &CollectionStatisticsModel::storageInitialised,
+ Qt::QueuedConnection);
+
+ connect(storage, &Storage::initialisationError,
+ this, &CollectionStatisticsModel::storageInitialisationError,
+ Qt::QueuedConnection);
+
+ connect(this, &CollectionStatisticsModel::collectionDetailRequest,
+ storage, &Storage::loadCollectionDetails,
+ Qt::QueuedConnection);
+
+ connect(storage, &Storage::collectionDetailsLoaded,
+ this, &CollectionStatisticsModel::onCollectionDetailsLoaded,
+ Qt::QueuedConnection);
+
+ connect(storage, &Storage::error,
+ this, &CollectionStatisticsModel::error,
+ Qt::QueuedConnection);
+
+}
+
+bool CollectionStatisticsModel::isLoading() const
+{
+ return !collectionLoaded;
+}
+
+QString CollectionStatisticsModel::getCollectionName() const
+{
+ return collectionLoaded? collection.name : "";
+}
+
+QString CollectionStatisticsModel::getCollectionDescription() const
+{
+ return collectionLoaded? collection.description : "";
+}
+
+void CollectionStatisticsModel::setCollectionId(QString id)
+{
+ bool ok;
+ collection.id = id.toLongLong(&ok);
+ if (!ok)
+ collection.id = -1;
+
+ emit collectionDetailRequest(collection);
+}
+
+void CollectionStatisticsModel::storageInitialised()
+{
+ beginResetModel();
+ collectionLoaded = false;
+ endResetModel();
+ if (collection.id > 0) {
+ emit collectionDetailRequest(collection);
+ }
+}
+
+void CollectionStatisticsModel::storageInitialisationError(QString)
+{
+ storageInitialised();
+}
+
+void CollectionStatisticsModel::onCollectionDetailsLoaded(Collection collection, bool ok)
+{
+ if (this->collection.id != collection.id) {
+ return;
+ }
+ collectionLoaded = true;
+ if (ok && collection.tracks) {
+ this->collection = collection;
+ QMap<QString, CollectionStatisticsItem> typeMap;
+ for (const Track &track: *(collection.tracks)) {
+ CollectionStatisticsItem &stat = typeMap[track.type];
+
+ stat.type = track.type;
+ stat.trackCount++;
+ stat.longestTrack = std::max(stat.longestTrack, track.statistics.distance);
+
+ stat.statistics.distance += track.statistics.distance;
+ stat.statistics.rawDistance += track.statistics.rawDistance;
+ stat.statistics.duration += track.statistics.duration;
+ stat.statistics.movingDuration += track.statistics.movingDuration;
+ stat.statistics.maxSpeed = std::max(stat.statistics.maxSpeed, track.statistics.maxSpeed);
+ stat.statistics.ascent += track.statistics.ascent;
+ stat.statistics.descent += track.statistics.descent;
+ stat.statistics.minElevation = minOpt(stat.statistics.minElevation, track.statistics.minElevation);
+ stat.statistics.maxElevation = maxOpt(stat.statistics.minElevation, track.statistics.minElevation);
+ }
+
+ beginResetModel();
+ for (const CollectionStatisticsItem &stat: typeMap.values()) {
+ items.emplace_back(stat);
+ }
+ std::sort(items.begin(), items.end(), [](const CollectionStatisticsItem &a, const CollectionStatisticsItem &b) -> bool {
+ return a.trackCount < b.trackCount;
+ });
+ endResetModel();
+ }
+ emit loadingChanged();
+}
+
+int CollectionStatisticsModel::rowCount(const QModelIndex &) const
+{
+ return items.size();
+}
+
+QVariant CollectionStatisticsModel::data(const QModelIndex &index, int role) const
+{
+ using namespace converters;
+ using namespace std::string_literals;
+
+ int row = index.row();
+ if(row < 0 || row >= (int)items.size()) {
+ return QVariant();
+ }
+
+ const CollectionStatisticsItem &item = items[row];
+ switch (role) {
+ case TypeRole: return item.type;
+ case DistanceRole: return item.statistics.distance.AsMeter();
+ case RawDistanceRole: return item.statistics.rawDistance.AsMeter();
+ case DurationRole: return item.statistics.durationMillis();
+ case MovingDurationRole: return item.statistics.movingDurationMillis();
+ case MaxSpeedRole: return item.statistics.maxSpeed;
+ case AscentRole: return item.statistics.ascent.AsMeter();
+ case DescentRole: return item.statistics.descent.AsMeter();
+ case MinElevationRole: return distanceOpt(item.statistics.minElevation);
+ case MaxElevationRole: return distanceOpt(item.statistics.maxElevation);
+ case LongestTrackRole: return item.longestTrack.AsMeter();
+ case TrackCountRole: return item.trackCount;
+ }
+ assert(false);
+}
+
+QHash<int, QByteArray> CollectionStatisticsModel::roleNames() const
+{
+ QHash<int, QByteArray> roles=QAbstractItemModel::roleNames();
+
+ roles[TypeRole] = "type";
+ roles[DistanceRole] = "distance";
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/src/CollectionStatisticsModel.h
^
|
| @@ -0,0 +1,96 @@
+/*
+ OSMScout for SFOS
+ Copyright (C) 2022 Lukas Karas
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#pragma once
+
+#include "Storage.h"
+
+#include <QObject>
+#include <QtCore/QAbstractItemModel>
+
+#include <variant>
+
+struct CollectionStatisticsItem {
+ QString type;
+ int trackCount{0};
+ osmscout::Distance longestTrack;
+ TrackStatistics statistics;
+};
+
+class CollectionStatisticsModel : public QAbstractListModel {
+
+ Q_OBJECT
+ Q_PROPERTY(bool loading READ isLoading NOTIFY loadingChanged)
+ Q_PROPERTY(QString collectionId READ getCollectionId WRITE setCollectionId)
+ Q_PROPERTY(QString name READ getCollectionName NOTIFY loadingChanged)
+ Q_PROPERTY(QString description READ getCollectionDescription NOTIFY loadingChanged)
+
+signals:
+ void loadingChanged();
+ void collectionDetailRequest(Collection);
+ void error(QString message);
+
+public slots:
+ void storageInitialised();
+ void storageInitialisationError(QString);
+ void onCollectionDetailsLoaded(Collection collection, bool ok);
+
+public:
+ CollectionStatisticsModel();
+
+ ~CollectionStatisticsModel() override = default;
+
+ enum Roles {
+ TypeRole = Qt::UserRole,
+ DistanceRole = Qt::UserRole + 1,
+ RawDistanceRole = Qt::UserRole + 2,
+ DurationRole = Qt::UserRole + 3,
+ MovingDurationRole = Qt::UserRole + 4,
+ MaxSpeedRole = Qt::UserRole + 5,
+ AscentRole = Qt::UserRole + 6,
+ DescentRole = Qt::UserRole + 7,
+ MinElevationRole = Qt::UserRole + 8,
+ MaxElevationRole = Qt::UserRole + 9,
+ LongestTrackRole = Qt::UserRole + 10,
+ TrackCountRole = Qt::UserRole + 11
+ };
+ Q_ENUM(Roles)
+
+ Q_INVOKABLE virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ Q_INVOKABLE virtual QVariant data(const QModelIndex &index, int role) const;
+ virtual QHash<int, QByteArray> roleNames() const;
+ Q_INVOKABLE virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+
+ QString getCollectionId() const
+ {
+ return QString::number(collection.id);
+ }
+
+ void setCollectionId(QString id);
+
+ bool isLoading() const;
+ QString getCollectionName() const;
+ QString getCollectionDescription() const;
+
+private:
+ Collection collection;
+ std::vector<CollectionStatisticsItem> items;
+
+ bool collectionLoaded{false};
+};
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/src/CollectionTrackModel.cpp
^
|
| @@ -220,8 +220,9 @@
// QML will take ownership
return new LocationEntry(LocationEntry::Type::typeNone,
"bbox",
+ "",
"bbox",
- QStringList(),
+ QList<AdminRegionInfoRef>(),
"",
track.statistics.bbox.GetCenter(),
track.statistics.bbox);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/src/NearWaypointModel.cpp
^
|
| @@ -21,6 +21,7 @@
#include <osmscout/util/Geometry.h>
#include <osmscoutclientqt/LocationEntry.h>
+#include <osmscoutclientqt/AdminRegionInfo.h>
NearWaypointModel::NearWaypointModel()
{
@@ -127,7 +128,8 @@
osmscout::LocationEntry::typeObject,
QString::fromStdString(waypoint.data.name ? waypoint.data.name.value() : waypoint.data.coord.GetDisplayText()),
"",
- QStringList(),
+ "",
+ QList<osmscout::AdminRegionInfoRef>(),
"",
waypoint.data.coord,
osmscout::GeoBox::BoxByCenterAndRadius(waypoint.data.coord, osmscout::Meters(2.0)));
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/src/OSMScout.cpp
^
|
| @@ -31,6 +31,7 @@
// collections
#include "Storage.h"
#include "CollectionModel.h"
+#include "CollectionStatisticsModel.h"
#include "CollectionListModel.h"
#include "CollectionTrackModel.h"
#include "CollectionMapBridge.h"
@@ -183,6 +184,7 @@
qmlRegisterType<CollectionListModel>("harbour.osmscout.map", 1, 0, "CollectionListModel");
qmlRegisterType<CollectionModel>("harbour.osmscout.map", 1, 0, "CollectionModel");
+ qmlRegisterType<CollectionStatisticsModel>("harbour.osmscout.map", 1, 0, "CollectionStatisticsModel");
qmlRegisterType<CollectionTrackModel>("harbour.osmscout.map", 1, 0, "CollectionTrackModel");
qmlRegisterType<CollectionMapBridge>("harbour.osmscout.map", 1, 0, "CollectionMapBridge");
qmlRegisterType<Tracker>("harbour.osmscout.map", 1, 0, "Tracker");
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/src/Storage.cpp
^
|
| @@ -2179,6 +2179,8 @@
//: name for new track created by splitting
trackTail.name = Storage::tr("%1, part 2").arg(track.name).toStdString();
trackTail.desc = track.description.toStdString();
+ trackTail.type = track.type.toStdString();
+ trackTail.displayColor = track.color;
quint64 skip=position;
for (const auto &seg: track.data->segments){
if (skip==0){
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/stylesheets/include/roads.oss
^
|
| @@ -517,7 +517,7 @@
[PATH
MAG veryClose-
- ONEWAY] WAY.SYMBOL {symbol: oneway_arrow; }
+ ONEWAY] WAY.SYMBOL {symbol: oneway_arrow; symbolSpace: 10mm; renderMode: scale; scale: 0.5; }
// Special objects
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/stylesheets/outdoor.oss
^
|
| @@ -1483,7 +1483,7 @@
highway_service,
highway_living_street,
highway_pedestrian ONEWAY] {
- WAY.SYMBOL { symbol: oneway_arrow; }
+ WAY.SYMBOL { symbol: oneway_arrow; symbolSpace: 10mm; renderMode: scale; scale: 0.5; }
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/stylesheets/standard.oss
^
|
| @@ -1177,7 +1177,7 @@
[PATH
MAG veryClose-
- ONEWAY] WAY.SYMBOL {symbol: oneway_arrow; }
+ ONEWAY] WAY.SYMBOL {symbol: oneway_arrow; symbolSpace: 10mm; renderMode: scale; scale: 0.5; }
// Special objects
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/cs.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation>Sdílet</translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation>Statistiky</translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation>Upravit sbírku</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation>Vzdálenost</translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation>Nejdelší trasa</translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation>Čas</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation>Čas v pohybu</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation>Maximální rychlost</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/h</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation>Nadmořská výška min/max</translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation>%1 / %2 stop n.m.</translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation>%1 / %2 m n.m.</translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation>Stoupání</translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation>Klesání</translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation>Neznámý typ</translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation>Počet tras</translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation>Noční režim</translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation>Preferovat anglické názvy</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation>Na mapě, hledání a informacích o místech</translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation>Chůze</translation>
- </message>
- <message>
- <source>Hike</source>
- <translation>Tůra</translation>
- </message>
- <message>
- <source>Run</source>
- <translation>Běh</translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation>Silniční kolo</translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation>Horské kolo</translation>
- </message>
- <message>
- <source>Car</source>
- <translation>Auto</translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation>Venčení psa</translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation>Plavání</translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation>Kolečkové brusle</translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation>Jízda na koni</translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation>Sjezdové lyžování</translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation>Běžky</translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2169,6 +2196,54 @@
<source>tourism_viewpoint</source>
<translation>Vyhlídka</translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation>Lavička</translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation>Přístřešek</translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation>Odpadkový koš</translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation>Kontejner na odpad</translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation>Katedrála</translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation>Kaple</translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation>Modlitebna</translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation>Synagoga</translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation>Mešita</translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation>Svatyně</translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/de.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation>Teilen</translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished">Statistik</translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished">Lade Sammlung</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished">Zeit</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished">Reisedauer</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished">%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished">%1 km/h</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished">Höhe min/max</translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished">%1 / %2 ft ü. M.</translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished">%1 / %2 m ü. M.</translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished">Anstieg</translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished">Abstieg</translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -426,7 +495,7 @@
<message>
<source>Type</source>
<extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Art</translation>
</message>
</context>
<context>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation>Nacht-Modus</translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished">Bevorzuge Englische Bezeichnungen</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1527,58 +1605,7 @@
<name>TrackTypeComboBox</name>
<message>
<source>Type</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished">Straßen-Fahrrad</translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished">Mountain Bike</translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished">Auto</translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
+ <translation>Art</translation>
</message>
</context>
<context>
@@ -1722,7 +1749,7 @@
<message>
<source>Type</source>
<extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Art</translation>
</message>
</context>
<context>
@@ -2168,6 +2195,54 @@
<source>tourism_viewpoint</source>
<translation>Aussichtspunkt</translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/en.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2168,6 +2195,54 @@
<source>tourism_viewpoint</source>
<translation>Viewpoint</translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation>Bench</translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation>Shelter</translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation>Waste basket</translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation>Waste disposal</translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation>Catedral</translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation>Chapel</translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation>Worship</translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation>Synagogue</translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation>Mosque</translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation>Shrine</translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/es.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation>Compartir</translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished">Estadísticas</translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished">Cargando colección</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished">Distancia</translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished">Tiempo</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished">%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished">%1 km/h</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished">Elevación min/max</translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished">%1 / %2 pi a.s.l.</translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished">%1 / %2 m a.s.l.</translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished">Preferir nombres en Inglés</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished">A bicicleta</translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished">A bicicleta de montaña</translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished">Automóvil</translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2168,6 +2195,54 @@
<source>tourism_viewpoint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/et.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation>Jaga</translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation>Statistika</translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation>Laadin kogumikku</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation>Vahemaa</translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation>Pikim rada</translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation>Kestus</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation>Liikumise kestus</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation>Suurim kiirus</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/h</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation>Suurim/väikseim kõrgus</translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation>%1 / %2 ft ümp</translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation>%1 / %2 m ümp</translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation>Tõus</translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation>Laskumine</translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation>Tundmatu tüüp</translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation>Radade arv</translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -426,7 +495,7 @@
<message>
<source>Type</source>
<extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Tüüp</translation>
</message>
</context>
<context>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation>Öörežiim</translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation>Eelista ingliskeelseid nimesid</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation>Kaardivaates, otsinguvormil ja asukoha teabe puhul</translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1527,58 +1605,7 @@
<name>TrackTypeComboBox</name>
<message>
<source>Type</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished">linnarattaga</translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished">maastikurattaga</translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished">autoga</translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
+ <translation>Tüüp</translation>
</message>
</context>
<context>
@@ -1722,7 +1749,7 @@
<message>
<source>Type</source>
<extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Tüüp</translation>
</message>
</context>
<context>
@@ -2168,6 +2195,54 @@
<source>tourism_viewpoint</source>
<translation>Vaateplatvorm</translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation>Pink</translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation>Varjualune</translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation>Prügikast</translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation>Prügikonteiner</translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation>Katedraal</translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/fa.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished">بارگیری مجموعه</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished">فاصله</translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished">زمان</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished">زمان جابهحایی</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2167,6 +2194,54 @@
<source>tourism_viewpoint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/fr.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished">Statistiques</translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished">Chargement de la collection</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished">Distance</translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished">Heure</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished">Durée de déplacement</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished">%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished">%1 km/h</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished">%1 / %2 pieds d'altitude</translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished">%1 / %2 m d'altitude</translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished">Descente</translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished">Préférer les noms anglais</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished">Vélo de route</translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished">VTT</translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished">Voiture</translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2168,6 +2195,54 @@
<source>tourism_viewpoint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/hu.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation>Megosztás</translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished">Statisztikák</translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished">Gyűjtemény betöltése</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished">Távolság</translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished">Időtartam</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished">Mozgás időtartama</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished">%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished">%1 km/h</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation>Éjszakai mód</translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished">Angol nevek használata</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished">Országúti kerékpárral</translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished">Hegyi kerékpárral</translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished">Autóval</translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2167,6 +2194,54 @@
<source>tourism_viewpoint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/it.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished">%1 km/h</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2168,6 +2195,54 @@
<source>tourism_viewpoint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/nb.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2168,6 +2195,54 @@
<source>tourism_viewpoint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/nl.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished">Verzameling wordt geladen</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished">Tijd</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished">Verplaatsingstijd</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished">%1 km/u</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished">Hoogteverschil min/max</translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished">%1 / %2 m boven NAP</translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished">Klim</translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished">Afdaling</translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished">Engelse namen verkiezen</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2168,6 +2195,54 @@
<source>tourism_viewpoint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/nl_BE.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished">Verzameling wordt geladen</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished">Tijd</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished">Verplaatsingstijd</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished">%1 km/u</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished">Hoogteverschil min/max</translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished">%1 / %2 m boven zeespiegel</translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished">Klim</translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished">Afdaling</translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished">Engelse namen verkiezen</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2168,6 +2195,54 @@
<source>tourism_viewpoint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/pl.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation>Udostępnij</translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation>Statystyki</translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation>Ładowanie kolekcji</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation>Dystans</translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation>Najdłuższy ślad</translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation>Czas</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation>Czas ruchu</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation>Prędkość maksymalna</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/h</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation>Wznios min/max</translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation>%1 / %2 ft n.p.m.</translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation>%1 / %2 m.n.p.m.</translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation>Wznios</translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation>Spadek</translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation>Nieznany rodzaj</translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation>Liczba śladów</translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -426,7 +495,7 @@
<message>
<source>Type</source>
<extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Rodzaj</translation>
</message>
</context>
<context>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation>Tryb nocny</translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished">Preferuj nazwy angielskie</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1527,58 +1605,7 @@
<name>TrackTypeComboBox</name>
<message>
<source>Type</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished">Rower Szosowy</translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished">Rower górski</translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished">Samochód</translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
+ <translation>Rodzaj</translation>
</message>
</context>
<context>
@@ -1723,7 +1750,7 @@
<message>
<source>Type</source>
<extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Rodzaj</translation>
</message>
</context>
<context>
@@ -2169,6 +2196,54 @@
<source>tourism_viewpoint</source>
<translation>Punkt widokowy</translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/pt_BR.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished">Carregando coleção</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished">Distância</translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished">Tempo</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished">Tempo em movimento</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished">Elevação min/máx</translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished">Subida</translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished">Descida</translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2168,6 +2195,54 @@
<source>tourism_viewpoint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/ru.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished">Статистика</translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished">Загрузка коллекции</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished">Время</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished">Время движения</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished">%1 миль/ч</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished">%1 км/ч</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished">Высота мин./макс.</translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished">%1 / %2 футов над уровнем моря</translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished">%1 / %2 м над уровнем моря</translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished">Подъём</translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished">Спуск</translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished">Английские названия</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2169,6 +2196,54 @@
<source>tourism_viewpoint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/sv.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation>Dela</translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation>Statistik</translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation>Läser in samling</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation>Avstånd</translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation>Längsta spår</translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation>Tid</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation>Rörelsetid</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation>Maxhastighet</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 mi/t</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/t</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation>Höjd min/max</translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation>%1 / %2 ft a.s.l.</translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation>%1 / %2 m a.s.l.</translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation>Stigning</translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation>Nedstigning</translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation>Okänd typ</translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation>Antal spår</translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -426,7 +495,7 @@
<message>
<source>Type</source>
<extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Typ</translation>
</message>
</context>
<context>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation>Nattläge</translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation>Föredra Engelska namn</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation>På karta, sök- och platsinformation</translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1527,58 +1605,7 @@
<name>TrackTypeComboBox</name>
<message>
<source>Type</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished">Vägcykel</translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished">Mountainbike</translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished">Bil</translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
+ <translation>Typ</translation>
</message>
</context>
<context>
@@ -1722,7 +1749,7 @@
<message>
<source>Type</source>
<extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Typ</translation>
</message>
</context>
<context>
@@ -2168,6 +2195,54 @@
<source>tourism_viewpoint</source>
<translation>Utsiktspunkt</translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation>Bänk</translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation>Väderskydd</translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation>Papperskorg</translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation>Avfallshantering</translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation>Katedral</translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.27.tar.bz2/translations/zh_CN.ts
^
|
| @@ -193,6 +193,11 @@
collection pull down menu</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Statistics</source>
+ <extracomment>collection pull down menu</extracomment>
+ <translation type="unfinished">统计数据</translation>
+ </message>
</context>
<context>
<name>CollectionComboBox</name>
@@ -347,6 +352,70 @@
</message>
</context>
<context>
+ <name>CollectionStatistics</name>
+ <message>
+ <source>Loading collection</source>
+ <translation type="unfinished">正在搜藏中</translation>
+ </message>
+ <message>
+ <source>Distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Longest track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation type="unfinished">时间</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation type="unfinished">运动时间</translation>
+ </message>
+ <message>
+ <source>Max speed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation type="unfinished">%1 米/小时</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation type="unfinished">%1 km/h</translation>
+ </message>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished">海拔最大值/最小值</translation>
+ </message>
+ <message>
+ <source>%1 / %2 ft a.s.l.</source>
+ <translation type="unfinished">%1 / %2 英尺 a.s.l.</translation>
+ </message>
+ <message>
+ <source>%1 / %2 m a.s.l.</source>
+ <translation type="unfinished">%1 / %2 m a.s.l.</translation>
+ </message>
+ <message>
+ <source>Ascent</source>
+ <translation type="unfinished">上坡</translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished">下坡</translation>
+ </message>
+ <message>
+ <source>Unknown type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Track count</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CollectionTrack</name>
<message>
<source>Show</source>
@@ -1261,6 +1330,15 @@
<extracomment>Setting toggle for button on main screen for night/daylight mode</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Prefer English names</source>
+ <translation type="unfinished">偏爱英语名称</translation>
+ </message>
+ <message>
+ <source>On the map, search and place info</source>
+ <extracomment>description of "Prefer English names" switch</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SpeedIndicator</name>
@@ -1531,57 +1609,6 @@
</message>
</context>
<context>
- <name>TrackTypes</name>
- <message>
- <source>Walk</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Hike</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Run</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Road bike</source>
- <translation type="unfinished">公路自行车</translation>
- </message>
- <message>
- <source>Mountain bike</source>
- <translation type="unfinished">山地自行车</translation>
- </message>
- <message>
- <source>Car</source>
- <translation type="unfinished">开车</translation>
- </message>
- <message>
- <source>Walking the dog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Swimming</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Inline skating</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Nordic skiing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Horseback riding</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Tracker</name>
<message>
<source>New track</source>
@@ -2167,6 +2194,54 @@
<source>tourism_viewpoint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>amenity_bench</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_shelter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_basket</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>amenity_waste_disposal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_cathedral_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_chapel_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>christian_worship</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>jewish_synagogue_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>muslim_mosque_building</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>shrine_building</source>
+ <translation type="unfinished"></translation>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout.changes.in
^
|
| @@ -564,3 +564,10 @@
- new icons for outdoor map (bench, shelter, basket)
- prepare split of christian church type to cathedral, chapel, church and its jewish and muslim equivalent
- possibility to define track type (Walk, Hike, Run, Road bike...)
+
+* 2022-12-10 Lukáš Karas <lukas.karas@centrum.cz> 2.27
+- update translations (Czech, Estonian, German, Polish, Swedish)
+- page with collection statistics
+- use English names of map objects (search, place detail, administrative regions) when available and English is preferred (in map settings)
+- preserve track type and color during track split
+- transliterate utf8 characters in prefix-based search. In other words, "snezka" search will return "Sněžka" in results.
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout.yaml
^
|
| @@ -1,6 +1,6 @@
Name: harbour-osmscout
Summary: OSMScout for Sailfish
-Version: 2.26
+Version: 2.27
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
|
