|
[-]
[+]
|
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.23</param>
+ <param name="revision">v2.24</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/.github/workflows/build_and_test_on_ubuntu_20_04.yml
^
|
| @@ -36,3 +36,6 @@
run: cmake -B build -DCMAKE_UNITY_BUILD=ON -Wno-dev
- name: Build project
run: cmake --build build -- all
+ - name: Run tests
+ run: ctest --output-on-failure
+ working-directory: build
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.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.23.0 LANGUAGES C CXX)
+project(osmscout-sailfish VERSION 2.24.0 LANGUAGES C CXX)
# ==================================================================================================
# Information to update before to release this package.
@@ -548,13 +548,17 @@
DESTINATION share/${HARBOUR_APP_NAME}/map-icons
FILES_MATCHING PATTERN "*.svg")
+install(DIRECTORY stylesheets/include
+ DESTINATION share/${HARBOUR_APP_NAME}/map-styles
+ FILES_MATCHING PATTERN "*.oss")
+
install(FILES
- stylesheets/boundaries.oss
stylesheets/public-transport.oss
stylesheets/standard.oss
stylesheets/outdoor.oss
stylesheets/winter-sports.oss
-DESTINATION share/${HARBOUR_APP_NAME}/map-styles)
+ stylesheets/cycle.oss
+ DESTINATION share/${HARBOUR_APP_NAME}/map-styles)
# ==================================================================================================
# PerformanceTest binary
@@ -620,3 +624,43 @@
${LIBSAILFISHAPP_LIBRARIES}
)
+
+# ==================================================================================================
+# OSTAndOSSCheck
+
+add_executable(OSTAndOSSCheck ${OSMSCOUT_BASE_DIR_SOURCE}/Tests/src/OSTAndOSSCheck.cpp)
+set_property(TARGET OSTAndOSSCheck PROPERTY CXX_STANDARD 17)
+target_link_libraries(OSTAndOSSCheck OSMScout OSMScoutMap)
+
+enable_testing()
+
+set(STYLESHEETS
+ standard.oss
+ winter-sports.oss
+ boundaries.oss
+ public-transport.oss
+ outdoor.oss
+ cycle.oss)
+
+foreach(STYLESHEET ${STYLESHEETS})
+ add_test(NAME CheckStyleSheet-${STYLESHEET}
+ COMMAND OSTAndOSSCheck
+ --warning-as-error
+ --poi-type _track
+ --poi-type _highlighted
+ --poi-type _waypoint
+ --poi-type _waypoint_red_circle
+ --poi-type _waypoint_green_circle
+ --poi-type _waypoint_blue_circle
+ --poi-type _waypoint_yellow_circle
+ --poi-type _waypoint_red_square
+ --poi-type _waypoint_green_square
+ --poi-type _waypoint_blue_square
+ --poi-type _waypoint_yellow_square
+ --poi-type _waypoint_red_triangle
+ --poi-type _waypoint_green_triangle
+ --poi-type _waypoint_blue_triangle
+ --poi-type _waypoint_yellow_triangle
+ ${CMAKE_CURRENT_SOURCE_DIR}/stylesheets/map.ost
+ ${CMAKE_CURRENT_SOURCE_DIR}/stylesheets/${STYLESHEET})
+endforeach()
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/.clang-tidy
^
|
| @@ -1,5 +1,5 @@
---
-Checks: '-*,bugprone-*,cert-*,clang-analyzer-*,cppcoreguidelines,misc-*,modernize-*,performance-*,readability-*,clang-diagnostic-*,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-redundant-access-specifiers,-readability-uppercase-literal-suffix,-readability-magic-numbers,-readability-isolate-declaration,-modernize-use-auto,-misc-non-private-member-variables-in-classes,-cert-dcl21-cpp,-modernize-pass-by-value,-readability-convert-member-functions-to-static'
+Checks: '-*,bugprone-*,cert-*,clang-analyzer-*,concurrency-*,cppcoreguidelines,misc-*,modernize-*,performance-*,readability-*,clang-diagnostic-*,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-redundant-access-specifiers,-readability-uppercase-literal-suffix,-readability-magic-numbers,-readability-isolate-declaration,-modernize-use-auto,-misc-non-private-member-variables-in-classes,-cert-dcl21-cpp,-modernize-pass-by-value,-readability-convert-member-functions-to-static,-readability-identifier-length,-bugprone-too-small-loop-variable'
WarningsAsErrors: ''
HeaderFilterRegex: '.*/libosmscout.*/.*'
AnalyzeTemporaryDtors: false
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/Demos/src/Navigation.cpp
^
|
| @@ -610,9 +610,9 @@
postprocessors.push_back(std::make_shared<osmscout::RoutePostprocessor::MotorwayJunctionPostprocessor>());
postprocessors.push_back(std::make_shared<osmscout::RoutePostprocessor::DestinationPostprocessor>());
- std::set<std::string> motorwayTypeNames;
- std::set<std::string> motorwayLinkTypeNames;
- std::set<std::string> junctionTypeNames;
+ std::set<std::string,std::less<>> motorwayTypeNames;
+ std::set<std::string,std::less<>> motorwayLinkTypeNames;
+ std::set<std::string,std::less<>> junctionTypeNames;
auto*instructionProcessor=new osmscout::RoutePostprocessor::InstructionPostprocessor();
if(vehicle == osmscout::vehicleCar){
motorwayTypeNames = {"highway_motorway", "highway_motorway_trunk", "highway_motorway_primary"};
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/Demos/src/NavigationSimulator.cpp
^
|
| @@ -707,13 +707,13 @@
};
osmscout::RoutePostprocessor postprocessor;
- std::set<std::string> motorwayTypeNames{"highway_motorway",
+ std::set<std::string,std::less<>> motorwayTypeNames{"highway_motorway",
"highway_motorway_trunk",
"highway_trunk",
"highway_motorway_primary"};
- std::set<std::string> motorwayLinkTypeNames{"highway_motorway_link",
+ std::set<std::string,std::less<>> motorwayLinkTypeNames{"highway_motorway_link",
"highway_trunk_link"};
- std::set<std::string> junctionTypeNames{"highway_motorway_junction"};
+ std::set<std::string,std::less<>> junctionTypeNames{"highway_motorway_junction"};
std::vector<osmscout::RoutingProfileRef> profiles{routingProfile};
std::vector<osmscout::DatabaseRef> databases{database};
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/Demos/src/Routing.cpp
^
|
| @@ -950,13 +950,13 @@
osmscout::StopClock postprocessTimer;
- std::set<std::string> motorwayTypeNames{"highway_motorway",
+ std::set<std::string,std::less<>> motorwayTypeNames{"highway_motorway",
"highway_motorway_trunk",
"highway_trunk",
"highway_motorway_primary"};
- std::set<std::string> motorwayLinkTypeNames{"highway_motorway_link",
+ std::set<std::string,std::less<>> motorwayLinkTypeNames{"highway_motorway_link",
"highway_trunk_link"};
- std::set<std::string> junctionTypeNames{"highway_motorway_junction"};
+ std::set<std::string,std::less<>> junctionTypeNames{"highway_motorway_junction"};
std::vector<osmscout::RoutingProfileRef> profiles{routingProfile};
std::vector<osmscout::DatabaseRef> databases{database};
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/Demos/src/Tiler.cpp
^
|
| @@ -25,6 +25,7 @@
#include <osmscout/util/StopClock.h>
#include <osmscout/util/Tiling.h>
+#include <osmscout/util/CmdLineParsing.h>
#include <osmscoutmap/MapService.h>
@@ -176,61 +177,93 @@
}
}
+struct Arguments {
+ bool help{false};
+ bool debug{false};
+ std::string databaseDirectory{"."};
+ std::string style{"stylesheets/standard.oss"};
+ std::string font{"/usr/share/fonts/TTF/DejaVuSans.ttf"};
+ osmscout::MagnificationLevel startZoom{0};
+ osmscout::MagnificationLevel endZoom{20};
+ osmscout::GeoCoord coordTopLeft;
+ osmscout::GeoCoord coordBottomRight;
+};
+
int main(int argc, char* argv[])
{
- std::string map;
- std::string style;
- double latTop,latBottom,lonLeft,lonRight;
- unsigned int startLevel;
- unsigned int endLevel;
-
- if (argc!=9) {
- std::cerr << "DrawMap ";
- std::cerr << "<map directory> <style-file> ";
- std::cerr << "<lat_top> <lon_left> <lat_bottom> <lon_right> ";
- std::cerr << "<start_zoom>" << std::endl;
- std::cerr << "<end_zoom>" << std::endl;
- return 1;
- }
-
- map=argv[1];
- style=argv[2];
-
- if (sscanf(argv[3],"%lf",&latTop)!=1) {
- std::cerr << "lon is not numeric!" << std::endl;
+ osmscout::CmdLineParser argParser("Tiler",
+ argc,argv);
+ Arguments args;
+
+ argParser.AddOption(osmscout::CmdLineFlag([&args](const bool& value) {
+ args.help=value;
+ }),
+ std::vector<std::string>{"h","help"},
+ "Display help",
+ true);
+ argParser.AddOption(osmscout::CmdLineFlag([&args](const bool& value) {
+ args.debug=value;
+ }),
+ "debug",
+ "Enable debug output",
+ false);
+ argParser.AddOption(osmscout::CmdLineStringOption([&args](const std::string& value) {
+ args.font=value;
+ }),
+ "font",
+ "Used font, default: " + args.font,
+ false);
+
+ argParser.AddPositional(osmscout::CmdLineStringOption([&args](const std::string& value) {
+ args.databaseDirectory=value;
+ }),
+ "databaseDir",
+ "Database directory");
+ argParser.AddPositional(osmscout::CmdLineStringOption([&args](const std::string& value) {
+ args.style=value;
+ }),
+ "stylesheet",
+ "Map stylesheet");
+ argParser.AddPositional(osmscout::CmdLineGeoCoordOption([&args](const osmscout::GeoCoord& coord) {
+ args.coordTopLeft = coord;
+ }),
+ "lat_top lon_left",
+ "Bounding box top-left coordinate");
+ argParser.AddPositional(osmscout::CmdLineGeoCoordOption([&args](const osmscout::GeoCoord& coord) {
+ args.coordBottomRight = coord;
+ }),
+ "lat_bottom lon_right",
+ "Bounding box bottom-right coordinate");
+ argParser.AddPositional(osmscout::CmdLineUIntOption([&args](const unsigned int& value) {
+ args.startZoom=osmscout::MagnificationLevel(value);
+ }),
+ "start-zoom",
+ "Start zoom");
+ argParser.AddPositional(osmscout::CmdLineUIntOption([&args](const unsigned int& value) {
+ args.endZoom=osmscout::MagnificationLevel(value);
+ }),
+ "end-zoom",
+ "End zoom");
+
+ osmscout::CmdLineParseResult argResult=argParser.Parse();
+ if (argResult.HasError()) {
+ std::cerr << "ERROR: " << argResult.GetErrorDescription() << std::endl;
+ std::cout << argParser.GetHelp() << std::endl;
return 1;
}
- if (sscanf(argv[4],"%lf",&lonLeft)!=1) {
- std::cerr << "lat is not numeric!" << std::endl;
- return 1;
- }
-
- if (sscanf(argv[5],"%lf",&latBottom)!=1) {
- std::cerr << "lon is not numeric!" << std::endl;
- return 1;
+ if (args.help) {
+ std::cout << argParser.GetHelp() << std::endl;
+ return 0;
}
- if (sscanf(argv[6],"%lf",&lonRight)!=1) {
- std::cerr << "lat is not numeric!" << std::endl;
- return 1;
- }
-
- if (sscanf(argv[7],"%u",&startLevel)!=1) {
- std::cerr << "start zoom is not numeric!" << std::endl;
- return 1;
- }
-
- if (sscanf(argv[8],"%u",&endLevel)!=1) {
- std::cerr << "end zoom is not numeric!" << std::endl;
- return 1;
- }
+ osmscout::log.Debug(args.debug);
osmscout::DatabaseParameter databaseParameter;
osmscout::DatabaseRef database=std::make_shared<osmscout::Database>(databaseParameter);
osmscout::MapServiceRef mapService=std::make_shared<osmscout::MapService>(database);
- if (!database->Open(map)) {
+ if (!database->Open(args.databaseDirectory)) {
std::cerr << "Cannot open database" << std::endl;
return 1;
@@ -238,7 +271,7 @@
osmscout::StyleConfigRef styleConfig=std::make_shared<osmscout::StyleConfig>(database->GetTypeConfig());
- if (!styleConfig->Load(style)) {
+ if (!styleConfig->Load(args.style)) {
std::cerr << "Cannot open style" << std::endl;
}
@@ -247,8 +280,7 @@
osmscout::AreaSearchParameter searchParameter;
// Change this, to match your system
- drawParameter.SetFontName("/usr/share/fonts/truetype/msttcorefonts/Verdana.ttf");
- drawParameter.SetFontName("/usr/share/fonts/TTF/DejaVuSans.ttf");
+ drawParameter.SetFontName(args.font);
drawParameter.SetFontSize(2.0);
// Fadings make problems with tile approach, we disable it
drawParameter.SetDrawFadings(false);
@@ -258,15 +290,15 @@
osmscout::MapPainterAgg painter(styleConfig);
- for (osmscout::MagnificationLevel level=osmscout::MagnificationLevel(std::min(startLevel,endLevel));
- level<=osmscout::MagnificationLevel(std::max(startLevel,endLevel));
+ for (osmscout::MagnificationLevel level=osmscout::MagnificationLevel(std::min(args.startZoom,args.endZoom));
+ level<=osmscout::MagnificationLevel(std::max(args.startZoom,args.endZoom));
level++) {
osmscout::Magnification magnification(level);
osmscout::OSMTileId tileA(osmscout::OSMTileId::GetOSMTile(magnification,
- osmscout::GeoCoord(latBottom,lonLeft)));
+ args.coordBottomRight));
osmscout::OSMTileId tileB(osmscout::OSMTileId::GetOSMTile(magnification,
- osmscout::GeoCoord(latTop,lonRight)));
+ args.coordTopLeft));
uint32_t xTileStart=std::min(tileA.GetX(),tileB.GetX());
uint32_t xTileEnd=std::max(tileA.GetX(),tileB.GetX());
uint32_t xTileCount=xTileEnd-xTileStart+1;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/Tests/CMakeLists.txt
^
|
| @@ -10,6 +10,9 @@
#---- BitsAndBytesNeeded
osmscout_test_project(NAME BitsAndBytesNeeded SOURCES src/BitsAndBytesNeeded.cpp)
+#---- ByteTest
+osmscout_test_project(NAME ByteTest SOURCES src/ByteTest.cpp)
+
#---- CachePerformance
osmscout_test_project(NAME CachePerformance SOURCES src/CachePerformance.cpp COMMAND --size 1000)
@@ -123,7 +126,8 @@
boundaries.oss
railways.oss
motorways.oss
- public-transport.oss)
+ public-transport.oss
+ cycle.oss)
foreach(STYLESHEET ${STYLESHEETS})
add_test(NAME CheckStyleSheet-${STYLESHEET}
@@ -193,7 +197,8 @@
boundaries.oss
railways.oss
motorways.oss
- public-transport.oss)
+ public-transport.oss
+ cycle.oss)
foreach(DRIVER ${PERFORMANCE_TEST_DRIVERS})
foreach(STYLESHEET ${STYLESHEETS})
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/Tests/meson.build
^
|
| @@ -35,6 +35,12 @@
link_with: [osmscout],
install: false)
+ByteTest = executable('ByteTest',
+ 'src/ByteTest.cpp',
+ include_directories: [testIncDir],
+ dependencies: [mathDep],
+ install: false)
+
CachePerformance = executable('CachePerformance',
'src/CachePerformance.cpp',
include_directories: [osmscoutIncDir],
@@ -338,6 +344,7 @@
test('Check parsing of time string', TimeParse)
test('Check calculation of bearing', Bearing)
test('Check encoding of numbers', BitsAndBytesNeeded)
+test('Check std_byte behaviour', ByteTest)
test('Check cache functionality with CachePerformance', CachePerformance, args : ['--size', '1000'])
test('Check position accuracy with coordinate bits', CalculateResolution)
test('Check parsing of command line args', CmdLineParsing)
@@ -390,6 +397,7 @@
'railways.oss',
'motorways.oss',
'public-transport.oss',
+ 'cycle.oss'
]
foreach stylesheet : stylesheets
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/Tests/src/ByteTest.cpp
^
|
| @@ -0,0 +1,18 @@
+#include <cstddef>
+
+#include <TestMain.h>
+
+TEST_CASE("std::byte initialisation") {
+ // Identity
+ REQUIRE(std::byte(0xffu)==std::byte(0xffu));
+ // Int>255, we take the lower byte
+ REQUIRE(std::byte(255+1)==std::byte(0x00u));
+ // Int>255, we take the lower byte
+ REQUIRE(std::byte(256)==std::byte(0x00u));
+ // Shifting beyong 8 bits, we take the lower byte
+ REQUIRE(std::byte(1u >> 8)==std::byte(0x00u));
+ // Two bytes with 0xff, we take the lower byte
+ REQUIRE(std::byte(256*256)==std::byte(0x00u));
+ // A rando number, we take the lower byte
+ REQUIRE(std::byte(1001)==std::byte(0xe9u));
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/Tests/src/OSTAndOSSCheck.cpp
^
|
| @@ -169,6 +169,7 @@
bool analyze = false;
std::string ostFile;
std::string ossFile;
+ std::vector<std::string> customPoiTypes;
};
int main(int argc, char** argv)
@@ -199,11 +200,18 @@
"Show detailed analysis of stylesheet",
false);
+ argParser.AddOption(osmscout::CmdLineStringOption([&args](const std::string& value) {
+ args.customPoiTypes.push_back(value);
+ }),
+ "poi-type",
+ "Register custom type in type definition",
+ false);
+
argParser.AddPositional(osmscout::CmdLineStringOption([&args](const std::string& value) {
args.ostFile=value;
}),
"OST_FILE",
- "Typedefinition file (*.ost)");
+ "Type definition file (*.ost)");
argParser.AddPositional(osmscout::CmdLineStringOption([&args](const std::string& value) {
args.ossFile=value;
@@ -232,6 +240,16 @@
if (typeConfig->LoadFromOSTFile(ostFilepath)) {
std::cout << "OST file '" << ostFilepath << "' => OK" << std::endl;
+ for (const std::string &typeName:args.customPoiTypes){
+ osmscout::TypeInfoRef typeInfo=std::make_shared<osmscout::TypeInfo>(typeName);
+
+ typeInfo->SetInternal()
+ .CanBeWay(true)
+ .CanBeArea(true)
+ .CanBeNode(true);
+
+ typeConfig->RegisterType(typeInfo);
+ }
StyleConfigAnalyzerRef styleConfig=std::make_shared<StyleConfigAnalyzer>(typeConfig);
std::string ossFilepath=args.ossFile;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/TiledMapRenderer.h
^
|
| @@ -56,7 +56,7 @@
TileCache onlineTileCache;
TileCache offlineTileCache;
- OsmTileDownloader *tileDownloader;
+ OsmTileDownloader *tileDownloader=nullptr;
std::atomic_bool onlineTilesEnabled;
std::atomic_bool offlineTilesEnabled;
@@ -65,7 +65,7 @@
int screenHeight;
// data loading request
- DBLoadJob *loadJob;
+ DBLoadJob *loadJob=nullptr;
uint32_t loadXFrom;
uint32_t loadXTo;
uint32_t loadYFrom;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/IconLookup.cpp
^
|
| @@ -229,19 +229,23 @@
}
}
} else {
- findIcon.image = QImage(findIcon.dimensions.width()*iconImageUpscale,
- findIcon.dimensions.height()*iconImageUpscale,
+ SymbolRef symbol=findIcon.iconStyle->GetSymbol();
+ double margin=symbol->GetMaxBorderWidth(projection)+1;
+ findIcon.image = QImage((findIcon.dimensions.width()+margin)*iconImageUpscale,
+ (findIcon.dimensions.height()+margin)*iconImageUpscale,
QImage::Format_ARGB32);
findIcon.image.fill(Qt::transparent);
QPainter painter(&findIcon.image);
+ painter.setRenderHint(QPainter::Antialiasing, true);
+ painter.setRenderHint(QPainter::TextAntialiasing, true);
SymbolRendererQt renderer(&painter);
- SymbolRef symbol=findIcon.iconStyle->GetSymbol();
double minX, minY, maxX, maxY;
symbol->GetBoundingBox(projection,minX,minY,maxX,maxY);
renderer.Render(*symbol,
- Vertex2D(minX*-1*iconImageUpscale,minY*-1*iconImageUpscale),
+ Vertex2D((minX*-1 + margin/2) * iconImageUpscale,
+ (minY*-1 + margin/2) * iconImageUpscale),
projection.GetMeterInPixel()*iconImageUpscale,
projection.ConvertWidthToPixel(iconImageUpscale));
painter.end();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/TiledMapRenderer.cpp
^
|
| @@ -80,12 +80,8 @@
TiledMapRenderer::~TiledMapRenderer()
{
qDebug() << "~TiledMapRenderer";
- if (tileDownloader != nullptr){
- delete tileDownloader;
- }
- if (loadJob!=nullptr){
- delete loadJob;
- }
+ delete tileDownloader;
+ delete loadJob;
}
void TiledMapRenderer::Initialize()
@@ -128,7 +124,7 @@
dbThread->RunSynchronousJob(
[this,&unknownFillStyle,&projection](const std::list<DBInstanceRef>& databases) {
- for (auto &db:databases){
+ for (const auto &db:databases){
auto styledConfig=db->GetStyleConfig();
if (styledConfig) {
unknownFillStyle=styledConfig->GetUnknownFillStyle(projection);
@@ -171,8 +167,7 @@
QElapsedTimer start;
start.start();
QMutexLocker locker(&tileCacheMutex);
- int elapsed = start.elapsed();
- if (elapsed > 1){
+ if (auto elapsed = start.elapsed(); elapsed > 1){
osmscout::log.Warn() << "Mutex acquire took " << elapsed << " ms";
}
@@ -256,7 +251,7 @@
return;
}
{
- QMutexLocker locker(&tileCacheMutex);
+ QMutexLocker tileCacheLocker(&tileCacheMutex);
if (!offlineTileCache.startRequestProcess(zoomLevel, xtile, ytile)) // request was canceled or started already
return;
@@ -268,10 +263,10 @@
bool render = (state != DatabaseCoverage::Outside) || (!onlineTilesEnabled);
if (render) {
// tile rendering have sub-linear complexity with area size
- // it means that it is advatage to merge more tile requests with same zoom
+ // it means that it is advantage to merge more tile requests with same zoom
// and render bigger area
{
- QMutexLocker locker(&tileCacheMutex);
+ QMutexLocker tileCacheLocker(&tileCacheMutex);
offlineTileCache.mergeAndStartRequests(zoomLevel, xtile, ytile,
loadXFrom, loadXTo, loadYFrom, loadYTo,
/*maxWidth*/ 5, /*maxHeight*/ 5);
@@ -316,7 +311,7 @@
}else{
// put Null image
- QMutexLocker locker(&tileCacheMutex);
+ QMutexLocker tileCacheLocker(&tileCacheMutex);
offlineTileCache.put(zoomLevel, xtile, ytile, QImage(), loadEpoch);
}
}
@@ -490,7 +485,7 @@
p.end();
{
- QMutexLocker locker(&tileCacheMutex);
+ QMutexLocker tileCacheLocker(&tileCacheMutex);
if (loadEpoch != offlineTileCache.getEpoch()){
qWarning() << "Rendered from outdated data" << loadEpoch << "!=" << offlineTileCache.getEpoch();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout-map-agg/src/osmscoutmapagg/MapPainterAgg.cpp
^
|
| @@ -59,9 +59,8 @@
if (!fontEngine->load_font(parameter.GetFontName().c_str(),
0,
renderingType)) {
- std::cout << "Cannot load font '" << parameter.GetFontName() << "'" << std::endl;
+ log.Error() << "Cannot load font '" << parameter.GetFontName() << "'";
return;
-
}
//fontEngine->resolution(72);
@@ -383,7 +382,9 @@
double h=fontEngine->height();
for (wchar_t i : label.text) {
const agg::glyph_cache *glyph = fontCacheManager->glyph(i);
- assert(glyph);
+ if (glyph==nullptr) {
+ continue; // silently skip glyph
+ }
fontCacheManager->add_kerning(&x, &y);
label.glyphs.emplace_back(MapPainterAgg::NativeGlyph{x, y, glyph});
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout-map-iosx/include/osmscoutmapiosx/MapPainterIOS.h
^
|
| @@ -176,6 +176,14 @@
const MapData& data,
CGContextRef paintCG);
+ OSMSCOUT_API bool DrawMap(const StyleConfig& styleConfig,
+ const Projection& projection,
+ const MapParameter& parameter,
+ const MapData& data,
+ CGContextRef paintCG,
+ RenderSteps startStep,
+ RenderSteps endStep);
+
OSMSCOUT_API void DrawGroundTiles(const Projection& projection,
const MapParameter& parameter,
const std::list<GroundTile>& groundTiles,
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout-map-iosx/src/osmscout/MapPainterIOS.mm
^
|
| @@ -73,18 +73,32 @@
}
/*
- * DrawMap()
+ * DrawMap() with start and end RenderSteps
*/
- bool MapPainterIOS::DrawMap(const StyleConfig& /*styleConfig*/,
- const Projection& projection,
- const MapParameter& parameter,
- const MapData& data,
- CGContextRef paintCG){
+ bool MapPainterIOS::DrawMap(const StyleConfig& styleConfig,
+ const Projection& projection,
+ const MapParameter& parameter,
+ const MapData& data,
+ CGContextRef paintCG,
+ RenderSteps startStep,
+ RenderSteps endStep){
cg = paintCG;
- Draw(projection,
- parameter,
- data);
- return true;
+ return Draw(projection,
+ parameter,
+ data,
+ startStep,
+ endStep);
+ }
+
+ /*
+ * DrawMap()
+ */
+ bool MapPainterIOS::DrawMap(const StyleConfig& styleConfig,
+ const Projection& projection,
+ const MapParameter& parameter,
+ const MapData& data,
+ CGContextRef paintCG) {
+ return DrawMap(styleConfig, projection, parameter, data, paintCG, RenderSteps::FirstStep, RenderSteps::LastStep);
}
/*
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout-map/include/osmscoutmap/LabelLayouter.h
^
|
| @@ -399,7 +399,9 @@
bool collision=false;
for (int r=std::max(0,mask.rowFrom); !collision && r<=std::min((int)viewportHeight-1, mask.rowTo); r++){
for (int c=std::max(0,mask.cellFrom); !collision && c<=std::min((int)mask.size()-1,mask.cellTo); c++){
- collision |= (mask.d[c] & canvas[r*mask.size() + c]) != 0;
+ if ((mask.d[c] & canvas[r*mask.size() + c]) != 0u) {
+ collision = true;
+ }
}
}
return collision;
@@ -538,7 +540,7 @@
{
labelInstances.reserve(allSortedLabels.size());
contourLabelInstances.reserve(allSortedContourLabels.size());
-
+
auto labelIter = allSortedLabels.begin();
auto contourLabelIter = allSortedContourLabels.begin();
while (labelIter != allSortedLabels.end()
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout-map/include/osmscoutmap/MapPainter.h
^
|
| @@ -711,11 +711,13 @@
for (size_t i=0;i<data.size(); i++){
const MapData &d=*(data[i]);
- success &= painters[i]->Draw(projection,
- parameter,
- d,
- (RenderSteps)step,
- (RenderSteps)step);
+ if (!painters[i]->Draw(projection,
+ parameter,
+ d,
+ (RenderSteps) step,
+ (RenderSteps) step)) {
+ success=false;
+ }
}
}
return success;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout-map/include/osmscoutmap/Styles.h
^
|
| @@ -1179,6 +1179,7 @@
BoundingBox mapBoundingBox; //!< bounding box in map canvas coordinates [mm]
BoundingBox groundBoundingBox; //!< bounding box in ground coordinates [m]
+ double maxBorderWidth=0; //!< maximum border width [mm]
public:
explicit Symbol(const std::string& name);
@@ -1199,10 +1200,10 @@
* bounding box in pixels for given projection
*/
void GetBoundingBox(const Projection &projection,
- double& minX,
- double& minY,
- double& maxX,
- double& maxY) const
+ double& minX,
+ double& minY,
+ double& maxX,
+ double& maxY) const
{
minX=std::min(projection.ConvertWidthToPixel(mapBoundingBox.minX),
projection.GetMeterInPixel() * groundBoundingBox.minX);
@@ -1216,6 +1217,18 @@
}
/**
+ * Maximum border width. As border is not accounted to bounding box and symbol dimension,
+ * it is good to use this value as symbol margin to make sure that symbol is to cropped.
+ *
+ * @param projection
+ * @return width in pixels
+ */
+ double GetMaxBorderWidth(const Projection &projection) const
+ {
+ return projection.ConvertWidthToPixel(maxBorderWidth);
+ }
+
+ /**
* width in pixels for given projection
*/
double GetWidth(const Projection &projection) const
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout-map/src/osmscoutmap/Styles.cpp
^
|
| @@ -1623,6 +1623,10 @@
assert(false);
}
+ if (primitive->GetBorderStyle() && primitive->GetBorderStyle()->IsVisible()) {
+ maxBorderWidth=std::max(maxBorderWidth, primitive->GetBorderStyle()->GetWidth());
+ }
+
primitives.push_back(primitive);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/GeoCoord.h
^
|
| @@ -183,15 +183,15 @@
*/
void DecodeFromBuffer(const unsigned char buffer[]) // NOLINT
{
- uint32_t latDat= (buffer[0] << 0u)
- | (buffer[1] << 8u)
- | (buffer[2] << 16u)
- | ((buffer[6] & 0x0fu) << 24u);
+ uint32_t latDat= uint32_t(buffer[0] << 0u)
+ | uint32_t(buffer[1] << 8u)
+ | uint32_t(buffer[2] << 16u)
+ | uint32_t(uint32_t(buffer[6] & 0x0fu) << 24u);
- uint32_t lonDat= (buffer[3] << 0u)
- | (buffer[4] << 8u)
- | (buffer[5] << 16u)
- | ((buffer[6] & 0xf0u) << 20u);
+ uint32_t lonDat= uint32_t(buffer[3] << 0u)
+ | uint32_t(buffer[4] << 8u)
+ | uint32_t(buffer[5] << 16u)
+ | uint32_t(uint32_t(buffer[6] & 0xf0u) << 20u);
lat=latDat/latConversionFactor-90.0;
lon=lonDat/lonConversionFactor-180.0;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/TypeConfig.h
^
|
| @@ -137,16 +137,18 @@
std::unordered_set<std::string> groups; //!< Set of idents that server as categorizing groups
std::unordered_map<std::string,std::string> descriptions; //!< Map of descriptions for given language codes
- private:
+ public:
+ explicit TypeInfo(const std::string& name);
+ ~TypeInfo() = default;
+
/**
- * We forbid copying of TypeInfo instances
+ * We forbid copying and moving of TypeInfo instances
*/
TypeInfo(const TypeInfo& other) = delete;
+ TypeInfo(TypeInfo&& other) = delete;
TypeInfo& operator=(const TypeInfo& other) = delete;
-
- public:
- explicit TypeInfo(const std::string& name);
+ TypeInfo& operator=(const TypeInfo&& other) = delete;
/**
* Set the id of this type
@@ -727,8 +729,8 @@
{
private:
TypeInfoRef type;
- uint8_t *featureBits;
- char *featureValueBuffer;
+ uint8_t *featureBits=nullptr;
+ char *featureValueBuffer=nullptr;
private:
void DeleteData();
@@ -746,10 +748,14 @@
}
public:
- FeatureValueBuffer();
+ FeatureValueBuffer() = default;
FeatureValueBuffer(const FeatureValueBuffer& other);
+ FeatureValueBuffer(FeatureValueBuffer&& other) noexcept;
~FeatureValueBuffer();
+ FeatureValueBuffer& operator=(const FeatureValueBuffer& other);
+ FeatureValueBuffer& operator=(FeatureValueBuffer&& other) noexcept;
+
/**
* Deletes the current feature values and assign the type and values
* of the passed featur evalue buffer.
@@ -912,7 +918,6 @@
bool specialFlag2,
bool specialFlag3) const;
- FeatureValueBuffer& operator=(const FeatureValueBuffer& other);
bool operator==(const FeatureValueBuffer& other) const;
bool operator!=(const FeatureValueBuffer& other) const;
@@ -967,14 +972,14 @@
void Write(FileWriter& writer,
const std::array<bool,FlagCnt> &specialFlags) const
{
- static_assert(FlagCnt <= 8);
+ static_assert(FlagCnt <= 8u);
if (BitsToBytes(type->GetFeatureCount()) == BitsToBytes(type->GetFeatureCount() + specialFlags.size())) {
- uint8_t mask=0x80;
+ uint8_t mask=0x80u;
for (const bool &specialFlag: specialFlags) {
if (specialFlag) {
- featureBits[type->GetFeatureMaskBytes() - 1] |= mask;
+ featureBits[type->GetFeatureMaskBytes() - 1u] |= mask;
} else {
- featureBits[type->GetFeatureMaskBytes() - 1] &= ~mask;
+ featureBits[type->GetFeatureMaskBytes() - 1u] &= uint8_t(~mask);
}
mask = mask >> 1;
}
@@ -987,13 +992,13 @@
writer.Write(featureBits[i]);
}
- uint8_t flagByte = 0;
- uint8_t mask=0x80;
+ uint8_t flagByte=0u;
+ uint8_t mask=0x80u;
for (const bool &specialFlag: specialFlags) {
if (specialFlag) {
flagByte |= mask;
}
- mask = mask >> 1;
+ mask = mask >> 1u;
}
writer.Write(flagByte);
@@ -1335,7 +1340,7 @@
* Returns the type definition for the given type name. If there is no
* type definition for the given name and invalid reference is returned.
*/
- const TypeInfoRef GetTypeInfo(const std::string& name) const;
+ TypeInfoRef GetTypeInfo(const std::string& name) const;
/**
* Return a node type (or an invalid reference if no type got detected)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/TypeFeatures.h
^
|
| @@ -204,7 +204,7 @@
class OSMSCOUT_API NameShortFeature : public Feature
{
private:
- TagId tagShortName;
+ TagId tagShortName=0;
public:
/** Name of this feature */
@@ -274,7 +274,7 @@
class OSMSCOUT_API RefFeature : public Feature
{
private:
- TagId tagRef;
+ TagId tagRef=0;
public:
/** Name of this feature */
@@ -419,9 +419,9 @@
class OSMSCOUT_API AddressFeature : public Feature
{
private:
- TagId tagAddrHouseNr;
- TagId tagAddrStreet;
- TagId tagAddrPlace;
+ TagId tagAddrHouseNr=0;
+ TagId tagAddrStreet=0;
+ TagId tagAddrPlace=0;
public:
/** Name of this feature */
@@ -670,10 +670,10 @@
private:
void ParseAccessFlag(const std::string& value,
- uint8_t& access,
- uint8_t bit) const
+ uint8_t& access,
+ uint8_t bit) const
{
- access&=~bit;
+ access&=uint8_t(~bit);
if (!(value=="no")) {
access|=bit;
@@ -1352,7 +1352,7 @@
class OSMSCOUT_API EleFeature : public Feature
{
private:
- TagId tagEle;
+ TagId tagEle=0;
public:
/** Name of this feature */
@@ -1433,9 +1433,9 @@
class OSMSCOUT_API DestinationFeature : public Feature
{
private:
- TagId tagDestination;
- TagId tagDestinationRef;
- TagId tagDestinationForward;
+ TagId tagDestination=0;
+ TagId tagDestinationRef=0;
+ TagId tagDestinationForward=0;
public:
/** Name of this feature */
@@ -1897,10 +1897,11 @@
// no code
}
- void SetLanes(uint8_t forwardLanes, uint8_t backwardLanes)
+ void SetLanes(uint8_t forwardLanes,
+ uint8_t backwardLanes)
{
- this->lanes=((forwardLanes & (uint8_t)0x7) << 2) |
- ((backwardLanes & (uint8_t)0x7) << 5);
+ this->lanes=((forwardLanes & uint8_t(0x7u)) << 2) |
+ ((backwardLanes & uint8_t(0x7u)) << 5);
}
bool HasSingleLane() const
@@ -1921,7 +1922,7 @@
uint8_t GetLanes() const;
void SetTurnLanes(const std::string& turnForward,
- const std::string& turnBawckard)
+ const std::string& turnBawckard)
{
this->turnForward=turnForward;
this->turnBackward=turnBawckard;
@@ -1948,7 +1949,7 @@
}
void SetDestinationLanes(const std::string& destinationForward,
- const std::string& destinationBawckard)
+ const std::string& destinationBawckard)
{
this->destinationForward=destinationForward;
this->destinationBackward=destinationBawckard;
@@ -1973,16 +1974,16 @@
class OSMSCOUT_API LanesFeature : public Feature
{
private:
- TagId tagOneway;
- TagId tagLanes;
- TagId tagLanesForward;
- TagId tagLanesBackward;
- TagId tagTurnLanes;
- TagId tagTurnLanesForward;
- TagId tagTurnLanesBackward;
- TagId tagDestinationLanes;
- TagId tagDestinationLanesForward;
- TagId tagDestinationLanesBackward;
+ TagId tagOneway=0;
+ TagId tagLanes=0;
+ TagId tagLanesForward=0;
+ TagId tagLanesBackward=0;
+ TagId tagTurnLanes=0;
+ TagId tagTurnLanesForward=0;
+ TagId tagTurnLanesBackward=0;
+ TagId tagDestinationLanes=0;
+ TagId tagDestinationLanesForward=0;
+ TagId tagDestinationLanesBackward=0;
public:
/** Name of this feature */
@@ -2163,7 +2164,7 @@
FromToFeatureValue(const FromToFeatureValue& featureValue) = default;
explicit FromToFeatureValue(const std::string& from,
- const std::string& to)
+ const std::string& to)
: from(from),
to(to)
{
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/routing/MultiDBRoutingService.h
^
|
| @@ -52,7 +52,7 @@
private:
std::vector<DatabaseHandle> handles;
- bool isOpen;
+ bool isOpen=false;
private:
Vehicle GetVehicle(const MultiDBRoutingState& state) override;
@@ -133,7 +133,7 @@
const RoutePosition &target,
const RoutingParameter ¶meter);
- RoutingResult CalculateRoute(std::vector<osmscout::GeoCoord> via,
+ RoutingResult CalculateRoute(const std::vector<osmscout::GeoCoord>& via,
const Distance &radius,
const RoutingParameter& parameter);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/routing/RoutePostprocessor.h
^
|
| @@ -466,9 +466,9 @@
const std::vector<RoutingProfileRef>& profiles,
const std::vector<DatabaseRef>& databases,
const std::list<PostprocessorRef>& processors,
- const std::set<std::string>& motorwayTypeNames=std::set<std::string>(),
- const std::set<std::string>& motorwayLinkTypeNames=std::set<std::string>(),
- const std::set<std::string>& junctionTypeNames=std::set<std::string>(),
+ const std::set<std::string,std::less<>>& motorwayTypeNames=std::set<std::string,std::less<>>(),
+ const std::set<std::string,std::less<>>& motorwayLinkTypeNames=std::set<std::string,std::less<>>(),
+ const std::set<std::string,std::less<>>& junctionTypeNames=std::set<std::string,std::less<>>(),
const std::string& miniRoundaboutTypeName="highway_mini_roundabout");
};
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/util/FileScanner.h
^
|
| @@ -71,22 +71,22 @@
};
private:
- std::string filename; //!< Filename
- std::FILE *file; //!< Internal low level file handle
- mutable bool hasError; //!< Flag to signal errors in the stream
+ std::string filename; //!< Filename
+ std::FILE *file=nullptr; //!< Internal low level file handle
+ mutable bool hasError=true; //!< Flag to signal errors in the stream
// For mmap usage
- char *mmap; //!< Pointer to the file memory
- FileOffset size; //!< Size of the memory/file
- FileOffset offset; //!< Current offset into the file memory
+ char *mmap=nullptr; //!< Pointer to the file memory
+ FileOffset size=0; //!< Size of the memory/file
+ FileOffset offset=0; //!< Current offset into the file memory
// For std::vector<GeoCoord> loading
- uint8_t *byteBuffer; //!< Temporary buffer for loading of std::vector<GeoCoord>
- size_t byteBufferSize; //!< Size of the temporary byte buffer
+ uint8_t *byteBuffer=nullptr; //!< Temporary buffer for loading of std::vector<GeoCoord>
+ size_t byteBufferSize=0; //!< Size of the temporary byte buffer
// For Windows mmap usage
#if defined(__WIN32__) || defined(WIN32)
- HANDLE mmfHandle;
+ HANDLE mmfHandle=0;
#endif
uint32_t fileFormatVersion;
@@ -196,7 +196,7 @@
}
public:
- FileScanner();
+ FileScanner() = default;
~FileScanner();
void Open(const std::string& filename,
@@ -230,6 +230,8 @@
bool ReadBool();
+ std::byte ReadByte();
+
int8_t ReadInt8();
int16_t ReadInt16();
int32_t ReadInt32();
@@ -289,7 +291,7 @@
{
private:
FileScanner& reader;
- FileOffset lastFileOffset;
+ FileOffset lastFileOffset=0;
public:
explicit ObjectFileRefStreamReader(FileScanner& reader);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/util/FileWriter.h
^
|
| @@ -49,17 +49,17 @@
class OSMSCOUT_API FileWriter CLASS_FINAL
{
private:
- std::string filename; //!< The filename
- std::FILE *file; //!< The low level FILE object
- bool hasError; //!< Flag for signaling that the stream has errors
- std::vector<int32_t> deltaBuffer; //!< Temporary storage for deltas for storing of std::vector<GeoCoord>
- std::vector<uint8_t> byteBuffer; //!< Temporary data buffer for storing of std::vector<GeoCoord>
+ std::string filename; //!< The filename
+ std::FILE *file=nullptr; //!< The low level FILE object
+ bool hasError=true; //!< Flag for signaling that the stream has errors
+ std::vector<int32_t> deltaBuffer; //!< Temporary storage for deltas for storing of std::vector<GeoCoord>
+ std::vector<uint8_t> byteBuffer; //!< Temporary data buffer for storing of std::vector<GeoCoord>
public:
static const uint64_t MAX_NODES;
public:
- FileWriter();
+ FileWriter() = default;
~FileWriter();
void Open(const std::string& filename);
@@ -87,6 +87,8 @@
void Write(bool boolean);
+ void Write(std::byte byteValue);
+
void Write(int8_t number);
void Write(int16_t number);
void Write(int32_t number);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/util/Number.h
^
|
| @@ -55,17 +55,17 @@
if (number<0) {
number^=static_cast<N>(-1);
- val=static_cast<char>((number & 0x3f) << 1 | 0x01);
+ val=static_cast<char>((number & 0x3fu) << 1 | 0x01u);
}
else {
- val=static_cast<char>((number & 0x3f) << 1);
+ val=static_cast<char>((number & 0x3fu) << 1);
}
number>>=6;
while (number!=0) {
- *(buffer++)=val | 0x80;
- val=static_cast<char>(number & 0x7f);
+ *(buffer++)=val | 0x80u;
+ val=static_cast<char>(number & 0x7fu);
number>>=7;
bytes++;
}
@@ -192,15 +192,15 @@
unsigned int bytes=1;
// negative form
- if ((*buffer & 0x01)!=0) {
- N val=(*buffer & 0x7e) >> 1;
+ if ((*buffer & 0x01u)!=0) {
+ N val=(*buffer & 0x7eu) >> 1;
number=-1;
nextShift=6;
- while ((*(buffer++) & 0x80)!=0) {
+ while ((*(buffer++) & 0x80u)!=0) {
number^=(val << shift);
- val=*buffer & 0x7f;
+ val=*buffer & 0x7fu;
shift=nextShift;
nextShift+=7;
bytes++;
@@ -209,14 +209,14 @@
number^=static_cast<N>(val) << shift;
}
else {
- N val=(*buffer & 0x7e) >> 1;
+ N val=(*buffer & 0x7eu) >> 1;
number=0;
nextShift=6;
- while ((*(buffer++) & 0x80)!=0) {
+ while ((*(buffer++) & 0x80u)!=0) {
number|=(val << shift);
- val=*buffer & 0x7f;
+ val=*buffer & 0x7fu;
shift=nextShift;
nextShift+=7;
bytes++;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/TypeConfig.cpp
^
|
| @@ -318,18 +318,16 @@
return typeInfo;
}
- FeatureValueBuffer::FeatureValueBuffer()
- : featureBits(nullptr),
- featureValueBuffer(nullptr)
+ FeatureValueBuffer::FeatureValueBuffer(const FeatureValueBuffer& other)
{
- // no code
+ Set(other);
}
- FeatureValueBuffer::FeatureValueBuffer(const FeatureValueBuffer& other)
- : featureBits(nullptr),
- featureValueBuffer(nullptr)
+ FeatureValueBuffer::FeatureValueBuffer(FeatureValueBuffer&& other) noexcept
{
- Set(other);
+ std::swap(type, other.type);
+ std::swap(featureBits, other.featureBits);
+ std::swap(featureValueBuffer, other.featureValueBuffer);
}
FeatureValueBuffer::~FeatureValueBuffer()
@@ -339,18 +337,37 @@
}
}
+ FeatureValueBuffer& FeatureValueBuffer::operator=(const FeatureValueBuffer& other)
+ {
+ if (this!=&other) {
+ Set(other);
+ }
+
+ return *this;
+ }
+
+ FeatureValueBuffer& FeatureValueBuffer::operator=(FeatureValueBuffer&& other) noexcept
+ {
+ std::swap(type, other.type);
+ std::swap(featureBits, other.featureBits);
+ std::swap(featureValueBuffer, other.featureValueBuffer);
+ return *this;
+ }
+
+
void FeatureValueBuffer::Set(const FeatureValueBuffer& other)
{
if (type) {
DeleteData();
}
+
if (other.GetType()) {
SetType(other.GetType());
for (size_t idx=0; idx<other.GetFeatureCount(); idx++) {
if (other.HasFeature(idx)) {
if (other.GetFeature(idx).GetFeature()->HasValue()) {
- FeatureValue* otherValue=other.GetValue(idx);
+ const FeatureValue* otherValue=other.GetValue(idx);
FeatureValue* thisValue=AllocateValue(idx);
*thisValue=*otherValue;
@@ -527,13 +544,6 @@
Write<3>(writer, std::array<bool,3>{specialFlag1, specialFlag2, specialFlag3});
}
- FeatureValueBuffer& FeatureValueBuffer::operator=(const FeatureValueBuffer& other)
- {
- Set(other);
-
- return *this;
- }
-
bool FeatureValueBuffer::operator==(const FeatureValueBuffer& other) const
{
if (this->type!=other.type) {
@@ -549,8 +559,8 @@
if (HasFeature(i) &&
other.HasFeature(i) &&
GetFeature(i).GetFeature()->HasValue()) {
- FeatureValue *thisValue=GetValue(i);
- FeatureValue *otherValue=other.GetValue(i);
+ const FeatureValue *thisValue=GetValue(i);
+ const FeatureValue *otherValue=other.GetValue(i);
if (!(*thisValue==*otherValue)) {
return false;
@@ -590,7 +600,7 @@
// Copy feature with/without value
if (other.GetFeature(i).GetFeature()->HasValue()) {
- FeatureValue* otherValue=other.GetValue(i);
+ const FeatureValue* otherValue=other.GetValue(i);
FeatureValue* thisValue=AllocateValue(featureIndex);
*thisValue=*otherValue;
@@ -801,10 +811,9 @@
}
// All ways have a layer
- if (typeInfo->CanBeWay()) {
- if (!typeInfo->HasFeature(LayerFeature::NAME)) {
- typeInfo->AddFeature(featureLayer);
- }
+ if (typeInfo->CanBeWay() &&
+ !typeInfo->HasFeature(LayerFeature::NAME)) {
+ typeInfo->AddFeature(featureLayer);
}
// All that is PATH-like automatically has a number of features,
@@ -948,7 +957,7 @@
return (TypeId)types.size();
}
- const TypeInfoRef TypeConfig::GetTypeInfo(const std::string& name) const
+ TypeInfoRef TypeConfig::GetTypeInfo(const std::string& name) const
{
auto typeEntry=nameToTypeMap.find(name);
@@ -956,7 +965,7 @@
return typeEntry->second;
}
- return TypeInfoRef();
+ return {};
}
TypeInfoRef TypeConfig::GetNodeType(const TagMap& tagMap) const
@@ -1241,7 +1250,7 @@
scanner.Close();
}
- catch (IOException& e) {
+ catch (const IOException& e) {
log.Error() << e.GetDescription();
scanner.CloseFailsafe();
return false;
@@ -1351,7 +1360,7 @@
writer.Close();
}
- catch (IOException& e) {
+ catch (const IOException& e) {
log.Error() << e.GetDescription();
writer.CloseFailsafe();
return false;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/TypeFeatures.cpp
^
|
| @@ -247,7 +247,6 @@
const size_t NameShortFeature::NAME_LABEL_INDEX = 0;
NameShortFeature::NameShortFeature()
- : tagShortName(0)
{
RegisterLabel(NAME_LABEL_INDEX,
NAME_LABEL);
@@ -328,7 +327,6 @@
const size_t RefFeature::NAME_LABEL_INDEX = 0;
RefFeature::RefFeature()
- : tagRef(0)
{
RegisterLabel(NAME_LABEL_INDEX,
NAME_LABEL);
@@ -499,9 +497,6 @@
AddressFeature::AddressFeature()
- : tagAddrHouseNr(0),
- tagAddrStreet(0),
- tagAddrPlace(0)
{
RegisterLabel(NAME_LABEL_INDEX,
NAME_LABEL);
@@ -1890,7 +1885,7 @@
// object may hold multiple phone tags - phone, contact:phone, contact:mobile
// we will append all unique values to one string separated by semicolon
// note: when some tag contains multiple phones separated by semicolon, deduplication is not working
- std::set<std::string> knownPhones;
+ std::set<std::string,std::less<>> knownPhones;
std::vector<TagId> phoneTags{tagPhone, tagContactPhone, tagContactMobile};
for (auto tagId:phoneTags) {
auto phone = tags.find(tagId);
@@ -2139,7 +2134,6 @@
const size_t EleFeature::IN_LOCALE_UNIT_LABEL_INDEX = 2;
EleFeature::EleFeature()
- : tagEle(0)
{
RegisterLabel(IN_METER_LABEL_INDEX,
IN_METER_LABEL);
@@ -2267,9 +2261,6 @@
const size_t DestinationFeature::NAME_LABEL_INDEX = 0;
DestinationFeature::DestinationFeature()
- : tagDestination(0),
- tagDestinationRef(0),
- tagDestinationForward(0)
{
RegisterLabel(NAME_LABEL_INDEX,
NAME_LABEL);
@@ -2544,7 +2535,7 @@
std::string endValue=strValue.substr(pos+1);
if (!startValue.empty() &&
- !endValue.empty() &&
+ !endValue.empty() &&
osmscout::StringToNumber(startValue,startYear) &&
osmscout::StringToNumber(endValue,endYear)) {
@@ -2762,7 +2753,7 @@
{
lanes=scanner.ReadUInt8();
- if ((lanes & 0x01)!=0) {
+ if ((lanes & 0x01u)!=0) {
turnForward=scanner.ReadString();
turnBackward=scanner.ReadString();
destinationForward=scanner.ReadString();
@@ -2776,15 +2767,15 @@
turnBackward.empty() &&
destinationForward.empty() &&
destinationBackward.empty()) {
- lanes=lanes & ~0x01;
+ lanes=lanes & uint8_t(~0x01u);
}
else {
- lanes=lanes | 0x01;
+ lanes=lanes | 0x01u;
}
writer.Write(lanes);
- if ((lanes & 0x01)!=0) {
+ if ((lanes & 0x01u)!=0) {
writer.Write(turnForward);
writer.Write(turnBackward);
writer.Write(destinationForward);
@@ -2828,9 +2819,6 @@
const size_t LanesFeature::NAME_LABEL_INDEX = 0;
LanesFeature::LanesFeature()
- : tagOneway(0),
- tagLanes(0)
-
{
RegisterLabel(NAME_LABEL_INDEX,
NAME_LABEL);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/TypeInfoSet.cpp
^
|
| @@ -24,7 +24,6 @@
namespace osmscout {
TypeInfoSet::TypeInfoSet(const TypeConfig& typeConfig)
- : count(0)
{
types.resize(typeConfig.GetTypeCount());
}
@@ -38,7 +37,6 @@
TypeInfoSet::TypeInfoSet(const std::vector<TypeInfoRef>& types)
{
- count=0;
for (const auto& type : types) {
Set(type);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/routing/MultiDBRoutingService.cpp
^
|
| @@ -40,8 +40,7 @@
MultiDBRoutingService::MultiDBRoutingService(const RouterParameter& parameter,
const std::vector<DatabaseRef> &databasesArg):
- AbstractRoutingService<MultiDBRoutingState>(parameter),
- isOpen(false)
+ AbstractRoutingService<MultiDBRoutingState>(parameter)
{
std::vector<DatabaseRef> databases;
for (auto& db : databasesArg) {
@@ -55,7 +54,7 @@
this->handles.resize(databases.size());
DatabaseId id=0;
- for (auto& db : databases) {
+ for (const auto& db : databases) {
handles[id].dbId=id;
handles[id].database=db;
@@ -126,7 +125,7 @@
{
RoutePositionResult position, closestPosition;
- for (auto& handle : handles) {
+ for (const auto& handle : handles) {
position=handle.router->GetClosestRoutableNode(coord,
*handle.profile,
radius);
@@ -305,7 +304,7 @@
bool MultiDBRoutingService::ResolveRouteDataJunctions(RouteData& route)
{
- for (auto& handle : handles) {
+ for (auto const& handle : handles) {
std::set<Id> nodeIds;
for (const auto& routeEntry : route.Entries()) {
@@ -419,7 +418,7 @@
* @return
* A RoutingResult object
*/
- RoutingResult MultiDBRoutingService::CalculateRoute(std::vector<osmscout::GeoCoord> via,
+ RoutingResult MultiDBRoutingService::CalculateRoute(const std::vector<osmscout::GeoCoord>& via,
const Distance &radius,
const RoutingParameter& parameter)
{
@@ -468,31 +467,31 @@
bool MultiDBRoutingService::PostProcessRouteDescription(RouteDescription &description,
const std::list<RoutePostprocessor::PostprocessorRef> &postprocessors)
{
- std::set<std::string> motorwayTypeNames;
- std::set<std::string> motorwayLinkTypeNames;
- std::set<std::string> junctionTypeNames;
+ std::set<std::string,std::less<>> motorwayTypeNames;
+ std::set<std::string,std::less<>> motorwayLinkTypeNames;
+ std::set<std::string,std::less<>> junctionTypeNames;
- junctionTypeNames.insert("highway_motorway_junction");
+ junctionTypeNames.emplace("highway_motorway_junction");
- motorwayTypeNames.insert("highway_motorway");
- motorwayLinkTypeNames.insert("highway_motorway_link");
+ motorwayTypeNames.emplace("highway_motorway");
+ motorwayLinkTypeNames.emplace("highway_motorway_link");
- motorwayTypeNames.insert("highway_motorway_trunk");
- motorwayTypeNames.insert("highway_trunk");
+ motorwayTypeNames.emplace("highway_motorway_trunk");
+ motorwayTypeNames.emplace("highway_trunk");
- motorwayLinkTypeNames.insert("highway_trunk_link");
- motorwayTypeNames.insert("highway_motorway_primary");
+ motorwayLinkTypeNames.emplace("highway_trunk_link");
+ motorwayTypeNames.emplace("highway_motorway_primary");
RoutePostprocessor routePostprocessor;
std::vector<RoutingProfileRef> profiles;
std::vector<DatabaseRef> databases;
- std::transform(handles.begin(),handles.end(),std::back_inserter(profiles),[](DatabaseHandle& handle) {
+ std::transform(handles.begin(),handles.end(),std::back_inserter(profiles),[](const DatabaseHandle& handle) {
return handle.profile;
});
- std::transform(handles.begin(),handles.end(),std::back_inserter(databases),[](DatabaseHandle& handle) {
+ std::transform(handles.begin(),handles.end(),std::back_inserter(databases),[](const DatabaseHandle& handle) {
return handle.database;
});
@@ -508,7 +507,7 @@
std::map<DatabaseId, std::string> MultiDBRoutingService::GetDatabaseMapping() const
{
std::map<DatabaseId, std::string> mapping;
- for (auto &handle:handles){
+ for (const auto &handle:handles){
mapping[handle.dbId]=handle.database->GetPath();
}
return mapping;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/routing/RoutePostprocessor.cpp
^
|
| @@ -2353,9 +2353,9 @@
const std::vector<RoutingProfileRef>& profiles,
const std::vector<DatabaseRef>& databases,
const std::list<PostprocessorRef>& processors,
- const std::set<std::string>& motorwayTypeNames,
- const std::set<std::string>& motorwayLinkTypeNames,
- const std::set<std::string>& junctionTypeNames,
+ const std::set<std::string,std::less<>>& motorwayTypeNames,
+ const std::set<std::string,std::less<>>& motorwayLinkTypeNames,
+ const std::set<std::string,std::less<>>& junctionTypeNames,
const std::string& miniRoundaboutTypeName)
{
Cleanup(); // We do not trust ourself ;-)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/util/FileScanner.cpp
^
|
| @@ -53,21 +53,6 @@
namespace osmscout {
- FileScanner::FileScanner()
- : file(nullptr),
- hasError(true),
- mmap(nullptr),
- size(0),
- offset(0),
- byteBuffer(nullptr),
- byteBufferSize(0)
-#if defined(_WIN32)
- ,mmfHandle((HANDLE)0)
-#endif
- {
- // no code
- }
-
FileScanner::~FileScanner()
{
if (IsOpen()) {
@@ -446,7 +431,7 @@
#if defined(HAVE_MMAP) || defined(_WIN32)
if (this->mmap!=nullptr) {
- if (offset+(FileOffset)bytes-1>=size) {
+ if (offset+bytes-1u>=size) {
hasError=true;
throw IOException(filename,"Cannot read byte array","Cannot read beyond end of file");
}
@@ -476,7 +461,7 @@
#if defined(HAVE_MMAP) || defined(_WIN32)
if (this->mmap!=nullptr) {
- if (offset+(FileOffset)bytes-1>=size) {
+ if (offset+bytes-1u>=size) {
hasError=true;
throw IOException(filename,"Cannot read byte array","Cannot read beyond end of file");
}
@@ -583,6 +568,37 @@
return ConvertBool(value);
}
+ std::byte FileScanner::ReadByte()
+ {
+ if (HasError()) {
+ throw IOException(filename,"Cannot read byte","File already in error state");
+ }
+
+ std::byte value;
+
+#if defined(HAVE_MMAP) || defined(_WIN32)
+ if (mmap!=nullptr) {
+ if (offset>=size) {
+ hasError=true;
+ throw IOException(filename,"Cannot read byte","Cannot read beyond end of file");
+ }
+
+ value=std::byte(mmap[offset]);
+ offset++;
+
+ return value;
+ }
+#endif
+
+ hasError=fread(&value,1,1,file)!=1;
+
+ if (hasError) {
+ throw IOException(filename,"Cannot read byte");
+ }
+
+ return value;
+ }
+
int8_t FileScanner::ReadInt8()
{
if (HasError()) {
@@ -659,12 +675,12 @@
const unsigned char *dataPtr=buffer.data();
int16_t add;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 0;
number|=add;
dataPtr++;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 8;
number|=add;
@@ -686,8 +702,8 @@
throw IOException(filename,"Cannot read int32_t","Cannot read beyond end of file");
}
- char *dataPtr=&mmap[offset];
- int32_t add;
+ const char *dataPtr=&mmap[offset];
+ int32_t add;
add=(unsigned char)(*dataPtr);
add=add << 0;
@@ -722,25 +738,25 @@
throw IOException(filename,"Cannot read int32_t");
}
- unsigned char *dataPtr=buffer.data();
- int32_t add;
+ const unsigned char *dataPtr=buffer.data();
+ int32_t add;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 0;
number|=add;
dataPtr++;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 8;
number|=add;
dataPtr++;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 16;
number|=add;
dataPtr++;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 24;
number|=add;
@@ -762,8 +778,8 @@
throw IOException(filename,"Cannot read int64_t","Cannot read beyond end of file");
}
- char *dataPtr=&mmap[offset];
- int64_t add;
+ const char *dataPtr=&mmap[offset];
+ int64_t add;
add=(unsigned char)(*dataPtr);
add=add << 0;
@@ -818,45 +834,45 @@
throw IOException(filename,"Cannot read int64_t");
}
- unsigned char *dataPtr=buffer.data();
- int64_t add;
+ const unsigned char *dataPtr=buffer.data();
+ int64_t add;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 0;
number|=add;
dataPtr++;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 8;
number|=add;
dataPtr++;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 16;
number|=add;
dataPtr++;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 24;
number|=add;
dataPtr++;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 32;
number|=add;
dataPtr++;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 40;
number|=add;
dataPtr++;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
add=add << 48;
number|=add;
dataPtr++;
- add=(unsigned char)(*dataPtr);
+ add=*dataPtr;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/util/FileWriter.cpp
^
|
| @@ -25,9 +25,7 @@
#include <algorithm>
-#include <string.h>
-
-#include <stdio.h>
+#include <cstring>
#include <osmscout/system/Assert.h>
#include <osmscout/system/Math.h>
@@ -37,14 +35,7 @@
namespace osmscout {
- const uint64_t FileWriter::MAX_NODES=0x03FFFFFF; // 26 bits
-
- FileWriter::FileWriter()
- : file(nullptr),
- hasError(true)
- {
- // no code
- }
+ const uint64_t FileWriter::MAX_NODES=0x03FFFFFFu; // 26 bits
FileWriter::~FileWriter()
{
@@ -100,7 +91,10 @@
return;
}
- fclose(file);
+ // We ignore the error code, since it is the best we can do in this case
+ if (fclose(file)!=0) {
+ log.Warn() << "Error while closing file'" << filename << "' in failsafe mode";
+ }
file=nullptr;
}
@@ -231,9 +225,9 @@
throw IOException(filename,"Cannot write bool","File already in error state");
}
- char value=boolean ? (char)1 : (char)0;
+ std::byte value=boolean ? std::byte(1) : std::byte(0);
- hasError=fwrite((const char*)&value,sizeof(char),1,file)!=1;
+ hasError=fwrite(&value,1,1,file)!=1;
if (hasError) {
throw IOException(filename,"Cannot write bool");
@@ -241,6 +235,23 @@
}
/**
+ *
+ * @throws IOException
+ */
+ void FileWriter::Write(std::byte byteValue)
+ {
+ if (HasError()) {
+ throw IOException(filename,"Cannot write byte","File already in error state");
+ }
+
+ hasError=fwrite(&byteValue,1,1,file)!=1;
+
+ if (hasError) {
+ throw IOException(filename,"Cannot write byte");
+ }
+ }
+
+ /**
*
* @throws IOException
*/
@@ -250,7 +261,7 @@
throw IOException(filename,"Cannot write int8_t","File already in error state");
}
- hasError=fwrite(&number,sizeof(char),sizeof(int8_t),file)!=sizeof(int8_t);
+ hasError=fwrite(&number,1,1,file)!=sizeof(int8_t);
if (hasError) {
throw IOException(filename,"Cannot write int8_t");
@@ -267,12 +278,12 @@
throw IOException(filename,"Cannot write int16_t","File already in error state");
}
- char buffer[2];
+ std::array<std::byte,2> buffer;
- buffer[0]=((number >> 0u) & 0xff);
- buffer[1]=((number >> 8u) & 0xff);
+ buffer[0]=std::byte(number >> 0u);
+ buffer[1]=std::byte(number >> 8u);
- hasError=fwrite(buffer,1,2,file)!=2;
+ hasError=fwrite(buffer.data(),1,2,file)!=2;
if (hasError) {
throw IOException(filename,"Cannot write int16_t");
@@ -358,12 +369,12 @@
throw IOException(filename,"Cannot write uint16_t","File already in error state");
}
- char buffer[2];
+ std::array<std::byte,2> buffer;
- buffer[0]=((number >> 0u) & 0xff);
- buffer[1]=((number >> 8u) & 0xff);
+ buffer[0]=std::byte(number >> 0u);
+ buffer[1]=std::byte(number >> 8u);
- hasError=fwrite(buffer,1,2,file)!=2;
+ hasError=fwrite(buffer.data(),1,2,file)!=2;
if (hasError) {
throw IOException(filename,"Cannot write uint16_t");
@@ -380,14 +391,14 @@
throw IOException(filename,"Cannot write uint32_t","File already in error state");
}
- char buffer[4];
+ std::array<std::byte,4> buffer;
- buffer[0]=uint8_t((number >> 0u) & 0xff);
- buffer[1]=uint8_t((number >> 8u) & 0xff);
- buffer[2]=uint8_t((number >> 16u) & 0xff);
- buffer[3]=uint8_t((number >> 24u) & 0xff);
+ buffer[0]=std::byte(number >> 0u);
+ buffer[1]=std::byte(number >> 8u);
+ buffer[2]=std::byte(number >> 16u);
+ buffer[3]=std::byte(number >> 24u);
- hasError=fwrite(buffer,1,4,file)!=4;
+ hasError=fwrite(buffer.data(),1,4,file)!=4;
if (hasError) {
throw IOException(filename,"Cannot write uint32_t");
@@ -404,18 +415,18 @@
throw IOException(filename,"Cannot write uint64_t","File already in error state");
}
- char buffer[8];
+ std::array<std::byte,8> buffer;
- buffer[0]=uint8_t((number >> 0u) & 0xff);
- buffer[1]=uint8_t((number >> 8u) & 0xff);
- buffer[2]=uint8_t((number >> 16u) & 0xff);
- buffer[3]=uint8_t((number >> 24u) & 0xff);
- buffer[4]=uint8_t((number >> 32u) & 0xff);
- buffer[5]=uint8_t((number >> 40u) & 0xff);
- buffer[6]=uint8_t((number >> 48u) & 0xff);
- buffer[7]=uint8_t((number >> 56u) & 0xff);
+ buffer[0]=std::byte(number >> 0u);
+ buffer[1]=std::byte(number >> 8u);
+ buffer[2]=std::byte(number >> 16u);
+ buffer[3]=std::byte(number >> 24u);
+ buffer[4]=std::byte(number >> 32u);
+ buffer[5]=std::byte(number >> 40u);
+ buffer[6]=std::byte(number >> 48u);
+ buffer[7]=std::byte(number >> 56u);
- hasError=fwrite(buffer,1,8,file)!=8;
+ hasError=fwrite(buffer.data(),1,8,file)!=8;
if (hasError) {
throw IOException(filename,"Cannot write uint64_t");
@@ -432,12 +443,12 @@
throw IOException(filename,"Cannot write size restricted uint16_t","File already in error state");
}
- char buffer[2];
+ std::array<std::byte,2> buffer;
- buffer[0]=uint8_t((number >> 0u) & 0xff);
- buffer[1]=uint8_t((number >> 8u) & 0xff);
+ buffer[0]=std::byte(number >> 0u);
+ buffer[1]=std::byte(number >> 8u);
- hasError=fwrite(buffer,1,bytes,file)!=bytes;
+ hasError=fwrite(buffer.data(),1,bytes,file)!=bytes;
if (hasError) {
throw IOException(filename,"Cannot write size restricted uint16_t");
@@ -454,14 +465,14 @@
throw IOException(filename,"Cannot write size restricted uint32_t","File already in error state");
}
- char buffer[4];
+ std::array<std::byte,4> buffer;
- buffer[0]=uint8_t((number >> 0u) & 0xff);
- buffer[1]=uint8_t((number >> 8u) & 0xff);
- buffer[2]=uint8_t((number >> 16u) & 0xff);
- buffer[3]=uint8_t((number >> 24u) & 0xff);
+ buffer[0]=std::byte(number >> 0u);
+ buffer[1]=std::byte(number >> 8u);
+ buffer[2]=std::byte(number >> 16u);
+ buffer[3]=std::byte(number >> 24u);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/sonar-project.properties
^
|
| @@ -2,6 +2,10 @@
sonar.projectKey=Framstag_libosmscout
sonar.host.url=https://sonarcloud.io
+# Explicitly Disable cache, as request by sonar UI
+sonar.cfamily.cache.enabled=false
+
+
# Encoding of the source code. Default is default system encoding
#sonar.sourceEncoding=UTF-8
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/cycle.oss
^
|
| @@ -71,6 +71,15 @@
MAG minorBuildingMag = block;
+ // road width
+ WIDTH motorwayWidth = 20m;
+ WIDTH trunkWidth = 18m;
+ WIDTH primaryWidth = 14m;
+ WIDTH secondaryWidth = 12m;
+ WIDTH tertiaryWidth = 10m;
+ WIDTH roadWidth = 8m;
+ WIDTH wayWidth = 8m;
+
// Label priorities
UINT labelPrioWaypoint = 0;
UINT labelPrioContinent = 1;
@@ -129,6 +138,16 @@
// For debugging :-)
COLOR red = #ff0000;
+ // Default label color
+ IF daylight {
+ COLOR labelColor = #000000;
+ COLOR emphasizeColor = #ffffff;
+ }
+ ELSE {
+ COLOR labelColor = #a0a0a0;
+ COLOR emphasizeColor = #707070;
+ }
+
// Pseudo types
COLOR routeColor = #ae00ff88;
@@ -190,6 +209,7 @@
COLOR greenFieldColor = #dcdcc8;
COLOR heathColor = #ffffc0;
COLOR industrialColor = #dfd1d6;
+ COLOR damColor = #b2a7ab;
IF daylight {
COLOR landFillColor = #b6b591;
@@ -264,7 +284,14 @@
COLOR wayLabelColor = #cccccc;
}
-
+
+ COLOR thinRoadColor = #fdd654;
+ COLOR thinMotorwayColor = darken(@motorwayColor, 0.2);
+ COLOR thinTrunkColor = @trunkColor;
+ COLOR thinPrimaryColor = @primaryColor;
+ COLOR thinSecondaryColor = @secondaryColor;
+ COLOR thinTertiaryColor = darken(@tertiaryColor, 0.2);
+
COLOR motorwayShieldColor = @motorwayAltColor;
COLOR motorwayJunctionLabelColor = lighten(@motorwayAltColor, 0.5);
COLOR trunkShieldColor = @trunkAltColor;
@@ -359,142 +386,10 @@
COLOR wallColor = #663e1b;
- SYMBOL viaFerrataEasyCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
- }
-
- SYMBOL viaFerrataModerateCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
- }
-
- SYMBOL viaFerrataDifficultCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
- }
-
- SYMBOL viaFerrataExtremeCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
- }
-
- SYMBOL oneway_arrow
- POLYGON 0,0.5 1,0 0,-0.5 {
- AREA { color: @onewayArrowColor; }
- }
-
- SYMBOL stream_arrow
- POLYGON 0,0.5 1,0 0,-0.5 {
- AREA { color: @waterLabelColor; }
- }
-
- SYMBOL natural_peak
- POLYGON -0.75,0 0.75,0 0.0,-1.5 {
- AREA { color: @peakSymbolColor; }
- }
-
- SYMBOL railway_station
- RECTANGLE 0,0 2 x 2 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL railway_halt
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL railway_tram_stop
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL highway_bus_stop
- CIRCLE 0,0 1.5 {
- AREA {color: @busSymbolColor; }
- }
-
- SYMBOL amenity
- RECTANGLE 0,0 1 x 1 {
- AREA {color: #b89c9c; }
- }
-
- SYMBOL amenity_hospital
- CIRCLE 0,0 2 {
- AREA.BORDER {color: @hospitalSymbolColor; width: 0.2mm; }
- }
- // Horizontal bar
- RECTANGLE -0.75,-0.25 1.5 x 0.5 {
- AREA { color: @hospitalSymbolColor; }
- }
- // Vertical bar
- RECTANGLE -0.25,-0.75 0.5 x 1.5 {
- AREA { color: @hospitalSymbolColor; }
- }
-
- SYMBOL amenity_pharmacy
- // Box
- RECTANGLE -1,1 2 x 2 {
- AREA.BORDER {color: @pharmacySymbolColor; width: 0.2mm; }
- }
- // Horizontal bar
- RECTANGLE -0.75,-0.25 1.5 x 0.5 {
- AREA { color: @pharmacySymbolColor; }
- }
- // Vertical bar
- RECTANGLE -0.25,-0.75 0.5 x 1.5 {
- AREA {color: @pharmacySymbolColor; }
- }
-
- SYMBOL amenity_parking
- CIRCLE 0,0 1.5 {
- AREA {color: #4bb2da; }
- }
-
- SYMBOL amenity_post_box
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @postSymbolColor; }
- }
-
- SYMBOL amenity_post_office
- RECTANGLE 0,0 2 x 2 {
- AREA { color: @postSymbolColor; }
- }
-
- SYMBOL christian_church_cross
- RECTANGLE 0.5,-2 0.5 x 2 {
- AREA { color: #000000; } // vertical bar
- }
- RECTANGLE 0,-1.5 1.5 x 0.5 {
- AREA { color: #000000; } // horizontal bar
- }
-
- SYMBOL speed_camera
- CIRCLE 0,0 1.5 {
- AREA {color: @red; }
- }
-
- SYMBOL highway_street_lamp
- CIRCLE 0,0 2 {
- AREA {color: #f5fb5b; }
- }
-
- SYMBOL marker
- CIRCLE 0,0 1.5 {
- AREA {color: #ff0000; }
- }
+MODULE "include/symbols"
+MODULE "include/land_sea"
+MODULE "include/roads"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/include/land_sea.oss
^
|
| (renamed from dependencies/libosmscout/stylesheets/land_sea.oss)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/include/land_sea_color.oss
^
|
| (renamed from dependencies/libosmscout/stylesheets/land_sea_color.oss)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/include/man_made.oss
^
|
| @@ -0,0 +1,176 @@
+OSS
+STYLE
+ // -------------------------------------------------------
+ //
+ // Man made:
+ // amenity, tourism, history, military, power, barrier
+ //
+ [MAG city-] {
+ [TYPE tourism_theme_park,
+ tourism_zoo,
+ historic_archaeological_site,
+ historic_battlefield] AREA { color: @tourismColor; }
+ }
+
+ [MAG city-] {
+
+ [TYPE military_airfield,
+ military_danger_area,
+ military_range,
+ military_naval_base] AREA { color: #f59897; }
+
+ [TYPE amenity_grave_yard] AREA { color: #bde3cb; }
+ }
+
+ [MAG detail-] {
+ [TYPE amenity_grave_yard] AREA.TEXT { label: Name.name; style: emphasize; emphasizeColor: @emphasizeColor; color: @labelColor; size: 0.8;}
+ }
+
+ [MAG detail-] {
+ [TYPE tourism_alpine_hut,
+ tourism_camp_site,
+ tourism_caravan_site,
+ tourism_attraction,
+ tourism_artwork,
+ tourism_chalet,
+ tourism_guest_house,
+ tourism_hostel,
+ tourism_hotel,
+ tourism_information,
+ tourism_motel,
+ tourism_museum,
+ tourism_picnic_site,
+ historic_castle,
+ historic_monument,
+ historic_memorial,
+ historic_ruins,
+ historic_wreck] AREA { color: @tourismColor; }
+
+ [TYPE power_generator] AREA { color: #bca9a9; }
+
+ // Special amenities
+ [TYPE amenity_post_office] AREA { color: @postColor; }
+
+ [TYPE amenity_hospital] {
+ AREA { color: @hospitalColor;}
+ AREA.BORDER { color: @hospitalBorderColor; width: 0.1mm; }
+ }
+
+ [TYPE amenity_taxi] AREA { color: #d2d2d2; }
+
+ // (Major) Amenities without special color
+ [TYPE amenity,
+ amenity_bank,
+ amenity_cafe,
+ amenity_fast_food,
+ amenity_fuel,
+ amenity_kindergarten,
+ amenity_library,
+ amenity_restaurant,
+ amenity_school] AREA { color: @amenityColor; }
+ }
+
+ [MAG close-] {
+ // (Minor) Amenities without special color
+ [TYPE amenity_atm,
+ amenity_recycling] AREA { color: @amenityColor; }
+
+ [TYPE man_made_pier] {
+ [SIZE 5m 0.1mm:3px<] WAY {color: #ffffff; width: 5.0m;}
+ [SIZE 5m <0.1mm:3px] WAY {color: #ffffff; displayWidth: 0.1mm;}
+ AREA { color: #ffffff; }
+ }
+
+ [TYPE waterway_dam] {
+ AREA { color: @damColor; }
+ WAY { color: @damColor; width: 4.0m; }
+ }
+
+ [TYPE railway_station] NODE.ICON { symbol: railway_station; }
+ }
+
+ [MAG closer-] {
+ [TYPE amenity_hospital,
+ amenity_hospital_building] {
+ AREA.ICON { symbol: amenity_hospital; name: hospital; }
+ NODE.ICON { symbol: amenity_hospital; name: hospital; }
+ }
+
+ [TYPE amenity_parking_building] {
+ NODE.ICON { symbol: amenity_parking; name: parking; }
+ AREA.ICON { symbol: amenity_parking; name: parking;}
+ }
+
+ [TYPE amenity_parking] {
+ NODE.ICON { symbol: amenity_parking; name: parking; }
+ AREA.ICON { symbol: amenity_parking; name: parking;}
+ }
+
+ [TYPE amenity_parking] {
+ AREA { color: @parkingColor;}
+ AREA.BORDER { color: @parkingBorderColor; width: 0.1mm; }
+ }
+
+ [TYPE railway_station] AREA.ICON { symbol: railway_station; }
+
+
+ [TYPE barrier_wall] WAY {color: @wallColor; displayWidth: 0.1mm; width: 0.5m;}
+ [TYPE barrier_retaining_wall] WAY {color: lighten(@wallColor, 0.5); displayWidth: 0.12mm; width: 0.5m;}
+
+ [TYPE barrier_city_wall] WAY {color: @wallColor; displayWidth: 0.1mm; width: 0.5m;}
+ [TYPE barrier_city_wall] WAY#decor {color: @wallColor;
+ dash: 1,5; displayOffset: 0.09mm; offset: 0.5m; joinCap: butt; endCap: butt;
+ displayWidth: 0.1mm; width: 0.5m;
+ }
+ [TYPE barrier_wall] {
+ AREA {color: lighten(@wallColor, 0.5); }
+ AREA.BORDER {color: @wallColor; width: 0.1mm; }
+ }
+
+ [TYPE barrier_retaining_wall] {
+ AREA {color: lighten(@wallColor, 0.5); }
+ AREA.BORDER {color: @wallColor; width: 0.1mm; }
+ }
+
+ [TYPE barrier_city_wall] {
+ AREA {color: lighten(@wallColor, 0.5);}
+ AREA.BORDER {color: @wallColor; width: 0.3mm; }
+ }
+ }
+
+ [MAG veryClose-] {
+ [TYPE amenity_pharmacy] NODE.ICON { symbol: amenity_pharmacy; name: pharmacy; }
+
+ [TYPE amenity_post_box] NODE.ICON { symbol: amenity_post_box; }
+
+ [TYPE amenity_post_office] NODE.ICON { symbol: amenity_post_office; }
+
+ [TYPE amenity_drinking_water] NODE.ICON { symbol: amenity_drinking_water; }
+
+ // Amenities without special color
+ [TYPE amenity,
+ amenity_bank,
+ amenity_cafe,
+ amenity_fast_food,
+ amenity_fuel,
+ amenity_kindergarten,
+ amenity_library,
+ amenity_recycling,
+ amenity_restaurant,
+ amenity_school] {
+ NODE.ICON { symbol: amenity; }
+ }
+
+ [TYPE barrier_fence] {
+ WAY {color: #aaaaaa; displayWidth: 0.1mm;}
+ AREA.BORDER {color: #aaaaaa; width: 0.1mm;}
+ }
+ }
+
+ [MAG block-] {
+ [TYPE railway_subway_entrance] {
+ NODE.ICON { symbol: railway_subway_entrance; }
+ }
+ }
+
+END
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/include/roads.oss
^
|
| @@ -0,0 +1,585 @@
+OSS
+
+STYLE
+ // -------------------------------------------------------
+ //
+ // highway_*, route_ferry
+ //
+
+ [MAG continent-] {
+ [TYPE highway_motorway] {
+ [SIZE @motorwayWidth 0.45mm:3px<] {
+ WAY#outline { color: darken(@motorwayColor,0.4); width: @motorwayWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @motorwayColor; width: @motorwayWidth;}
+ }
+ [SIZE @motorwayWidth <0.45mm:3px] WAY { color: @thinMotorwayColor; displayWidth: 0.45mm;}
+ }
+ }
+
+ [MAG county-] {
+ [TYPE highway_trunk,
+ highway_motorway_trunk] {
+ [SIZE @trunkWidth 0.4mm:3px<] {
+ WAY#outline { color: darken(@trunkColor,0.4); width: @trunkWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @trunkColor; width: @trunkWidth;}
+ }
+ [SIZE @trunkWidth <0.4mm:3px] WAY { color: @thinTrunkColor; displayWidth: 0.4mm;}
+ }
+
+ [TYPE highway_primary,
+ highway_motorway_primary] {
+ [SIZE @primaryWidth 0.4mm:3px<] {
+ WAY#outline { color: darken(@primaryColor,0.4); width: @primaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @primaryColor; width: @primaryWidth;}
+ }
+ [SIZE @primaryWidth <0.4mm:3px] WAY { color: @thinPrimaryColor; displayWidth: 0.4mm;}
+ }
+ }
+
+ [MAG cityOver-] {
+ [TYPE highway_secondary] {
+ [SIZE @secondaryWidth 0.25mm:3px<] {
+ WAY#outline { color: darken(@secondaryColor,0.4); width: @secondaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @secondaryColor; width: @secondaryWidth;}
+ }
+ [SIZE @secondaryWidth <0.25mm:3px] WAY { color: @thinSecondaryColor; displayWidth: 0.25mm; }
+ }
+ }
+
+ [MAG city-] {
+ [TYPE highway_tertiary] {
+ [SIZE @tertiaryWidth 0.25mm:3px<] {
+ WAY#outline { color: darken(@tertiaryColor,0.4); width: @tertiaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @tertiaryColor; width: @tertiaryWidth;}
+ }
+ [SIZE @tertiaryWidth <0.25mm:3px] WAY { color: @thinTertiaryColor; displayWidth: 0.25mm;}
+ }
+ }
+
+ [MAG suburb-] {
+ [TYPE highway_motorway_link] {
+ [SIZE @motorwayWidth 0.45mm:3px<] {
+ WAY#outline { color: darken(@motorwayColor,0.4); width: @motorwayWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @motorwayColor; width: @motorwayWidth;}
+ }
+ [SIZE @motorwayWidth <0.45mm:3px] WAY { color: @thinMotorwayColor; displayWidth: 0.45mm;}
+ }
+
+ [TYPE route_ferry] {
+ WAY#outline { color: #ffffff50; displayWidth: 0.8mm; priority: -1; joinCap: butt; endCap: butt; }
+ WAY {color: #0000ff; dash: 1,1; joinCap: butt; endCap: butt; displayWidth: 0.4mm;}
+ }
+ }
+ [TYPE highway_mini_roundabout] {
+ [MAG closer-] NODE.ICON { symbol: mini_roundabout; name: mini_roundabout; }
+ }
+ [TYPE amenity_ferry_terminal] {
+ [MAG detail-] NODE.ICON { symbol: ferry_terminal;}
+ [MAG close-] NODE.TEXT { label: Name.name; color: #303070;}
+ }
+ [MAG suburb-] {
+ [TYPE highway_trunk_link] {
+ [SIZE @trunkWidth 0.4mm:3px<] {
+ WAY#outline { color: darken(@trunkColor,0.4); width: @trunkWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @trunkColor; width: @trunkWidth;}
+ }
+ [SIZE @trunkWidth <0.4mm:3px] WAY { color: lighten(@trunkColor,0.3); displayWidth: 0.4mm;}
+ }
+
+ [TYPE highway_primary_link] {
+ [SIZE @primaryWidth 0.4mm:3px<] {
+ WAY#outline { color: darken(@primaryColor,0.4); width: @primaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @primaryColor; width: @primaryWidth;}
+ }
+ [SIZE @primaryWidth <0.4mm:3px] WAY { color: lighten(@primaryColor,0.3); displayWidth: 0.4mm;}
+ }
+
+ [TYPE highway_secondary_link] {
+ [SIZE @secondaryWidth 0.25mm:3px<] {
+ WAY#outline { color: darken(@secondaryColor,0.4); width: @secondaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @secondaryColor; width: @secondaryWidth;}
+ }
+ [SIZE @secondaryWidth <0.25mm:3px] WAY { color: #fdd654; displayWidth: 0.25mm;}
+ }
+
+ [TYPE highway_tertiary_link] {
+ [SIZE @tertiaryWidth 0.25mm:3px<] {
+ WAY#outline { color: darken(@secondaryColor,0.4); width: @tertiaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @secondaryColor; width: @tertiaryWidth;}
+ }
+ [SIZE @tertiaryWidth <0.25mm:3px] WAY { color: #fdd654; displayWidth: 0.25mm; }
+ }
+
+ [TYPE highway_road] {
+ [SIZE @roadWidth 0.1mm:3px<] {
+ WAY#outline { color: @roadBColor; width: @roadWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @roadColor; width: @roadWidth;}
+ }
+ [SIZE @roadWidth <0.1mm:3px] WAY { color: #888888; displayWidth: 0.1mm;}
+ }
+
+ [TYPE highway_unclassified,
+ highway_residential] {
+ [SIZE @wayWidth 0.1mm:3px<] {
+ WAY#outline { color: @roadBColor; width: @wayWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @roadColor; width: @wayWidth;}
+ }
+ [SIZE @wayWidth <0.1mm:3px] WAY { color: @thinRoadColor; displayWidth: 0.1mm; }
+
+ AREA { color: @roadColor;}
+ AREA.BORDER { color: @roadBColor; width: 0.1mm;}
+ }
+ }
+
+ [MAG closer-] {
+ [TYPE highway_service] {
+ [SIZE @wayWidth 0.1mm:3px<] {
+ WAY#outline { color: @roadBColor; width: @wayWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @roadColor; width: @wayWidth;}
+ }
+ [SIZE @wayWidth <0.1mm:3px] WAY { color: #999999; displayWidth: 0.1mm;}
+
+ AREA { color: @roadColor; }
+ AREA.BORDER { color: @roadBColor; width: 0.1mm; }
+ }
+
+ [TYPE highway_living_street] {
+ [SIZE @wayWidth 0.1mm:3px<] {
+ WAY#outline { color: @roadBColor; width: @wayWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @livingStreetColor; width: @wayWidth;}
+ }
+ [SIZE @wayWidth <0.1mm:3px] WAY { color: @livingStreetColor; displayWidth: 0.1mm;}
+ }
+
+
+ [TYPE highway_construction] WAY {color: #99cccc; displayWidth: 0.1mm; width: 2m;}
+
+ [TYPE highway_pedestrian] {
+ AREA { color: @pedestrianColor; }
+ AREA.BORDER { color: darken(@pedestrianColor, 0.3); width: 0.1mm; }
+ }
+
+ [TYPE public_transport_platform] {
+ WAY#outline {color: #887b7b; width: 2m; displayWidth: 0.2mm;}
+ WAY {color: #9b9b9c; width: 2m; }
+
+ AREA { color: #9b9b9c; }
+ AREA.BORDER { color: #887b7b; width: 0.1mm; }
+ }
+
+ [TYPE highway_footway] {
+ AREA { color: #ededed; }
+ AREA.BORDER { color: #c5c5c5; width: 0.1mm; }
+ }
+ }
+
+ [MAG closer-] {
+
+ [TYPE highway_pedestrian] {
+ [SIZE @wayWidth 0.1mm:3px<] WAY {color: @pedestrianColor; width: @wayWidth; }
+ [SIZE @wayWidth <0.1mm:3px] WAY {color: @pedestrianColor; displayWidth: 0.1mm; }
+ }
+
+ [TYPE highway_bus_guideway] WAY {color: #90570c; displayWidth: 0.1mm; }
+
+ [TYPE highway_motorway, highway_motorway_link SIZE @motorwayWidth 0.45mm:3px<] {
+ [FEATURE Tunnel] {
+ WAY#outline { dash: 0.5,0.5; }
+ WAY { color: lighten(@motorwayColor,0.3);}
+ }
+
+ [FEATURE Bridge] {
+ WAY#lbridge {color: @bridgeColor; displayWidth: 0.2mm; offset: -10m; displayOffset: -0.25mm;}
+ WAY#rbridge {color: @bridgeColor; displayWidth: 0.2mm; offset: 10m; displayOffset: 0.25mm;}
+ }
+ }
+
+ [TYPE highway_trunk, highway_trunk_link, highway_motorway_trunk SIZE @trunkWidth 0.4mm:3px<] {
+ [FEATURE Tunnel] {
+ WAY#outline { dash: 0.5,0.5; }
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/include/route.oss
^
|
| (renamed from dependencies/libosmscout/stylesheets/route.oss)
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/include/symbols.oss
^
|
| @@ -0,0 +1,279 @@
+OSS
+CONST
+
+ COLOR turnSymbolColor = #ffffff80;
+ COLOR turnSymbolOutlineColor = #a0a0a080;
+
+ SYMBOL viaFerrataEasyCross
+ POLYGON -0.5,-0.5 0.5,0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
+ }
+ POLYGON -0.5,0.5 0.5,-0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
+ }
+
+ SYMBOL viaFerrataModerateCross
+ POLYGON -0.5,-0.5 0.5,0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
+ }
+ POLYGON -0.5,0.5 0.5,-0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
+ }
+
+ SYMBOL viaFerrataDifficultCross
+ POLYGON -0.5,-0.5 0.5,0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
+ }
+ POLYGON -0.5,0.5 0.5,-0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
+ }
+
+ SYMBOL viaFerrataExtremeCross
+ POLYGON -0.5,-0.5 0.5,0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
+ }
+ POLYGON -0.5,0.5 0.5,-0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
+ }
+
+ SYMBOL oneway_arrow
+ POLYGON 0,0.5 1,0 0,-0.5 {
+ AREA { color: @onewayArrowColor; }
+ }
+
+ SYMBOL stream_arrow
+ POLYGON 0,0.5 1,0 0,-0.5 {
+ AREA { color: @waterLabelColor; }
+ }
+
+ SYMBOL natural_spring
+ CIRCLE 0,0 1.0 {
+ AREA.BORDER {color: @waterLabelColor; width: 0.2mm; }
+ }
+ CIRCLE 0,0 0.3 {
+ AREA {color: @waterLabelColor; }
+ }
+
+ SYMBOL natural_tree
+ CIRCLE GROUND 0,0 5 {
+ AREA {color: #9acd3250; }
+ }
+ CIRCLE GROUND 0,0 0.3 {
+ AREA {color: #8b4513; }
+ }
+
+ SYMBOL amenity_charging_station
+ RECTANGLE -1,-1 2 x 2 {
+ AREA { color: #0000ff; }
+ }
+ CIRCLE 0,0 0.8 {
+ AREA {color: #ffffff; }
+ }
+
+ SYMBOL amenity_drinking_water
+ CIRCLE 0,0 0.4 {
+ AREA {color: @waterLabelColor; }
+ }
+
+ SYMBOL waterway_waterfall
+ RECTANGLE 0,0 1.75 x 0.5 {
+ AREA { color: darken(@waterColor, 0.4); }
+ }
+ POLYGON 1.75,0.5 2.0,1 {
+ AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
+ }
+ POLYGON 1.25,0.5 1.5,1 {
+ AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
+ }
+ POLYGON 0.75,0.5 1,1 {
+ AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
+ }
+
+ SYMBOL waterway_weir
+ RECTANGLE 0,0 2 x 0.5 {
+ AREA { color: darken(@waterColor, 0.4); }
+ }
+ CIRCLE 0.25,0.8 0.25 {
+ AREA {color: darken(@waterColor, 0.2); }
+ }
+ CIRCLE 1,0.8 0.25 {
+ AREA {color: darken(@waterColor, 0.2); }
+ }
+ CIRCLE 1.75,0.8 0.25 {
+ AREA {color: darken(@waterColor, 0.2); }
+ }
+
+ SYMBOL natural_peak
+ POLYGON -0.75,0 0.75,0 0.0,-1.5 {
+ AREA { color: @peakSymbolColor; }
+ }
+
+ SYMBOL railway_station
+ RECTANGLE 0,0 2 x 2 {
+ AREA { color: @railwaySymbolColor; }
+ }
+
+ SYMBOL railway_halt
+ RECTANGLE 0,0 1 x 1 {
+ AREA { color: @railwaySymbolColor; }
+ }
+
+ SYMBOL railway_subway_entrance
+ RECTANGLE 0,0 2 x 2 {
+ AREA { color: @railwaySymbolColor; }
+ }
+ RECTANGLE 0.5,0.5 1 x 1 {
+ AREA { color: #ffffff; }
+ }
+
+ SYMBOL railway_tram_stop
+ RECTANGLE 0,0 1 x 1 {
+ AREA { color: @railwaySymbolColor; }
+ }
+
+ SYMBOL highway_bus_stop
+ CIRCLE 0,0 1.5 {
+ AREA {color: @busSymbolColor; }
+ }
+
+ SYMBOL ferry_terminal
+ RECTANGLE 0,0 1 x 1 {
+ AREA { color: #30307080; }
+ }
+
+ SYMBOL amenity
+ RECTANGLE 0,0 1 x 1 {
+ AREA {color: #b89c9c; }
+ }
+
+ SYMBOL amenity_hospital
+ CIRCLE 0,0 2.0 {
+ AREA.BORDER {color: @hospitalSymbolColor; width: 0.2mm; }
+ }
+ // Horizontal bar
+ RECTANGLE -0.75,-0.25 1.5 x 0.5 {
+ AREA { color: @hospitalSymbolColor; }
+ }
+ // Vertical bar
+ RECTANGLE -0.25,-0.75 0.5 x 1.5 {
+ AREA { color: @hospitalSymbolColor; }
+ }
+
+ SYMBOL amenity_pharmacy
+ // Box
+ RECTANGLE -1,-1 2 x 2 {
+ AREA.BORDER {color: @pharmacySymbolColor; width: 0.2mm; }
+ }
+ // Horizontal bar
+ RECTANGLE -0.75,-0.25 1.5 x 0.5 {
+ AREA { color: @pharmacySymbolColor; }
+ }
+ // Vertical bar
+ RECTANGLE -0.25,-0.75 0.5 x 1.5 {
+ AREA {color: @pharmacySymbolColor; }
+ }
+
+ SYMBOL amenity_parking
+ CIRCLE 0,0 1.5 {
+ AREA {color: #4bb2da; }
+ }
+
+ SYMBOL amenity_post_box
+ RECTANGLE 0,0 1 x 1 {
+ AREA { color: @postSymbolColor; }
+ }
+
+ SYMBOL amenity_post_office
+ RECTANGLE 0,0 2 x 2 {
+ AREA { color: @postSymbolColor; }
+ }
+
+ SYMBOL christian_church_cross
+ RECTANGLE 0.5,-2 0.5 x 2 {
+ AREA { color: #000000; } // vertical bar
+ }
+ RECTANGLE 0,-1.5 1.5 x 0.5 {
+ AREA { color: #000000; } // horizontal bar
+ }
+
+ SYMBOL mini_roundabout
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/map.ost
^
|
| @@ -1350,6 +1350,11 @@
ADDRESS POI
GROUP tourism
+ TYPE tourism_information_guidepost
+ = NODE ("tourism"=="information" AND "information"=="guidepost")
+ {Name, NameAlt}
+ GROUP tourism
+
TYPE tourism_hostel_building
= AREA ("tourism"=="hostel" AND EXISTS "building" AND !("building" IN ["no","false","0"]))
{Name, NameAlt}
@@ -1517,7 +1522,7 @@
GROUP historic, building, routingPOI
TYPE historic
- = NODE AREA (EXISTS "historic" AND !("historic" IN ["citywalls"]))
+ = NODE AREA (EXISTS "historic" AND !("historic" IN ["citywalls"]) AND !("barrier"=="city_wall"))
{Name, NameAlt}
ADDRESS POI
GROUP historic
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/motorways.oss
^
|
| @@ -22,11 +22,9 @@
AREA {color: #ff000055; }
}
+ MODULE "include/land_sea"
+
STYLE
- [TYPE _tile_sea] AREA {color: @waterColor;}
- [TYPE _tile_coast] AREA {color: @waterColor;}
- [TYPE _tile_land] AREA {color: @landColor;}
- [TYPE _tile_unknown] AREA {color: @unknownColor;}
[TYPE highway_motorway] {
WAY { color: #809bc0; displayWidth: 0.45mm; width: 20m; }
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/railways.oss
^
|
| @@ -24,11 +24,9 @@
AREA {color: #00ff0055; }
}
+ MODULE "include/land_sea"
+
STYLE
- [TYPE _tile_sea] AREA {color: @waterColor;}
- [TYPE _tile_coast] AREA {color: @waterColor;}
- [TYPE _tile_land] AREA {color: @landColor;}
- [TYPE _tile_unknown] AREA {color: @unknownColor;}
[MAG continent-] {
[TYPE railway_rail] {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/standard.oss
^
|
| @@ -60,7 +60,7 @@
GROUP waterway_weir, waterway_waterfall, route_ferry
GROUP waterway_river, waterway_canal, waterway_drain, waterway_ditch, waterway_stream
-MODULE "land_sea_color"
+MODULE "include/land_sea_color"
CONST
MAG stepsMag = veryClose;
@@ -74,7 +74,7 @@
MAG minorBuildingMag = veryClose;
- // read width
+ // road width
WIDTH motorwayWidth = 20m;
WIDTH trunkWidth = 18m;
WIDTH primaryWidth = 14m;
@@ -199,6 +199,7 @@
COLOR greenFieldColor = #dcdcc8;
COLOR heathColor = #ffffc0;
COLOR industrialColor = #dfd1d6;
+ COLOR damColor = #b2a7ab;
IF daylight {
COLOR landFillColor = #b6b591;
@@ -264,6 +265,13 @@
COLOR wayLabelColor = #cccccc;
}
+ COLOR thinRoadColor = #999999;
+ COLOR thinMotorwayColor = lighten(@motorwayColor,0.3);
+ COLOR thinTrunkColor = lighten(@trunkColor,0.3);
+ COLOR thinPrimaryColor = lighten(@primaryColor,0.3);
+ COLOR thinSecondaryColor = #fdd654;
+ COLOR thinTertiaryColor = #fefe73;
+
COLOR motorwayShieldColor = @motorwayColor;
COLOR motorwayJunctionLabelColor = lighten(@motorwayColor, 0.5);
COLOR trunkShieldColor = @trunkColor;
@@ -358,9 +366,6 @@
COLOR wallColor = #663e1b;
- COLOR turnSymbolColor = #ffffff80;
- COLOR turnSymbolOutlineColor = #a0a0a080;
-
IF daylight {
COLOR aerodromeColor = #d5ddbd;
COLOR aerodromeTerminalColor = #cc99ff;
@@ -374,280 +379,11 @@
COLOR aerodromeApron = darken(#e8d1fe, 0.6);
}
- SYMBOL viaFerrataEasyCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
- }
-
- SYMBOL viaFerrataModerateCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
- }
-
- SYMBOL viaFerrataDifficultCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
- }
-
- SYMBOL viaFerrataExtremeCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
- }
-
- SYMBOL oneway_arrow
- POLYGON 0,0.5 1,0 0,-0.5 {
- AREA { color: @onewayArrowColor; }
- }
-
- SYMBOL stream_arrow
- POLYGON 0,0.5 1,0 0,-0.5 {
- AREA { color: @waterLabelColor; }
- }
-
- SYMBOL natural_spring
- CIRCLE 0,0 1.0 {
- AREA.BORDER {color: @waterLabelColor; width: 0.2mm; }
- }
- CIRCLE 0,0 0.3 {
- AREA {color: @waterLabelColor; }
- }
-
- SYMBOL natural_tree
- CIRCLE GROUND 0,0 5 {
- AREA {color: #9acd3250; }
- }
- CIRCLE GROUND 0,0 0.3 {
- AREA {color: #8b4513; }
- }
-
- SYMBOL amenity_charging_station
- RECTANGLE -1,-1 2 x 2 {
- AREA { color: #0000ff; }
- }
- CIRCLE 0,0 0.8 {
- AREA {color: #ffffff; }
- }
-
- SYMBOL amenity_drinking_water
- CIRCLE 0,0 0.4 {
- AREA {color: @waterLabelColor; }
- }
-
- SYMBOL waterway_waterfall
- RECTANGLE 0,0 1.75 x 0.5 {
- AREA { color: darken(@waterColor, 0.4); }
- }
- POLYGON 1.75,0.5 2.0,1 {
- AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
- }
- POLYGON 1.25,0.5 1.5,1 {
- AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
- }
- POLYGON 0.75,0.5 1,1 {
- AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
- }
-
- SYMBOL waterway_weir
- RECTANGLE 0,0 2 x 0.5 {
- AREA { color: darken(@waterColor, 0.4); }
- }
- CIRCLE 0.25,0.8 0.25 {
- AREA {color: darken(@waterColor, 0.2); }
- }
- CIRCLE 1,0.8 0.25 {
- AREA {color: darken(@waterColor, 0.2); }
- }
- CIRCLE 1.75,0.8 0.25 {
- AREA {color: darken(@waterColor, 0.2); }
- }
-
- SYMBOL natural_peak
- POLYGON -0.75,0 0.75,0 0.0,-1.5 {
- AREA { color: @peakSymbolColor; }
- }
-
- SYMBOL railway_station
- RECTANGLE 0,0 2 x 2 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL railway_halt
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL railway_subway_entrance
- RECTANGLE 0,0 2 x 2 {
- AREA { color: @railwaySymbolColor; }
- }
- RECTANGLE 0.5,0.5 1 x 1 {
- AREA { color: #ffffff; }
- }
-
- SYMBOL railway_tram_stop
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL highway_bus_stop
- CIRCLE 0,0 0.8 {
- AREA {color: @busSymbolColor; }
- }
-
- SYMBOL ferry_terminal
- RECTANGLE 0,0 1 x 1 {
- AREA { color: #30307080; }
- }
-
- SYMBOL amenity
- RECTANGLE 0,0 1 x 1 {
- AREA {color: #b89c9c; }
- }
-
- SYMBOL amenity_hospital
- CIRCLE 0,0 1.0 {
- AREA.BORDER {color: @hospitalSymbolColor; width: 0.2mm; }
- }
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/dependencies/libosmscout/stylesheets/winter-sports.oss
^
|
| @@ -72,6 +72,15 @@
MAG minorBuildingMag = veryClose;
+ // road width
+ WIDTH motorwayWidth = 20m;
+ WIDTH trunkWidth = 18m;
+ WIDTH primaryWidth = 14m;
+ WIDTH secondaryWidth = 12m;
+ WIDTH tertiaryWidth = 10m;
+ WIDTH roadWidth = 8m;
+ WIDTH wayWidth = 8m;
+
// Label priorities
UINT labelPrioContinent = 1;
UINT labelPrioIsland = 1;
@@ -129,8 +138,15 @@
// For debugging :-)
COLOR red = #ff0000;
- // Pseudo types
- COLOR routeColor = #ff000088;
+ // Default label color
+ IF daylight {
+ COLOR labelColor = #000000;
+ COLOR emphasizeColor = #ffffff;
+ }
+ ELSE {
+ COLOR labelColor = #a0a0a0;
+ COLOR emphasizeColor = #707070;
+ }
// Ground tiles
@@ -190,6 +206,7 @@
COLOR greenFieldColor = #dcdcc8;
COLOR heathColor = #ffffc0;
COLOR industrialColor = #dfd1d6;
+ COLOR damColor = #b2a7ab;
IF daylight {
COLOR landFillColor = #b6b591;
@@ -226,6 +243,7 @@
// Ways
COLOR bridgeColor = #000000; // black
+ COLOR cyclewayColor = #ec47c7;
IF daylight {
COLOR motorwayColor = #4440ec; // dark blue
@@ -253,7 +271,14 @@
COLOR wayLabelColor = #cccccc;
}
-
+
+ COLOR thinRoadColor = #a08080;
+ COLOR thinMotorwayColor = lighten(@motorwayColor,0.3);
+ COLOR thinTrunkColor = lighten(@trunkColor,0.3);
+ COLOR thinPrimaryColor = lighten(@primaryColor,0.3);
+ COLOR thinSecondaryColor = #fdd654;
+ COLOR thinTertiaryColor = #fefe73;
+
COLOR motorwayShieldColor = @motorwayColor;
COLOR motorwayJunctionLabelColor = lighten(@motorwayColor, 0.5);
COLOR trunkShieldColor = @trunkColor;
@@ -348,172 +373,13 @@
COLOR wallColor = #663e1b;
- SYMBOL viaFerrataEasyCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
- }
-
- SYMBOL viaFerrataModerateCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
- }
-
- SYMBOL viaFerrataDifficultCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
- }
-
- SYMBOL viaFerrataExtremeCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
- }
-
- SYMBOL oneway_arrow
- POLYGON 0,0.5 1,0 0,-0.5 {
- AREA { color: @onewayArrowColor; }
- }
-
- SYMBOL stream_arrow
- POLYGON 0,0.5 1,0 0,-0.5 {
- AREA { color: @waterLabelColor; }
- }
-
- SYMBOL natural_peak
- POLYGON -0.75,0 0.75,0 0.0,-1.5 {
- AREA { color: @peakSymbolColor; }
- }
-
- SYMBOL railway_station
- RECTANGLE 0,0 2 x 2 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL railway_halt
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL railway_tram_stop
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL highway_bus_stop
- CIRCLE 0,0 1.5 {
- AREA {color: @busSymbolColor; }
- }
-
- SYMBOL amenity
- RECTANGLE 0,0 1 x 1 {
- AREA {color: #b89c9c; }
- }
-
- SYMBOL amenity_hospital
- CIRCLE 0,0 2 {
- AREA.BORDER {color: @hospitalSymbolColor; width: 0.2mm; }
- }
- // Horizontal bar
- RECTANGLE -0.75,-0.25 1.5 x 0.5 {
- AREA { color: @hospitalSymbolColor; }
- }
- // Vertical bar
- RECTANGLE -0.25,-0.75 0.5 x 1.5 {
- AREA { color: @hospitalSymbolColor; }
- }
-
- SYMBOL amenity_pharmacy
- // Box
- RECTANGLE -1,1 2 x 2 {
- AREA.BORDER {color: @pharmacySymbolColor; width: 0.2mm; }
- }
- // Horizontal bar
- RECTANGLE -0.75,-0.25 1.5 x 0.5 {
- AREA { color: @pharmacySymbolColor; }
- }
- // Vertical bar
- RECTANGLE -0.25,-0.75 0.5 x 1.5 {
- AREA {color: @pharmacySymbolColor; }
- }
-
- SYMBOL amenity_parking
- CIRCLE 0,0 1.5 {
- AREA {color: #4bb2da; }
- }
-
- SYMBOL amenity_post_box
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @postSymbolColor; }
- }
-
- SYMBOL amenity_post_office
- RECTANGLE 0,0 2 x 2 {
- AREA { color: @postSymbolColor; }
- }
-
- SYMBOL christian_church_cross
- RECTANGLE 0.5,-2 0.5 x 2 {
- AREA { color: #000000; } // vertical bar
- }
- RECTANGLE 0,-1.5 1.5 x 0.5 {
- AREA { color: #000000; } // horizontal bar
- }
-
- SYMBOL speed_camera
- CIRCLE 0,0 1.5 {
- AREA {color: @red; }
- }
-
- SYMBOL highway_street_lamp
- CIRCLE 0,0 2 {
- AREA {color: #f5fb5b; }
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/graphics/cover-2.24.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.24.tar.bz2/pics/cover.jpg
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/qml/l10n.qml
^
|
| @@ -42,6 +42,7 @@
QT_TRANSLATE_NOOP("stylesheet", "public-transport"),
QT_TRANSLATE_NOOP("stylesheet", "outdoor"),
QT_TRANSLATE_NOOP("stylesheet", "winter-sports"),
+ QT_TRANSLATE_NOOP("stylesheet", "cycle"),
QT_TRANSLATE_NOOP("styleflag", "daylight"),
QT_TRANSLATE_NOOP("styleflag", "waterway"),
@@ -55,6 +56,7 @@
QT_TRANSLATE_NOOP("styleflag", "skiingDownhill"),
QT_TRANSLATE_NOOP("styleflag", "skiingNordic"),
QT_TRANSLATE_NOOP("styleflag", "cycloRoutes"),
+ QT_TRANSLATE_NOOP("styleflag", "mtbRoutes"),
QT_TRANSLATE_NOOP("styleflag", "hikingRoutes"),
QT_TRANSLATE_NOOP("message", "Directory already exists"),
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/cycle.oss
^
|
| @@ -0,0 +1,1283 @@
+OSS
+/*
+ See http://libosmscout.sourceforge.net/documentation/stylesheet/
+ for an description of the style sheet syntax.
+ */
+
+/*
+ Some general rules in the design of this specific style sheet:
+
+ Labels:
+ * A possible icon will always show on top
+ * The main label (the name of the object) will always be shown below the icon (else on top)
+ * A possible additional label (height of a peak) will be placed below the main label.
+*/
+
+FLAG
+ daylight = true;
+ waterway = true;
+ wood = true;
+ elevationContours = true;
+
+ IF daylight {
+ _natural = true;
+ _railway = true;
+ _leisure = true;
+ _building = true;
+ _minorBuilding = true;
+ }
+ ELSE {
+ _natural = false;
+ _railway = false;
+ _leisure = false;
+ _building = false;
+ _minorBuilding = false;
+ }
+
+ORDER WAYS
+ GROUP _route
+ GROUP highway_motorway
+ GROUP highway_motorway_trunk
+ GROUP highway_motorway_primary
+ GROUP highway_trunk
+ GROUP aerialway_gondola, aerialway_chair_lift, aerialway_drag_lift
+ GROUP highway_primary
+ GROUP highway_secondary
+ GROUP highway_tertiary
+ GROUP highway_motorway_link, highway_trunk_link, highway_primary_link, highway_secondary_link, highway_tertiary_link
+ GROUP highway_unclassified, highway_road, highway_residential
+ GROUP railway_rail,
+ aeroway_runway, aeroway_taxiway
+ GROUP highway_living_street, highway_service, highway_bus_guideway,
+ railway_tram, railway_light_rail, railway_subway, public_transport_platform,
+ railway_narrow_gauge, railway_preserved
+ GROUP highway_track, highway_pedestrian, highway_path, highway_cycleway,
+ highway_footway, highway_bridleway, highway_construction,
+ leisure_track
+ GROUP highway_steps, barrier_fence
+ GROUP waterway_weir, route_ferry
+ GROUP waterway_river, waterway_canal, waterway_drain, waterway_ditch, waterway_stream
+ GROUP elevation_contour_major, elevation_contour_medium, elevation_contour_minor
+
+CONST
+ MAG stepsMag = veryClose;
+ MAG labelPathsMag = veryClose;
+
+ MAG specialBuildingMag = close;
+ MAG labelSpecialBuildingMag = closer;
+
+ MAG buildingMag = closer;
+ MAG labelBuildingMag = veryClose;
+
+ MAG minorBuildingMag = block;
+
+ // road width
+ WIDTH motorwayWidth = 20m;
+ WIDTH trunkWidth = 18m;
+ WIDTH primaryWidth = 14m;
+ WIDTH secondaryWidth = 12m;
+ WIDTH tertiaryWidth = 10m;
+ WIDTH roadWidth = 8m;
+ WIDTH wayWidth = 8m;
+
+ // Label priorities
+ UINT labelPrioWaypoint = 0;
+ UINT labelPrioContinent = 1;
+ UINT labelPrioIsland = 1;
+ UINT labelPrioCountry = 2;
+ UINT labelPrioState = 3;
+ UINT labelPrioRegion = 4;
+ UINT labelPrioCounty = 5;
+ UINT labelPrioMillionCity = 6;
+ UINT labelPrioBigCity = 7;
+ UINT labelPrioCity = 8;
+
+ UINT labelShieldMotorway = 9;
+ UINT labelShieldTrunk = 11;
+ UINT labelShieldPrimary = 11;
+
+ UINT labelPrioTown = 12;
+ UINT labelPrioVillage = 13;
+ UINT labelPrioHamlet = 14;
+ UINT labelPrioSuburb = 15;
+ UINT labelPrioLocality = 16;
+
+ UINT labelPrioCycle = 17;
+ UINT labelPrioAeroway = 17;
+ UINT labelPrioFerry = 17;
+ UINT labelPrioPublicTransportWay = 17;
+ UINT labelPrioHighway = 18;
+ UINT labelPrioOtherWays = 19;
+
+ UINT labelPrioNatural = 20;
+ UINT labelPrioLanduse = 25;
+ UINT labelPrioLeisure = 26;
+
+ UINT labelPrioPeak = 29;
+
+ UINT labelPrioHighwayServices = 34;
+ UINT labelPrioRailwayStation = 35;
+
+ UINT labelPrioSpecialBuilding = 37;
+ UINT labelPrioMajorBuilding = 38;
+
+ UINT labelPrioRailwayHalt = 40;
+ UINT labelPrioTramHalt = 40;
+
+ UINT labelPrioHighwayArea = 43;
+
+ UINT labelPrioAmenity = 45;
+ UINT labelPrioShop = 50;
+
+ UINT labelPrioHighwayJunction = 55;
+
+ UINT labelPrioBuilding = 100;
+
+ UINT labelPrioElevationContour = 500;
+
+ // For debugging :-)
+ COLOR red = #ff0000;
+
+ // Default label color
+ IF daylight {
+ COLOR labelColor = #000000;
+ COLOR emphasizeColor = #ffffff;
+ }
+ ELSE {
+ COLOR labelColor = #a0a0a0;
+ COLOR emphasizeColor = #707070;
+ }
+
+ // Pseudo types
+ COLOR routeColor = #ae00ff88;
+ COLOR trackColor = #10a000a0;
+ COLOR highlightedColor = @routeColor;
+
+ // Ground tiles
+
+ IF daylight {
+ COLOR waterColor = #85bdd6;
+ COLOR waterLabelColor = darken(@waterColor, 0.5);
+ COLOR landColor = #f1eee9;
+ COLOR unknownColor = @landColor;
+ }
+ ELSE {
+ COLOR waterColor = darken(#9acffd, 0.5);
+ COLOR waterLabelColor = darken(@waterColor, 0.5);
+ COLOR landColor = #333333;
+ COLOR unknownColor = @landColor;
+ }
+
+ COLOR seaColor = @waterColor;
+ COLOR cliffColor = #440000;
+
+ // Borders
+ COLOR countryBorderColor = #ff0000;
+
+ // Contour
+ COLOR majorContourColor = #9f9f9f;
+ COLOR mediumContourColor = #a5a5a5;
+ COLOR minorContourColor = #aaaaaa;
+ COLOR contourLabelColor = #505050;
+
+ // Landuse, water
+ IF daylight {
+ COLOR allotmentsColor = #c8b084;
+ }
+ ELSE {
+ COLOR allotmentsColor = darken(#c8b084,0.5);
+ }
+
+ COLOR beachColor = #eecc55;
+
+ COLOR brownFieldColor = #b6b592;
+ COLOR brownFieldLabelColor = darken(@brownFieldColor, 0.5);
+
+ COLOR cemeteryColor = #a9caae;
+ COLOR commercialColor = #efc8c8;
+ COLOR constructionColor = #9d9d6c;
+
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/include/land_sea.oss
^
|
| @@ -0,0 +1,17 @@
+OSS
+
+STYLE
+ [MAG world-] {
+ [TYPE _tile_sea] AREA {color: @seaColor;}
+ //[TYPE _tile_coast] AREA {color: @seaColor;}
+ //[TYPE _tile_coast] AREA {color: @seaColor; borderColor: #000000; borderWidth: 0.1mm;}
+ [TYPE _tile_land] AREA {color: @landColor;}
+ [TYPE _tile_unknown] AREA {color: @unknownColor;}
+
+ //[TYPE _osm_tile_border] WAY {color: #222222; displayWidth: 0.2mm; }
+ //[TYPE _osm_subtile_border] WAY {color: #444444; displayWidth: 0.1mm; }
+
+ // [TYPE _tile_coastline] WAY {color: #ff0000; displayWidth: 0.1mm;}
+ }
+
+END
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/include/man_made.oss
^
|
| @@ -0,0 +1,252 @@
+OSS
+STYLE
+ // -------------------------------------------------------
+ //
+ // Man made:
+ // amenity, tourism, history, military, power, barrier
+ //
+ [MAG city-] {
+ [TYPE tourism_theme_park,
+ tourism_zoo,
+ historic_archaeological_site,
+ historic_battlefield] AREA { color: @tourismColor; }
+ }
+
+ [MAG city-] {
+
+ [TYPE military_airfield,
+ military_danger_area,
+ military_range,
+ military_naval_base] AREA { color: #f59897; }
+
+ [TYPE amenity_grave_yard] AREA { color: @amenityGraveYardColor; }
+ }
+
+ [MAG detail-] {
+ [TYPE amenity_grave_yard] AREA.TEXT { label: Name.name; style: emphasize; emphasizeColor: @emphasizeColor; color: @labelColor; size: 0.8;}
+ }
+
+ [MAG detail-] {
+ [TYPE tourism_alpine_hut,
+ tourism_camp_site,
+ tourism_caravan_site,
+ tourism_attraction,
+ tourism_artwork,
+ tourism_chalet,
+ tourism_guest_house,
+ tourism_hostel,
+ tourism_hotel,
+ tourism_information,
+ tourism_motel,
+ tourism_museum,
+ tourism_picnic_site,
+ historic_castle,
+ historic_monument,
+ historic_memorial,
+ historic_ruins,
+ historic_wreck] AREA { color: @tourismColor; }
+
+ [TYPE power_generator] AREA { color: #bca9a9; }
+
+ // Special amenities
+ [TYPE amenity_post_office] AREA { color: @postColor; }
+
+ [TYPE amenity_hospital] {
+ AREA { color: @hospitalColor;}
+ AREA.BORDER { color: @hospitalBorderColor; width: 0.1mm; }
+ }
+
+ [TYPE amenity_taxi] AREA { color: #d2d2d2; }
+
+ // (Major) Amenities without special color
+ [TYPE amenity,
+ amenity_bank,
+ amenity_cafe,
+ amenity_fast_food,
+ amenity_fuel,
+ amenity_kindergarten,
+ amenity_library,
+ amenity_restaurant,
+ amenity_school] AREA { color: @amenityColor; }
+ }
+
+ [MAG close-] {
+ // (Minor) Amenities without special color
+ [TYPE amenity_atm,
+ amenity_recycling] AREA { color: @amenityColor; }
+
+ [TYPE man_made_pier] {
+ [SIZE 5m 0.1mm:3px<] WAY {color: #ffffff; width: 5.0m;}
+ [SIZE 5m <0.1mm:3px] WAY {color: #ffffff; displayWidth: 0.1mm;}
+ AREA { color: #ffffff; }
+ }
+
+ [TYPE waterway_dam] {
+ AREA { color: @damColor; }
+ WAY { color: @damColor; width: 4.0m; }
+ }
+
+ [TYPE railway_station] NODE.ICON { symbol: railway_station; }
+ }
+
+ [MAG closer-] {
+ [TYPE amenity_hospital,
+ amenity_hospital_building] {
+ AREA.ICON { symbol: amenity_hospital; name: hospital; }
+ NODE.ICON { symbol: amenity_hospital; name: hospital; }
+ }
+
+ [TYPE amenity_parking_building] {
+ NODE.ICON { symbol: amenity_parking; name: parking; }
+ AREA.ICON { symbol: amenity_parking; name: parking;}
+ }
+
+ [TYPE amenity_parking] {
+ NODE.ICON { symbol: amenity_parking; name: parking; }
+ AREA.ICON { symbol: amenity_parking; name: parking;}
+ }
+
+ [TYPE amenity_parking] {
+ AREA { color: @parkingColor;}
+ AREA.BORDER { color: @parkingBorderColor; width: 0.1mm; }
+ }
+
+ [TYPE railway_station] AREA.ICON { symbol: railway_station; }
+
+
+ [TYPE barrier_wall] WAY {color: @wallColor; displayWidth: 0.1mm; width: 0.5m;}
+ [TYPE barrier_retaining_wall] WAY {color: lighten(@wallColor, 0.5); displayWidth: 0.12mm; width: 0.5m;}
+
+ [TYPE barrier_city_wall] WAY {color: @wallColor; displayWidth: 0.1mm; width: 0.5m;}
+ [TYPE barrier_city_wall] WAY#decor {color: @wallColor;
+ dash: 1,5; displayOffset: 0.09mm; offset: 0.5m; joinCap: butt; endCap: butt;
+ displayWidth: 0.1mm; width: 0.5m;
+ }
+ [TYPE barrier_wall] {
+ AREA {color: lighten(@wallColor, 0.5); }
+ AREA.BORDER {color: @wallColor; width: 0.1mm; }
+ }
+
+ [TYPE barrier_retaining_wall] {
+ AREA {color: lighten(@wallColor, 0.5); }
+ AREA.BORDER {color: @wallColor; width: 0.1mm; }
+ }
+
+ [TYPE barrier_city_wall] {
+ AREA {color: lighten(@wallColor, 0.5);}
+ AREA.BORDER {color: @wallColor; width: 0.3mm; }
+ }
+
+ [TYPE tourism_museum, tourism_museum_building] {
+ NODE.ICON { name: museum; }
+ AREA.ICON { name: museum; }
+ }
+ [TYPE historic_castle, historic_castle_building] {
+ NODE.ICON { name: castle; }
+ AREA.ICON { name: castle; }
+ }
+ [TYPE amenity_ferry_terminal] {
+ NODE.ICON { name: ferry; }
+ AREA.ICON { name: ferry; }
+ }
+ [TYPE amenity_fuel, amenity_fuel_building] {
+ NODE.ICON { name: fuel; }
+ AREA.ICON { name: fuel; }
+ }
+ [TYPE amenity_charging_station] {
+ NODE.ICON { symbol: amenity_charging_station; name: charging_station; }
+ }
+ }
+
+ [MAG veryClose-] {
+ [TYPE amenity_pharmacy] NODE.ICON { symbol: amenity_pharmacy; name: pharmacy; }
+
+ [TYPE amenity_post_box] NODE.ICON { symbol: amenity_post_box; }
+
+ [TYPE amenity_post_office] NODE.ICON { symbol: amenity_post_office; }
+
+ [TYPE amenity_drinking_water] NODE.ICON { symbol: amenity_drinking_water; }
+
+ // Amenities without special color and icon
+ [TYPE amenity,
+ amenity_bank,
+ amenity_kindergarten,
+ amenity_library,
+ amenity_school] {
+ NODE.ICON { symbol: amenity; }
+ }
+
+ // these types are too dense in big cities, lets show its icons from veryClose [16]
+ [TYPE amenity_restaurant] NODE.ICON { name: restaurant; }
+ [TYPE amenity_restaurant_building] AREA.ICON { name: restaurant; }
+ [TYPE amenity_fast_food] NODE.ICON { name: fastfood;}
+ [TYPE amenity_fast_food_building] AREA.ICON { name: fastfood;}
+ [TYPE amenity_cafe] NODE.ICON { name: cafe;}
+ [TYPE amenity_cafe_building] AREA.ICON { name: cafe;}
+ [TYPE amenity_recycling] NODE.ICON { name: recycling;}
+
+ [TYPE amenity_bar] {
+ NODE.ICON { name: bar; }
+ AREA.ICON { name: bar; }
+ }
+ [TYPE amenity_pub] {
+ NODE.ICON { name: pub; }
+ AREA.ICON { name: pub; }
+ }
+ [TYPE amenity_drinking_water] {
+ NODE.ICON { name: drinking_water; }
+ AREA.ICON { name: drinking_water; }
+ }
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/include/roads.oss
^
|
| @@ -0,0 +1,585 @@
+OSS
+
+STYLE
+ // -------------------------------------------------------
+ //
+ // highway_*, route_ferry
+ //
+
+ [MAG continent-] {
+ [TYPE highway_motorway] {
+ [SIZE @motorwayWidth 0.45mm:3px<] {
+ WAY#outline { color: darken(@motorwayColor,0.4); width: @motorwayWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @motorwayColor; width: @motorwayWidth;}
+ }
+ [SIZE @motorwayWidth <0.45mm:3px] WAY { color: @thinMotorwayColor; displayWidth: 0.45mm;}
+ }
+ }
+
+ [MAG county-] {
+ [TYPE highway_trunk,
+ highway_motorway_trunk] {
+ [SIZE @trunkWidth 0.4mm:3px<] {
+ WAY#outline { color: darken(@trunkColor,0.4); width: @trunkWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @trunkColor; width: @trunkWidth;}
+ }
+ [SIZE @trunkWidth <0.4mm:3px] WAY { color: @thinTrunkColor; displayWidth: 0.4mm;}
+ }
+
+ [TYPE highway_primary,
+ highway_motorway_primary] {
+ [SIZE @primaryWidth 0.4mm:3px<] {
+ WAY#outline { color: darken(@primaryColor,0.4); width: @primaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @primaryColor; width: @primaryWidth;}
+ }
+ [SIZE @primaryWidth <0.4mm:3px] WAY { color: @thinPrimaryColor; displayWidth: 0.4mm;}
+ }
+ }
+
+ [MAG cityOver-] {
+ [TYPE highway_secondary] {
+ [SIZE @secondaryWidth 0.25mm:3px<] {
+ WAY#outline { color: darken(@secondaryColor,0.4); width: @secondaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @secondaryColor; width: @secondaryWidth;}
+ }
+ [SIZE @secondaryWidth <0.25mm:3px] WAY { color: @thinSecondaryColor; displayWidth: 0.25mm; }
+ }
+ }
+
+ [MAG city-] {
+ [TYPE highway_tertiary] {
+ [SIZE @tertiaryWidth 0.25mm:3px<] {
+ WAY#outline { color: darken(@tertiaryColor,0.4); width: @tertiaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @tertiaryColor; width: @tertiaryWidth;}
+ }
+ [SIZE @tertiaryWidth <0.25mm:3px] WAY { color: @thinTertiaryColor; displayWidth: 0.25mm;}
+ }
+ }
+
+ [MAG suburb-] {
+ [TYPE highway_motorway_link] {
+ [SIZE @motorwayWidth 0.45mm:3px<] {
+ WAY#outline { color: darken(@motorwayColor,0.4); width: @motorwayWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @motorwayColor; width: @motorwayWidth;}
+ }
+ [SIZE @motorwayWidth <0.45mm:3px] WAY { color: @thinMotorwayColor; displayWidth: 0.45mm;}
+ }
+
+ [TYPE route_ferry] {
+ WAY#outline { color: #ffffff50; displayWidth: 0.8mm; priority: -1; joinCap: butt; endCap: butt; }
+ WAY {color: #0000ff; dash: 1,1; joinCap: butt; endCap: butt; displayWidth: 0.4mm;}
+ }
+ }
+ [TYPE highway_mini_roundabout] {
+ [MAG closer-] NODE.ICON { symbol: mini_roundabout; name: mini_roundabout; }
+ }
+ [TYPE amenity_ferry_terminal] {
+ [MAG detail-] NODE.ICON { symbol: ferry_terminal;}
+ [MAG close-] NODE.TEXT { label: Name.name; color: #303070;}
+ }
+ [MAG suburb-] {
+ [TYPE highway_trunk_link] {
+ [SIZE @trunkWidth 0.4mm:3px<] {
+ WAY#outline { color: darken(@trunkColor,0.4); width: @trunkWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @trunkColor; width: @trunkWidth;}
+ }
+ [SIZE @trunkWidth <0.4mm:3px] WAY { color: lighten(@trunkColor,0.3); displayWidth: 0.4mm;}
+ }
+
+ [TYPE highway_primary_link] {
+ [SIZE @primaryWidth 0.4mm:3px<] {
+ WAY#outline { color: darken(@primaryColor,0.4); width: @primaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @primaryColor; width: @primaryWidth;}
+ }
+ [SIZE @primaryWidth <0.4mm:3px] WAY { color: lighten(@primaryColor,0.3); displayWidth: 0.4mm;}
+ }
+
+ [TYPE highway_secondary_link] {
+ [SIZE @secondaryWidth 0.25mm:3px<] {
+ WAY#outline { color: darken(@secondaryColor,0.4); width: @secondaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @secondaryColor; width: @secondaryWidth;}
+ }
+ [SIZE @secondaryWidth <0.25mm:3px] WAY { color: #fdd654; displayWidth: 0.25mm;}
+ }
+
+ [TYPE highway_tertiary_link] {
+ [SIZE @tertiaryWidth 0.25mm:3px<] {
+ WAY#outline { color: darken(@secondaryColor,0.4); width: @tertiaryWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @secondaryColor; width: @tertiaryWidth;}
+ }
+ [SIZE @tertiaryWidth <0.25mm:3px] WAY { color: #fdd654; displayWidth: 0.25mm; }
+ }
+
+ [TYPE highway_road] {
+ [SIZE @roadWidth 0.1mm:3px<] {
+ WAY#outline { color: @roadBColor; width: @roadWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @roadColor; width: @roadWidth;}
+ }
+ [SIZE @roadWidth <0.1mm:3px] WAY { color: #888888; displayWidth: 0.1mm;}
+ }
+
+ [TYPE highway_unclassified,
+ highway_residential] {
+ [SIZE @wayWidth 0.1mm:3px<] {
+ WAY#outline { color: @roadBColor; width: @wayWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @roadColor; width: @wayWidth;}
+ }
+ [SIZE @wayWidth <0.1mm:3px] WAY { color: @thinRoadColor; displayWidth: 0.1mm; }
+
+ AREA { color: @roadColor;}
+ AREA.BORDER { color: @roadBColor; width: 0.1mm;}
+ }
+ }
+
+ [MAG closer-] {
+ [TYPE highway_service] {
+ [SIZE @wayWidth 0.1mm:3px<] {
+ WAY#outline { color: @roadBColor; width: @wayWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @roadColor; width: @wayWidth;}
+ }
+ [SIZE @wayWidth <0.1mm:3px] WAY { color: #999999; displayWidth: 0.1mm;}
+
+ AREA { color: @roadColor; }
+ AREA.BORDER { color: @roadBColor; width: 0.1mm; }
+ }
+
+ [TYPE highway_living_street] {
+ [SIZE @wayWidth 0.1mm:3px<] {
+ WAY#outline { color: @roadBColor; width: @wayWidth; displayWidth: 0.5mm; priority: -1; joinCap: butt; }
+ WAY { color: @livingStreetColor; width: @wayWidth;}
+ }
+ [SIZE @wayWidth <0.1mm:3px] WAY { color: @livingStreetColor; displayWidth: 0.1mm;}
+ }
+
+
+ [TYPE highway_construction] WAY {color: #99cccc; displayWidth: 0.1mm; width: 2m;}
+
+ [TYPE highway_pedestrian] {
+ AREA { color: @pedestrianColor; }
+ AREA.BORDER { color: darken(@pedestrianColor, 0.3); width: 0.1mm; }
+ }
+
+ [TYPE public_transport_platform] {
+ WAY#outline {color: #887b7b; width: 2m; displayWidth: 0.2mm;}
+ WAY {color: #9b9b9c; width: 2m; }
+
+ AREA { color: #9b9b9c; }
+ AREA.BORDER { color: #887b7b; width: 0.1mm; }
+ }
+
+ [TYPE highway_footway] {
+ AREA { color: #ededed; }
+ AREA.BORDER { color: #c5c5c5; width: 0.1mm; }
+ }
+ }
+
+ [MAG closer-] {
+
+ [TYPE highway_pedestrian] {
+ [SIZE @wayWidth 0.1mm:3px<] WAY {color: @pedestrianColor; width: @wayWidth; }
+ [SIZE @wayWidth <0.1mm:3px] WAY {color: @pedestrianColor; displayWidth: 0.1mm; }
+ }
+
+ [TYPE highway_bus_guideway] WAY {color: #90570c; displayWidth: 0.1mm; }
+
+ [TYPE highway_motorway, highway_motorway_link SIZE @motorwayWidth 0.45mm:3px<] {
+ [FEATURE Tunnel] {
+ WAY#outline { dash: 0.5,0.5; }
+ WAY { color: lighten(@motorwayColor,0.3);}
+ }
+
+ [FEATURE Bridge] {
+ WAY#lbridge {color: @bridgeColor; displayWidth: 0.2mm; offset: -10m; displayOffset: -0.25mm;}
+ WAY#rbridge {color: @bridgeColor; displayWidth: 0.2mm; offset: 10m; displayOffset: 0.25mm;}
+ }
+ }
+
+ [TYPE highway_trunk, highway_trunk_link, highway_motorway_trunk SIZE @trunkWidth 0.4mm:3px<] {
+ [FEATURE Tunnel] {
+ WAY#outline { dash: 0.5,0.5; }
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/include/route.oss
^
|
| @@ -0,0 +1,16 @@
+OSS
+
+STYLE
+ [TYPE _route] {
+ [MAG world-] {
+ WAY {color: alpha(@routeColor, 1.00); displayWidth: 0.8mm; priority: 100; }
+ }
+ [MAG city-] {
+ WAY {color: alpha(@routeColor, 0.80); displayWidth: 1.8mm; priority: 100; }
+ }
+ [MAG veryClose-] {
+ WAY {color: alpha(@routeColor, 0.70); displayWidth: 3.0mm; priority: 100; }
+ }
+ }
+
+END
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/include/symbols.oss
^
|
| @@ -0,0 +1,344 @@
+OSS
+CONST
+
+ COLOR turnSymbolColor = #ffffff80;
+ COLOR turnSymbolOutlineColor = #a0a0a080;
+
+ SYMBOL viaFerrataEasyCross
+ POLYGON -0.5,-0.5 0.5,0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
+ }
+ POLYGON -0.5,0.5 0.5,-0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
+ }
+
+ SYMBOL viaFerrataModerateCross
+ POLYGON -0.5,-0.5 0.5,0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
+ }
+ POLYGON -0.5,0.5 0.5,-0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
+ }
+
+ SYMBOL viaFerrataDifficultCross
+ POLYGON -0.5,-0.5 0.5,0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
+ }
+ POLYGON -0.5,0.5 0.5,-0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
+ }
+
+ SYMBOL viaFerrataExtremeCross
+ POLYGON -0.5,-0.5 0.5,0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
+ }
+ POLYGON -0.5,0.5 0.5,-0.5 {
+ AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
+ }
+
+ SYMBOL oneway_arrow
+ POLYGON 0,0.5 1,0 0,-0.5 {
+ AREA { color: @onewayArrowColor; }
+ }
+
+ SYMBOL stream_arrow
+ POLYGON 0,0.5 1,0 0,-0.5 {
+ AREA { color: @waterLabelColor; }
+ }
+
+ SYMBOL natural_spring
+ CIRCLE 0,0 1.0 {
+ AREA.BORDER {color: @waterLabelColor; width: 0.2mm; }
+ }
+ CIRCLE 0,0 0.3 {
+ AREA {color: @waterLabelColor; }
+ }
+
+ SYMBOL natural_tree
+ CIRCLE GROUND 0,0 5 {
+ AREA {color: #9acd3250; }
+ }
+ CIRCLE GROUND 0,0 0.3 {
+ AREA {color: #8b4513; }
+ }
+
+ SYMBOL amenity_charging_station
+ RECTANGLE -1,-1 2 x 2 {
+ AREA { color: #0000ff; }
+ }
+ CIRCLE 0,0 0.8 {
+ AREA {color: #ffffff; }
+ }
+
+ SYMBOL amenity_drinking_water
+ CIRCLE 0,0 0.4 {
+ AREA {color: @waterLabelColor; }
+ }
+
+ SYMBOL waterway_waterfall
+ RECTANGLE 0,0 1.75 x 0.5 {
+ AREA { color: darken(@waterColor, 0.4); }
+ }
+ POLYGON 1.75,0.5 2.0,1 {
+ AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
+ }
+ POLYGON 1.25,0.5 1.5,1 {
+ AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
+ }
+ POLYGON 0.75,0.5 1,1 {
+ AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
+ }
+
+ SYMBOL waterway_weir
+ RECTANGLE 0,0 2 x 0.5 {
+ AREA { color: darken(@waterColor, 0.4); }
+ }
+ CIRCLE 0.25,0.8 0.25 {
+ AREA {color: darken(@waterColor, 0.2); }
+ }
+ CIRCLE 1,0.8 0.25 {
+ AREA {color: darken(@waterColor, 0.2); }
+ }
+ CIRCLE 1.75,0.8 0.25 {
+ AREA {color: darken(@waterColor, 0.2); }
+ }
+
+ SYMBOL natural_peak
+ POLYGON -0.75,0 0.75,0 0.0,-1.5 {
+ AREA { color: @peakSymbolColor; }
+ }
+
+ SYMBOL railway_station
+ RECTANGLE 0,0 2 x 2 {
+ AREA { color: @railwaySymbolColor; }
+ }
+
+ SYMBOL railway_halt
+ RECTANGLE 0,0 1 x 1 {
+ AREA { color: @railwaySymbolColor; }
+ }
+
+ SYMBOL railway_subway_entrance
+ RECTANGLE 0,0 2 x 2 {
+ AREA { color: @railwaySymbolColor; }
+ }
+ RECTANGLE 0.5,0.5 1 x 1 {
+ AREA { color: #ffffff; }
+ }
+
+ SYMBOL railway_tram_stop
+ RECTANGLE 0,0 1 x 1 {
+ AREA { color: @railwaySymbolColor; }
+ }
+
+ SYMBOL highway_bus_stop
+ CIRCLE 0,0 1.5 {
+ AREA {color: @busSymbolColor; }
+ }
+
+ SYMBOL ferry_terminal
+ RECTANGLE 0,0 1 x 1 {
+ AREA { color: #30307080; }
+ }
+
+ SYMBOL amenity
+ RECTANGLE 0,0 1 x 1 {
+ AREA {color: #b89c9c; }
+ }
+
+ SYMBOL amenity_hospital
+ CIRCLE 0,0 2.0 {
+ AREA.BORDER {color: @hospitalSymbolColor; width: 0.2mm; }
+ }
+ // Horizontal bar
+ RECTANGLE -0.75,-0.25 1.5 x 0.5 {
+ AREA { color: @hospitalSymbolColor; }
+ }
+ // Vertical bar
+ RECTANGLE -0.25,-0.75 0.5 x 1.5 {
+ AREA { color: @hospitalSymbolColor; }
+ }
+
+ SYMBOL amenity_pharmacy
+ // Box
+ RECTANGLE -1,-1 2 x 2 {
+ AREA.BORDER {color: @pharmacySymbolColor; width: 0.2mm; }
+ }
+ // Horizontal bar
+ RECTANGLE -0.75,-0.25 1.5 x 0.5 {
+ AREA { color: @pharmacySymbolColor; }
+ }
+ // Vertical bar
+ RECTANGLE -0.25,-0.75 0.5 x 1.5 {
+ AREA {color: @pharmacySymbolColor; }
+ }
+
+ SYMBOL amenity_parking
+ CIRCLE 0,0 1.5 {
+ AREA {color: #4bb2da; }
+ }
+
+ SYMBOL amenity_post_box
+ RECTANGLE 0,0 1 x 1 {
+ AREA { color: @postSymbolColor; }
+ }
+
+ SYMBOL amenity_post_office
+ RECTANGLE 0,0 2 x 2 {
+ AREA { color: @postSymbolColor; }
+ }
+
+ SYMBOL christian_church_cross
+ RECTANGLE 0.5,-2 0.5 x 2 {
+ AREA { color: #000000; } // vertical bar
+ }
+ RECTANGLE 0,-1.5 1.5 x 0.5 {
+ AREA { color: #000000; } // horizontal bar
+ }
+
+ SYMBOL mini_roundabout
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/include/track.oss
^
|
| @@ -0,0 +1,16 @@
+OSS
+
+STYLE
+ [TYPE _track] {
+ [MAG world-] {
+ WAY {color: alpha(@trackColor, 1.0); displayWidth: 0.3mm; priority: 100; preferColorFeature: true; }
+ }
+ [MAG city-] {
+ WAY {color: alpha(@trackColor, 0.9); displayWidth: 0.5mm; width: 2.2m; priority: 100; preferColorFeature: true; }
+ }
+ [MAG veryClose-] {
+ WAY {color: alpha(@trackColor, 0.4); displayWidth: 1.1mm; width: 2.2m; priority: 100; preferColorFeature: true; }
+ }
+ }
+
+END
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/include/waypoint.oss
^
|
| @@ -0,0 +1,60 @@
+OSS
+
+STYLE
+ [MAG world-] {
+ [TYPE _highlighted] WAY {color: @highlightedColor; displayWidth: 1.5mm; priority: 100; }
+ [TYPE _highlighted] AREA.BORDER {color: @highlightedColor; width: 1.0mm; }
+ [TYPE _highlighted] NODE.ICON { symbol: marker; priority: @labelPrioWaypoint; }
+
+ [TYPE _waypoint, _waypoint_red_circle] {
+ NODE.ICON { symbol: marker; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointRedColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ [TYPE _waypoint_green_circle] {
+ NODE.ICON { symbol: green_circle; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointGreenColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ [TYPE _waypoint_blue_circle] {
+ NODE.ICON { symbol: blue_circle; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointBlueColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ [TYPE _waypoint_yellow_circle] {
+ NODE.ICON { symbol: yellow_circle; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointYellowColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ [TYPE _waypoint_red_square] {
+ NODE.ICON { symbol: red_square; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointRedColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ [TYPE _waypoint_green_square] {
+ NODE.ICON { symbol: green_square; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointGreenColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ [TYPE _waypoint_blue_square] {
+ NODE.ICON { symbol: blue_square; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointBlueColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ [TYPE _waypoint_yellow_square] {
+ NODE.ICON { symbol: yellow_square; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointYellowColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ [TYPE _waypoint_red_triangle] {
+ NODE.ICON { symbol: red_triangle; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointRedColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ [TYPE _waypoint_green_triangle] {
+ NODE.ICON { symbol: green_triangle; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointGreenColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ [TYPE _waypoint_blue_triangle] {
+ NODE.ICON { symbol: blue_triangle; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointBlueColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ [TYPE _waypoint_yellow_triangle] {
+ NODE.ICON { symbol: yellow_triangle; priority: @labelPrioWaypoint; }
+ NODE.TEXT { label: Name.name; color: @waypointYellowColor; size: 1.0; priority: @labelPrioWaypoint; }
+ }
+ }
+
+
+END
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/map.ost
^
|
| @@ -0,0 +1,2487 @@
+OST
+
+/*
+ Types:
+ A type can be support for any of the following types:
+ * NODE
+ * WAY: Ways automatically get assigned the following features: Layer
+ * AREA
+ * RELATION
+
+ Meaning of the different OPTIONS:
+ PATH[[FOOT] [BICYLCE] [CAR]]:
+ This way or area is a traversable path and possibly routable for the given vehicles.
+
+ See: http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing/Access-Restrictions
+
+ If something is a path, the following features are automatically assigned:
+ * Width
+ * Grade
+ * Bridge
+ * Tunnel
+ * Roundabout
+ If something is routable, the following features are automatically assigned:
+ * Access
+ * MaxSpeed
+ OPTIMIZE_LOW_ZOOM:
+ Optimize this area or way for displaying in low zoom by
+ reducing visible complexity
+ PIN_WAY:
+ This is a way, even if the path is closed
+ MULTIPOLYGON:
+ Type should be handled as multipolygon even if type is not set to multipolygon.
+ ROUTE_MASTER:
+ Type should be handled as route master relation (public transport schema)..
+ ROUTE:
+ Type should be handled as route relation.
+ ADMIN_REGION:
+ The given area or node describes an administrate region
+ that should be part of the region tree for the city/street
+ index
+ POI:
+ The given area, way or node is a POI and should be indexed
+ by its name in relation to the enclosing region. If something is a POI and has the
+ feature "Name"
+ It automatically get the following features assigned:
+ * Location
+ * Address
+ * Website
+ * Phone
+ ADDRESS:
+ Objects should be indexed as address
+ It automatically get the following features assigned:
+ * Location
+ * Address
+ LOCATION:
+ The given way or area should be indexed as location.
+ MERGE_AREAS:
+ Areas of this type that "touch" each other and the same attribute values
+ will get merged.
+ IGNORESEALAND:
+ Ignore this type for calculation of land masses (because objects of this type can
+ occur on sea, too, and thus have no distinguishing character).
+ IGNORE:
+ Ignore objects of this type
+*/
+
+/*
+ List of max speeds aliases. Normally value for the tag "maxspeed" should always
+ have a numeric value and the source of the speed limit should be placed into
+ the value of the tag "source:maxspeed" containing an alias name.
+ In some country this is not (only) the case, the alias is also sometimes
+ placed into "maxspeed" itself. This table helps to resolve these aliases
+ to numeric values again.
+
+ https://wiki.openstreetmap.org/wiki/OSM_tags_for_routing/Maxspeed
+ https://wiki.openstreetmap.org/wiki/Speed_limits
+*/
+MAX SPEEDS
+ SPEED "CZ:urban" = 50 km/h
+ SPEED "CZ:rural" = 90 km/h
+ SPEED "CZ:motorway" = 130 km/h
+
+ SPEED "DE:living_street" = 10 km/h
+ SPEED "DE:urban" = 50 km/h
+ SPEED "DE:rural" = 100 km/h
+
+ SPEED "FR:walk" = 6 km/h
+ SPEED "FR:urban" = 50 km/h
+ SPEED "FR:rural" = 90 km/h
+ SPEED "FR:motorway" = 130 km/h
+
+ SPEED "SK:urban" = 50 km/h
+ SPEED "SK:rural" = 90 km/h
+ SPEED "SK:motorway" = 130 km/h
+
+ SPEED "IT:urban" = 50 km/h
+ SPEED "IT:rural" = 90 km/h
+ SPEED "IT:trunk" = 110 km/h
+ SPEED "IT:motorway" = 130 km/h
+
+ SPEED "RU:living_street" = 20 km/h
+ SPEED "RU:urban" = 60 km/h
+ SPEED "RU:rural" = 90 km/h
+ SPEED "RU:motorway" = 110 km/h
+
+/*
+ Allows you to map surface descriptions to a grade value ([1-5]).
+ Grade 1 ist very well, grade 5 is very bad.
+*/
+GRADES
+ SURFACE GRADE 1 {
+ "paved"
+ "asphalt"
+ "cobblestone"
+ "cobblestone:flattened"
+ "concrete"
+ "concrete:lanes"
+ "concrete:plates"
+ "paving_stones"
+ "paving_stones:20"
+ "paving_stones:30"
+ "sett"
+ "tarred"
+ "tartan"
+ "iron"
+ }
+
+ SURFACE GRADE 2 {
+ "ash"
+ "clay"
+ "compacted"
+ "compacted_gravel"
+ "fine_gravel"
+ "gravel"
+ "grass_paver"
+ "metal"
+ "pebblestone"
+ "stone"
+ "wood"
+ "marble"
+ "panel"
+ }
+
+ SURFACE GRADE 3 {
+ "unpaved"
+ "dirt"
+ "dirt/sand"
+ "earth"
+ "grass"
+ "ground"
+ "mud"
+ "sand"
+ "soil"
+ "woodchips"
+ }
+
+ SURFACE GRADE 4 {
+ "artificial_turf"
+ "bark_mulch"
+ "stones"
+ "rock"
+ "rocks"
+ }
+
+FEATURES
+ FEATURE Address
+ DESC
+ en: "Address"
+ de: "Adresse"
+
+ FEATURE AdminLevel
+ DESC
+ en: "administrative level"
+ de: "Administrative Hierachie"
+
+ FEATURE Destination
+ DESC
+ en: "destination"
+ de: "Ziel"
+
+ FEATURE Name
+ DESC
+ en: "object name"
+ de: "Objektname"
+
+ FEATURE NameAlt
+ DESC
+ en: "object name"
+ de: "Objektname"
+
+ FEATURE Width
+ DESC
+ en: "width"
+ de: "Breite"
+
+TYPES
+
+ //
+ // contour lines
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/outdoor.oss
^
|
| @@ -1,7 +1,9 @@
OSS
FLAG
- cycloRoutes = true;
- hikingRoutes = true;
+ daylight = true;
+ cycloRoutes = true;
+ mtbRoutes = true;
+ hikingRoutes = true;
ORDER WAYS
GROUP _route
@@ -28,7 +30,6 @@
GROUP elevation_contour_major, elevation_contour_medium, elevation_contour_minor
CONST
- //COLOR red = #ff0000;
// Label priorities
UINT labelPrioWaypoint = 0;
@@ -78,46 +79,103 @@
COLOR trackColor = #10a000a0;
// Ground tiles
-
- COLOR waterColor = #aad3df;
- COLOR landColor = #f1eee9;
- COLOR unknownColor = #c4dff6;
-
- COLOR coastColor = lighten(@waterColor,0.5);
- COLOR waterLabelColor = darken(@waterColor, 0.5);
-
- COLOR blackColor = #000000;
+ IF daylight {
+ COLOR waterColor = #aad3df;
+ COLOR landColor = #f1eee9;
+ COLOR unknownColor = @landColor;
+ COLOR seaColor = @waterColor;
+
+ COLOR coastColor = lighten(@waterColor,0.5);
+ COLOR waterLabelColor = darken(@waterColor, 0.5);
+ } ELSE {
+ COLOR waterColor = #000080;
+ COLOR landColor = #000000;
+ COLOR unknownColor = @landColor;
+ COLOR seaColor = #000060;
+
+ COLOR coastColor = lighten(@waterColor,0.5);
+ COLOR waterLabelColor = darken(@waterColor, 0.5);
+ }
+
+ // Default label color
+ IF daylight {
+ COLOR labelColor = #000000;
+ COLOR emphasizeColor = #ffffff;
+ } ELSE {
+ COLOR labelColor = #a0a0a0;
+ COLOR emphasizeColor = #707070;
+ }
// Landuse, water
- COLOR allotmentsColor = #c8b084;
- COLOR beachColor = #fefab8;
- COLOR brownFieldColor = #ebd7fe;
- COLOR cemeteryColor = #a9caae;
- COLOR commercialColor = #efc8c8;
- COLOR constructionColor = #9d9d6c;
- COLOR farmColor = #ead8bd;
- COLOR farmyardColor = #dcbe92;
- COLOR fellColor = #f9f9f9;
- COLOR glacierColor = #ddecec;
- COLOR grassColor = #cfeca8;
- COLOR greenFieldColor = #dcdcc8;
- COLOR heathColor = #d6d99f;
- COLOR industrialColor = #dfd1d6;
- COLOR landFillColor = #b6b591;
- COLOR militaryColor = #fe989822;
- COLOR quarryColor = #b3b3b3;
- COLOR recreationColor = #bce2ca;
- COLOR residentialColor = #dcdcdc;
- COLOR retailColor = #feeaea;
- COLOR scrubColor = #b5e2b5;
- COLOR vineyardColor = #b3e2a8;
- COLOR wetlandColor = #bdd8d8;
- COLOR woodColor = #aed1a0;
- COLOR rockColor = #cccccc;
-
- COLOR natureReserveColor = #abde9622;
- COLOR natureReserveLabelColor = #566f4bb0;
- COLOR natureReserveBorderColor = #82a77180;
+ IF daylight {
+ COLOR allotmentsColor = #c8b084;
+ COLOR beachColor = #fefab8;
+ COLOR brownFieldColor = #ebd7fe;
+ COLOR cemeteryColor = #a9caae;
+ COLOR commercialColor = #efc8c8;
+ COLOR constructionColor = #9d9d6c;
+ COLOR farmColor = #ead8bd;
+ COLOR farmyardColor = #dcbe92;
+ COLOR fellColor = #f9f9f9;
+ COLOR glacierColor = #ddecec;
+ COLOR grassColor = #cfeca8;
+ COLOR greenFieldColor = #dcdcc8;
+ COLOR heathColor = #d6d99f;
+ COLOR industrialColor = #dfd1d6;
+ COLOR damColor = #b2a7ab;
+ COLOR landFillColor = #b6b591;
+ COLOR militaryColor = #fe989822;
+ COLOR quarryColor = #b3b3b3;
+ COLOR recreationColor = #bce2ca;
+ COLOR residentialColor = #dcdcdc;
+ COLOR retailColor = #feeaea;
+ COLOR scrubColor = #b5e2b5;
+ COLOR vineyardColor = #b3e2a8;
+ COLOR wetlandColor = #bdd8d8;
+ COLOR wetlandBogColor = #efe8ff;
+ COLOR woodColor = #aed1a0;
+ COLOR rockColor = #cccccc;
+ COLOR landuseRailwayColor = #dcdcc8;
+ } ELSE {
+ COLOR allotmentsColor = #1b1812;
+ COLOR beachColor = #2c2700;
+ COLOR brownFieldColor = #1e1c21;
+ COLOR cemeteryColor = #181d19;
+ COLOR commercialColor = #161212;
+ COLOR constructionColor = #1b1b13;
+ COLOR farmColor = #161412;
+ COLOR farmyardColor = #1d1913;
+ COLOR fellColor = #161616;
+ COLOR glacierColor = #17252a;
+ COLOR grassColor = #151811;
+ COLOR greenFieldColor = #1d1d1a;
+ COLOR heathColor = #1a1a13;
+ COLOR industrialColor = #1a1819;
+ COLOR damColor = #b2a7ab;
+ COLOR landFillColor = #1d1d17;
+ COLOR militaryColor = #27171722;
+ COLOR quarryColor = #161616;
+ COLOR recreationColor = #111513;
+ COLOR residentialColor = #191919;
+ COLOR retailColor = #221f1f;
+ COLOR scrubColor = #161b16;
+ COLOR vineyardColor = #131812;
+ COLOR wetlandColor = #181b1b;
+ COLOR wetlandBogColor = #161618;
+ COLOR woodColor = #242a21;
+ COLOR rockColor = #161616;
+ COLOR landuseRailwayColor = #282824;
+ }
+
+ IF daylight {
+ COLOR natureReserveColor = #abde9622;
+ COLOR natureReserveLabelColor = #566f4bb0;
+ COLOR natureReserveBorderColor = #82a77180;
+ } ELSE {
+ COLOR natureReserveColor = #abde9622;
+ COLOR natureReserveLabelColor = #566f4bb0;
+ COLOR natureReserveBorderColor = #82a77180;
+ }
// Symbols
COLOR railwaySymbolColor = #7885b0;
@@ -129,9 +187,6 @@
COLOR hospitalSymbolColor = #da0092;
COLOR pharmacySymbolColor = #da0092;
- COLOR railwayColor = #bb75d9;
- COLOR railwayLabelColor = darken(@railwayColor, 0.5);
-
COLOR peakLabelColor = #9c5329;
COLOR mountainPassLabelColor = #9c5329;
COLOR cliffColor = #440000;
@@ -140,19 +195,81 @@
COLOR tourismLabelColor = #5e3118;
// Ways
- COLOR bridgeColor = #000000; // black
+ IF daylight {
+ COLOR bridgeColor = #000000; // black
+
+ COLOR motorwayColor = #ffff88; // yellow
+ COLOR motorwayBColor = #ff8600; // orange
+ COLOR trunkColor = #f9b29c;
+ COLOR primaryColor = #fcd6a4;
+ COLOR secondaryColor = #f7fabf;
+ COLOR thinSecondaryColor = #fdd654;
+ COLOR tertiaryColor = #ffffff;
+ COLOR roadColor = #ffffff;
+ COLOR roadBColor = #bfbfbf;
+ COLOR thinRoadColor = #999999;
+ COLOR areaRoadColor = #999999;
+ COLOR livingStreetColor = #ededed;
+
+ COLOR areaServiceColor = #cb9999;
+
+ COLOR pedestrianColor = #ebeaea;
+ COLOR thinPedestrianColor = #ebeaea;
+ COLOR pedestrianBorderColor = #c5c5c5;
+
+ COLOR railwayOutlineColor = #b3b3b3;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/public-transport.oss
^
|
| @@ -23,6 +23,7 @@
COLOR routeColor = #ff000088;
COLOR trackColor = #10a000a0;
+ COLOR highlightedColor = @routeColor;
// Label priorities
UINT labelPrioWaypoint = 0;
@@ -35,6 +36,22 @@
COLOR waypointBlueColor = #203bb3;
COLOR waypointYellowColor = #dfed00;
+ COLOR viaFerrataEasyColor = darken(#fdac44, 0.4);
+ COLOR viaFerrataModerateColor = #fdac44;
+ COLOR viaFerrataDifficultColor = #ec4044;
+ COLOR viaFerrataExtremeColor = #ff0000;
+
+ COLOR railwaySymbolColor = #60005070;
+ COLOR busSymbolColor = #7885b0;
+ COLOR onewayArrowColor = #00000028;
+ COLOR waterLabelColor =darken(@waterColor, 0.5);
+ COLOR peakSymbolColor = #9c5e29;
+ COLOR hospitalSymbolColor = #da0092;
+ COLOR pharmacySymbolColor = #da0092;
+ COLOR postSymbolColor = #e8f000;
+ COLOR red = #ff0000;
+ COLOR cliffColor = #440000;
+
SYMBOL place_city
CIRCLE 0,0 2.5 {
AREA {color: #ff000050; }
@@ -45,173 +62,29 @@
AREA {color: #ff000040; }
}
-SYMBOL railway_station
+SYMBOL railway_station2
CIRCLE 0,0 1.0 {
AREA {color: #60005070; }
}
-SYMBOL railway_halt
+SYMBOL railway_halt2
CIRCLE 0,0 0.5 {
AREA {color: #00800080; }
}
-SYMBOL railway_tram_stop
- RECTANGLE 0,0 1 x 1 {
- AREA { color: #b05bec; }
- }
-SYMBOL ferry_terminal
- RECTANGLE 0,0 1 x 1 {
- AREA { color: #30307080; }
- }
-SYMBOL highway_bus_stop
- RECTANGLE 0,0 1 x 1 {
- AREA { color: #10107080; }
- }
+
SYMBOL subway_entrance
POLYGON -0.4,0 -0.4,-0.8 0,-0.4 0.4,-0.8 0.4,0 1,0 0,1 -1,0 {
AREA { color: #60005070; }
}
- SYMBOL marker
- CIRCLE 0,0 1.5 {
- AREA {color: @waypointRedColor; }
- }
-
- SYMBOL green_circle
- CIRCLE 0,0 1.5 {
- AREA {color: @waypointGreenColor; }
- }
-
- SYMBOL blue_circle
- CIRCLE 0,0 1.5 {
- AREA {color: @waypointBlueColor; }
- }
-
- SYMBOL yellow_circle
- CIRCLE 0,0 1.5 {
- AREA {color: @waypointYellowColor; }
- }
-
- SYMBOL red_square
- RECTANGLE -1.5,-1.5 3 x 3 {
- AREA {color: @waypointRedColor; }
- }
-
- SYMBOL green_square
- RECTANGLE -1.5,-1.5 3 x 3 {
- AREA {color: @waypointGreenColor; }
- }
-
- SYMBOL blue_square
- RECTANGLE -1.5,-1.5 3 x 3 {
- AREA {color: @waypointBlueColor; }
- }
-
- SYMBOL yellow_square
- RECTANGLE -1.5,-1.5 3 x 3 {
- AREA {color: @waypointYellowColor; }
- }
-
- SYMBOL red_triangle
- POLYGON -1.5,0 1.5,0 0.0,-2.4 {
- AREA { color: @waypointRedColor; }
- }
-
- SYMBOL green_triangle
- POLYGON -1.5,0 1.5,0 0.0,-2.4 {
- AREA { color: @waypointGreenColor; }
- }
-
- SYMBOL blue_triangle
- POLYGON -1.5,0 1.5,0 0.0,-2.4 {
- AREA { color: @waypointBlueColor; }
- }
+MODULE "include/symbols"
- SYMBOL yellow_triangle
- POLYGON -1.5,0 1.5,0 0.0,-2.4 {
- AREA { color: @waypointYellowColor; }
- }
+MODULE "include/land_sea"
+MODULE "include/route"
+MODULE "include/track"
+MODULE "include/waypoint"
STYLE
- [TYPE _tile_sea] AREA {color: @seaColor;}
- // [TYPE _tile_coast] AREA {color: @seaColor;}
- [TYPE _tile_land] AREA {color: @landColor;}
- // [TYPE _tile_unknown] AREA {color: @unknownColor;}
-
- [TYPE _track] {
- [MAG world-] {
- WAY {color: alpha(@trackColor, 1.0); displayWidth: 0.3mm; priority: 100; preferColorFeature: true; }
- }
- [MAG city-] {
- WAY {color: alpha(@trackColor, 0.9); displayWidth: 0.5mm; width: 2.2m; priority: 100; preferColorFeature: true; }
- }
- [MAG veryClose-] {
- WAY {color: alpha(@trackColor, 0.4); displayWidth: 1.1mm; width: 2.2m; priority: 100; preferColorFeature: true; }
- }
- }
- [TYPE _route] {
- [MAG world-] {
- WAY {color: alpha(@routeColor, 1.0); displayWidth: 0.4mm; priority: 100; }
- }
- [MAG city-] {
- WAY {color: alpha(@routeColor, 0.6); displayWidth: 0.6mm; priority: 100; }
- }
- [MAG veryClose-] {
- WAY {color: alpha(@routeColor, 0.5); displayWidth: 1.5mm; priority: 100; }
- }
- }
-
- [TYPE _highlighted] WAY {color: @routeColor; displayWidth: 1.5mm; priority: 100; }
- [TYPE _highlighted] AREA.BORDER {color: @routeColor; width: 1.0mm; }
- [TYPE _highlighted] NODE.ICON { symbol: marker; priority: @labelPrioWaypoint; }
-
- [TYPE _waypoint, _waypoint_red_circle] {
- NODE.ICON { symbol: marker; priority: @labelPrioWaypoint; }
- NODE.TEXT { label: Name.name; color: @waypointRedColor; size: 1.0; priority: @labelPrioWaypoint; }
- }
- [TYPE _waypoint_green_circle] {
- NODE.ICON { symbol: green_circle; priority: @labelPrioWaypoint; }
- NODE.TEXT { label: Name.name; color: @waypointGreenColor; size: 1.0; priority: @labelPrioWaypoint; }
- }
- [TYPE _waypoint_blue_circle] {
- NODE.ICON { symbol: blue_circle; priority: @labelPrioWaypoint; }
- NODE.TEXT { label: Name.name; color: @waypointBlueColor; size: 1.0; priority: @labelPrioWaypoint; }
- }
- [TYPE _waypoint_yellow_circle] {
- NODE.ICON { symbol: yellow_circle; priority: @labelPrioWaypoint; }
- NODE.TEXT { label: Name.name; color: @waypointYellowColor; size: 1.0; priority: @labelPrioWaypoint; }
- }
- [TYPE _waypoint_red_square] {
- NODE.ICON { symbol: red_square; priority: @labelPrioWaypoint; }
- NODE.TEXT { label: Name.name; color: @waypointRedColor; size: 1.0; priority: @labelPrioWaypoint; }
- }
- [TYPE _waypoint_green_square] {
- NODE.ICON { symbol: green_square; priority: @labelPrioWaypoint; }
- NODE.TEXT { label: Name.name; color: @waypointGreenColor; size: 1.0; priority: @labelPrioWaypoint; }
- }
- [TYPE _waypoint_blue_square] {
- NODE.ICON { symbol: blue_square; priority: @labelPrioWaypoint; }
- NODE.TEXT { label: Name.name; color: @waypointBlueColor; size: 1.0; priority: @labelPrioWaypoint; }
- }
- [TYPE _waypoint_yellow_square] {
- NODE.ICON { symbol: yellow_square; priority: @labelPrioWaypoint; }
- NODE.TEXT { label: Name.name; color: @waypointYellowColor; size: 1.0; priority: @labelPrioWaypoint; }
- }
- [TYPE _waypoint_red_triangle] {
- NODE.ICON { symbol: red_triangle; priority: @labelPrioWaypoint; }
- NODE.TEXT { label: Name.name; color: @waypointRedColor; size: 1.0; priority: @labelPrioWaypoint; }
- }
- [TYPE _waypoint_green_triangle] {
- NODE.ICON { symbol: green_triangle; priority: @labelPrioWaypoint; }
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/standard.oss
^
|
| @@ -70,6 +70,15 @@
MAG minorBuildingMag = veryClose;
+ // road width
+ WIDTH motorwayWidth = 20m;
+ WIDTH trunkWidth = 18m;
+ WIDTH primaryWidth = 14m;
+ WIDTH secondaryWidth = 12m;
+ WIDTH tertiaryWidth = 10m;
+ WIDTH roadWidth = 8m;
+ WIDTH wayWidth = 8m;
+
// Label priorities
UINT labelPrioWaypoint = 0;
UINT labelPrioContinent = 1;
@@ -158,6 +167,8 @@
COLOR unknownColor = @landColor;
}
+ COLOR seaColor = @waterColor;
+
// Borders
COLOR countryBorderColor = #ff0000;
@@ -208,6 +219,7 @@
COLOR greenFieldColor = #dcdcc8;
COLOR heathColor = #ffffc0;
COLOR industrialColor = #dfd1d6;
+ COLOR damColor = #b2a7ab;
IF daylight {
COLOR landFillColor = #b6b591;
@@ -395,9 +407,6 @@
COLOR wallColor = #663e1b;
- COLOR turnSymbolColor = #ffffff80;
- COLOR turnSymbolOutlineColor = #a0a0a080;
-
COLOR waypointRedColor = #b32020;
COLOR waypointGreenColor = #00b200;
COLOR waypointBlueColor = #203bb3;
@@ -416,334 +425,13 @@
COLOR aerodromeApron = darken(#e8d1fe, 0.6);
}
- SYMBOL viaFerrataEasyCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
- }
-
- SYMBOL viaFerrataModerateCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
- }
-
- SYMBOL viaFerrataDifficultCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
- }
-
- SYMBOL viaFerrataExtremeCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
- }
-
- SYMBOL oneway_arrow
- POLYGON 0,0.5 1,0 0,-0.5 {
- AREA { color: @onewayArrowColor; }
- }
-
- SYMBOL stream_arrow
- POLYGON 0,0.5 1,0 0,-0.5 {
- AREA { color: @waterLabelColor; }
- }
-
- SYMBOL natural_spring
- CIRCLE 0,0 1.0 {
- AREA.BORDER {color: @waterLabelColor; width: 0.2mm; }
- }
- CIRCLE 0,0 0.3 {
- AREA {color: @waterLabelColor; }
- }
+MODULE "include/symbols"
- SYMBOL amenity_charging_station
- RECTANGLE -1,-1 2 x 2 {
- AREA { color: #0000ff; }
- }
- CIRCLE 0,0 0.8 {
- AREA {color: #ffffff; }
- }
-
- SYMBOL amenity_drinking_water
- CIRCLE 0,0 0.4 {
- AREA {color: @waterLabelColor; }
- }
-
- SYMBOL waterway_waterfall
- RECTANGLE 0,0 1.75 x 0.5 {
- AREA { color: darken(@waterColor, 0.4); }
- }
- POLYGON 1.75,0.5 2.0,1 {
- AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
- }
- POLYGON 1.25,0.5 1.5,1 {
- AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
- }
- POLYGON 0.75,0.5 1,1 {
- AREA.BORDER { width: 0.25mm; color: darken(@waterColor, 0.2); }
- }
-
- SYMBOL waterway_weir
- RECTANGLE 0,0 2 x 0.5 {
- AREA { color: darken(@waterColor, 0.4); }
- }
- CIRCLE 0.25,0.8 0.25 {
- AREA {color: darken(@waterColor, 0.2); }
- }
- CIRCLE 1,0.8 0.25 {
- AREA {color: darken(@waterColor, 0.2); }
- }
- CIRCLE 1.75,0.8 0.25 {
- AREA {color: darken(@waterColor, 0.2); }
- }
-
- SYMBOL natural_tree
- CIRCLE GROUND 0,0 5 {
- AREA {color: #9acd3250; }
- }
- CIRCLE GROUND 0,0 0.3 {
- AREA {color: #8b4513; }
- }
-
- SYMBOL natural_peak
- POLYGON -0.75,0 0.75,0 0.0,-1.5 {
- AREA { color: @peakSymbolColor; }
- }
-
- SYMBOL railway_station
- RECTANGLE 0,0 2 x 2 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL railway_halt
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL railway_tram_stop
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL highway_bus_stop
- CIRCLE 0,0 1.5 {
- AREA {color: @busSymbolColor; }
- }
-
- SYMBOL ferry_terminal
- RECTANGLE 0,0 1 x 1 {
- AREA { color: #30307080; }
- }
-
- SYMBOL amenity
- RECTANGLE 0,0 1 x 1 {
- AREA {color: #b89c9c; }
- }
-
- SYMBOL amenity_hospital
- CIRCLE 0,0 1.2 {
- AREA.BORDER {color: @hospitalSymbolColor; width: 0.2mm; }
- }
- // Horizontal bar
- RECTANGLE -0.75,-0.25 1.5 x 0.5 {
- AREA { color: @hospitalSymbolColor; }
- }
- // Vertical bar
- RECTANGLE -0.25,-0.75 0.5 x 1.5 {
- AREA { color: @hospitalSymbolColor; }
- }
-
- SYMBOL amenity_pharmacy
- // Box
- RECTANGLE -1,-1 2 x 2 {
- AREA.BORDER {color: @pharmacySymbolColor; width: 0.2mm; }
- }
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/stylesheets/winter-sports.oss
^
|
| @@ -75,6 +75,15 @@
MAG minorBuildingMag = veryClose;
+ // road width
+ WIDTH motorwayWidth = 20m;
+ WIDTH trunkWidth = 18m;
+ WIDTH primaryWidth = 14m;
+ WIDTH secondaryWidth = 12m;
+ WIDTH tertiaryWidth = 10m;
+ WIDTH roadWidth = 8m;
+ WIDTH wayWidth = 8m;
+
// Label priorities
UINT labelPrioWaypoint = 0;
UINT labelPrioContinent = 1;
@@ -136,6 +145,7 @@
// Pseudo types
COLOR routeColor = #ff000088;
COLOR trackColor = #10a000a0;
+ COLOR highlightedColor = @routeColor;
// Ground tiles
@@ -151,6 +161,7 @@
COLOR landColor = #333333;
COLOR unknownColor = #000000;
}
+ COLOR seaColor = @waterColor;
// Default label color
IF daylight {
@@ -210,6 +221,7 @@
COLOR greenFieldColor = #dcdcc8;
COLOR heathColor = #ffffc0;
COLOR industrialColor = #dfd1d6;
+ COLOR damColor = #b2a7ab;
IF daylight {
COLOR landFillColor = #b6b591;
@@ -247,6 +259,7 @@
// Ways
COLOR bridgeColor = #000000; // black
+ COLOR cyclewayColor = #ec47c7;
IF daylight {
COLOR motorwayColor = #4440ec; // dark blue
@@ -275,6 +288,13 @@
COLOR wayLabelColor = #cccccc;
}
+ COLOR thinRoadColor = #a08080;
+ COLOR thinMotorwayColor = lighten(@motorwayColor,0.3);
+ COLOR thinTrunkColor = lighten(@trunkColor,0.3);
+ COLOR thinPrimaryColor = lighten(@primaryColor,0.3);
+ COLOR thinSecondaryColor = #fdd654;
+ COLOR thinTertiaryColor = #fefe73;
+
COLOR motorwayShieldColor = @motorwayColor;
COLOR motorwayJunctionLabelColor = lighten(@motorwayColor, 0.5);
COLOR trunkShieldColor = @trunkColor;
@@ -343,10 +363,12 @@
IF daylight {
COLOR amenityColor = #f0f0d8;
COLOR amenityBuildingColor = #d9b8b8;
+ COLOR amenityGraveYardColor = #bde3cb;
}
ELSE {
COLOR amenityColor = darken(#f0f0d8, 0.5);
COLOR amenityBuildingColor = darken(#d9b8b8, 0.5);
+ COLOR amenityGraveYardColor = darken(#bde3cb, 0.5);
}
COLOR amenityLabelColor = darken(@amenityBuildingColor, 0.5);
COLOR amenityBuildingBorderColor = darken(@amenityBuildingColor, 0.3);
@@ -383,314 +405,21 @@
COLOR waypointBlueColor = #203bb3;
COLOR waypointYellowColor = #dfed00;
- SYMBOL viaFerrataEasyCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataEasyColor; }
- }
-
- SYMBOL viaFerrataModerateCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataModerateColor; }
- }
-
- SYMBOL viaFerrataDifficultCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataDifficultColor; }
- }
-
- SYMBOL viaFerrataExtremeCross
- POLYGON -0.5,-0.5 0.5,0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
- }
- POLYGON -0.5,0.5 0.5,-0.5 {
- AREA.BORDER { width: 0.1mm; color: @viaFerrataExtremeColor; }
- }
-
- SYMBOL oneway_arrow
- POLYGON 0,0.5 1,0 0,-0.5 {
- AREA { color: @onewayArrowColor; }
- }
-
- SYMBOL stream_arrow
- POLYGON 0,0.5 1,0 0,-0.5 {
- AREA { color: @waterLabelColor; }
- }
-
- SYMBOL natural_peak
- POLYGON -0.75,0 0.75,0 0.0,-1.5 {
- AREA { color: @peakSymbolColor; }
- }
-
- SYMBOL railway_station
- RECTANGLE 0,0 2 x 2 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL railway_halt
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL railway_tram_stop
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @railwaySymbolColor; }
- }
-
- SYMBOL highway_bus_stop
- CIRCLE 0,0 1.5 {
- AREA {color: @busSymbolColor; }
- }
-
- SYMBOL amenity
- RECTANGLE 0,0 1 x 1 {
- AREA {color: #b89c9c; }
- }
-
- SYMBOL amenity_hospital
- CIRCLE 0,0 1.2 {
- AREA.BORDER {color: @hospitalSymbolColor; width: 0.2mm; }
- }
- // Horizontal bar
- RECTANGLE -0.75,-0.25 1.5 x 0.5 {
- AREA { color: @hospitalSymbolColor; }
- }
- // Vertical bar
- RECTANGLE -0.25,-0.75 0.5 x 1.5 {
- AREA { color: @hospitalSymbolColor; }
- }
-
- SYMBOL amenity_pharmacy
- // Box
- RECTANGLE -1,-1 2 x 2 {
- AREA.BORDER {color: @pharmacySymbolColor; width: 0.2mm; }
- }
- // Horizontal bar
- RECTANGLE -0.75,-0.25 1.5 x 0.5 {
- AREA { color: @pharmacySymbolColor; }
- }
- // Vertical bar
- RECTANGLE -0.25,-0.75 0.5 x 1.5 {
- AREA {color: @pharmacySymbolColor; }
- }
-
- SYMBOL amenity_parking
- CIRCLE 0,0 1.5 {
- AREA {color: #4bb2da; }
- }
-
- SYMBOL amenity_post_box
- RECTANGLE 0,0 1 x 1 {
- AREA { color: @postSymbolColor; }
- }
-
- SYMBOL amenity_post_office
- RECTANGLE 0,0 2 x 2 {
- AREA { color: @postSymbolColor; }
- }
-
- SYMBOL christian_church_cross
- RECTANGLE 0.5,-2 0.5 x 2 {
- AREA { color: #000000; } // vertical bar
- }
- RECTANGLE 0,-1.5 1.5 x 0.5 {
- AREA { color: #000000; } // horizontal bar
- }
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/cs.ts
^
|
| @@ -2574,6 +2574,10 @@
<source>hikingRoutes</source>
<translation>Turistické trasy</translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation>MTB trasy</translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2597,5 +2601,9 @@
<source>outdoor</source>
<translation>Outdoor</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation>Cyklo</translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/de.ts
^
|
| @@ -819,11 +819,11 @@
<message>
<source>Share place link</source>
<extracomment>Page header for share method selection</extracomment>
- <translation type="unfinished">Teile Orts als link</translation>
+ <translation>Teile Ort als Link</translation>
</message>
<message>
<source>Edit waypoint</source>
- <translation type="unfinished">Bearbeite Wegpunkt</translation>
+ <translation>Bearbeite Wegpunkt</translation>
</message>
<message>
<source>ETA %1</source>
@@ -845,7 +845,7 @@
<message>
<source>Deleting</source>
<extracomment>remorse dialog</extracomment>
- <translation type="unfinished">Lösche</translation>
+ <translation>Lösche</translation>
</message>
</context>
<context>
@@ -1717,7 +1717,7 @@
<message>
<source>northwest</source>
<extracomment>in sense indicating location of some place: "place is located NORTHWEST"</extracomment>
- <translation>Norwest</translation>
+ <translation>Nordwest</translation>
</message>
<message>
<source>feet</source>
@@ -1826,279 +1826,279 @@
</message>
<message>
<source>amenity_atm</source>
- <translation type="unfinished"></translation>
+ <translation>Geldautomat</translation>
</message>
<message>
<source>amenity_bar</source>
- <translation type="unfinished"></translation>
+ <translation>Bar</translation>
</message>
<message>
<source>amenity_cafe</source>
- <translation type="unfinished"></translation>
+ <translation>Café</translation>
</message>
<message>
<source>amenity_cafe_building</source>
- <translation type="unfinished"></translation>
+ <translation>Café</translation>
</message>
<message>
<source>amenity_drinking_water</source>
- <translation type="unfinished"></translation>
+ <translation>Trinkwasserquelle</translation>
</message>
<message>
<source>amenity_fast_food</source>
- <translation type="unfinished"></translation>
+ <translation>Fast Food</translation>
</message>
<message>
<source>amenity_fast_food_building</source>
- <translation type="unfinished"></translation>
+ <translation>Fast Food</translation>
</message>
<message>
<source>amenity_ferry_terminal</source>
- <translation type="unfinished"></translation>
+ <translation>Fährhafen</translation>
</message>
<message>
<source>amenity_fuel</source>
- <translation type="unfinished"></translation>
+ <translation>Tankstelle</translation>
</message>
<message>
<source>amenity_fuel_building</source>
- <translation type="unfinished"></translation>
+ <translation>Tankstelle</translation>
</message>
<message>
<source>amenity_charging_station</source>
- <translation type="unfinished"></translation>
+ <translation>Ladestation</translation>
</message>
<message>
<source>amenity_parking</source>
- <translation type="unfinished"></translation>
+ <translation>Parken</translation>
</message>
<message>
<source>amenity_parking_building</source>
- <translation type="unfinished"></translation>
+ <translation>Parken</translation>
</message>
<message>
<source>amenity_pharmacy</source>
- <translation type="unfinished"></translation>
+ <translation>Apotheke</translation>
</message>
<message>
<source>amenity_post_box</source>
- <translation type="unfinished"></translation>
+ <translation>Briefkasten</translation>
</message>
<message>
<source>amenity_post_office</source>
- <translation type="unfinished"></translation>
+ <translation>Postfiliale</translation>
</message>
<message>
<source>amenity_pub</source>
- <translation type="unfinished"></translation>
+ <translation>Kneipe</translation>
</message>
<message>
<source>amenity_recycling</source>
- <translation type="unfinished"></translation>
+ <translation>Recycling Container</translation>
</message>
<message>
<source>amenity_restaurant</source>
- <translation type="unfinished"></translation>
+ <translation>Restaurant</translation>
</message>
<message>
<source>amenity_restaurant_building</source>
- <translation type="unfinished"></translation>
+ <translation>Restaurant</translation>
</message>
<message>
<source>amenity_toilets</source>
- <translation type="unfinished"></translation>
+ <translation>Toiletten</translation>
</message>
<message>
<source>_highlighted</source>
- <translation type="unfinished"></translation>
+ <translation>Markiertes Objekt</translation>
</message>
<message>
<source>highway_bus_stop</source>
- <translation type="unfinished"></translation>
+ <translation>Bushaltestelle</translation>
</message>
<message>
<source>highway_mini_roundabout</source>
- <translation type="unfinished"></translation>
+ <translation>kleiner Kreisverkehr</translation>
</message>
<message>
<source>highway_street_lamp</source>
- <translation type="unfinished"></translation>
+ <translation>Straßenlaterne</translation>
</message>
<message>
<source>historic_castle</source>
- <translation type="unfinished"></translation>
+ <translation>Burg</translation>
</message>
<message>
<source>historic_castle_building</source>
- <translation type="unfinished"></translation>
+ <translation>Burg</translation>
</message>
<message>
<source>historic_memorial</source>
- <translation type="unfinished"></translation>
+ <translation>Gedenkstätte</translation>
</message>
<message>
<source>historic_memorial_building</source>
- <translation type="unfinished"></translation>
+ <translation>Gedenkstätte</translation>
</message>
<message>
<source>historic_monument</source>
- <translation type="unfinished"></translation>
+ <translation>Denkmal</translation>
</message>
<message>
<source>historic_monument_building</source>
- <translation type="unfinished"></translation>
+ <translation>Denkmal</translation>
</message>
<message>
<source>leisure_playground</source>
- <translation type="unfinished"></translation>
+ <translation>Spielplatz</translation>
</message>
<message>
<source>natural_peak</source>
- <translation type="unfinished"></translation>
+ <translation>Gipfel</translation>
</message>
<message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/en.ts
^
|
| @@ -2573,6 +2573,10 @@
<source>hikingRoutes</source>
<translation>Hiking routes</translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation>Mountain bike routes</translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2596,5 +2600,9 @@
<source>outdoor</source>
<translation>Outdoor</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation>Cycle</translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/es.ts
^
|
| @@ -2573,6 +2573,10 @@
<source>hikingRoutes</source>
<translation>RutasDeSenderismo</translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2596,5 +2600,9 @@
<source>outdoor</source>
<translation>al aire libre</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/et.ts
^
|
| @@ -2573,6 +2573,10 @@
<source>hikingRoutes</source>
<translation>Matkarajad</translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation>Mägiratastele sobivad rajad</translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2596,5 +2600,9 @@
<source>outdoor</source>
<translation>Välitingimused</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation>Jalgratas</translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/fa.ts
^
|
| @@ -2572,6 +2572,10 @@
<source>hikingRoutes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2595,5 +2599,9 @@
<source>outdoor</source>
<translation>Outdoor</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/fr.ts
^
|
| @@ -2573,6 +2573,10 @@
<source>hikingRoutes</source>
<translation>Randonnées pédestres</translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2596,5 +2600,9 @@
<source>outdoor</source>
<translation>Extérieur</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/hu.ts
^
|
| @@ -2572,6 +2572,10 @@
<source>hikingRoutes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2595,5 +2599,9 @@
<source>outdoor</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/it.ts
^
|
| @@ -2573,6 +2573,10 @@
<source>hikingRoutes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2596,5 +2600,9 @@
<source>outdoor</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/nb.ts
^
|
| @@ -2573,6 +2573,10 @@
<source>hikingRoutes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2596,5 +2600,9 @@
<source>outdoor</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/nl.ts
^
|
| @@ -2573,6 +2573,10 @@
<source>hikingRoutes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2596,5 +2600,9 @@
<source>outdoor</source>
<translation>Openlucht</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/nl_BE.ts
^
|
| @@ -2573,6 +2573,10 @@
<source>hikingRoutes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2596,5 +2600,9 @@
<source>outdoor</source>
<translation>Openlucht</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/pl.ts
^
|
| @@ -2079,11 +2079,11 @@
</message>
<message>
<source>tourism_chalet</source>
- <translation type="unfinished"></translation>
+ <translation>szalet</translation>
</message>
<message>
<source>tourism_chalet_building</source>
- <translation type="unfinished"></translation>
+ <translation>szalet</translation>
</message>
<message>
<source>tourism_information</source>
@@ -2574,6 +2574,10 @@
<source>hikingRoutes</source>
<translation>trasy turystyczne</translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation>Trasy MTB</translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2597,5 +2601,9 @@
<source>outdoor</source>
<translation>na zewnątrz</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation>rowerowa</translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/pt_BR.ts
^
|
| @@ -2573,6 +2573,10 @@
<source>hikingRoutes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2596,5 +2600,9 @@
<source>outdoor</source>
<translation>Ao ar livre</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/ru.ts
^
|
| @@ -2574,6 +2574,10 @@
<source>hikingRoutes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2597,5 +2601,9 @@
<source>outdoor</source>
<translation>походный</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/sv.ts
^
|
| @@ -2573,6 +2573,10 @@
<source>hikingRoutes</source>
<translation>Vandringsleder</translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation>Mountainbike-leder</translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2596,5 +2600,9 @@
<source>outdoor</source>
<translation>Utomhus</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation>Cykel</translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.24.tar.bz2/translations/zh_CN.ts
^
|
| @@ -2572,6 +2572,10 @@
<source>hikingRoutes</source>
<translation>徒步路线</translation>
</message>
+ <message>
+ <source>mtbRoutes</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>stylesheet</name>
@@ -2595,5 +2599,9 @@
<source>outdoor</source>
<translation>户外</translation>
</message>
+ <message>
+ <source>cycle</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout.changes.in
^
|
| @@ -542,3 +542,12 @@
- fix amenity_atm icon
- active (clickable) map icons / symbols
- update translations (Czech, Estonian, Polish, Swedish)
+
+* 2022-06-11 Lukáš Karas <lukas.karas@centrum.cz> 2.24
+- update translations (Czech, Estonian, German, Polish, Swedish)
+- add Cycle stylesheet. Thanks to Jean-Luc Barrière, aka janbar
+- remove Boundaries stylesheet, it was there mainly for debugging
+- display power lines (and towers, poles) in outdoor stylesheet
+- separate flags for road and MTB cycle routes in outdoor stylesheet
+- fix English labels with outdoor stylesheet
+- initial support for night colors in outdoor stylesheet
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout.yaml
^
|
| @@ -1,6 +1,6 @@
Name: harbour-osmscout
Summary: OSMScout for Sailfish
-Version: 2.23
+Version: 2.24
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
|
