|
[-]
[+]
|
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.33</param>
+ <param name="revision">v2.34</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/CMakeMod/FindICONV.cmake
^
|
| @@ -1,77 +0,0 @@
-# - Try to find Iconv
-# Once done this will define
-#
-# ICONV_FOUND - system has Iconv
-# ICONV_INCLUDE_DIR - the Iconv include directory
-# ICONV_LIBRARIES - Link these to use Iconv
-# ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
-#
-include(CheckCCompilerFlag)
-include(CheckCSourceCompiles)
-
-#if (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
- # Already in cache, be silent
-# set(ICONV_FIND_QUIETLY TRUE)
-#endif ()
-
-if(APPLE)
- find_path(ICONV_INCLUDE_DIR iconv.h
- PATHS
- /opt/local/include/
- NO_CMAKE_SYSTEM_PATH
- )
-
- find_library(ICONV_LIBRARIES NAMES iconv libiconv c
- PATHS
- /opt/local/lib/
- NO_CMAKE_SYSTEM_PATH
- )
-endif()
-
-find_path(ICONV_INCLUDE_DIR iconv.h PATHS /opt/local/include /sw/include /usr/include /usr/local/include)
-
-string(REGEX REPLACE "(.*)/include/?" "\\1" ICONV_INCLUDE_BASE_DIR "${ICONV_INCLUDE_DIR}")
-
-find_library(ICONV_LIBRARIES NAMES libiconv iconv libiconv.lib libiconv.dylib)
-
-if(NOT ICONV_LIBRARIES AND UNIX)
- find_library(ICONV_LIBRARIES NAMES c libc)
-endif()
-
-if(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
- set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
- set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
- check_c_compiler_flag("-Werror" ICONV_HAVE_WERROR)
- set (CMAKE_C_FLAGS_BACKUP "${CMAKE_C_FLAGS}")
- if(ICONV_HAVE_WERROR)
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
- endif(ICONV_HAVE_WERROR)
- check_c_source_compiles("
- #include <iconv.h>
- int main(){
- iconv_t conv = 0;
- const char* in = 0;
- size_t ilen = 0;
- char* out = 0;
- size_t olen = 0;
- iconv(conv, &in, &ilen, &out, &olen);
- return 0;
- }
- " ICONV_SECOND_ARGUMENT_IS_CONST )
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}")
-endif()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ICONV DEFAULT_MSG ICONV_INCLUDE_DIR ICONV_LIBRARIES)
-
-# Copy the results to the output variables.
-if(ICONV_FOUND)
- set(ICONV_LIBRARY ${ICONV_LIBRARIES})
- set(ICONV_INCLUDE_DIRS ${ICONV_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(
- ICONV_INCLUDE_DIR
- ICONV_LIBRARIES
- ICONV_SECOND_ARGUMENT_IS_CONST
-)
\ No newline at end of file
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/.circleci/config.yml
^
|
| @@ -1,25 +0,0 @@
-version: 2
-jobs:
- build:
- docker:
- - image: libosmscout/archlinux_gcc_cmake:latest
- environment:
- TZ: "/usr/share/zoneinfo/Europe/Berlin"
- LANG: "en_US.utf8"
- branches:
- only:
- - master
- - pull/*
- steps:
- - checkout
- - run:
- name: Configure project
- command: cmake -B build -DCMAKE_UNITY_BUILD=ON -DOSMSCOUT_BUILD_BINDING_JAVA=OFF -Wno-dev
- - run:
- name: Build project
- command: cmake --build build
- - run:
- name: Test project
- command: ctest -j 2 --output-on-failure
- working_directory: build
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/.travis.yml
^
|
| @@ -1,41 +0,0 @@
-language: cpp
-
-branches:
- only:
- - master
-
-matrix:
- include:
- - os: linux
- dist: bionic
- sudo: required
- compiler: gcc
- env:
- - BUILDTOOL=cmake
- - TARGET=importer
- - IMPORT_TOOL_OS=Linux
- - IMPORT_TOOL_ARCH=x86_64
-
-before_install:
- - $TRAVIS_BUILD_DIR/ci/travis/install.sh
-
-script:
- - $TRAVIS_BUILD_DIR/ci/travis/build.sh
-
-notifications:
- email:
- recipients:
- - tim@framstag.com
- on_success: change
- on_failure: always
-
-deploy:
- provider: releases
- api_key:
- secure: VtjyOqGYuL4LcStX0LqFJ+3jK9ojgEUKqyO7ZjukFscxGpH6zvHGb8whgHUugu+xyb4K3sZf/uqBE1gvQsbCgAltUc1akZczN61Jlwg2kb0KQqQKMKyr944+nDrLU3H7HpdLHEBR5FgrVmggjY4BeU3XYO2e+niyccpGCj5T6ocV0N3oQ1pI1wtWC6JwWViG4JA6K4uszpj/d0koQ1ncIFkEp8C7jk/j67FeSzemDVmNaHCIJOQdOf4lR4z5JvDAjsMtEfFtPvZyo4eJuHkpc7cU2FZeWmkkTHfMRZQkVBplxExQofzaZ9oN1I5VX+kiOQltH5jCFbh+8oWxHEGir5/Hy+6WfQzIjHF40Ane/Ri521ZDrxLky5QMdC4/U2cgB1WkHwuoYlWwCyB90n2Hjn1VCNABhuVXnhAu6YY+cAf+Z5nwbh5sT3LRk1lWuC9aGOSWsG/Ye5gPIk1GyW1k/kDr89J0jyuXd065JTT371mRScME4NMaUAHt/nHqonvUXQwYwNr1wjOf3XAfHVzSiByROuaYlTBgCG01+0wpRL0DSTE5072+3r6Piab7oX7j/EHgZ2rVCxSHPT8AlPl3LpJYesfZuj1WaJMaNXTIFWLBf4H8JnkoqBwdrhHQJK/XjqPENiY3saXpvd2O3G1KY3vAeLAP2uTvAJPSR9Pj8k4=
- file: build-import/libosmscout-importer.$IMPORT_TOOL_OS.$IMPORT_TOOL_ARCH.tar.gz
- skip_cleanup: true
- on:
- tags: true
- repo: Framstag/libosmscout
- condition: $TARGET = importer
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX/AppDelegate.h
^
|
| @@ -1,15 +0,0 @@
-//
-// AppDelegate.h
-// OSMScoutOSX
-//
-// Created by Vladimir Vyskocil on 18/08/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface AppDelegate : NSObject <NSApplicationDelegate>
-
-@property (assign) IBOutlet NSWindow *window;
-
-@end
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX/AppDelegate.m
^
|
| @@ -1,16 +0,0 @@
-//
-// AppDelegate.m
-// OSMScoutOSX
-//
-// Created by Vladimir Vyskocil on 18/08/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import "AppDelegate.h"
-
-@implementation AppDelegate
-
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
-}
-
-@end
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX/OSMScoutView.h
^
|
| @@ -1,18 +0,0 @@
-//
-// OSMScoutView.h
-// OSMScoutOSX
-//
-// Created by Vladimir Vyskocil on 18/08/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-#import <CoreLocation/CoreLocation.h>
-#import <MapKit/MapKit.h>
-#import "OSMScout.h"
-
-@interface OSMScoutView : MKMapView <MKMapViewDelegate> {
- MKTileOverlay *tileOverlay;
-}
-
-@end
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX/OSMScoutView.m
^
|
| @@ -1,59 +0,0 @@
-//
-// OSMScoutView.m
-// OSMScoutOSX
-//
-// Created by Vladimir Vyskocil on 18/08/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import "OSMScoutView.h"
-#import "OSMScoutMKTileOverlay.h"
-
-@implementation OSMScoutView
-
-// The OpenStreetMap imported data used to draw the map are provided by the map.osmscout folder
-// in the Resources of the project, by default this is the Greater London from GeoFabrik
-// (https://download.geofabrik.de/europe/great-britain/england/greater-london.html)
-
-// The center of the displayed map
-#define LATITUDE 51.5102
-#define LONGITUDE -0.1024
-// The zoom level
-#define ZOOM 16
-
--(void)defaults {
- CLLocationCoordinate2D centerCoordinate = CLLocationCoordinate2DMake(LATITUDE, LONGITUDE);
- MKCoordinateSpan span = MKCoordinateSpanMake(0, 360/pow(2, ZOOM)*self.frame.size.width/256);
- [self setRegion:MKCoordinateRegionMake(centerCoordinate, span) animated:NO];
- self.delegate = self;
- OSMScoutMKTileOverlay *overlay = [[OSMScoutMKTileOverlay alloc] initWithURLTemplate: nil];
- NSString *path = [[[NSBundle mainBundle] resourcePath] stringByAppendingString: @"/map.osmscout"];
- OSMScoutMKTileOverlay.path = path;
- tileOverlay = overlay;
- [self insertOverlay:tileOverlay atIndex:0 level:MKOverlayLevelAboveLabels];
-}
-
-- (void)awakeFromNib {
- [super awakeFromNib];
- [self defaults];
-}
-
-- (id)initWithFrame:(NSRect)frame {
- self = [super initWithFrame:frame];
- if (self) {
- }
-
- return self;
-}
-
-#pragma mark - MKMapViewDelegate
-
-- (MKOverlayRenderer *)mapView:(MKMapView *)mapView rendererForOverlay:(id<MKOverlay>)overlay {
- if ([overlay isKindOfClass:[MKTileOverlay class]]) {
- return [[MKTileOverlayRenderer alloc] initWithTileOverlay:overlay];
- } else {
- return nil;
- }
-}
-
-@end
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX/OSMScoutViewController.h
^
|
| @@ -1,13 +0,0 @@
-//
-// OSMScoutViewController.h
-// OSMScoutOSX
-//
-// Created by Vladimir Vyskocil on 18/08/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface OSMScoutViewController : NSViewController
-
-@end
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX/OSMScoutViewController.m
^
|
| @@ -1,26 +0,0 @@
-//
-// OSMScoutViewController.m
-// OSMScoutOSX
-//
-// Created by Vladimir Vyskocil on 18/08/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import "OSMScoutViewController.h"
-
-@interface OSMScoutViewController ()
-
-@end
-
-@implementation OSMScoutViewController
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
- self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
- if (self) {
- }
-
- return self;
-}
-
-@end
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX/main.m
^
|
| @@ -1,14 +0,0 @@
-//
-// main.m
-// OSMScoutOSX
-//
-// Created by Vladimir Vyskocil on 18/08/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-int main(int argc, char *argv[])
-{
- return NSApplicationMain(argc, (const char **)argv);
-}
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/AppDelegate.h
^
|
| @@ -1,19 +0,0 @@
-//
-// AppDelegate.h
-// OSMScoutiOS
-//
-// Created by Vladimir Vyskocil on 20/09/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@class OSMScoutIOSViewController;
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@property (strong, nonatomic) OSMScoutIOSViewController *viewController;
-
-@end
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/AppDelegate.m
^
|
| @@ -1,29 +0,0 @@
-//
-// AppDelegate.m
-// OSMScoutiOS
-//
-// Created by Vladimir Vyskocil on 20/09/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import "AppDelegate.h"
-
-#import "OSMScoutIOSViewController.h"
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
- self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
- // Override point for customization after application launch.
- if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
- self.viewController = [[OSMScoutIOSViewController alloc] initWithNibName:@"OSMScoutIOSViewController_iPhone" bundle:nil];
- } else {
- self.viewController = [[OSMScoutIOSViewController alloc] initWithNibName:@"OSMScoutIOSViewController_iPad" bundle:nil];
- }
- self.window.rootViewController = self.viewController;
- [self.window makeKeyAndVisible];
- return YES;
-}
-
-@end
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/OSMScoutIOSView.h
^
|
| @@ -1,18 +0,0 @@
-//
-// OSMScoutIOSView.h
-// OSMScoutOSX
-//
-// Created by Vladimir Vyskocil on 22/09/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <CoreLocation/CoreLocation.h>
-#import <MapKit/MapKit.h>
-#import "OSMScout.h"
-
-@interface OSMScoutIOSView : MKMapView <MKMapViewDelegate> {
- MKTileOverlay *tileOverlay;
-}
-
-@end
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/OSMScoutIOSView.m
^
|
| @@ -1,63 +0,0 @@
-//
-// OSMScoutIOSView.m
-// OSMScoutOSX
-//
-// Created by Vladimir Vyskocil on 22/09/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import "OSMScoutIOSView.h"
-#import "OSMScoutMKTileOverlay.h"
-
-@implementation OSMScoutIOSView
-
-// The OpenStreetMap imported data used to draw the map are provided by the map.osmscout folder
-// in the Resources of the project, by default this is the Greater London from GeoFabrik
-// (https://download.geofabrik.de/europe/great-britain/england/greater-london.html)
-
-// The center of the displayed map
-#define LATITUDE 51.5102
-#define LONGITUDE -0.1024
-// The zoom level
-#define ZOOM 16
-
--(void)defaults {
- [self setShowsTraffic:NO];
- [self setShowsBuildings:NO];
- [self setShowsPointsOfInterest:NO];
-
- CLLocationCoordinate2D centerCoordinate = CLLocationCoordinate2DMake(LATITUDE, LONGITUDE);
- MKCoordinateSpan span = MKCoordinateSpanMake(0, 360/pow(2, ZOOM)*self.frame.size.width/256);
- [self setRegion:MKCoordinateRegionMake(centerCoordinate, span) animated:NO];
- self.delegate = self;
- OSMScoutMKTileOverlay *overlay = [[OSMScoutMKTileOverlay alloc] initWithURLTemplate: nil];
- NSString *path = [[[NSBundle mainBundle] resourcePath] stringByAppendingString: @"/map.osmscout"];
- OSMScoutMKTileOverlay.path = path;
- tileOverlay = overlay;
- [self insertOverlay:tileOverlay atIndex:0 level:MKOverlayLevelAboveLabels];
-}
-
-- (void)awakeFromNib {
- [super awakeFromNib];
- [self defaults];
-}
-
-- (id)initWithFrame:(CGRect)frame {
- self = [super initWithFrame:frame];
- if (self) {
- [self defaults];
- }
- return self;
-}
-
-#pragma mark - MKMapViewDelegate
-
-- (MKOverlayRenderer *)mapView:(MKMapView *)mapView rendererForOverlay:(id<MKOverlay>)overlay {
- if ([overlay isKindOfClass:[MKTileOverlay class]]) {
- return [[MKTileOverlayRenderer alloc] initWithTileOverlay:overlay];
- } else {
- return nil;
- }
-}
-
-@end
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/OSMScoutIOSViewController.h
^
|
| @@ -1,13 +0,0 @@
-//
-// ViewController.h
-// OSMScoutiOS
-//
-// Created by Vladimir Vyskocil on 20/09/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface OSMScoutIOSViewController : UIViewController
-
-@end
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/OSMScoutIOSViewController.m
^
|
| @@ -1,25 +0,0 @@
-//
-// ViewController.m
-// OSMScoutiOS
-//
-// Created by Vladimir Vyskocil on 20/09/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import "OSMScoutIOSViewController.h"
-
-@interface OSMScoutIOSViewController ()
-
-@end
-
-@implementation OSMScoutIOSViewController
-
-- (void)viewDidLoad {
- [super viewDidLoad];
-}
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
-}
-
-@end
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/areaarea.idx
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/areanode.idx
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/arearoute.idx
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/areas.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/areasopt.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/areaway.idx
^
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/bounding.dat
^
|
| @@ -1 +0,0 @@
-ÿØFúü69MFF
\ No newline at end of file
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/coverage.idx
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/atm.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/atm@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/atm@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/bank.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/bank@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/bank@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/beach.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/beach@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/beach@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/buddhist.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/buddhist@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/buddhist@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/bus_stop.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/bus_stop@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/bus_stop@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/bus_stop_small.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/bus_stop_small@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/bus_stop_small@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/cafe.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/cafe@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/cafe@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/camp.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/camp@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/camp@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/cave.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/cave@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/cave@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/cemetery.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/cemetery@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/cemetery@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/christian.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/christian@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/christian@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/fastfood.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/fastfood@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/fastfood@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/forest.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/forest@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/forest@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/fuel.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/fuel@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/fuel@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/guidepost.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/guidepost@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/guidepost@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/hospital.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/hospital@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/hospital@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/hotel.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/hotel@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/hotel@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/jewish.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/jewish@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/jewish@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/museum.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/museum@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/museum@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/muslim.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/muslim@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/muslim@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/parking.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/parking@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/parking@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/pharmacy.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/pharmacy@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/pharmacy@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/radar.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/radar@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/radar@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/restaurant.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/restaurant@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/restaurant@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/scree.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/scree@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/scree@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/scrub.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/scrub@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/scrub@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/shinto.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/shinto@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/shinto@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/subway_entrance.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/subway_entrance@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/subway_entrance@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/town.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/town@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/town@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/viewpoint.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/viewpoint@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/viewpoint@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/waterfall.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/waterfall@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/waterfall@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/wetland.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/wetland@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/wetland@3x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/worship.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/worship@2x.png
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/icons/worship@3x.png
^
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/import.log
^
|
| @@ -1,7602 +0,0 @@
-+ Dump parameter...
- Mapfile: ../greater-london.osm.pbf
- typefile: map.ost
- Destination directory: .
- Steps: 1 - 28
- Router: foot+bicycle+car - 'router'
- StrictAreas: false
- ProcessingQueueSize: 8
- NumericIndexPageSize: 1024
- RawCoordBlockSize: 60000000
- RawNodeDataMemoryMaped: false
- RawWayIndexMemoryMaped: true
- RawWayDataMemoryMaped: false
- RawWayIndexCacheSize: 10000
- RawWayBlockSize: 500000
- SortObjects: true
- SortBlockSize: 40000000
- CoordDataMemoryMaped: false
- CoordIndexCacheSize: 1000000
- CoordBlockSize: 250000
- AreaDataMemoryMaped: false
- AreaDataCacheSize: 0
- WayDataMemoryMaped: false
- WayDataCacheSize: 0
- AreaNodeGridMag: 14
- AreaNodeSimpleListLimit: 500
- AreaNodeTileListLimit: 100
- AreaNodeTileListCoordLimit: 1000
- AreaNodeBitmapMaxMag: 20
- AreaNodeBitmapLimit: 20
- RouteNodeBlockSize: 500000
- MaxAdminLevel: 10
- Eco: false
-+ Loading type config...
- Number of types: 478
- Number of node types: 220 1 byte(s)
- Number of way types: 90 1 byte(s)
- Number of area types: 269 2 byte(s)
- Parsed language(s) :
- default
- Parsed alt language(s) :
-+ Step #1 - TypeDataGenerator...
- Module description: Dump *.ost information into data file
- Module provides file 'types.dat'
- - Generate types.dat...
- Number of types: 478
- => 0.001s
-+ Step #2 - Preprocess...
- Module description: Initial parsing of import file(s)
- Module provides file 'bounding.dat'
- Module provides temporary file 'distribution.dat'
- Module provides temporary file 'rawcoords.dat'
- Module provides temporary file 'rawnodes.dat'
- Module provides temporary file 'rawways.dat'
- Module provides temporary file 'rawrels.dat'
- Module provides temporary file 'rawcoastline.dat'
- Module provides temporary file 'rawdatapolygon.dat'
- Module provides temporary file 'rawturnrestr.dat'
- Module provides temporary file 'rawroutemaster.dat'
- Module provides temporary file 'rawroute.dat'
- Using 8 block worker threads with queue size of 8
- - Parsing *.osm.pbf file '../greater-london.osm.pbf'...
- Feature 'OsmSchema-V0.6'
- Feature 'DenseNodes'
- Start reading nodes
- Start reading ways
- WW Way 2876749 "Lamb's Conduit Street" - Unknown surface type 'brick' !
- WW Way 3993338 "Grant Way" - Should be way but is area (highway_service)
- WW Way 4006321 - Should be way but is area (highway_service)
- WW Way 4020011 "Garratt Lane" - No oneway, but turn:lanes tag is set
- WW Way 4256528 "Embankment Place" - Unknown surface type 'brick' !
- WW Way 4258107 "Strutton Ground" - Unknown surface type 'bricks' !
- WW Way 4259629 "New Palace Yard" - Should be way but is area (highway_service)
- WW Way 4408045 "High Street" - Unknown surface type 'bricks' !
- WW Way 4408048 "High Street" - Unknown surface type 'bricks' !
- WW Way 4776112 - Should be way but is area (highway_service)
- WW Way 4830161 - Should be way but is area (highway_service)
- WW Way 5172957 - Should be way but is area (highway_service)
- WW Way 5182530 - Should be way but is area (highway_service)
- WW Way 4874240 - Should be way but is area (highway_service)
- WW Way 5215364 - Should be way but is area (highway_service)
- WW Way 5372139 - Should be way but is area (highway_service)
- WW Way 5372248 - Should be way but is area (highway_service)
- WW Way 5373005 - Should be way but is area (highway_service)
- WW Way 5373567 "Southgate Road" - Should be way but is area (highway_service)
- WW Way 5374597 - Should be way but is area (highway_service)
- WW Way 5562016 - Should be way but is area (highway_service)
- WW Way 5562974 - Should be way but is area (highway_service)
- WW Way 5718033 "Wapping High Street" - Unknown surface type 'unhewn_cobblestone' !
- WW Way 8133666 - Should be way but is area (highway_service)
- WW Way 8173112 - Should be way but is area (highway_service)
- WW Way 7954850 - Should be way but is area (highway_service)
- WW Way 7979369 - Should be way but is area (highway_service)
- WW Way 7998240 - Should be way but is area (highway_service)
- WW Way 10484670 - Should be way but is area (highway_service)
- WW Way 10604409 - Should be way but is area (highway_service)
- WW Way 9348937 - Unknown surface type 'paved:gravel' !
- WW Way 10605399 - Should be way but is area (highway_service)
- WW Way 10781184 - Should be way but is area (highway_service)
- WW Way 10874179 - Should be way but is area (highway_service)
- WW Way 10054378 - Should be way but is area (highway_service)
- WW Way 10068364 - Should be way but is area (highway_service)
- WW Way 10132845 - Should be way but is area (highway_service)
- WW Way 11549791 - Should be way but is area (highway_service)
- WW Way 11849696 - Should be way but is area (highway_service)
- WW Way 12704451 - Should be way but is area (highway_service)
- WW Way 13853832 - Should be way but is area (highway_service)
- WW Way 13868585 - Should be area but is way (boundary_political)
- WW Way 13869316 - Should be way but is area (highway_service)
- WW Way 18658325 "Wandle Bank" - Unknown surface type 'hardcore' !
- WW Way 19797445 - Should be way but is area (highway_service)
- WW Way 22753552 - Should be area but is way (boundary_political)
- WW Way 22754344 - Should be way but is area (highway_service)
- WW Way 20064481 - Should be way but is area (highway_service)
- WW Way 23000187 "Montague Close" - Unknown surface type 'unhewn_cobblestone' !
- WW Way 23023275 - Should be way but is area (highway_service)
- WW Way 23059206 - Should be way but is area (highway_service)
- WW Way 23061772 - Should be way but is area (highway_service)
- WW Way 23062475 - Should be way but is area (highway_service)
- WW Way 22677151 - Should be way but is area (highway_service)
- WW Way 22715779 - Unknown surface type 'ramp' !
- WW Way 23089030 - Should be way but is area (highway_service)
- WW Way 23142091 - Should be way but is area (highway_service)
- WW Way 23181002 "Heaven Tree Close" - Unknown surface type 'brick' !
- WW Way 23197919 "Scarba Walk" - Unknown surface type 'brick' !
- WW Way 23256167 - Should be area but is way (boundary_political)
- WW Way 23269122 - Should be way but is area (highway_service)
- WW Way 23286277 "Brancroft Way" - Should be way but is area (highway_service)
- WW Way 23287275 - Should be way but is area (highway_service)
- WW Way 23518128 - Should be way but is area (highway_service)
- WW Way 23614039 - Should be way but is area (highway_service)
- WW Way 24002733 - Should be way but is area (highway_service)
- WW Way 24058552 - Should be way but is area (highway_service)
- WW Way 24224348 - Unknown surface type 'tarmac' !
- WW Way 24224349 - Unknown surface type 'grit' !
- WW Way 24224351 - Unknown surface type 'grit' !
- WW Way 24384858 - Should be way but is area (highway_service)
- WW Way 24497932 "St. Davids Square" - Should be way but is area (highway_service)
- WW Way 24539504 - Should be way but is area (highway_service)
- WW Way 24540507 - Should be way but is area (highway_service)
- WW Way 24540513 - Should be way but is area (highway_service)
- WW Way 25818556 - Layer tag value '-0.5' is not numeric!
- WW Way 24982183 - Should be way but is area (highway_service)
- WW Way 25842317 - Should be way but is area (highway_service)
- WW Way 25409586 "Fishponds Road" - lanes tag value '1.5' is not numeric!
- WW Way 26514409 - Should be way but is area (highway_service)
- WW Way 26644302 "Strutton Ground" - Unknown surface type 'bricks' !
- WW Way 26716302 "Staplefield Close" - Should be way but is area (highway_service)
- WW Way 26815664 "Cambridge Terrace Mews" - Should be way but is area (highway_service)
- WW Way 27236821 - Unknown surface type 'unhewn_cobblestone' !
- WW Way 27342326 - Should be way but is area (highway_service)
- WW Way 27416528 - Should be way but is area (highway_service)
- WW Way 29163690 "Yew Walk" - Unknown surface type 'bricks' !
- WW Way 29648153 - Should be way but is area (highway_service)
- WW Way 27890717 - Should be way but is area (highway_service)
- WW Way 30060848 - Should be area but is way (sport_climbing)
- WW Way 30073399 "Old Royal Free Place" - Unknown surface type 'brick' !
- WW Way 30079693 - Should be way but is area (highway_service)
- WW Way 30079876 - Should be way but is area (highway_service)
- WW Way 30119840 - Should be way but is area (highway_service)
- WW Way 28055218 - Should be way but is area (highway_service)
- WW Way 28460201 - Unknown surface type 'anti-slip' !
- WW Way 28460203 - Unknown surface type 'anti-slip' !
- WW Way 30450611 - Should be way but is area (highway_service)
- WW Way 30477237 "Lister Mews" - Should be way but is area (highway_service)
- WW Way 30694596 - Should be way but is area (highway_service)
- WW Way 33819640 - Unknown surface type 'slabs' !
- WW Way 31864684 "Lilliput Road" - Unknown surface type 'brick' !
- WW Way 34035709 - Should be way but is area (highway_service)
- WW Way 34196733 "Shaftesbury Circle" - Should be way but is area (highway_service)
- WW Way 34227504 - Should be way but is area (highway_service)
- WW Way 37760023 - Should be way but is area (highway_service)
- WW Way 31065470 - Should be way but is area (highway_service)
- WW Way 37804501 "Daling Way" - Unknown surface type 'tarmac' !
- WW Way 37809056 - Should be way but is area (highway_service)
- WW Way 37828411 - Should be way but is area (highway_service)
- WW Way 37879916 - Unknown surface type 'brick_weave' !
- WW Way 37937971 - Should be way but is area (highway_service)
- WW Way 37938372 - Should be way but is area (highway_service)
- WW Way 38087693 "FP183" - Unknown surface type 'slabs' !
- WW Way 38088414 "FP181" - Unknown surface type 'slabs' !
- WW Way 35164221 "Berry's Hill" - lanes tag value '1.5' is not numeric!
- WW Way 35213387 "Speedbird Way" - Should be way but is area (highway_service)
- WW Way 38240761 "Baskerville Gardens" - Should be way but is area (highway_service)
- WW Way 31120027 "Villiers Street" - Unknown surface type 'brick' !
- WW Way 38249219 - Should be way but is area (highway_service)
- WW Way 35434992 - Unknown surface type 'slabs' !
- WW Way 35434995 - Unknown surface type 'slabs' !
- WW Way 42003210 - Should be way but is area (highway_service)
- WW Way 35435900 - Unknown surface type 'slabs' !
- WW Way 35448958 - Unknown surface type 'tarmac' !
- WW Way 38382961 "High Street" - Unknown surface type 'yes' !
- WW Way 35485676 - Should be way but is area (highway_service)
- WW Way 35543936 - Should be area but is way (landuse_residential)
- WW Way 35646008 - Should be way but is area (highway_service)
- WW Way 38500506 - Unknown surface type 'slabs' !
- WW Way 39000867 - Should be way but is area (highway_service)
- WW Way 35958766 - Should be way but is area (highway_service)
- WW Way 32814340 - Should be way but is area (highway_service)
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/intersections.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/intersections.idx
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/location.idx
^
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/map.ost
^
|
| @@ -1,2670 +0,0 @@
-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"
- "gravel;grass"
- "grass_paver"
- "metal"
- "pebblestone"
- "stone"
- "wood"
- "marble"
- "panel"
- }
-
- SURFACE GRADE 3 {
- "unpaved"
- "dirt"
- "dirt/sand"
- "earth"
- "grass"
- "grass;earth"
- "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
-
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/nodes.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/ptroutes.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/route.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/router.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/router2.dat
^
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/standard.oss
^
|
| @@ -1,1624 +0,0 @@
-OSS
- ORDER WAYS
- GROUP _route
- GROUP highway_motorway, highway_motorway_trunk, highway_motorway_primary
- GROUP highway_trunk
- 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
- GROUP highway_track, highway_pedestrian, highway_path, highway_cycleway,
- highway_footway, highway_bridleway, highway_construction,
- leisure_track,
- waterway_stream, route_ferry
- GROUP highway_steps, barrier_fence
- GROUP waterway_river, waterway_canal, waterway_drain
- GROUP elevation_contour_major, elevation_contour_medium, elevation_contour_minor
-
-CONST
- //COLOR red = #ff0000;
-
- // Label priorities
- 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 labelPrioTown = 9;
- UINT labelPrioVillage = 10;
- UINT labelPrioHamlet = 11;
- UINT labelPrioSuburb = 12;
- UINT labelPrioLocality = 13;
-
- 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;
-
- // Ground tiles
-
- COLOR waterColor = #9acffd;
- COLOR landColor = #f1eee9;
- COLOR unknownColor = #c4dff6;
-
- COLOR coastColor = lighten(@waterColor,0.5);
-
- COLOR blackColor = #000000;
-
- // 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;
-
- // Symbols
- COLOR railwaySymbolColor = #7885b0;
- COLOR busSymbolColor = #4bb2da;
- COLOR fuelSymbolColor = #4bb2da;
- COLOR onewayArrowColor = #00000050;
- COLOR peakSymbolColor = #9c5e29;
- COLOR mountainPassSymbolColor = #9c5e29;
- COLOR hospitalSymbolColor = #da0092;
- COLOR pharmacySymbolColor = #da0092;
-
- COLOR peakLabelColor = #9c5329;
- COLOR mountainPassLabelColor = #9c5329;
- COLOR cliffColor = #440000;
-
- COLOR guidepostLabelColor = #9c5329;
-
- // Ways
- COLOR bridgeColor = #000000; // black
-
- COLOR motorwayColor = #ffff88; // yellow
- COLOR motorwayBColor = #ff8600; // orange
- COLOR trunkColor = #f9b29c;
- COLOR primaryColor = #fcd6a4;
- COLOR secondaryColor = #f7fabf;
- COLOR tertiaryColor = #ffffff;
- COLOR roadColor = #ffffff;
- COLOR roadBColor = #bfbfbf;
- COLOR livingStreetColor = #ededed;
-
- // Amenity
- COLOR postColor = #ffcc00;
- COLOR buildingColor = #bcbcbc;
-
- // Man made
- COLOR historicCityWallsColor= #994444;
-
- // Contour
- COLOR minorContourColor = #558855;
- COLOR mediumContourColor = #447744;
- COLOR majorContourColor = #446644;
-
- COLOR countryBorderColor = #9f6bff99;
-
-SYMBOL debug_oneway_arrow
- POLYGON 0,1.2 2.4,0 0,-1.2 0,-0.4 -1.5,-0.4 -1.5,0.4 0,0.4 {
- AREA { color: @onewayArrowColor; }
- }
- RECTANGLE -6.5,0 12.5 x 0.2 {
- AREA { color: @onewayArrowColor; }
- }
-
-SYMBOL oneway_arrow
- POLYGON 0,0.6 1.2,0 0,-0.6 0,-0.2 -0.75,-0.2 -0.75,0.2 0,0.2 {
- AREA { color: @onewayArrowColor; }
- }
-
-SYMBOL natural_peak
- POLYGON -0.75,0 0.75,0 0.0,-1.5 {
- AREA { color: @peakSymbolColor; }
- }
-
-SYMBOL mountain_pass
- POLYGON 0,0 0,-1.2 0.6,-0.3 1.2,-1.2 1.2,0 {
- AREA { color: @mountainPassSymbolColor; }
- }
-
-SYMBOL cliff
- POLYGON 0,0 1,0 0.5,1.5 {
- AREA { color: @cliffColor; }
- }
-
-SYMBOL border
- RECTANGLE 0,0.45 0.1 x 1 {
- AREA { color: #000000; }
- }
- RECTANGLE -0.45,0 1 x 0.1 {
- AREA { color: #000000; }
- }
-
-SYMBOL railway_station
- RECTANGLE 0,0 1.5 x 1.5 {
- 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 0.75 {
- AREA { color: @busSymbolColor; }
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/textloc.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/textother.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/textpoi.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/textregion.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/types.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/water.idx
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/ways.dat
^
|
|
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Resources/map.osmscout/waysopt.dat
^
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/main.m
^
|
| @@ -1,18 +0,0 @@
-//
-// main.m
-// OSMScoutiOS
-//
-// Created by Vladimir Vyskocil on 20/09/12.
-// Copyright (c) 2012 libosmscout. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char *argv[])
-{
- @autoreleasepool {
- return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
- }
-}
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/appveyor.yml
^
|
| @@ -1,46 +0,0 @@
-version: '{build}'
-
-branches:
- only:
- - master
-
-environment:
- matrix:
- - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- COMPILER: msys2
- BUILDTOOL: cmake
- MSYS2_ARCH: x86_64
- MSYS2_DIR: msys64
- MSYSTEM: MINGW64
- TARGET: importer
- PLATFORM: x64
- APPVEYOR_SAVE_CACHE_ON_ERROR: true
-
-install:
-- cmd: set
-- cmd: '%APPVEYOR_BUILD_FOLDER%\ci\appveyor\install.bat'
-
-build_script:
-# cmd is executed on windows only, sh is executed just on Ubuntu
-- cmd: '%APPVEYOR_BUILD_FOLDER%\ci\appveyor\build.bat'
-
-deploy:
- provider: GitHub
- description: ''
- auth_token:
- secure: Aj9mbq43PDgYOWS4LsWkDC3UQIgPGlL8NGdUKRTRA7GZhirzOhzDyXqM7SUIk8iU
- artifact: libosmscout-importer-Windows-x86_64.zip
- on:
- branch: master
- appveyor_repo_tag: true
- target: importer
-
-notifications:
-- provider: Email
- to:
- - tim@framstag.com
- on_build_failure: true
- on_build_status_changed: true
-
-cache:
- - c:\tools\vcpkg\installed\
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/appveyor/README
^
|
| @@ -1,16 +0,0 @@
-For adding deployment in AppVeyor:
-
-* In appveyor.yml, specify your email, where appropriate
-
-* Add GitHub project to your projects in AppVeyor
-
-* In AppVeyor project settings, go to Environment.
-
- * There define environment variable GITHUB_TOKEN with the token
- that you can generate at https://github.com/settings/tokens
-
- * Save the Settings
-
-* On each build, an importer tool will be generated and put as a build
- artifact. On release or tags, this artifact is uploaded to GitHub as
- an attachment to the release.
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/appveyor/build.bat
^
|
| @@ -1,28 +0,0 @@
-@echo off
-
-cd %APPVEYOR_BUILD_FOLDER%
-
-echo Compiler: %COMPILER%
-echo Architecture: %MSYS2_ARCH%
-echo Platform: %PLATFORM%
-echo MSYS2 directory: %MSYS2_DIR%
-echo MSYS2 system: %MSYSTEM%
-echo Configuration: %CONFIGURATION%
-echo Buildtool: %BUILDTOOL%
-echo Target: %TARGET%
-
-IF %COMPILER%==msys2 (
- @echo on
- echo Compiling libosmscout using msys2...
- SET "PATH=C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%"
-
- IF %BUILDTOOL%==cmake (
- echo Using build tool 'cmake'...
- IF %TARGET%==importer (
- echo Building importer...
- bash -lc "set -x && cd ${APPVEYOR_BUILD_FOLDER} && . setupMSYS2.sh && exec 0</dev/null && . packaging/import/windows/build_import.sh"
- appveyor PushArtifact build\libosmscout-importer-Windows-x86_64.zip
- )
- echo Finished cmake build
- )
-)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/appveyor/install.bat
^
|
| @@ -1,61 +0,0 @@
-@echo off
-
-cd %APPVEYOR_BUILD_FOLDER%
-
-echo Compiler: %COMPILER%
-echo Architecture: %MSYS2_ARCH%
-echo Platform: %PLATFORM%
-echo MSYS2 directory: %MSYS2_DIR%
-echo MSYS2 system: %MSYSTEM%
-echo Configuration: %CONFIGURATION%
-echo Build tool: %BUILDTOOL%
-echo Target: %TARGET%
-
-set timestart=%time%
-
-echo Start updating build dependencies...
-
-IF %COMPILER%==msys2 (
- echo Installing MSYS2 build preconditions...
-
- @echo on
-
- echo Extending path to MSYS and MINGW...
- SET "PATH=C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%"
-
- echo Updating pacman...
- bash -lc "pacman --noconfirm -Syuu --overwrite *"
-
- echo Killing pacman...
- taskkill.exe /F /FI "MODULES eq msys-2.0.dll
-
- echo Updating system...
- bash -lc "pacman --noconfirm -Syuu --overwrite *"
-
- echo Installing git...
- bash -lc "pacman --noconfirm -S --needed git"
-
- IF %BUILDTOOL%==cmake (
- echo Installing cmake build tool...
- bash -lc "pacman --noconfirm -S --needed make mingw-w64-%MSYS2_ARCH%-cmake mingw-w64-%MSYS2_ARCH%-extra-cmake-modules"
- )
-
- echo Installing build and compile time dependencies...
-
- IF %TARGET%==importer (
- bash -lc "pacman --noconfirm -S --needed mingw-w64-%MSYS2_ARCH%-toolchain mingw-w64-%MSYS2_ARCH%-libtool mingw-w64-%MSYS2_ARCH%-libiconv mingw-w64-%MSYS2_ARCH%-libxml2 zip"
-
- cinst wget -x86
-
- wget https://github.com/rinigus/marisa-trie/archive/0.2.4.zip -O marisa.zip
- 7z x marisa.zip
- bash -lc "cd ${APPVEYOR_BUILD_FOLDER} && cd marisa-trie-0.2.4 && ./configure --disable-shared && make -j2 && make install"
-
- wget https://github.com/google/protobuf/releases/download/v3.19.0/protobuf-cpp-3.19.0.zip -O protobuf-cpp-3.19.0.zip
- 7z x protobuf-cpp-3.19.0.zip
- bash -lc "cd ${APPVEYOR_BUILD_FOLDER} && cd protobuf-3.19.0 && ./configure --disable-shared && make -j2 && make install"
-
- )
-
- echo Finished installing MSYS2 build preconditions
-)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/docker/ubuntu_20.04_gcc_cmake/Dockerfile
^
|
| @@ -1,38 +0,0 @@
-FROM ubuntu:focal
-
-# disable interactive functions
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update && apt-get install -y \
- git make libtool pkg-config \
- libxml2-dev libprotobuf-dev protobuf-compiler \
- libagg-dev \
- libfreetype6-dev \
- libcairo2-dev \
- libpangocairo-1.0-0 libpango1.0-dev \
- qt5-default qtdeclarative5-dev libqt5svg5-dev \
- qtlocation5-dev qtpositioning5-dev qttools5-dev-tools qttools5-dev qtmultimedia5-dev \
- freeglut3 freeglut3-dev \
- libmarisa-dev \
- doxygen \
- swig openjdk-8-jdk \
- locales \
- && rm -rf /var/lib/apt/lists/*
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.utf8
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
-ENV QT_QPA_PLATFORM offscreen
-
-RUN apt-get update && apt-get install -y \
- cmake \
- g++ \
- && rm -rf /var/lib/apt/lists/*
-
-RUN mkdir /work
-
-COPY data/build.sh /work
-RUN chmod +x /work/build.sh
-
-WORKDIR /work
-CMD ./build.sh
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/docker/ubuntu_20.04_gcc_cmake/build.sh
^
|
| @@ -1,3 +0,0 @@
-#!/bin/sh
-cd `dirname $0`
-docker build -t libosmscout/ubuntu_20.04_gcc_cmake .
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/docker/ubuntu_20.04_gcc_cmake/data/build.sh
^
|
| @@ -1,25 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ $# -ge 1 ] ; then
- REPO="$1"
-else
- REPO="https://github.com/Framstag/libosmscout.git"
-fi
-
-if [ $# -ge 2 ] ; then
- BRANCH="$2"
-else
- BRANCH="master"
-fi
-
-git clone -b "$BRANCH" "$REPO" libosmscout
-
-export LANG=en_US.utf8
-cd libosmscout
-mkdir build
-cd build
-cmake -DCMAKE_BUILD_TYPE=DEBUG -DOSMSCOUT_BUILD_BINDING_JAVA=OFF ..
-make -j $(nproc) install
-ctest --output-on-failure
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/docker/ubuntu_20.04_gcc_cmake/run.sh
^
|
| @@ -1,3 +0,0 @@
-#!/bin/sh
-
-docker run --rm=true -it libosmscout/ubuntu_20.04_gcc_cmake ./build.sh "$@"
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/timedexec.bat
^
|
| @@ -1,33 +0,0 @@
-@echo off
-
-@setlocal
-
-set start=%1
-set timemaxdelta=%2
-set end=%time%
-
-shift
-shift
-
-set options="tokens=1-4 delims=:., "
-for /f %options% %%a in ("%start%") do set start_h=%%a&set /a start_m=100%%b %% 100&set /a start_s=100%%c %% 100&set /a start_ms=100%%d %% 100
-for /f %options% %%a in ("%end%") do set end_h=%%a&set /a end_m=100%%b %% 100&set /a end_s=100%%c %% 100&set /a end_ms=100%%d %% 100
-
-set /a hours=%end_h%-%start_h%
-set /a mins=%end_m%-%start_m%
-set /a secs=%end_s%-%start_s%
-set /a ms=%end_ms%-%start_ms%
-if %ms% lss 0 set /a secs = %secs% - 1 & set /a ms = 100%ms%
-if %secs% lss 0 set /a mins = %mins% - 1 & set /a secs = 60%secs%
-if %mins% lss 0 set /a hours = %hours% - 1 & set /a mins = 60%mins%
-if %hours% lss 0 set /a hours = 24%hours%
-if 1%ms% lss 100 set ms=0%ms%
-
-:: Mission accomplished
-set /a totalsecs = %hours%*3600 + %mins%*60 + %secs%
-
-IF %totalsecs% LEQ %timemaxdelta% (
- call %1 %2 %3 %4 %5 %6 %7 %8 %9
-) ELSE (
- echo "Not called, not enough time left"
-)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/timediff.bat
^
|
| @@ -1,39 +0,0 @@
-@echo off
-
-set start=%1
-set end=%time%
-
-set options="tokens=1-4 delims=:.,"
-for /f %options% %%a in ("%start%") do set start_h=%%a&set /a start_m=100%%b %% 100&set /a start_s=100%%c %% 100&set /a start_ms=100%%d %% 100
-for /f %options% %%a in ("%end%") do set end_h=%%a&set /a end_m=100%%b %% 100&set /a end_s=100%%c %% 100&set /a end_ms=100%%d %% 100
-
-set /a hours=%end_h%-%start_h%
-set /a mins=%end_m%-%start_m%
-set /a secs=%end_s%-%start_s%
-set /a ms=%end_ms%-%start_ms%
-if %ms% lss 0 set /a secs = %secs% - 1 & set /a ms = 100%ms%
-if %secs% lss 0 set /a mins = %mins% - 1 & set /a secs = 60%secs%
-if %mins% lss 0 set /a hours = %hours% - 1 & set /a mins = 60%mins%
-if %hours% lss 0 set /a hours = 24%hours%
-if 1%ms% lss 100 set ms=0%ms%
-
-:: Mission accomplished
-set /a totalsecs = %hours%*3600 + %mins%*60 + %secs%
-
-set timediff=%totalsecs%
-
-set start=
-set end=
-set start_h=
-set start_m=
-set start_s=
-set start_ms=
-set end_h=
-set end_m=
-set end_s=
-set end_ms=
-set hours=
-set mins=
-set secs=
-set ms=
-set totalsecs=
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/travis/README
^
|
| @@ -1,37 +0,0 @@
-For adding deployment in Travis:
-
-* In .travis.yml, specify your email, where appropriate
-
-* Add GitHub project to your projects in Travis
-
-* Follow https://docs.travis-ci.com/user/deployment/releases/ to fill
- the missing data in .travis.yml:
-
- * You may have to use "force" option or delete deployment section
- in .travis.yml before running
-
- travis setup releases --force
-
- Running this script will make a new personal access token on
- GitHub, in addition to changes in .travis.yml
-
- * Write down the secure key from new .travis.yml, you will need
- it later
-
- * Restore your previous .travis.yml from git:
-
- git checkout .travis.yml
-
- * In .travis.yml, insert your secure key as well as repo under
- deploy, as indicated by comments.
-
-* In .travis.yml, you may want to remove branches
- section. Alternatively, you would have to set it up so, that
- releases would get build. See Travis documentation for that.
-
-* In .travis.yml, when running on forked repo, remove build for
- website.
-
-* On each build, an importer tool will be generated. On release or
- tags, this tool is uploaded to GitHub as an attachment to the
- release.
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/travis/build.sh
^
|
| @@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-echo "Setting LANG to C.UTF-8:"
-export LANG="C.UTF-8"
-
-echo "New locale settings:"
-locale
-
-echo "Build start time: $(date)"
-
-if [ "$TARGET" = "importer" ]; then
- packaging/import/linux/build_import.sh
-fi
-
-echo "Build end time: $(date)"
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/ci/travis/install.sh
^
|
| @@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-echo "Target: " "$TARGET"
-echo "OS: " "$TRAVIS_OS_NAME"
-echo "Build tool: " "$BUILDTOOL"
-echo "Compiler: " "$CXX"
-
-echo "Installation start time: $(date)"
-
-export DEBIAN_FRONTEND=noninteractive
-
-if [ "$TARGET" = "importer" ]; then
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
- sudo apt-get -qq update
-
- if [ "$BUILDTOOL" = "cmake" ]; then
- sudo apt-get install -y cmake
- fi
-
- sudo apt-get install -y \
- pkg-config \
- libxml2-dev \
- libprotobuf-dev protobuf-compiler \
- libmarisa-dev \
- libicu-dev \
- liblzma-dev
- fi
-fi
-
-echo "Installation end time: $(date)"
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout-2.33.tar.bz2/dependencies/libosmscout/wercker.yml
^
|
| @@ -1,16 +0,0 @@
-build:
- box:
- id: libosmscout/archlinux_gcc_meson
- tag: latest
- steps:
- - script:
- name: Configure project
- code: meson setup --buildtype debugoptimized --unity on debug -DenableClientQt=false
- - script:
- name: Build project
- code: meson compile -C debug
- - script:
- name: Test project
- code: meson test -C debug
-
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.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.33.0 LANGUAGES C CXX)
+project(osmscout-sailfish VERSION 2.34.0 LANGUAGES C CXX)
# ==================================================================================================
# Information to update before to release this package.
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/CMakeMod/Config.h.cmake
^
|
| @@ -201,6 +201,16 @@
#cmakedefine HAVE_VISIBILITY 1
#endif
+/* Define to 1 or 0, depending whether the compiler supports parallel execution algorithms. */
+#ifndef HAVE_STD_EXECUTION
+#cmakedefine HAVE_STD_EXECUTION 1
+#endif
+
+/* Define to 1 or 0, depending whether the tbb::task_scheduler_init exists. */
+#ifndef TBB_HAS_SCHEDULER_INIT
+#cmakedefine TBB_HAS_SCHEDULER_INIT 1
+#endif
+
/* int16_t is available */
#ifndef OSMSCOUT_HAVE_INT16_T
#cmakedefine OSMSCOUT_HAVE_INT16_T 1
@@ -341,14 +351,6 @@
#cmakedefine HAVE_LIB_ZLIB 1
#endif
-/* iconv detected */
-#ifndef HAVE_ICONV
-#cmakedefine HAVE_ICONV 1
-#endif
-#ifndef ICONV_CONST
-#define ICONV_CONST @ICONV_CONST@
-#endif
-
/* libagg detected */
#ifndef HAVE_LIB_AGG
#cmakedefine HAVE_LIB_AGG 1
@@ -379,14 +381,14 @@
#cmakedefine OSMSCOUT_MAP_SVG_HAVE_LIB_PANGO 1
#endif
-/* gl/glut */
-#ifndef OSMSCOUT_MAP_OPENGL_HAVE_GL_GLUT_H
-#cmakedefine OSMSCOUT_MAP_OPENGL_HAVE_GL_GLUT_H 1
+#ifndef OSMSCOUT_PTHREAD
+/* Threads are pthreads */
+#cmakedefine OSMSCOUT_PTHREAD
#endif
-/* glut/glut */
-#ifndef OSMSCOUT_MAP_OPENGL_HAVE_GLUT_GLUT_H
-#cmakedefine OSMSCOUT_MAP_OPENGL_HAVE_GLUT_GLUT_H 1
+#ifndef OSMSCOUT_PTHREAD_NAME
+/* Threads are pthreads and non-posix setname is available */
+#cmakedefine OSMSCOUT_PTHREAD_NAME
#endif
#endif // @OSMSCOUT_PRIVATE_CONFIG_HEADER_NAME@_PRIVATE_CONFIG_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/CMakeMod/features.cmake
^
|
| @@ -101,14 +101,13 @@
find_package(LibXml2)
-find_package(ICONV QUIET)
-if(ICONV_FOUND)
- set(HAVE_ICONV TRUE)
- if(${ICONV_SECOND_ARGUMENT_IS_CONST})
- set(ICONV_CONST "const")
- endif()
-else()
- message(WARNING "No iconv support")
+if(NOT TARGET LibXml2::LibXml2)
+ # libxml2 v2.9.8 doesn't define cmake target
+ add_library(LibXml2::LibXml2 SHARED IMPORTED)
+ set_target_properties(LibXml2::LibXml2 PROPERTIES
+ IMPORTED_LOCATION ${LIBXML2_LIBRARY}
+ INTERFACE_INCLUDE_DIRECTORIES ${LIBXML2_INCLUDE_DIR}
+ )
endif()
# prepare cmake variables for configuration files
@@ -119,6 +118,34 @@
set(OSMSCOUT_HAVE_SSE2 ${HAVE_SSE2})
set(OSMSCOUT_GPX_HAVE_LIB_XML ${LIBXML2_FOUND})
+find_package(Threads)
+if(THREADS_HAVE_PTHREAD_ARG)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${THREADS_PTHREAD_ARG}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${THREADS_PTHREAD_ARG}")
+endif()
+
+if (CMAKE_USE_PTHREADS_INIT)
+ set(OSMSCOUT_PTHREAD TRUE)
+endif()
+
+try_compile(PTHREAD_NAME_OK "${PROJECT_BINARY_DIR}"
+ "${PROJECT_SOURCE_DIR}/dependencies/libosmscout/cmake/TestPThreadName.cpp"
+ LINK_LIBRARIES pthread
+ OUTPUT_VARIABLE PTHREAD_NAME_OUT)
+if(PTHREAD_NAME_OK)
+ set(OSMSCOUT_PTHREAD_NAME TRUE)
+else()
+ message(STATUS "TestPThreadName.cpp cannot be compiled: ${PTHREAD_NAME_OUT}")
+endif()
+
+find_package(TBB QUIET)
+if (TBB_FOUND)
+ try_compile(TBB_HAS_SCHEDULER_INIT "${PROJECT_BINARY_DIR}"
+ "${PROJECT_SOURCE_DIR}/dependencies/libosmscout/cmake/TestTBBSchedulerInit.cpp"
+ LINK_LIBRARIES TBB::tbb)
+endif()
+set(HAVE_STD_EXECUTION ${TBB_FOUND})
+
function(create_private_config output name)
string(REPLACE "-" "_" OSMSCOUT_PRIVATE_CONFIG_HEADER_NAME ${name})
string(TOUPPER ${OSMSCOUT_PRIVATE_CONFIG_HEADER_NAME} OSMSCOUT_PRIVATE_CONFIG_HEADER_NAME)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/README.md
^
|
| @@ -1,6 +1,7 @@
# OSM Scout for Sailfish OS
-[](https://github.com/Karry/osmscout-sailfish/actions/workflows/build_and_test_on_ubuntu_20_04.yml)
+[](https://github.com/Karry/osmscout-sailfish/actions/workflows/build_and_test_on_ubuntu_20_04.yml)
+[](https://github.com/Karry/osmscout-sailfish/actions/workflows/build_and_test_on_ubuntu_22_04.yml)
[<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/21/Flattr_Logo.svg/320px-Flattr_Logo.svg.png" alt="Flattr this project" width="70" style="background: white; margin: 6px">](https://flattr.com/submit/auto?fid=rowzv7&url=https%3A%2F%2Fgithub.com%2FKarry%2Fosmscout-sailfish)
[](https://paypal.me/OSMScoutForSailfish)
[](https://liberapay.com/OSMScoutForSailfishOS/donate)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_ios.yml
^
|
| @@ -16,7 +16,7 @@
runs-on: macos-12
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install build tool
run: brew install cmake ninja
- name: Install dependencies
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_msys.yml
^
|
| @@ -19,13 +19,13 @@
shell: msys2 {0}
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
# mingw-w64-x86_64-cairo mingw-w64-x86_64-pango
- name: Setup MSYS/MINGW64
uses: msys2/setup-msys2@v2
with:
update: true
- install: "mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-libiconv
+ install: "mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool
mingw-w64-x86_64-cmake mingw-w64-x86_64-extra-cmake-modules mingw-w64-x86_64-ninja
mingw-w64-x86_64-protobuf
mingw-w64-x86_64-libxml2
@@ -38,6 +38,7 @@
run: cmake --build build
- name: Run tests
run: "PATH=$PATH:$PWD/libosmscout:$PWD/libosmscout-import:$PWD/libosmscout-map:$PWD/libosmscout-test
+ LC_ALL=C
ctest -j 4 --output-on-failure --exclude-regex PerformanceTest"
working-directory: build
@@ -49,12 +50,12 @@
shell: msys2 {0}
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup MSYS/MINGW64
uses: msys2/setup-msys2@v2
with:
update: true
- install: "mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-libiconv
+ install: "mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool
mingw-w64-x86_64-meson mingw-w64-x86_64-ninja
mingw-w64-x86_64-protobuf
mingw-w64-x86_64-libxml2
@@ -69,6 +70,7 @@
- name: Build project
run: meson compile -C debug
- name: Run tests
- run: meson test -C debug --print-errorlogs
+ run: "LC_ALL=C
+ meson test -C debug --print-errorlogs"
env:
LANG: en_US.utf8
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_osx.yml
^
|
| @@ -16,7 +16,7 @@
runs-on: macos-12
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install build tool
run: brew install meson ninja
- name: Install dependencies
@@ -35,7 +35,7 @@
runs-on: macos-12
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install build tool
run: brew install cmake ninja
- name: Install dependencies
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_ubuntu_20_04.yml
^
|
| @@ -16,7 +16,7 @@
runs-on: ubuntu-20.04
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler and Co
@@ -48,7 +48,7 @@
runs-on: ubuntu-20.04
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler, cmake and ninja
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_ubuntu_22_04.yml
^
|
| @@ -16,7 +16,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Update package list
run: sudo apt-get update
- name: Install software-properties-common
@@ -50,7 +50,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler and Co
@@ -82,7 +82,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler, cmake and ninja
@@ -118,7 +118,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler and Co
@@ -146,7 +146,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler, cmake and ninja
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/build_and test_on_vs2019.yml
^
|
| @@ -16,15 +16,15 @@
runs-on: windows-2019
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Copy vcpkg.json
run: copy vcpkg_medium.json vcpkg.json
- name: Add msbuild to PATH
- uses: microsoft/setup-msbuild@v1.3.1
+ uses: microsoft/setup-msbuild@v2
# Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg").
- name: Restore from cache and install vcpkg
# Download and build vcpkg, without installing any port. If content is cached already, it is a no-op.
- uses: lukka/run-vcpkg@v11.1
+ uses: lukka/run-vcpkg@v11.4
with:
runVcpkgInstall: false
vcpkgJsonGlob: '**/vcpkg.json'
@@ -66,7 +66,7 @@
run: copy /Y build\Demos\Debug\*.exe dist
shell: cmd
- name: Upload distribution archive
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: Libosmscout_Windows.zip
path: dist
@@ -79,9 +79,9 @@
shell: cmd
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Python 3.x for meson
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install meson and ninja
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/build_on_ubuntu_22_04_qt_android.yml
^
|
| @@ -20,18 +20,16 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v3
- - name: set up JDK 11
+ uses: actions/checkout@v4
+ - name: set up JDK 17
uses: actions/setup-java@v3
with:
distribution: zulu
- java-version: 11
+ java-version: 17
- name: Setup Android SDK
- uses: android-actions/setup-android@v2
- - name: Run sdkmanager update
- run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
- - name: Install android platform, platform-tools, build-tools and ndk
- run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "platform-tools" "platforms;android-29" "build-tools;29.0.2" "ndk;23.1.7779620"
+ uses: android-actions/setup-android@v3
+ with:
+ packages: "platform-tools platforms;android-29 build-tools;29.0.2 ndk;23.1.7779620"
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/release.yml
^
|
| @@ -17,7 +17,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/release_latest.yml
^
|
| @@ -19,7 +19,7 @@
if: github.ref == 'refs/heads/master'
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
fetch-depth: 0
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/sanitize_on_ubuntu_22_04.yml
^
|
| @@ -16,7 +16,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Update package list
run: sudo apt-get update
- name: Install software-properties-common
@@ -69,7 +69,7 @@
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install software-properties-common
run: sudo apt-get install software-properties-common
- name: Install gcc compiler, cmake and ninja
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/sonar.yml
^
|
| @@ -29,7 +29,7 @@
- name: Install gcc compiler, meson and ninja
run: sudo apt-get -y install gcc-11 g++-11 libtbb-dev ccache libtool pkg-config
- name: Install meson, ninja, lcov and gcovr via pip
- run: pip install meson ninja lcov gcovr
+ run: pip install meson ninja lcov gcovr==6.0
- name: Install libosmscout dependencies
run: "sudo apt-get install -y
libxml2-dev
@@ -40,14 +40,8 @@
qttools5-dev qtmultimedia5-dev
libglm-dev libglew-dev freeglut3 freeglut3-dev
libmarisa-dev"
- - name: Prepare Sonar scanner
- run: |
- wget -nv https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-5.0.1.3006-linux.zip
- unzip -q sonar-scanner-cli-5.0.1.3006-linux.zip
- echo "${PWD}/sonar-scanner-5.0.1.3006-linux/bin/" >> $GITHUB_PATH
- wget -nv https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
- unzip -q build-wrapper-linux-x86.zip
- echo "${PWD}/build-wrapper-linux-x86" >> $GITHUB_PATH
+ - name: Install sonar-scanner and build-wrapper
+ uses: sonarsource/sonarcloud-github-c-cpp@v2
- name: Configure build project
run: meson setup --buildtype debugoptimized -Db_coverage=true --unity on debug
env:
@@ -58,7 +52,7 @@
- name: Create gcov files
run: mkdir gcov && cd gcov && gcov -p ../debug//*/*/*
- name: SonarCloud Scan
- run: sonar-scanner -Dsonar.cfamily.build-wrapper-output=sonar-build-output -Dsonar.cfamily.gcov.reportsPath=gcov -Dsonar.login=$SONAR_TOKEN
+ run: sonar-scanner -Dsonar.cfamily.build-wrapper-output=sonar-build-output -Dsonar.cfamily.gcov.reportsPath=gcov -Dsonar.token=$SONAR_TOKEN
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/.github/workflows/webpage.yml
^
|
| @@ -14,7 +14,7 @@
environment: SOURCEFORGE
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Update package list
run: sudo apt-get update
- name: Install additional tools
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX.xcodeproj/project.pbxproj
^
|
| @@ -11,12 +11,8 @@
E501875823CA77610055F4B2 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E501875723CA77610055F4B2 /* Media.xcassets */; };
E501876323CA99800055F4B2 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E501876223CA99800055F4B2 /* libiconv.tbd */; };
E50B832C15E0136800C685B3 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E50B832A15E0136800C685B3 /* InfoPlist.strings */; };
- E50B832E15E0136800C685B3 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E50B832D15E0136800C685B3 /* main.m */; };
E50B833215E0136800C685B3 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = E50B833015E0136800C685B3 /* Credits.rtf */; };
- E50B833515E0136800C685B3 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E50B833415E0136800C685B3 /* AppDelegate.m */; };
E50B833815E0136900C685B3 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E50B833615E0136900C685B3 /* MainMenu.xib */; };
- E50B856815E0219200C685B3 /* OSMScoutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E50B856715E0219200C685B3 /* OSMScoutViewController.m */; };
- E50B856B15E021DD00C685B3 /* OSMScoutView.m in Sources */ = {isa = PBXBuildFile; fileRef = E50B856A15E021DD00C685B3 /* OSMScoutView.m */; };
E50B856E15E024D400C685B3 /* OSMScout.mm in Sources */ = {isa = PBXBuildFile; fileRef = E50B856D15E024D400C685B3 /* OSMScout.mm */; };
E51A610422C57414007316F9 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E51A610322C573CA007316F9 /* CoreText.framework */; };
E51A610F22C57B91007316F9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E51A610022C5738D007316F9 /* Cocoa.framework */; };
@@ -24,6 +20,8 @@
E51A611122C57BA6007316F9 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E51A60FD22C57337007316F9 /* CoreLocation.framework */; };
E51A611222C57BAC007316F9 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E50B832415E0136800C685B3 /* AppKit.framework */; };
E51A611322C57BB3007316F9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E50B832615E0136800C685B3 /* Foundation.framework */; };
+ E5437DF92B40298A008E508F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5437DF82B40298A008E508F /* AppDelegate.swift */; };
+ E5437E022B406D35008E508F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5437E012B406D35008E508F /* AppDelegate.swift */; };
E5653B591F4EF59D00EF6212 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5653B581F4EF59D00EF6212 /* CoreGraphics.framework */; };
E5653B5E1F4EF66E00EF6212 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5653B5D1F4EF66E00EF6212 /* UIKit.framework */; };
E5653B601F4EF6B700EF6212 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5653B5F1F4EF6B700EF6212 /* MapKit.framework */; };
@@ -38,14 +36,13 @@
E59C37E726C87A8000C38713 /* OSMScoutMap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E59C37D626C8751500C38713 /* OSMScoutMap.framework */; };
E59C37E926C87A8300C38713 /* OSMScoutMapIOSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E59C37D526C8751500C38713 /* OSMScoutMapIOSX.framework */; };
E59C37EC26C87B8200C38713 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E59C37EB26C87B8200C38713 /* Launch Screen.storyboard */; };
+ E59D8B182B417C3A00860D2F /* OSMScoutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E59D8B172B417C3A00860D2F /* OSMScoutView.swift */; };
+ E59D8B192B417DD300860D2F /* OSMScoutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E59D8B172B417C3A00860D2F /* OSMScoutView.swift */; };
+ E59D8B1A2B417DD400860D2F /* OSMScoutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E59D8B172B417C3A00860D2F /* OSMScoutView.swift */; };
E5F711EF27A5565700890F3C /* map.osmscout in Resources */ = {isa = PBXBuildFile; fileRef = E5F711EE27A5565700890F3C /* map.osmscout */; };
E5F711F027A5565700890F3C /* map.osmscout in Resources */ = {isa = PBXBuildFile; fileRef = E5F711EE27A5565700890F3C /* map.osmscout */; };
E5F711F227A5C9B600890F3C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F5DD1BBE160B880500084E83 /* InfoPlist.strings */; };
- E5F711F527A5CA2E00890F3C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F5DD1BC1160B880500084E83 /* main.m */; };
- E5F711F627A5CA2E00890F3C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F5DD1BC5160B880500084E83 /* AppDelegate.m */; };
- E5F711F727A5CA2E00890F3C /* OSMScoutIOSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5DD1BCE160B880500084E83 /* OSMScoutIOSViewController.m */; };
E5F711F827A5CA2E00890F3C /* OSMScout.mm in Sources */ = {isa = PBXBuildFile; fileRef = E50B856D15E024D400C685B3 /* OSMScout.mm */; };
- E5F711F927A5CA2E00890F3C /* OSMScoutIOSView.m in Sources */ = {isa = PBXBuildFile; fileRef = F5DD1C14160D1DFA00084E83 /* OSMScoutIOSView.m */; };
E5F711FA27A5CA2E00890F3C /* OSMScoutMKTileOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = F5D6036918875EE000D8242B /* OSMScoutMKTileOverlay.m */; };
E5F711FD27A5CA2E00890F3C /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E501876223CA99800055F4B2 /* libiconv.tbd */; };
E5F711FE27A5CA2E00890F3C /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5653B611F4EF79900EF6212 /* CoreLocation.framework */; };
@@ -64,13 +61,9 @@
E5F7121C27A5CCB200890F3C /* OSMScoutMapIOSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5F7121427A5CB3000890F3C /* OSMScoutMapIOSX.framework */; };
F5D6036A18875EE000D8242B /* OSMScoutMKTileOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = F5D6036918875EE000D8242B /* OSMScoutMKTileOverlay.m */; };
F5D6036B18875EE000D8242B /* OSMScoutMKTileOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = F5D6036918875EE000D8242B /* OSMScoutMKTileOverlay.m */; };
- F5DD1BC2160B880500084E83 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F5DD1BC1160B880500084E83 /* main.m */; };
- F5DD1BC6160B880500084E83 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F5DD1BC5160B880500084E83 /* AppDelegate.m */; };
- F5DD1BCF160B880500084E83 /* OSMScoutIOSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5DD1BCE160B880500084E83 /* OSMScoutIOSViewController.m */; };
F5DD1BD2160B880500084E83 /* OSMScoutIOSViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = F5DD1BD0160B880500084E83 /* OSMScoutIOSViewController_iPhone.xib */; };
F5DD1BD5160B880500084E83 /* OSMScoutIOSViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = F5DD1BD3160B880500084E83 /* OSMScoutIOSViewController_iPad.xib */; };
F5DD1BDA160B88EA00084E83 /* OSMScout.mm in Sources */ = {isa = PBXBuildFile; fileRef = E50B856D15E024D400C685B3 /* OSMScout.mm */; };
- F5DD1C15160D1DFA00084E83 /* OSMScoutIOSView.m in Sources */ = {isa = PBXBuildFile; fileRef = F5DD1C14160D1DFA00084E83 /* OSMScoutIOSView.m */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -99,15 +92,8 @@
E50B832615E0136800C685B3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
E50B832915E0136800C685B3 /* OSMScoutOSX-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OSMScoutOSX-Info.plist"; sourceTree = "<group>"; };
E50B832B15E0136800C685B3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
- E50B832D15E0136800C685B3 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
E50B832F15E0136800C685B3 /* OSMScoutOSX-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OSMScoutOSX-Prefix.pch"; sourceTree = "<group>"; };
E50B833115E0136800C685B3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = "<group>"; };
- E50B833315E0136800C685B3 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
- E50B833415E0136800C685B3 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
- E50B856615E0219200C685B3 /* OSMScoutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSMScoutViewController.h; sourceTree = "<group>"; };
- E50B856715E0219200C685B3 /* OSMScoutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OSMScoutViewController.m; sourceTree = "<group>"; };
- E50B856915E021DD00C685B3 /* OSMScoutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSMScoutView.h; sourceTree = "<group>"; };
- E50B856A15E021DD00C685B3 /* OSMScoutView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OSMScoutView.m; sourceTree = "<group>"; };
E50B856D15E024D400C685B3 /* OSMScout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OSMScout.mm; path = OSMScoutOSX/OSMScout.mm; sourceTree = "<group>"; };
E50B856F15E029A800C685B3 /* OSMScout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OSMScout.h; path = OSMScoutOSX/OSMScout.h; sourceTree = "<group>"; };
E51A60FD22C57337007316F9 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
@@ -115,6 +101,10 @@
E51A610022C5738D007316F9 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
E51A610122C573A3007316F9 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
E51A610322C573CA007316F9 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/CoreText.framework; sourceTree = DEVELOPER_DIR; };
+ E5437DF72B40298A008E508F /* OSMScoutiOS-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OSMScoutiOS-Bridging-Header.h"; sourceTree = "<group>"; };
+ E5437DF82B40298A008E508F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+ E5437E012B406D35008E508F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+ E5437E032B406DD7008E508F /* OSMScoutOSX-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OSMScoutOSX-Bridging-Header.h"; sourceTree = "<group>"; };
E5653B581F4EF59D00EF6212 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
E5653B5D1F4EF66E00EF6212 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
E5653B5F1F4EF6B700EF6212 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/MapKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -129,6 +119,7 @@
E59C37DC26C875DB00C38713 /* OSMScout.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OSMScout.framework; path = OSMScoutOSX/Frameworks/OSMScout.framework; sourceTree = "<group>"; };
E59C37DD26C875DB00C38713 /* OSMScoutMap.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OSMScoutMap.framework; path = OSMScoutOSX/Frameworks/OSMScoutMap.framework; sourceTree = "<group>"; };
E59C37EB26C87B8200C38713 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
+ E59D8B172B417C3A00860D2F /* OSMScoutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSMScoutView.swift; sourceTree = "<group>"; };
E5F711EE27A5565700890F3C /* map.osmscout */ = {isa = PBXFileReference; lastKnownFileType = folder; path = map.osmscout; sourceTree = "<group>"; };
E5F711F127A57B4B00890F3C /* Readme.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Readme.md; sourceTree = "<group>"; };
E5F7120F27A5CA2E00890F3C /* OSMScoutiOS Simulator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "OSMScoutiOS Simulator.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -141,14 +132,7 @@
F5DD1BB3160B880400084E83 /* OSMScoutiOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OSMScoutiOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
F5DD1BBD160B880500084E83 /* OSMScoutiOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OSMScoutiOS-Info.plist"; sourceTree = "<group>"; };
F5DD1BBF160B880500084E83 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
- F5DD1BC1160B880500084E83 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
F5DD1BC3160B880500084E83 /* OSMScoutiOS-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OSMScoutiOS-Prefix.pch"; sourceTree = "<group>"; };
- F5DD1BC4160B880500084E83 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
- F5DD1BC5160B880500084E83 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
- F5DD1BCD160B880500084E83 /* OSMScoutIOSViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSMScoutIOSViewController.h; sourceTree = "<group>"; };
- F5DD1BCE160B880500084E83 /* OSMScoutIOSViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSMScoutIOSViewController.m; sourceTree = "<group>"; };
- F5DD1C13160D1DFA00084E83 /* OSMScoutIOSView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSMScoutIOSView.h; sourceTree = "<group>"; };
- F5DD1C14160D1DFA00084E83 /* OSMScoutIOSView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OSMScoutIOSView.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -254,12 +238,7 @@
E50B832715E0136800C685B3 /* OSMScoutOSX */ = {
isa = PBXGroup;
children = (
- E50B833315E0136800C685B3 /* AppDelegate.h */,
- E50B833415E0136800C685B3 /* AppDelegate.m */,
- E50B856915E021DD00C685B3 /* OSMScoutView.h */,
- E50B856A15E021DD00C685B3 /* OSMScoutView.m */,
- E50B856615E0219200C685B3 /* OSMScoutViewController.h */,
- E50B856715E0219200C685B3 /* OSMScoutViewController.m */,
+ E5437E012B406D35008E508F /* AppDelegate.swift */,
E50B833615E0136900C685B3 /* MainMenu.xib */,
E501875523CA771A0055F4B2 /* Media.xcassets */,
E50B832815E0136800C685B3 /* Supporting Files */,
@@ -270,9 +249,9 @@
E50B832815E0136800C685B3 /* Supporting Files */ = {
isa = PBXGroup;
children = (
+ E5437E032B406DD7008E508F /* OSMScoutOSX-Bridging-Header.h */,
E50B832915E0136800C685B3 /* OSMScoutOSX-Info.plist */,
E50B832A15E0136800C685B3 /* InfoPlist.strings */,
- E50B832D15E0136800C685B3 /* main.m */,
E50B832F15E0136800C685B3 /* OSMScoutOSX-Prefix.pch */,
E50B833015E0136800C685B3 /* Credits.rtf */,
E501876123CA90660055F4B2 /* OSMScoutOSX.entitlements */,
@@ -316,12 +295,7 @@
F5DD1BBB160B880500084E83 /* OSMScoutiOS */ = {
isa = PBXGroup;
children = (
- F5DD1BC4160B880500084E83 /* AppDelegate.h */,
- F5DD1BC5160B880500084E83 /* AppDelegate.m */,
- F5DD1C13160D1DFA00084E83 /* OSMScoutIOSView.h */,
- F5DD1C14160D1DFA00084E83 /* OSMScoutIOSView.m */,
- F5DD1BCD160B880500084E83 /* OSMScoutIOSViewController.h */,
- F5DD1BCE160B880500084E83 /* OSMScoutIOSViewController.m */,
+ E5437DF82B40298A008E508F /* AppDelegate.swift */,
F5DD1BD0160B880500084E83 /* OSMScoutIOSViewController_iPhone.xib */,
F5DD1BD3160B880500084E83 /* OSMScoutIOSViewController_iPad.xib */,
E501875723CA77610055F4B2 /* Media.xcassets */,
@@ -337,8 +311,8 @@
F5DD1BBD160B880500084E83 /* OSMScoutiOS-Info.plist */,
E5F7121D27A6F31100890F3C /* OSMScoutiOS Simulator-Info.plist */,
F5DD1BBE160B880500084E83 /* InfoPlist.strings */,
- F5DD1BC1160B880500084E83 /* main.m */,
F5DD1BC3160B880500084E83 /* OSMScoutiOS-Prefix.pch */,
+ E5437DF72B40298A008E508F /* OSMScoutiOS-Bridging-Header.h */,
E59C37EB26C87B8200C38713 /* Launch Screen.storyboard */,
);
name = "Supporting Files";
@@ -351,6 +325,7 @@
E50B856D15E024D400C685B3 /* OSMScout.mm */,
F5D6036818875EE000D8242B /* OSMScoutMKTileOverlay.h */,
F5D6036918875EE000D8242B /* OSMScoutMKTileOverlay.m */,
+ E59D8B172B417C3A00860D2F /* OSMScoutView.swift */,
);
name = Common;
sourceTree = "<group>";
@@ -421,6 +396,7 @@
TargetAttributes = {
E50B831C15E0136800C685B3 = {
DevelopmentTeam = TE75LNDCJS;
+ LastSwiftMigration = 1510;
ProvisioningStyle = Automatic;
};
E5F711F327A5CA2E00890F3C = {
@@ -429,6 +405,7 @@
};
F5DD1BB2160B880400084E83 = {
DevelopmentTeam = TE75LNDCJS;
+ LastSwiftMigration = 1510;
ProvisioningStyle = Automatic;
};
};
@@ -499,10 +476,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- E50B832E15E0136800C685B3 /* main.m in Sources */,
- E50B833515E0136800C685B3 /* AppDelegate.m in Sources */,
- E50B856815E0219200C685B3 /* OSMScoutViewController.m in Sources */,
- E50B856B15E021DD00C685B3 /* OSMScoutView.m in Sources */,
+ E59D8B182B417C3A00860D2F /* OSMScoutView.swift in Sources */,
+ E5437E022B406D35008E508F /* AppDelegate.swift in Sources */,
E50B856E15E024D400C685B3 /* OSMScout.mm in Sources */,
F5D6036A18875EE000D8242B /* OSMScoutMKTileOverlay.m in Sources */,
);
@@ -512,11 +487,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- E5F711F527A5CA2E00890F3C /* main.m in Sources */,
- E5F711F627A5CA2E00890F3C /* AppDelegate.m in Sources */,
- E5F711F727A5CA2E00890F3C /* OSMScoutIOSViewController.m in Sources */,
+ E59D8B1A2B417DD400860D2F /* OSMScoutView.swift in Sources */,
E5F711F827A5CA2E00890F3C /* OSMScout.mm in Sources */,
- E5F711F927A5CA2E00890F3C /* OSMScoutIOSView.m in Sources */,
|
|
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX.xcodeproj/project.xcworkspace/xcuserdata/vyskocil.xcuserdatad/UserInterfaceState.xcuserstate
^
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX/AppDelegate.swift
^
|
| @@ -0,0 +1,15 @@
+//
+// AppDelegate.swift
+// OSMScoutOSX
+//
+// Created by Vladimir Vyskocil on 30/12/2023.
+// Copyright © 2023 libosmscout. All rights reserved.
+//
+
+import AppKit
+
+@main
+class AppDelegate: NSResponder, NSApplicationDelegate {
+ var window : NSWindow? = nil
+
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX/Base.lproj/MainMenu.xib
^
|
| @@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <deployment defaultVersion="1080" identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +12,7 @@
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
- <customObject id="-3" userLabel="Application"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
<menu title="AMainMenu" systemMenu="main" id="29">
<items>
<menuItem title="OSMScoutOSX" id="56">
@@ -646,16 +647,18 @@
</menu>
</menuItem>
</items>
+ <point key="canvasLocation" x="27" y="-92"/>
</menu>
<window title="OSMScoutOSX" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="335" y="390" width="480" height="360"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
- <view key="contentView" id="372" customClass="OSMScoutView">
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+ <view key="contentView" id="372" customClass="OSMScoutView" customModule="OSMScoutOSX" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
<autoresizingMask key="autoresizingMask"/>
</view>
+ <point key="canvasLocation" x="26" y="-369"/>
</window>
<customObject id="494" customClass="AppDelegate">
<connections>
@@ -664,4 +667,4 @@
</customObject>
<customObject id="420" customClass="NSFontManager"/>
</objects>
-</document>
\ No newline at end of file
+</document>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX/OSMScout.h
^
|
| @@ -19,6 +19,7 @@
#include <osmscoutmap/StyleConfig.h>
#include <osmscoutmap/MapService.h>
#include <osmscout/location/LocationService.h>
+#include <osmscout/projection/TileProjection.h>
namespace osmscout {
class MyBreaker : public Breaker {
@@ -46,7 +47,7 @@
bool isDatabaseOpened;
StyleConfigRef styleConfig;
MapPainterIOS *mapPainter;
- TileProjection projection;
+ TileProjection projection;
MapParameter drawParameter;
std::shared_ptr<MyBreaker> drawBreaker;
double loadedLatMin;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutOSX/OSMScout.mm
^
|
| @@ -68,7 +68,7 @@
Magnification mag(zoom);
projection.Set(OSMTileId((uint32_t)x,(uint32_t)y), mag, dpi, (width+1), (height+1));
GeoBox boundingBox;
- projection.GetDimensions(boundingBox);
+ boundingBox = projection.GetDimensions();
std::list<osmscout::TileRef> tiles;
mapService->LookupTiles(projection,tiles);
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutView.swift
^
|
| @@ -0,0 +1,68 @@
+//
+// OSMScoutView.swift
+// OSMScoutOSX
+//
+// Created by Vladimir Vyskocil on 31/12/2023.
+// Copyright © 2023 libosmscout. All rights reserved.
+//
+
+import MapKit
+import CoreLocation
+
+// The OpenStreetMap compiled data with the Import tools should be put in map.osmscout
+// folder in the Resources of the project, a example of OSM source data is
+// the Greater London from GeoFabrik
+// (https://download.geofabrik.de/europe/great-britain/england/greater-london.html)
+
+class OSMScoutView: MKMapView, MKMapViewDelegate {
+ // The center of the displayed map
+ let LATITUDE = 51.5102
+ let LONGITUDE = -0.1024
+ // The zoom level
+ let ZOOM = 16.0
+
+ var tileOverlay : MKTileOverlay! = nil
+
+ func defaults() {
+ showsTraffic = false
+ showsBuildings = false
+ pointOfInterestFilter = .excludingAll
+
+ let centerCoordinate = CLLocationCoordinate2D(latitude:LATITUDE, longitude:LONGITUDE)
+ let longitudeDelta = 360.0 / pow(2, ZOOM) * Double(frame.size.width/256)
+ let span = MKCoordinateSpan(latitudeDelta: 0, longitudeDelta: longitudeDelta)
+
+ setRegion(MKCoordinateRegion(center: centerCoordinate, span: span), animated:false)
+ delegate = self
+ let overlay = OSMScoutMKTileOverlay(urlTemplate: nil)
+ let path = (Bundle.main.resourcePath ?? "") + "/map.osmscout"
+ OSMScoutMKTileOverlay.path = path
+ tileOverlay = overlay;
+ insertOverlay(tileOverlay, at:0, level:.aboveLabels)
+ }
+
+ override func awakeFromNib() {
+ super.awakeFromNib()
+ defaults()
+ }
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ defaults()
+ }
+
+ required init?(coder: NSCoder) {
+ super.init(coder: coder)
+ defaults()
+ }
+
+ // MARK: - MKMapViewDelegate
+
+ func mapView(_ mapView: MKMapView, rendererFor overlay: MKOverlay) -> MKOverlayRenderer {
+ if let overlay = overlay as? MKTileOverlay {
+ return MKTileOverlayRenderer(tileOverlay: overlay)
+ } else {
+ return MKOverlayRenderer()
+ }
+ }
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/AppDelegate.swift
^
|
| @@ -0,0 +1,33 @@
+//
+// AppDelegate.swift
+// OSMScoutiOS
+//
+// Created by Vladimir Vyskocil on 30/12/2023.
+// Copyright © 2023 libosmscout. All rights reserved.
+//
+
+import UIKit
+
+@main
+class AppDelegate: UIResponder, UIApplicationDelegate {
+ var window : UIWindow? = nil
+ var viewController : UIViewController! = nil
+
+
+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+ self.window = UIWindow(frame: UIScreen.main.bounds)
+
+ // Override point for customization after application launch.
+ if UIDevice.current.userInterfaceIdiom == .phone {
+ viewController = UIViewController(nibName: "OSMScoutIOSViewController_iPhone", bundle: nil)
+ } else {
+ viewController = UIViewController(nibName:"OSMScoutIOSViewController_iPad", bundle:nil)
+ }
+ window?.rootViewController = viewController
+ window?.makeKeyAndVisible()
+
+
+ return true
+ }
+
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Base.lproj/OSMScoutIOSViewController_iPad.xib
^
|
| @@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+ <device id="ipad10_9rounded" orientation="portrait" layout="fullscreen" appearance="light"/>
<dependencies>
- <deployment defaultVersion="1536" identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OSMScoutIOSViewController">
@@ -11,11 +12,13 @@
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
- <view contentMode="scaleToFill" id="2" customClass="OSMScoutIOSView">
+ <view contentMode="scaleToFill" id="2" customClass="OSMScoutView" customModule="OSMScoutiOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
+ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+ <point key="canvasLocation" x="96" y="0.0"/>
</view>
</objects>
</document>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Apple/OSMScoutOSX/OSMScoutiOS/Base.lproj/OSMScoutIOSViewController_iPhone.xib
^
|
| @@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
- <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -13,7 +12,7 @@
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
- <view contentMode="scaleToFill" id="8" customClass="OSMScoutIOSView">
+ <view contentMode="scaleToFill" id="8" customClass="OSMScoutView" customModule="OSMScoutiOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="548"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/CMakeLists.txt
^
|
| @@ -307,7 +307,7 @@
set(OSMSCOUT_BUILD_MAP_IOSX OFF CACHE INTERNAL "" FORCE)
endif()
-if(OPENGL_FOUND AND GLEW_FOUND AND TARGET glm AND PNG_FOUND AND OSMSCOUT_BUILD_MAP)
+if(OPENGL_FOUND AND GLEW_FOUND AND TARGET glm::glm AND PNG_FOUND AND OSMSCOUT_BUILD_MAP)
set(OSMSCOUT_BUILD_MAP_OPENGL_CACHE ON)
else()
set(OSMSCOUT_BUILD_MAP_OPENGL_CACHE OFF)
@@ -330,7 +330,7 @@
message(SEND_ERROR "GLEW is required for OpenGL map drawing backend")
set(OSMSCOUT_BUILD_MAP_OPENGL OFF)
endif()
- if(NOT TARGET glm)
+ if(NOT TARGET glm::glm)
message(SEND_ERROR "GLM is required for OpenGL map drawing backend")
set(OSMSCOUT_BUILD_MAP_OPENGL OFF)
endif()
@@ -547,7 +547,7 @@
message(STATUS)
message(STATUS "Dependencies:")
-if (TARGET glm)
+if (TARGET glm::glm)
message(STATUS "- glm: TRUE")
else ()
message(STATUS "- glm: FALSE")
@@ -562,11 +562,6 @@
else ()
message(STATUS "- harfbuzz: FALSE")
endif ()
-if (TARGET Iconv::Iconv)
- message(STATUS "- Iconv: TRUE")
-else ()
- message(STATUS "- Iconv: FALSE")
-endif ()
if (TARGET LibLZMA::LibLZMA)
message(STATUS "- LibLZMA: TRUE")
else ()
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Import/src/Import.cpp
^
|
| @@ -34,7 +34,7 @@
#include <osmscoutimport/Import.h>
-static std::string VehcileMaskToString(osmscout::VehicleMask vehicleMask)
+static std::string VehicleMaskToString(osmscout::VehicleMask vehicleMask)
{
std::string result;
@@ -308,7 +308,7 @@
for (const auto& router : parameter.GetRouter()) {
- progress.Info(std::string("Router: ")+VehcileMaskToString(router.GetVehicleMask())+ " - '"+router.GetFilenamebase()+"'");
+ progress.Info(std::string("Router: ") + VehicleMaskToString(router.GetVehicleMask()) + " - '" + router.GetFilenamebase() + "'");
}
progress.Info(std::string("StrictAreas: ")+
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/README.md
^
|
| @@ -75,5 +75,3 @@
|Windows, Visual Studio 2019|Github Actions|[](https://github.com/Framstag/libosmscout/actions/workflows/build_and%20test_on_vs2019.yml)|
|Android (on Ubuntu 18.04)|Github Actions|[](https://github.com/Framstag/libosmscout/actions/workflows/build_on_ubuntu_18_04_qt_android.yml)|
|Linux (with sanitizers)|Github Actions|[](https://github.com/Framstag/libosmscout/actions/workflows/sanitize_on_ubuntu_20_04.yml)|
-|Windows|Appveyor|[](https://ci.appveyor.com/project/Framstag/libosmscout)|
-|Linux|Wercker|[](https://app.wercker.com/project/byKey/39a4ba230c28d1d9e4ecae6158b283e8)|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Tests/CMakeLists.txt
^
|
| @@ -34,6 +34,9 @@
#---- CoordinateEncoding
osmscout_test_project(NAME CoordinateEncoding SOURCES src/CoordinateEncoding.cpp COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/data/testregion")
+#---- Latch
+osmscout_test_project(NAME Latch SOURCES src/Latch.cpp)
+
#---- LocationLookup
osmscout_test_project(NAME LocationLookupTest SOURCES src/LocationServiceTest.cpp src/SearchForLocationByStringTest.cpp src/SearchForLocationByFormTest.cpp src/SearchForPOIByFormTest.cpp TARGET OSMScout::Test OSMScout::Import)
set_source_files_properties(src/SearchForLocationByStringTest.cpp src/SearchForLocationByFormTest.cpp src/SearchForPOIByFormTest.cpp src/LocationServiceTest.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Tests/meson.build
^
|
| @@ -225,6 +225,16 @@
test('Check use of \'<\'...\'>\' for includes', HeaderCheck, env: headerCheckEnv)
+Latch = executable('Latch',
+ 'src/Latch.cpp',
+ include_directories: [testIncDir, osmscoutIncDir],
+ dependencies: [mathDep, threadDep, openmpDep],
+ link_with: [osmscout],
+ install: true,
+ install_dir: testInstallDir)
+
+test('Check latch consistency', Latch)
+
if buildImport
LocationServiceTest = executable('LocationServiceTest',
[
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Tests/src/Latch.cpp
^
|
| @@ -0,0 +1,617 @@
+/*
+ Latch - a test program for libosmscout
+ Copyright (C) 2024 Jean-Luc Barriere
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ asize_t with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include <chrono>
+#include <functional>
+#include <iostream>
+#include <thread>
+#include <vector>
+#include <atomic>
+
+#include <osmscout/async/ReadWriteLock.h>
+#include <osmscout/async/ProcessingQueue.h>
+#include <osmscout/util/StopClock.h>
+
+#include <TestMain.h>
+
+using namespace std::chrono_literals;
+
+static size_t iterationCount=250;
+static auto taskDuration=1ms;
+
+static size_t refCounter = 0;
+static osmscout::Latch latch;
+
+class ReaderWorker
+{
+private:
+ osmscout::ProcessingQueue<int>& queue;
+ std::thread thread;
+
+public:
+ size_t processedCount;
+
+private:
+ void ProcessorLoop()
+ {
+ std::cout << "Processing..." << std::endl;
+
+ while (true) {
+ std::optional<int> value=queue.PopTask();
+
+ if (!value) {
+ std::cout << "Queue empty!" << std::endl;
+ break;
+ }
+
+ if (value<0) {
+ std::cout << "Stop signal fetched!" << std::endl;
+ break;
+ }
+
+ {
+ osmscout::ReadLock locker(latch);
+ [[maybe_unused]] size_t c = refCounter;
+ std::this_thread::sleep_for(taskDuration);
+ }
+
+ processedCount++;
+ }
+
+ std::cout << "Processing...done" << std::endl;
+ }
+
+public:
+ explicit ReaderWorker(osmscout::ProcessingQueue<int>& queue)
+ : queue(queue),
+ thread(&ReaderWorker::ProcessorLoop,this),
+ processedCount(0)
+ {
+ }
+
+ void Wait() {
+ thread.join();
+ }
+};
+
+class WriterWorker
+{
+private:
+ osmscout::ProcessingQueue<int>& queue;
+ std::thread thread;
+
+public:
+ size_t processedCount;
+
+private:
+ void ProcessorLoop()
+ {
+ std::cout << "Processing..." << std::endl;
+
+ while (true) {
+ std::optional<int> value=queue.PopTask();
+
+ if (!value) {
+ std::cout << "Queue empty!" << std::endl;
+ break;
+ }
+
+ if (value<0) {
+ std::cout << "Stop signal fetched!" << std::endl;
+ break;
+ }
+
+ {
+ osmscout::WriteLock locker(latch);
+ ++refCounter;
+ std::this_thread::sleep_for(taskDuration);
+ }
+
+ processedCount++;
+ }
+
+ std::cout << "Processing...done" << std::endl;
+ }
+
+public:
+ explicit WriterWorker(osmscout::ProcessingQueue<int>& queue)
+ : queue(queue),
+ thread(&WriterWorker::ProcessorLoop,this),
+ processedCount(0)
+ {
+ }
+
+ void Wait() {
+ thread.join();
+ }
+};
+
+class ReaderReaderWorker
+{
+private:
+ osmscout::ProcessingQueue<int>& queue;
+ std::thread thread;
+
+public:
+ size_t processedCount;
+
+private:
+ void ProcessorLoop()
+ {
+ std::cout << "Processing..." << std::endl;
+
+ while (true) {
+ std::optional<int> value=queue.PopTask();
+
+ if (!value) {
+ std::cout << "Queue empty!" << std::endl;
+ break;
+ }
+
+ if (value<0) {
+ std::cout << "Stop signal fetched!" << std::endl;
+ break;
+ }
+
+ {
+ osmscout::ReadLock rl1(latch);
+ {
+ osmscout::ReadLock rl2(latch);
+ {
+ osmscout::ReadLock rl3(latch);
+ [[maybe_unused]] size_t c = refCounter;
+ std::this_thread::sleep_for(taskDuration);
+ }
+ }
+ }
+
+ processedCount++;
+ }
+
+ std::cout << "Processing...done" << std::endl;
+ }
+
+public:
+ explicit ReaderReaderWorker(osmscout::ProcessingQueue<int>& queue)
+ : queue(queue),
+ thread(&ReaderReaderWorker::ProcessorLoop,this),
+ processedCount(0)
+ {
+ }
+
+ void Wait() {
+ thread.join();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Tests/src/PerformanceTest.cpp
^
|
| @@ -57,8 +57,8 @@
#include <gperftools/heap-profiler.h>
#include <malloc.h> // mallinfo
#else
-#if defined(HAVE_MALLINFO)
-#include <malloc.h> // mallinfo
+#if defined(HAVE_MALLINFO2)
+#include <malloc.h> // mallinfo2
#endif
#endif
@@ -886,11 +886,11 @@
}
struct mallinfo alloc_info = tc_mallinfo();
#else
-#if defined(HAVE_MALLINFO)
- struct mallinfo alloc_info = mallinfo();
+#if defined(HAVE_MALLINFO2)
+ struct mallinfo2 alloc_info = mallinfo2();
#endif
#endif
-#if defined(HAVE_MALLINFO) || defined(PERF_TEST_GPERFTOOLS_USAGE)
+#if defined(HAVE_MALLINFO2) || defined(PERF_TEST_GPERFTOOLS_USAGE)
std::cout << "memory usage: " << formatAlloc(alloc_info.uordblks) << std::endl;
stats.allocMax = std::max(stats.allocMax, (double) alloc_info.uordblks);
stats.allocSum = stats.allocSum + (double) alloc_info.uordblks;
@@ -973,7 +973,7 @@
std::cout << "Level: " << stats.level << std::endl;
std::cout << "Tiles: " << stats.tileCount << " (load " << args.loadRepeat << "x, drawn " << args.drawRepeat << "x)" << std::endl;
-#if defined(HAVE_MALLINFO) || defined(PERF_TEST_GPERFTOOLS_USAGE)
+#if defined(HAVE_MALLINFO2) || defined(PERF_TEST_GPERFTOOLS_USAGE)
std::cout << " Used memory: ";
std::cout << "max: " << formatAlloc(stats.allocMax) << " ";
std::cout << "avg: " << formatAlloc(stats.allocSum / (stats.tileCount * args.loadRepeat)) << std::endl;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Tests/src/PerformanceTestConfig.h.cmake
^
|
| @@ -42,7 +42,7 @@
#cmakedefine HAVE_MEMORY_H 1
/* Define to 1 if you have the `mallinfo' function. */
-#cmakedefine HAVE_MALLINFO 1
+#cmakedefine HAVE_MALLINFO2 1
/* Define to 1 if you have the `mmap' function. */
#cmakedefine HAVE_MMAP 1
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Tests/src/StringUtils.cpp
^
|
| @@ -308,8 +308,23 @@
{
osmscout::Locale locale;
locale.SetThousandsSeparator(" ");
+ locale.SetDecimalSeparator(".");
REQUIRE(osmscout::NumberToString(1002030, locale) == "1 002 030");
REQUIRE(osmscout::NumberToString(-1002030, locale) == "-1 002 030");
+
+ REQUIRE(osmscout::FloatToString(M_PI, locale, 2) == "3.14");
+ REQUIRE(osmscout::FloatToString(-1002030.123456, locale, 6) == "-1 002 030.123 456");
+ REQUIRE(osmscout::FloatToString(-1002030.125, locale, 2) == "-1 002 030.13");
+}
+
+TEST_CASE("Byte size to string")
+{
+ osmscout::Locale locale;
+ locale.SetThousandsSeparator("'");
+ locale.SetDecimalSeparator(",");
+ locale.SetUnitsSeparator(" ");
+ REQUIRE(osmscout::ByteSizeToString(1063256064.0, locale) == "1'014,0 MiB");
+ REQUIRE(osmscout::ByteSizeToString(6406241158.0, locale) == "6,0 GiB");
}
TEST_CASE("Trim string")
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Tests/src/SunriseSunsetTest.cpp
^
|
| @@ -64,40 +64,40 @@
}
TEST_CASE("Compute Prague sunrise and sunset at winter solstice") {
- std::string winterSolstice="2021-12-21T12:00:00.0Z";
+ std::string winterSolstice="2021-12-21T12:00:00.000Z";
osmscout::GeoCoord pragueLoc(50.083, 14.422);
- REQUIRE(SunriseSunsetString(winterSolstice, pragueLoc, +1) == "2021-12-21T07:59:58.0Z - 2021-12-21T16:03:24.0Z");
+ REQUIRE(SunriseSunsetString(winterSolstice, pragueLoc, +1) == "2021-12-21T07:59:58.000Z - 2021-12-21T16:03:24.000Z");
}
TEST_CASE("Polar night at Tromso at winter solstice") {
- std::string winterSolstice="2021-12-21T12:00:00.0Z";
+ std::string winterSolstice="2021-12-21T12:00:00.000Z";
osmscout::GeoCoord tromsoLoc(69.6523, 18.9753);
REQUIRE(SunriseSunsetString(winterSolstice, tromsoLoc, +1) == "nullopt");
}
TEST_CASE("Compute sunrise and sunset for some date and locations") {
- REQUIRE(SunriseSunsetTest(Ts("2013-01-20T12:00:00.0Z"), osmscout::GeoCoord(34.0522, -118.2437), -8,
- Ts("2013-01-20T06:57:00.0Z"), Ts("2013-01-20T17:11:00.0Z")));
- REQUIRE(SunriseSunsetTest(Ts("2013-01-20T12:00:00.0Z"), osmscout::GeoCoord(48.8567, 2.351), +1,
- Ts("2013-01-20T08:35:00.0Z"), Ts("2013-01-20T17:28:00.0Z")));
- REQUIRE(SunriseSunsetTest(Ts("2012-12-25T12:00:00.0Z"), osmscout::GeoCoord(-33.86, 151.2111), +11,
- Ts("2012-12-25T05:43:00.0Z"), Ts("2012-12-25T20:07:00.0Z")));
- REQUIRE(SunriseSunsetTest(Ts("2013-05-01T12:00:00.0Z"), osmscout::GeoCoord(35.6938, 139.7036), +9,
- Ts("2013-05-01T04:49:00.0Z"), Ts("2013-05-01T18:27:00.0Z")));
- REQUIRE(SunriseSunsetTest(Ts("2013-06-05T12:00:00.0Z"), osmscout::GeoCoord(53.3441, -6.2675), +1,
- Ts("2013-06-05T05:01:00.0Z"), Ts("2013-06-05T21:46:00.0Z")));
- REQUIRE(SunriseSunsetTest(Ts("2013-06-22T12:00:00.0Z"), osmscout::GeoCoord(41.8781, -87.6298), -5,
- Ts("2013-06-22T05:16:00.0Z"), Ts("2013-06-22T20:29:00.0Z")));
- REQUIRE(SunriseSunsetTest(Ts("2015-08-27T12:00:00.0Z"), osmscout::GeoCoord(21.3069, -157.8583), -10,
- Ts("2015-08-27T06:13:00.0Z"), Ts("2015-08-27T18:53:00.0Z")));
- REQUIRE(SunriseSunsetTest(Ts("2013-05-01T12:00:00.0Z"), osmscout::GeoCoord(-34.6092, -58.3732), -3,
- Ts("2013-05-01T07:29:00.0Z"), Ts("2013-05-01T18:12:00.0Z")));
- REQUIRE(SunriseSunsetTest(Ts("2013-10-19T12:00:00.0Z"), osmscout::GeoCoord(-34.6092, -58.3732), -3,
- Ts("2013-10-19T06:07:00.0Z"), Ts("2013-10-19T19:11:00.0Z")));
- REQUIRE(SunriseSunsetTest(Ts("2013-01-26T12:00:00.0Z"), osmscout::GeoCoord(-34.6092, -58.3732), -3,
- Ts("2013-01-26T06:07:00.0Z"), Ts("2013-01-26T20:04:00.0Z")));
- REQUIRE(SunriseSunsetTest(Ts("2013-10-20T12:00:00.0Z"), osmscout::GeoCoord(-34.6092, -58.3732), -3,
- Ts("2013-10-20T06:05:00.0Z"), Ts("2013-10-20T19:11:00.0Z")));
- REQUIRE(SunriseSunsetTest(Ts("2013-10-31T12:00:00.0Z"), osmscout::GeoCoord(-34.6092, -58.3732), -3,
- Ts("2013-10-31T05:53:00.0Z"), Ts("2013-10-31T19:21:00.0Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2013-01-20T12:00:00.000Z"), osmscout::GeoCoord(34.0522, -118.2437), -8,
+ Ts("2013-01-20T06:57:00.000Z"), Ts("2013-01-20T17:11:00.000Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2013-01-20T12:00:00.000Z"), osmscout::GeoCoord(48.8567, 2.351), +1,
+ Ts("2013-01-20T08:35:00.000Z"), Ts("2013-01-20T17:28:00.000Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2012-12-25T12:00:00.000Z"), osmscout::GeoCoord(-33.86, 151.2111), +11,
+ Ts("2012-12-25T05:43:00.000Z"), Ts("2012-12-25T20:07:00.000Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2013-05-01T12:00:00.000Z"), osmscout::GeoCoord(35.6938, 139.7036), +9,
+ Ts("2013-05-01T04:49:00.000Z"), Ts("2013-05-01T18:27:00.000Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2013-06-05T12:00:00.000Z"), osmscout::GeoCoord(53.3441, -6.2675), +1,
+ Ts("2013-06-05T05:01:00.000Z"), Ts("2013-06-05T21:46:00.000Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2013-06-22T12:00:00.000Z"), osmscout::GeoCoord(41.8781, -87.6298), -5,
+ Ts("2013-06-22T05:16:00.000Z"), Ts("2013-06-22T20:29:00.000Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2015-08-27T12:00:00.000Z"), osmscout::GeoCoord(21.3069, -157.8583), -10,
+ Ts("2015-08-27T06:13:00.000Z"), Ts("2015-08-27T18:53:00.000Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2013-05-01T12:00:00.000Z"), osmscout::GeoCoord(-34.6092, -58.3732), -3,
+ Ts("2013-05-01T07:29:00.000Z"), Ts("2013-05-01T18:12:00.000Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2013-10-19T12:00:00.000Z"), osmscout::GeoCoord(-34.6092, -58.3732), -3,
+ Ts("2013-10-19T06:07:00.000Z"), Ts("2013-10-19T19:11:00.000Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2013-01-26T12:00:00.000Z"), osmscout::GeoCoord(-34.6092, -58.3732), -3,
+ Ts("2013-01-26T06:07:00.000Z"), Ts("2013-01-26T20:04:00.000Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2013-10-20T12:00:00.000Z"), osmscout::GeoCoord(-34.6092, -58.3732), -3,
+ Ts("2013-10-20T06:05:00.000Z"), Ts("2013-10-20T19:11:00.000Z")));
+ REQUIRE(SunriseSunsetTest(Ts("2013-10-31T12:00:00.000Z"), osmscout::GeoCoord(-34.6092, -58.3732), -3,
+ Ts("2013-10-31T05:53:00.000Z"), Ts("2013-10-31T19:21:00.000Z")));
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/Tests/src/TimeParse.cpp
^
|
| @@ -4,8 +4,16 @@
TEST_CASE("Parse ISO8601 time string") {
osmscout::Timestamp ts;
- std::string testString="2017-03-12T14:31:56.0Z";
+ std::string testString="2017-03-12T14:31:56.000Z";
REQUIRE(osmscout::ParseISO8601TimeString(testString, ts));
REQUIRE(std::chrono::duration_cast<std::chrono::milliseconds>(ts.time_since_epoch()).count()==1489329116000);
REQUIRE(osmscout::TimestampToISO8601TimeString(ts)==testString);
}
+
+TEST_CASE("Parse ISO8601 time string with millisecond precision") {
+ osmscout::Timestamp ts;
+ std::string testString="2017-03-12T14:31:56.012Z";
+ REQUIRE(osmscout::ParseISO8601TimeString(testString, ts));
+ REQUIRE(std::chrono::duration_cast<std::chrono::milliseconds>(ts.time_since_epoch()).count()==1489329116012);
+ REQUIRE(osmscout::TimestampToISO8601TimeString(ts)==testString);
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/WellScoutedRoute/meson.build
^
|
| @@ -0,0 +1,7 @@
+DumpData = executable('WellScoutedRoute',
+ 'src/WellScoutedRoute.cpp',
+ include_directories: [osmscoutIncDir, osmscoutgpxIncDir],
+ dependencies: [mathDep, openmpDep],
+ link_with: [osmscout, osmscoutgpx],
+ install: true)
+
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/WellScoutedRoute/src/WellScoutedRoute.cpp
^
|
| @@ -0,0 +1,878 @@
+/*
+ WellscoutedRoute - a demo program for libosmscout
+ Copyright (C) 2023 Tim Teulings
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include <chrono>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
+
+#include <osmscout/db/Database.h>
+
+#include <osmscout/routing/RoutePostprocessor.h>
+#include <osmscout/routing/DBFileOffset.h>
+#include <osmscout/routing/RoutingService.h>
+#include <osmscout/routing/RouteDescriptionPostprocessor.h>
+
+#include <osmscout/cli/CmdLineParsing.h>
+#include <osmscout/util/Geometry.h>
+
+#include <osmscoutgpx/GpxFile.h>
+#include <osmscoutgpx/Export.h>
+
+/**
+ * Call me with:
+ * maps/arnsberg-regbez 51.5725728 7.4649565 20
+ */
+struct Arguments
+{
+ bool help=false;
+ std::string router=osmscout::RoutingService::DEFAULT_FILENAME_BASE;
+ osmscout::Vehicle vehicle=osmscout::Vehicle::vehicleBicycle;
+ std::string databaseDirectory;
+ osmscout::GeoCoord start;
+ osmscout::Distance routeLength;
+ bool debug=false;
+ bool dataDebug=false;
+ bool routeDebug=false;
+ std::string routeJson;
+};
+
+struct Path
+{
+ osmscout::Distance length;
+ osmscout::ObjectFileRef object;
+ size_t targetNodeIndex;
+ uint8_t flags;
+ double costs;
+};
+
+struct Node
+{
+ osmscout::Point point;
+ std::vector<Path> paths;
+ double costs;
+ size_t previousNodeIndex;
+};
+
+struct Route
+{
+ size_t nodeIndex;
+ std::vector<size_t> path;
+ double costs;
+ osmscout::Distance length;
+};
+
+struct Step;
+
+using StepRef = std::shared_ptr<Step>;
+
+struct Step
+{
+ Route route;
+ StepRef previousStep;
+ StepRef ptaskreviousStep;
+};
+
+struct StepTask
+{
+ double costs;
+ size_t stepCount;
+ osmscout::Distance currentDistance;
+ osmscout::Distance remainingDistance;
+ StepRef previousStep;
+ size_t startNodeIndex;
+ std::unordered_set<size_t> nodeRestrictions;
+ osmscout::Distance requestedLength;
+};
+
+/*
+struct Step
+{
+ double costs;
+ size_t nodeIndex;
+ size_t previousNodeIndex;
+ osmscout::Distance length;
+ osmscout::Distance currentDirectDistance;
+ osmscout::Distance maximumDirectDistance;
+ std::vector<size_t> path;
+
+ bool operator<(const Step& other)
+ {
+ return this->costs/this->currentDirectDistance.AsMeter()<other.costs/this->currentDirectDistance.AsMeter();
+ }
+};*/
+
+static void ExportGpx(std::vector<Node>& graph,
+ const StepRef& lastStep,
+ const std::string& prefix,
+ size_t dumpIndex)
+{
+ osmscout::gpx::GpxFile gpxFile;
+ StepRef currentStep=lastStep;
+ std::list<StepRef> path;
+
+ while (currentStep) {
+ path.push_front(currentStep);
+ currentStep=currentStep->previousStep;
+ }
+
+ gpxFile.name="Route";
+
+ osmscout::gpx::Waypoint startPoint(graph[path.front()->route.path.front()].point.GetCoord());
+ startPoint.name="Start";
+ gpxFile.waypoints.push_back(startPoint);
+
+ osmscout::gpx::Track track;
+ track.name="Roundtrip";
+ track.displayColor=osmscout::Color::DARK_RED;
+
+ for (const StepRef step : path) {
+ osmscout::gpx::TrackSegment segment;
+
+ for (auto nodeIndex : step->route.path) {
+ segment.points.emplace_back(graph[nodeIndex].point.GetCoord());
+ }
+
+ track.segments.push_back(segment);
+ }
+
+ gpxFile.tracks.push_back(track);
+
+ osmscout::gpx::ExportGpx(gpxFile,"Route_"+prefix+"_"+std::to_string(dumpIndex)+".gpx");
+}
+
+static void ExportGpx(const std::vector<Node>& graph,
+ const std::vector<size_t>& path,
+ const std::string& prefix,
+ size_t dumpIndex)
+{
+ osmscout::gpx::GpxFile gpxFile;
+ osmscout::gpx::Route route;
+
+ route.name="Route";
+ for (auto nodeIndex : path) {
+ route.points.emplace_back(graph[nodeIndex].point.GetCoord());
+ }
+
+ gpxFile.name="Route";
+ gpxFile.routes.push_back(route);
+
+ osmscout::gpx::ExportGpx(gpxFile,"Route_"+prefix+"_"+std::to_string(dumpIndex)+".gpx");
+}
+
+static void ExportGpx(const std::vector<Node>& graph,
+ const std::vector<size_t>& path,
+ size_t currentNodeIndex,
+ const std::string& prefix,
+ size_t dumpIndex)
+{
+ osmscout::gpx::GpxFile gpxFile;
+ osmscout::gpx::Route route;
+
+ route.name="Route";
+ for (auto nodeIndex : path) {
+ route.points.emplace_back(graph[nodeIndex].point.GetCoord());
+ }
+ route.points.emplace_back(graph[currentNodeIndex].point.GetCoord());
+
+ gpxFile.name="Route";
+ gpxFile.routes.push_back(route);
+
+ osmscout::gpx::ExportGpx(gpxFile,"Route_"+prefix+"_"+std::to_string(dumpIndex)+".gpx");
+}
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/ci/docker/buildAll.sh
^
|
| @@ -7,7 +7,7 @@
./archlinux_gcc_meson/build.sh
./debian_buster_gcc_meson/build.sh
./debian_bullseye_gcc_meson/build.sh
-./ubuntu_20.04_gcc_cmake/build.sh
+./debian_bookworm_gcc_meson/build.sh
./ubuntu_22.04_gcc_cmake/build.sh
./ubuntu_22.04_gcc_meson_qt6/build.sh
./ubuntu_22.04_aarch64_gcc_cmake/build.sh
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/ci/docker/debian_bookworm_gcc_meson/Dockerfile
^
|
| @@ -0,0 +1,32 @@
+FROM debian:bookworm
+
+RUN apt-get update && apt-get install -y \
+ git make libtool pkg-config \
+ libxml2-dev libprotobuf-dev protobuf-compiler \
+ libagg-dev \
+ libfreetype6-dev \
+ libcairo2-dev \
+ libpangocairo-1.0-0 libpango1.0-dev \
+ qtdeclarative5-dev libqt5svg5-dev \
+ qtlocation5-dev qtpositioning5-dev qttools5-dev-tools qttools5-dev qtmultimedia5-dev \
+ freeglut3-dev libglew-dev libglm-dev \
+ libtbb-dev liblzma-dev \
+ libmarisa-dev \
+ doxygen \
+ locales \
+ meson ninja-build g++ \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
+RUN locale-gen
+ENV LANG en_US.utf8
+
+ENV QT_QPA_PLATFORM offscreen
+
+RUN mkdir /work
+
+COPY data/build.sh /work
+RUN chmod +x /work/build.sh
+
+WORKDIR /work
+CMD ./build.sh
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/ci/docker/debian_bookworm_gcc_meson/build.sh
^
|
| @@ -0,0 +1,3 @@
+#!/bin/sh
+cd `dirname $0`
+docker build -t libosmscout/debian_bullseye_gcc_meson .
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/ci/docker/debian_bookworm_gcc_meson/data/build.sh
^
|
| @@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+
+if [ $# -ge 1 ] ; then
+ REPO="$1"
+else
+ REPO="https://github.com/Framstag/libosmscout.git"
+fi
+
+if [ $# -ge 2 ] ; then
+ BRANCH="$2"
+else
+ BRANCH="master"
+fi
+
+git clone -b "$BRANCH" "$REPO" libosmscout
+
+env
+
+cd libosmscout
+meson debug
+cd debug
+
+ninja
+ninja test
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/ci/docker/debian_bookworm_gcc_meson/run.sh
^
|
| @@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker run --rm=true -it libosmscout/debian_bullseye_gcc_meson ./build.sh "$@"
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/ci/docker/runAll.sh
^
|
| @@ -17,8 +17,8 @@
./debian_bullseye_gcc_meson/run.sh "$@"
RESULT_debian_bullseye_gcc_meson=$?
-./ubuntu_20.04_gcc_cmake/run.sh "$@"
-RESULT_ubuntu_20_04_gcc_cmake=$?
+./debian_bullseye_gcc_meson/run.sh "$@"
+RESULT_debian_bookworm_gcc_meson=$?
./ubuntu_22.04_gcc_cmake/run.sh "$@"
RESULT_ubuntu_22_04_gcc_cmake=$?
@@ -48,8 +48,8 @@
echo -ne "debian_bullseye_gcc_meson "
if [ $RESULT_debian_bullseye_gcc_meson -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi
-echo -ne "ubuntu_20.04_gcc_cmake "
-if [ $RESULT_ubuntu_20_04_gcc_cmake -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi
+echo -ne "debian_bullseye_gcc_meson "
+if [ $RESULT_debian_bookworm_gcc_meson -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi
echo -ne "ubuntu_22.04_gcc_cmake "
if [ $RESULT_ubuntu_22_04_gcc_cmake -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/cmake/Config.h.cmake
^
|
| @@ -346,14 +346,6 @@
#cmakedefine HAVE_LIB_ZLIB 1
#endif
-/* iconv detected */
-#ifndef HAVE_ICONV
-#cmakedefine HAVE_ICONV 1
-#endif
-#ifndef ICONV_CONST
-#define ICONV_CONST @ICONV_CONST@
-#endif
-
/* libagg detected */
#ifndef HAVE_LIB_AGG
#cmakedefine HAVE_LIB_AGG 1
@@ -384,6 +376,11 @@
#cmakedefine OSMSCOUT_MAP_SVG_HAVE_LIB_PANGO 1
#endif
+#ifndef OSMSCOUT_PTHREAD
+/* Threads are pthreads */
+#cmakedefine OSMSCOUT_PTHREAD
+#endif
+
#ifndef OSMSCOUT_PTHREAD_NAME
/* Threads are pthreads and non-posix setname is available */
#cmakedefine OSMSCOUT_PTHREAD_NAME
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/cmake/features.cmake
^
|
| @@ -132,7 +132,7 @@
check_function_exists(mmap HAVE_MMAP)
check_function_exists(posix_fadvise HAVE_POSIX_FADVISE)
check_function_exists(posix_madvise HAVE_POSIX_MADVISE)
-check_function_exists(mallinfo HAVE_MALLINFO)
+check_function_exists(mallinfo2 HAVE_MALLINFO2)
# prefer static libraries if shared are disabled
if(NOT BUILD_SHARED_LIBS AND (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX OR CMAKE_COMPILER_IS_GNUCC))
@@ -140,6 +140,14 @@
endif()
# check libraries and tools
+macro(target_exists target var)
+ if(TARGET ${target})
+ set(${var} 1)
+ else()
+ set(${var} 0)
+ endif()
+endmacro()
+
if(NOT IOS)
find_package(Marisa)
endif()
@@ -160,41 +168,17 @@
list(APPEND LIBXML2_LIBRARIES "dl")
endif()
endif()
-set(HAVE_LIB_XML $<TARGET_EXISTS:LibXml2>)
-set(OSMSCOUT_GPX_HAVE_LIB_XML $<TARGET_EXISTS:LibXml2>)
+target_exists(LibXml2::LibXml2 HAVE_LIB_XML)
+target_exists(LibXml2::LibXml2 OSMSCOUT_GPX_HAVE_LIB_XML)
find_package(Protobuf QUIET)
if (TARGET protobuf::libprotobuf AND NOT EXISTS ${PROTOBUF_PROTOC_EXECUTABLE})
message(STATUS "Protobuf library found, but protoc compiler is missing")
endif()
-set(HAVE_LIB_PROTOBUF $<TARGET_EXISTS:protobuf::libprotobuf>)
+target_exists(protobuf::libprotobuf HAVE_LIB_PROTOBUF)
find_package(ZLIB QUIET)
-set(HAVE_LIB_ZLIB $<TARGET_EXISTS:ZLIB::ZLIB>)
-
-find_package(Iconv QUIET)
-if(TARGET Iconv::Iconv)
- set(HAVE_ICONV TRUE)
-
- cmake_push_check_state(RESET)
- set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
- set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
- if(MSVC)
- set(CMAKE_REQUIRED_FLAGS /we4028 /fp:fast /wd4251 /Oi)
- endif()
- check_prototype_definition("iconv"
- "size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)"
- "-1"
- "iconv.h"
- ICONV_SECOND_ARGUMENT_IS_CONST)
- cmake_pop_check_state()
-
- if(${ICONV_SECOND_ARGUMENT_IS_CONST})
- set(ICONV_CONST "const")
- endif()
-else()
- message(WARNING "No iconv support")
-endif()
+target_exists(ZLIB::ZLIB HAVE_LIB_ZLIB)
find_package(LibLZMA QUIET)
@@ -223,7 +207,7 @@
set(OSMSCOUT_MAP_SVG_HAVE_LIB_PANGO ${PANGOFT2_FOUND})
find_package(harfbuzz QUIET)
-set(HAVE_LIB_HARFBUZZ $<TARGET_EXISTS:harfbuzz::harfbuzz>)
+target_exists(harfbuzz::harfbuzz HAVE_LIB_HARFBUZZ)
set(OpenGL_GL_PREFERENCE "GLVND") # Prever non-legacy OpenGL libraries
find_package(OpenGL QUIET)
@@ -232,7 +216,7 @@
find_package(GLEW QUIET)
find_package(glm QUIET)
-if(NOT TARGET glm)
+if(NOT TARGET glm::glm)
message(STATUS "glm NOT found")
find_package(Git QUIET)
if(Git_FOUND)
@@ -375,6 +359,10 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${THREADS_PTHREAD_ARG}")
endif()
+if (CMAKE_USE_PTHREADS_INIT)
+ set(OSMSCOUT_PTHREAD TRUE)
+endif()
+
try_compile(PTHREAD_NAME_OK "${PROJECT_BINARY_DIR}"
"${PROJECT_SOURCE_DIR}/cmake/TestPThreadName.cpp")
if(PTHREAD_NAME_OK)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/DBLoadJob.h
^
|
| @@ -81,7 +81,7 @@
void Run(const osmscout::BasemapDatabaseRef& basemapDatabase,
const std::list<DBInstanceRef> &databases,
- std::shared_lock<std::shared_mutex> &&locker) override;
+ ReadLock &&locker) override;
void Close() override;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/ElevationChartWidget.h
^
|
| @@ -186,7 +186,7 @@
int textPixelSize=14;
int textPadding=4;
- Locale locale=Locale::ByEnvironment();
+ Locale locale=Locale::ByEnvironmentSafe();
};
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/MapRenderer.h
^
|
| @@ -68,7 +68,7 @@
void Run(const osmscout::BasemapDatabaseRef& basemapDatabase,
const std::list<DBInstanceRef> &allDatabases,
- std::shared_lock<std::shared_mutex> &&locker) override;
+ ReadLock &&locker) override;
inline bool IsSuccess() const{
return success;
@@ -119,6 +119,7 @@
void showAltLanguageSignal(bool);
void unitsSignal(QString);
void stylesheetFilenameChanged();
+ void databaseLoadFinished(const osmscout::GeoBox &geoBox);
private:
// slots
@@ -159,12 +160,14 @@
};
Slot<> stylesheetFilenameChangedSlot{ std::bind(&MapRenderer::stylesheetFilenameChanged, this) };
+ Slot<GeoBox> databaseLoadFinishedSlot{ std::bind(&MapRenderer::databaseLoadFinished, this, std::placeholders::_1) };
public slots:
virtual void Initialize() = 0;
virtual void InvalidateVisualCache() = 0;
virtual void onStylesheetFilenameChanged();
+ virtual void onDatabaseLoaded(osmscout::GeoBox boundingBox) = 0;
virtual void onMapDPIChange(double dpi);
virtual void onRenderSeaChanged(bool);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/NavigationModule.h
^
|
| @@ -134,7 +134,7 @@
private:
QThread *thread;
SettingsRef settings;
- DistanceUnitSystem units{Locale::ByEnvironment().GetDistanceUnits()}; // TODO: make possible to override
+ DistanceUnitSystem units{Locale::ByEnvironmentSafe().GetDistanceUnits()}; // TODO: make possible to override
DBThreadRef dbThread;
QTimer timer;
std::optional<Bearing> lastBearing;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/PlaneMapRenderer.h
^
|
| @@ -83,6 +83,8 @@
public slots:
virtual void Initialize();
virtual void InvalidateVisualCache();
+ virtual void onDatabaseLoaded(osmscout::GeoBox boundingBox);
+
void DrawMap();
void HandleTileStatusChanged(QString dbPath,const osmscout::TileRef tile);
void onLoadJobFinished(QMap<QString,QMap<osmscout::TileKey,osmscout::TileRef>>);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/StyleModule.h
^
|
| @@ -42,6 +42,8 @@
QThread *thread;
DBThreadRef dbThread;
+ std::shared_ptr<bool> alive=std::make_shared<bool>(true);
+
Slot<osmscout::GeoBox> dbLoadedSlot{
[this](const osmscout::GeoBox &b) {
emit initialisationFinished(b);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/include/osmscoutclientqt/TiledMapRenderer.h
^
|
| @@ -82,24 +82,22 @@
Slot<OnlineTileProvider> onlineTileProviderSlot{ std::bind(&TiledMapRenderer::onlineTileProviderSignal, this, std::placeholders::_1) };
Slot<bool> onlineTileEnabledSlot{ std::bind(&TiledMapRenderer::onlineTilesEnabledSignal, this, std::placeholders::_1) };
Slot<bool> offlineMapChangedSlot{ std::bind(&TiledMapRenderer::offlineMapChangedSignal, this, std::placeholders::_1) };
- Slot<GeoBox> databaseLoadFinishedSlot{ std::bind(&TiledMapRenderer::databaseLoadFinished, this, std::placeholders::_1) };
signals:
void onlineTileProviderSignal(OnlineTileProvider provider);
void onlineTilesEnabledSignal(bool);
void offlineMapChangedSignal(bool);
- void databaseLoadFinished(const GeoBox &geoBox);
public slots:
virtual void Initialize();
virtual void InvalidateVisualCache();
virtual void onStylesheetFilenameChanged();
+ virtual void onDatabaseLoaded(osmscout::GeoBox boundingBox);
void onlineTileRequest(uint32_t zoomLevel, uint32_t xtile, uint32_t ytile);
void offlineTileRequest(uint32_t zoomLevel, uint32_t xtile, uint32_t ytile);
void tileDownloaded(uint32_t zoomLevel, uint32_t x, uint32_t y, QImage image, QByteArray downloadedData);
void tileDownloadFailed(uint32_t zoomLevel, uint32_t x, uint32_t y, bool zoomLevelOutOfRange);
- void onDatabaseLoaded(osmscout::GeoBox boundingBox);
void onLoadJobFinished(QMap<QString,QMap<osmscout::TileKey,osmscout::TileRef>>);
void onlineTileProviderChanged(const OnlineTileProvider &);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/DBLoadJob.cpp
^
|
| @@ -55,7 +55,7 @@
void DBLoadJob::Run(const osmscout::BasemapDatabaseRef& basemapDatabase,
const std::list<DBInstanceRef> &databases,
- std::shared_lock<std::shared_mutex> &&locker)
+ ReadLock &&locker)
{
osmscout::GeoBox lookupBox(lookupProjection.GetDimensions());
std::list<DBInstanceRef> relevantDatabases;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/MapRenderer.cpp
^
|
| @@ -51,6 +51,7 @@
settings->showAltLanguageChanged.Connect(showAltLanguageSlot);
settings->unitsChanged.Connect(unitsSlot);
dbThread->stylesheetFilenameChanged.Connect(stylesheetFilenameChangedSlot);
+ dbThread->databaseLoadFinished.Connect(databaseLoadFinishedSlot);
connect(this, &MapRenderer::mapDpiChangeSignal,
this, &MapRenderer::onMapDPIChange,
@@ -76,6 +77,9 @@
connect(this, &MapRenderer::stylesheetFilenameChanged,
this, &MapRenderer::onStylesheetFilenameChanged,
Qt::QueuedConnection);
+ connect(this, &MapRenderer::databaseLoadFinished,
+ this, &MapRenderer::onDatabaseLoaded,
+ Qt::QueuedConnection);
}
MapRenderer::~MapRenderer()
@@ -250,7 +254,7 @@
void DBRenderJob::Run(const osmscout::BasemapDatabaseRef& basemapDatabase,
const std::list<DBInstanceRef> &allDatabases,
- std::shared_lock<std::shared_mutex> &&locker)
+ ReadLock &&locker)
{
std::list<DBInstanceRef> databases; // enabled databases for rendering
if (renderDatabases) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/OsmTileDownloader.cpp
^
|
| @@ -79,7 +79,7 @@
QString server = QString::fromStdString(servers[serverNumber % servers.size()]);
QUrl tileUrl(server.arg(zoomLevel).arg(x).arg(y));
- osmscout::log.Debug() << "Download tile" << tileUrl.toString().toStdString() << "(current thread:" << QThread::currentThread() << ")";
+ osmscout::log.Debug() << "Download tile " << tileUrl.toString().toStdString();
TileCacheKey key = {zoomLevel, x, y};
@@ -102,7 +102,7 @@
QUrl url = reply->url();
if (reply->error() != QNetworkReply::NoError){
- osmscout::log.Warn() << "Downloading" << url.toString().toStdString() << "failed with" << reply->errorString().toStdString();
+ osmscout::log.Warn() << "Downloading " << url.toString().toStdString() << " failed with " << reply->errorString().toStdString();
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) /* For compatibility with QT 5.6 */
serverNumber = qrand(); // try another server for future requests
#else
@@ -114,7 +114,7 @@
QImage image;
if (image.loadFromData(downloadedData, Q_NULLPTR)){
- osmscout::log.Debug() << "Downloaded tile " << url.toString().toStdString() << " (current thread: " << QThread::currentThread() << ")";
+ osmscout::log.Debug() << "Downloaded tile " << url.toString().toStdString();
emit downloaded(key.zoomLevel, key.xtile, key.ytile, image, downloadedData);
}else{
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/PlaneMapRenderer.cpp
^
|
| @@ -85,12 +85,17 @@
delete loadJob;
}
+void PlaneMapRenderer::onDatabaseLoaded([[maybe_unused]] osmscout::GeoBox boundingBox)
+{
+ InvalidateVisualCache();
+}
+
void PlaneMapRenderer::InvalidateVisualCache()
{
{
QMutexLocker finishedLocker(&finishedMutex);
osmscout::log.Debug() << "Invalidate finished image";
- epoch++;;
+ epoch++;
}
emit Redraw();
}
@@ -408,6 +413,7 @@
if (loadJob->IsFinished()){
// this slot is may be called from DBLoadJob, we can't delete it now
+ loadJob->Close();
loadJob->deleteLater();
loadJob=nullptr;
}
@@ -469,7 +475,8 @@
{
QMutexLocker locker(&lock);
if (loadJob!=nullptr){
- // TODO: check if job contains same tiles...
+ // TODO: check if job contains the same tiles...
+ loadJob->Close();
loadJob->deleteLater();
loadJob=nullptr;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/StyleModule.cpp
^
|
| @@ -43,6 +43,7 @@
if (thread!=nullptr){
thread->quit();
}
+ *alive=false;
}
void StyleModule::loadStyle(QString stylesheetFilename,
@@ -69,7 +70,14 @@
void StyleModule::onSetFlagRequest(QString key, bool value)
{
- dbThread->SetStyleFlag(key.toStdString(), value);
- emit flagSet(key, value);
+ qDebug() << "Setting flag" << key << "to" << value;
+ auto thisAlive=alive;
+ dbThread->SetStyleFlag(key.toStdString(), value)
+ .OnComplete([this, key, value, thisAlive](const bool &){
+ if (*thisAlive) { // avoid to call slot with deleted object
+ emit flagSet(key, value);
+ }
+ qDebug() << "Flag" << key << "setup done (" << value << ")";
+ });
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client-qt/src/osmscoutclientqt/TiledMapRenderer.cpp
^
|
| @@ -56,7 +56,6 @@
settings->onlineTileProviderChanged.Connect(onlineTileProviderSlot);
settings->onlineTilesEnabledChanged.Connect(onlineTileEnabledSlot);
settings->offlineMapChanged.Connect(offlineMapChangedSlot);
- dbThread->databaseLoadFinished.Connect(databaseLoadFinishedSlot);
connect(this, &TiledMapRenderer::onlineTileProviderSignal,
this, &TiledMapRenderer::onlineTileProviderChanged,
@@ -68,9 +67,6 @@
this, &TiledMapRenderer::onOfflineMapChanged,
Qt::QueuedConnection);
- connect(this, &TiledMapRenderer::databaseLoadFinished,
- this, &TiledMapRenderer::onDatabaseLoaded,
- Qt::QueuedConnection);
//
// Make sure that we always decouple caller and receiver even if they are running in the same thread
// else we might get into a dead lock
@@ -217,7 +213,7 @@
{
QMutexLocker locker(&tileCacheMutex);
onlineTileCache.invalidate(boundingBox);
- offlineTileCache.invalidate(boundingBox);
+ offlineTileCache.incEpoch();
}
emit Redraw();
@@ -492,6 +488,7 @@
}
// this slot is called from DBLoadJob, we can't delete it now
+ loadJob->Close();
loadJob->deleteLater();
loadJob=nullptr;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client/CMakeLists.txt
^
|
| @@ -52,6 +52,11 @@
target_link_libraries(OSMScoutClient OpenMP::OpenMP_CXX)
endif()
+if(MARISA_FOUND)
+ target_include_directories(OSMScoutClient PUBLIC ${MARISA_INCLUDE_DIRS})
+ target_link_libraries(OSMScoutClient ${MARISA_LIBRARIES})
+endif()
+
if(APPLE AND OSMSCOUT_BUILD_FRAMEWORKS)
set_target_properties(OSMScoutClient PROPERTIES
FRAMEWORK TRUE
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client/include/osmscoutclient/DBJob.h
^
|
| @@ -24,6 +24,7 @@
#include <osmscoutclient/DBInstance.h>
+#include <osmscout/async/ReadWriteLock.h>
#include <osmscout/db/BasemapDatabase.h>
#include <thread>
@@ -37,15 +38,15 @@
*/
class OSMSCOUT_CLIENT_API DBJob {
- protected:
+protected:
osmscout::BasemapDatabaseRef basemapDatabase; //!< Optional reference to the basemap db
std::list<DBInstanceRef> databases; //!< borrowed databases
std::thread::id threadId; //!< job thread
- private:
- std::shared_lock<std::shared_mutex> locker; //!< db locker
+private:
+ ReadLock locker; //!< db locker
- public:
+public:
DBJob();
DBJob(const DBJob&) = delete;
DBJob(DBJob&&) = delete;
@@ -54,8 +55,8 @@
virtual ~DBJob();
virtual void Run(const osmscout::BasemapDatabaseRef& basemapDatabase,
- const std::list<DBInstanceRef> &databases,
- std::shared_lock<std::shared_mutex> &&locker);
+ const std::list<DBInstanceRef> &databases,
+ ReadLock &&locker);
virtual void Close();
};
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client/include/osmscoutclient/DBThread.h
^
|
| @@ -30,6 +30,7 @@
#include <osmscout/async/Signal.h>
#include <osmscout/async/AsyncWorker.h>
+#include <osmscout/async/ReadWriteLock.h>
#include <osmscoutmap/MapService.h>
@@ -96,7 +97,7 @@
using AsynchronousDBJob = std::function<void (const osmscout::BasemapDatabaseRef& basemapDatabase,
const std::list<DBInstanceRef> &databases,
- std::shared_lock<std::shared_mutex> &&locker)>;
+ ReadLock &&locker)>;
// signals
Signal<> stylesheetFilenameChanged;
@@ -105,50 +106,34 @@
// slots
Slot<> toggleDaylight{
- [this](){
- ToggleDaylight();
- }
+ std::bind(&DBThread::ToggleDaylight, this)
};
Slot<std::string, bool> setStyleFlag{
- [this](const std::string &key, bool value) {
- SetStyleFlag(key, value);
- }
+ std::bind(&DBThread::SetStyleFlag, this, std::placeholders::_1, std::placeholders::_2)
};
Slot<std::string> reloadStyle{
- [this](const std::string &suffix) {
- ReloadStyle(suffix);
- }
+ std::bind(&DBThread::ReloadStyle, this, std::placeholders::_1)
};
Slot<std::string, std::unordered_map<std::string,bool>, std::string> loadStyle {
- [this](const std::string &stylesheetFilename,
- const std::unordered_map<std::string,bool> &stylesheetFlags,
- const std::string &suffix) {
- LoadStyle(stylesheetFilename, stylesheetFlags, suffix);
- }
+ std::bind(&DBThread::LoadStyle, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)
};
Slot<> initialize{
- [this](){
- Initialize();
- }
+ std::bind(&DBThread::Initialize, this)
};
Slot<std::vector<std::filesystem::path>> databaseListChangedSlot {
- [this](const std::vector<std::filesystem::path> &paths) {
- OnDatabaseListChanged(paths);
- }
+ std::bind(&DBThread::OnDatabaseListChanged, this, std::placeholders::_1)
};
/**
* Flush all caches for db that was not used in recent idleMs
*/
Slot<std::chrono::milliseconds> flushCaches {
- [this](const std::chrono::milliseconds &idleMs) {
- FlushCaches(idleMs);
- }
+ std::bind(&DBThread::FlushCaches, this, std::placeholders::_1)
};
private:
@@ -158,7 +143,7 @@
double mapDpi;
- mutable std::shared_mutex lock;
+ mutable Latch latch;
osmscout::BasemapDatabaseParameter basemapDatabaseParameter;
osmscout::BasemapDatabaseRef basemapDatabase;
@@ -251,12 +236,12 @@
const std::list<StyleError> &GetStyleErrors() const
{
- return styleErrors;
+ return styleErrors;
}
StyleConfigRef GetEmptyStyleConfig() const
{
- std::shared_lock locker(lock);
+ ReadLock locker(latch);
return emptyStyleConfig;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client/src/osmscoutclient/DBJob.cpp
^
|
| @@ -33,7 +33,7 @@
void DBJob::Run(const osmscout::BasemapDatabaseRef& basemapDatabase,
const std::list<DBInstanceRef> &databases,
- std::shared_lock<std::shared_mutex> &&locker)
+ ReadLock &&locker)
{
assert(threadId==std::this_thread::get_id());
this->basemapDatabase=basemapDatabase;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client/src/osmscoutclient/DBThread.cpp
^
|
| @@ -64,7 +64,7 @@
DBThread::~DBThread()
{
- std::unique_lock locker(lock);
+ WriteLock locker(latch);
osmscout::log.Debug() << "DBThread::~DBThread()";
mapDpiSlot.Disconnect();
@@ -89,7 +89,7 @@
bool DBThread::isInitialized()
{
- std::shared_lock locker(lock);
+ ReadLock locker(latch);
return isInitializedInternal();
}
@@ -104,7 +104,7 @@
}
const GeoBox DBThread::databaseBoundingBox() const {
- std::shared_lock locker(lock);
+ ReadLock locker(latch);
GeoBox response;
for (const auto& db:databases){
response.Include(db->GetDBGeoBox());
@@ -115,7 +115,7 @@
DatabaseCoverage DBThread::databaseCoverage(const osmscout::Magnification &magnification,
const osmscout::GeoBox &bbox)
{
- std::shared_lock locker(lock);
+ ReadLock locker(latch);
osmscout::GeoBox boundingBox;
for (const auto &db:databases){
@@ -173,7 +173,7 @@
if (breaker.IsAborted()) {
return false;
}
- std::unique_lock locker(lock);
+ WriteLock locker(latch);
if (basemapDatabase) {
basemapDatabase->Close();
@@ -365,7 +365,7 @@
CancelableFuture<bool> DBThread::ToggleDaylight()
{
return Async<bool>([this](const Breaker &) -> bool {
- std::unique_lock locker(lock);
+ WriteLock locker(latch);
if (!isInitializedInternal()) {
return false;
@@ -384,7 +384,7 @@
CancelableFuture<bool> DBThread::OnMapDPIChange(double dpi)
{
return Async<bool>([this, dpi](const Breaker&) -> bool{
- std::unique_lock locker(lock);
+ WriteLock locker(latch);
mapDpi = dpi;
return true;
});
@@ -393,8 +393,8 @@
CancelableFuture<bool> DBThread::SetStyleFlag(const std::string &key, bool value)
{
return Async<bool>([this, key, value](const Breaker&) -> bool{
- log.Debug() << "SetStyleFlag" << key << "to" << value;
- std::unique_lock locker(lock);
+ log.Debug() << "SetStyleFlag " << key << " to " << value;
+ WriteLock locker(latch);
if (!isInitializedInternal()) {
return false;
@@ -411,7 +411,7 @@
{
return Async<bool>([this, suffix](const Breaker &) -> bool {
log.Debug() << "Reloading style " << stylesheetFilename << suffix << "...";
- std::unique_lock locker(lock);
+ WriteLock locker(latch);
LoadStyleInternal(stylesheetFilename, stylesheetFlags, suffix);
log.Debug() << "Reloading style done.";
return true;
@@ -423,7 +423,7 @@
const std::string &suffix)
{
return Async<bool>([this, stylesheetFilename, stylesheetFlags, suffix](const Breaker&){
- std::unique_lock locker(lock);
+ WriteLock locker(latch);
LoadStyleInternal(stylesheetFilename, stylesheetFlags, suffix);
return true;
});
@@ -455,7 +455,7 @@
const std::map<std::string,bool> DBThread::GetStyleFlags() const
{
- std::shared_lock locker(lock);
+ ReadLock locker(latch);
std::map<std::string,bool> flags;
// add flag overrides
for (const auto& flag : stylesheetFlags){
@@ -470,7 +470,7 @@
auto styleFlags = db->GetStyleConfig()->GetFlags(); // iterate temporary container is UB!
for (const auto& flag : styleFlags){
- if (flags.find(flag.first)!=flags.end()){
+ if (flags.find(flag.first)==flags.end()){
flags[flag.first]=flag.second;
}
}
@@ -508,7 +508,7 @@
void DBThread::RunJob(AsynchronousDBJob job)
{
- std::shared_lock locker(lock);
+ ReadLock locker(latch);
if (!isInitializedInternal()){
locker.unlock();
osmscout::log.Warn() << "ignore request, dbs is not initialized";
@@ -519,7 +519,7 @@
void DBThread::RunSynchronousJob(SynchronousDBJob job)
{
- std::shared_lock locker(lock);
+ ReadLock locker(latch);
if (!isInitializedInternal()){
osmscout::log.Warn() << "ignore request, dbs is not initialized";
return;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-client/src/osmscoutclient/MapManager.cpp
^
|
| @@ -48,7 +48,7 @@
// https://en.cppreference.com/w/cpp/filesystem/is_directory
// https://en.cppreference.com/w/cpp/filesystem/status
if (!std::filesystem::exists(lookupDir) || !std::filesystem::is_directory(lookupDir)) {
- osmscout::log.Warn() << "Lookup dir" << lookupDir.string() << "doesn't exist or isn't a directory";
+ osmscout::log.Warn() << "Lookup dir " << lookupDir.string() << " doesn't exist or isn't a directory";
continue;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-gpx/meson.build
^
|
| @@ -17,7 +17,7 @@
osmscoutgpxSrc,
include_directories: [osmscoutgpxIncDir, osmscoutIncDir],
cpp_args: cppArgs,
- dependencies: [mathDep, threadDep, xml2Dep, iconvDep, zlibDep],
+ dependencies: [mathDep, threadDep, xml2Dep, zlibDep],
link_with: [osmscout],
version: libraryVersion,
install: true)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-import/src/osmscoutimport/GenRouteDat.cpp
^
|
| @@ -63,45 +63,42 @@
AccessFeatureValue RouteDataGenerator::GetAccess(const FeatureValueBuffer& buffer) const
{
- AccessFeatureValue *accessValue=accessReader->GetValue(buffer);
+ const AccessFeatureValue *accessValue=accessReader->GetValue(buffer);
if (accessValue!=nullptr) {
return *accessValue;
}
- else {
- return AccessFeatureValue (buffer.GetType()->GetDefaultAccess());
- }
+
+ return AccessFeatureValue (buffer.GetType()->GetDefaultAccess());
}
uint8_t RouteDataGenerator::GetMaxSpeed(const Way& way) const
{
- MaxSpeedFeatureValue *maxSpeedValue=maxSpeedReader->GetValue(way.GetFeatureValueBuffer());
+ const MaxSpeedFeatureValue *maxSpeedValue=maxSpeedReader->GetValue(way.GetFeatureValueBuffer());
if (maxSpeedValue!=nullptr) {
return maxSpeedValue->GetMaxSpeed();
}
- else {
- return 0;
- }
+
+ return 0;
}
uint8_t RouteDataGenerator::GetGrade(const Way& way) const
{
- GradeFeatureValue *gradeValue=gradeReader->GetValue(way.GetFeatureValueBuffer());
+ const GradeFeatureValue *gradeValue=gradeReader->GetValue(way.GetFeatureValueBuffer());
if (gradeValue!=nullptr) {
return gradeValue->GetGrade();
}
- else {
- return 1;
- }
+
+ return 1;
}
uint8_t RouteDataGenerator::CopyFlags(const Area::Ring& ring) const
{
- uint8_t flags=0;
- AccessFeatureValue access=GetAccess(ring.GetFeatureValueBuffer());
- AccessRestrictedFeatureValue *accessRestrictedValue=accessRestrictedReader->GetValue(ring.GetFeatureValueBuffer());
+ uint8_t flags=0;
+ AccessFeatureValue access=GetAccess(ring.GetFeatureValueBuffer());
+ const AccessRestrictedFeatureValue *accessRestrictedValue=accessRestrictedReader->GetValue(ring.GetFeatureValueBuffer());
if (accessRestrictedValue!=nullptr) {
@@ -135,9 +132,9 @@
uint8_t RouteDataGenerator::CopyFlagsForward(const Way& way) const
{
- uint8_t flags=0;
- AccessFeatureValue access=GetAccess(way.GetFeatureValueBuffer());
- AccessRestrictedFeatureValue *accessRestrictedValue=accessRestrictedReader->GetValue(way.GetFeatureValueBuffer());
+ uint8_t flags=0;
+ AccessFeatureValue access=GetAccess(way.GetFeatureValueBuffer());
+ const AccessRestrictedFeatureValue *accessRestrictedValue=accessRestrictedReader->GetValue(way.GetFeatureValueBuffer());
if (accessRestrictedValue!=nullptr) {
if (!accessRestrictedValue->CanAccessFoot()) {
@@ -170,9 +167,9 @@
uint8_t RouteDataGenerator::CopyFlagsBackward(const Way& way) const
{
- uint8_t flags=0;
- AccessFeatureValue access=GetAccess(way.GetFeatureValueBuffer());
- AccessRestrictedFeatureValue *accessRestrictedValue=accessRestrictedReader->GetValue(way.GetFeatureValueBuffer());
+ uint8_t flags=0;
+ AccessFeatureValue access=GetAccess(way.GetFeatureValueBuffer());
+ const AccessRestrictedFeatureValue *accessRestrictedValue=accessRestrictedReader->GetValue(way.GetFeatureValueBuffer());
if (accessRestrictedValue!=nullptr) {
if (!accessRestrictedValue->CanAccessFoot()) {
@@ -1735,6 +1732,8 @@
const ImportParameter& parameter,
Progress& progress)
{
+ using namespace std::string_literals;
+
// List of restrictions for a way
ViaTurnRestrictionMap restrictions;
@@ -1847,7 +1846,7 @@
std::string variantFilename=AppendFileToDir(parameter.GetDestinationDirectory(),
router.GetVariantFilename());
- progress.SetAction(std::string("Writing route graph '")+dataFilename+"'");
+ progress.SetAction("Writing route graph to '"s+dataFilename+"' and '"s+variantFilename+"'"s);
WriteRouteGraph(parameter,
progress,
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-map-opengl/CMakeLists.txt
^
|
| @@ -69,7 +69,7 @@
HEADER ${HEADER_FILES}
INCLUDEDIR osmscoutmapopengl
TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/include/osmscoutmapopengl/MapOpenGLFeatures.h.cmake
- TARGET OSMScout::OSMScout OSMScout::Map OpenGL::GL glm GLEW::GLEW PNG::PNG Freetype::Freetype
+ TARGET OSMScout::OSMScout OSMScout::Map OpenGL::GL glm::glm GLEW::GLEW PNG::PNG Freetype::Freetype
)
if(APPLE AND OSMSCOUT_BUILD_FRAMEWORKS)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout-map/src/osmscoutmap/MapParameter.cpp
^
|
| @@ -62,7 +62,7 @@
warnObjectCountLimit(0),
warnCoordCountLimit(0),
showAltLanguage(false),
- locale{Locale::ByEnvironment()}
+ locale{Locale::ByEnvironmentSafe()}
{
// no code
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/CMakeLists.txt
^
|
| @@ -37,6 +37,7 @@
include/osmscout/async/Breaker.h
include/osmscout/async/CancelableFuture.h
include/osmscout/async/ProcessingQueue.h
+ include/osmscout/async/ReadWriteLock.h
include/osmscout/async/Signal.h
include/osmscout/async/Thread.h
include/osmscout/async/Worker.h
@@ -214,7 +215,9 @@
src/osmscout/io/FileWriter.cpp
src/osmscout/io/NumericIndex.cpp
src/osmscout/async/AsyncWorker.cpp
+ src/osmscout/async/ReadWriteLock.cpp
src/osmscout/async/Breaker.cpp
+ src/osmscout/async/ReadWriteLock.cpp
src/osmscout/async/Thread.cpp
src/osmscout/async/Worker.cpp
src/osmscout/async/WorkQueue.cpp
@@ -403,10 +406,6 @@
target_link_libraries(OSMScout ${MARISA_LIBRARIES})
endif()
-if (TARGET Iconv::Iconv)
- target_link_libraries(OSMScout Iconv::Iconv)
-endif()
-
if(CMAKE_THREAD_LIBS_INIT)
target_link_libraries(OSMScout ${CMAKE_THREAD_LIBS_INIT})
endif()
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/include/meson.build
^
|
| @@ -9,6 +9,7 @@
'osmscout/async/Breaker.h',
'osmscout/async/CancelableFuture.h',
'osmscout/async/ProcessingQueue.h',
+ 'osmscout/async/ReadWriteLock.h',
'osmscout/async/Signal.h',
'osmscout/async/Thread.h',
'osmscout/async/Worker.h',
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/async/CancelableFuture.h
^
|
| @@ -180,7 +180,7 @@
/**
* Callback triggered on future complete.
- * When future is calceled, it is never called.
+ * When future is canceled, it is never called.
* It is called from thread of value producer.
* When future is completed already, callback is called immediately in thread of caller.
*
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/async/ReadWriteLock.h
^
|
| @@ -0,0 +1,234 @@
+#ifndef LIBOSMSCOUT_READWRITELOCK_H
+#define LIBOSMSCOUT_READWRITELOCK_H
+
+/*
+ This source is part of the libosmscout library
+ Copyright (C) 2024 Jean-Luc Barriere
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <osmscout/lib/CoreImportExport.h>
+
+#include <atomic>
+#include <thread>
+#include <mutex>
+#include <condition_variable>
+
+namespace osmscout {
+
+/**
+ * This implements a pure C++ Latch providing lock-S (shared) and lock-X (exclusive).
+ * The concept used here allows X requests to be prioritized faster and more smoothly
+ * than standard implementations. It uses a no-lock strategy whenever possible and
+ * reverts to lock and wait in race condition.
+ */
+
+class OSMSCOUT_API Latch {
+private:
+ mutable std::atomic<bool> s_spin = false;
+
+ volatile int x_wait = 0; /* counts requests in wait for X */
+ volatile int x_flag = 0; /* X status: 0, 1, 2, or 3 */
+ std::thread::id x_owner; /* X owner (thread id) */
+
+ std::mutex x_gate_lock;
+ std::condition_variable x_gate; /* wait for release of X */
+ std::mutex s_gate_lock;
+ std::condition_variable s_gate; /* wait for release of S */
+
+ bool px = true; /* enable X precedence */
+
+ struct TNode {
+ TNode * _prev = nullptr;
+ TNode * _next = nullptr;
+ std::thread::id id;
+ int count = 0;
+ };
+ TNode * s_freed = nullptr;
+ TNode * s_nodes = nullptr;
+
+ void spin_lock() {
+ while (s_spin.exchange(true, std::memory_order_acquire)) {
+ do {
+ std::this_thread::yield();
+ } while (s_spin.load(std::memory_order_relaxed));
+ }
+ }
+ void spin_unlock() {
+ s_spin.store(false, std::memory_order_release);
+ }
+
+ TNode * find_node(const std::thread::id& id);
+ TNode * new_node(const std::thread::id& id);
+ void free_node(TNode * n);
+
+public:
+ Latch();
+ explicit Latch(bool _px) : px(_px) { }
+ Latch(const Latch&) = delete;
+ Latch(Latch&&) = delete;
+ Latch& operator=(const Latch&) = delete;
+ Latch& operator=(Latch&&) = delete;
+ ~Latch();
+
+ /* Locks the latch for exclusive ownership,
+ * blocks if the latch is not available
+ */
+ void lock();
+
+ /* Unlocks the latch (exclusive ownership) */
+ void unlock();
+
+ /* Locks the latch for shared ownership,
+ * blocks if the latch is not available
+ */
+ void lock_shared();
+
+ /* Unlocks the latch (shared ownership) */
+ void unlock_shared();
+
+ /* Tries to lock the latch for shared ownership,
+ * returns true if the latch has no exclusive ownership or any request for
+ * exclusive ownership, else false
+ */
+ bool try_lock_shared();
+};
+
+/*
+ * Cannot use the template std::shared_lock as Latch does not implement all the
+ * requirements of the standard
+ */
+class OSMSCOUT_API ReadLock
+{
+private:
+ Latch *p = nullptr;
+ bool owns = false;
+
+ void swap(ReadLock& rl) noexcept {
+ std::swap(p, rl.p);
+ std::swap(owns, rl.owns);
+ }
+
+public:
+
+ ReadLock() = default;
+
+ explicit ReadLock(Latch& latch) : p(&latch), owns(true) { latch.lock_shared(); }
+
+ /* Assume the calling thread already has ownership of the shared lock */
+ ReadLock(Latch& latch, std::adopt_lock_t) : p(&latch), owns(true) { }
+
+ ~ReadLock() {
+ if (owns) {
+ p->unlock_shared();
+ }
+ }
+
+ ReadLock(ReadLock const&) = delete;
+ ReadLock& operator=(ReadLock const&) = delete;
+
+ ReadLock(ReadLock&& rl) noexcept { swap(rl); }
+
+ ReadLock& operator=(ReadLock&& rl) noexcept {
+ swap(rl);
+ return *this;
+ }
+
+ bool owns_lock() const noexcept {
+ return owns;
+ }
+
+ void lock() {
+ if (!owns && p != nullptr) {
+ p->lock_shared();
+ owns = true;
+ }
+ }
+
+ void unlock() {
+ if (owns) {
+ owns = false;
+ p->unlock_shared();
+ }
+ }
+
+ bool try_lock() {
+ if (!owns && p != nullptr) {
+ owns = p->try_lock_shared();
+ }
+ return owns;
+ }
+};
+
+/*
+ * Cannot use the template std::unique_lock as Latch does not implement all the
+ * requirements of the standard
+ */
+class OSMSCOUT_API WriteLock
+{
+private:
+ Latch *p = nullptr;
+ bool owns = false;
+
+ void swap(WriteLock& wl) noexcept {
+ std::swap(p, wl.p);
+ std::swap(owns, wl.owns);
+ }
+
+public:
+
+ WriteLock() = default;
+
+ explicit WriteLock(Latch& latch) : p(&latch), owns(true) { latch.lock(); }
+
+ ~WriteLock() {
+ if (owns) {
+ p->unlock();
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/private/meson.build
^
|
| @@ -10,10 +10,6 @@
coreCfg.set('HAVE_POSIX_FADVISE',posixfadviceAvailable, description: 'posixfadvice() is available')
coreCfg.set('HAVE_POSIX_MADVISE',posixmadviceAvailable, description: 'posixmadvice() is available')
coreCfg.set('SIZEOF_WCHAR_T',sizeOfWChar, description: 'byte size of wchar_t')
-coreCfg.set('HAVE_ICONV',iconvAvailable, description: 'iconv library available')
-
-## TODO
-coreCfg.set('ICONV_CONST','', description: 'Signature of second parameter of the iconv() function')
configure_file(output: 'Config.h',
configuration: coreCfg)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/routing/RouteNode.h
^
|
| @@ -101,6 +101,20 @@
uint8_t objectIndex; //!< The index of the way to use from this route node to the target route node
uint8_t flags; //!< Certain flags
+ bool IsUsable(Vehicle vehicle) const
+ {
+ switch (vehicle) {
+ case vehicleFoot:
+ return (flags & usableByFoot) != 0;
+ case vehicleBicycle:
+ return (flags & usableByBicycle) != 0;
+ case vehicleCar:
+ return (flags & usableByCar) != 0;
+ }
+
+ return false;
+ }
+
bool IsRestricted(Vehicle vehicle) const
{
switch (vehicle) {
@@ -140,8 +154,12 @@
return point.GetCoord();
}
+ Point GetPoint() const {
+ return point;
+ }
+
void Initialize(FileOffset fileOffset,
- const Point& point)
+ const Point& point)
{
this->fileOffset=fileOffset;
this->point=point;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/util/Locale.h
^
|
| @@ -24,6 +24,7 @@
#include <osmscout/system/Compiler.h>
#include <osmscout/util/Distance.h>
+#include <osmscout/log/Logger.h>
#include <string>
@@ -102,7 +103,33 @@
}
public:
- static Locale ByEnvironment(std::locale locale = std::locale(""));
+
+ /** Creates Locale from provided std::locale
+ */
+ static Locale FromStdLocale(std::locale locale);
+
+ /** Creates Locale defined by current environment
+ *
+ * @throw std::runtime_error when locale defined by environment is undefined
+ */
+ static Locale ByEnvironment()
+ {
+ return FromStdLocale(std::locale(""));
+ }
+
+ /** Creates Locale defined by current environment,
+ * it is not throwing exception when environment locale is incorrect,
+ * it just return default Locale instead.
+ */
+ static Locale ByEnvironmentSafe()
+ {
+ try {
+ return ByEnvironment();
+ } catch (const std::runtime_error &e) {
+ log.Warn() << "Failed to get environment locale: " << e.what();
+ return Locale();
+ }
+ }
};
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/include/osmscout/util/String.h
^
|
| @@ -74,11 +74,21 @@
*
* @param value
* @param locale
- * @return
+ * @return UTF-8 string
*/
extern OSMSCOUT_API std::string NumberToString(long value, const Locale &locale);
/**
+ * Returns locale-aware string representation of number
+ *
+ * @param value
+ * @param locale
+ * @param precision
+ * @return UTF-8 string
+ */
+ extern OSMSCOUT_API std::string FloatToString(double value, const Locale &locale, uint32_t precision = 3);
+
+ /**
* \ingroup Util
* Returns the numerical value of the given character, if the character
* is a digit in a numerical value. The current code allows digits
@@ -403,9 +413,13 @@
/**
* \ingroup Util
*
+ * Prints byte size with short, human readable form by ISO/IEC 80000 standard.
+ * It means that KiB stands for 1024 bytes, MiB for 1024^2, GiB 1024^3...
+ *
+ * Returned string is locale aware, UTF-8 encoded
*/
- extern OSMSCOUT_API std::string ByteSizeToString(FileOffset size);
- extern OSMSCOUT_API std::string ByteSizeToString(double size);
+ extern OSMSCOUT_API std::string ByteSizeToString(FileOffset size, const Locale &locale = Locale::ByEnvironmentSafe());
+ extern OSMSCOUT_API std::string ByteSizeToString(double size, const Locale &locale = Locale::ByEnvironmentSafe());
/**
* \ingroup Util
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/meson.build
^
|
| @@ -27,7 +27,7 @@
osmscoutSrc,
include_directories: osmscoutIncDir,
cpp_args: cppArgs,
- dependencies: [mathDep, threadDep, openmpDep, iconvDep, marisaDep],
+ dependencies: [mathDep, threadDep, openmpDep, marisaDep],
link_args: link_args,
version: libraryVersion,
install: true)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/src/meson.build
^
|
| @@ -5,6 +5,7 @@
'src/osmscout/cli/CmdLineParsing.cpp',
'src/osmscout/async/AsyncWorker.cpp',
'src/osmscout/async/Breaker.cpp',
+ 'src/osmscout/async/ReadWriteLock.cpp',
'src/osmscout/async/Thread.cpp',
'src/osmscout/async/Worker.cpp',
'src/osmscout/async/WorkQueue.cpp',
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/async/ReadWriteLock.cpp
^
|
| @@ -0,0 +1,316 @@
+/*
+ This source is part of the libosmscout library
+ Copyright (C) 2024 Jean-Luc Barriere
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <osmscout/private/Config.h>
+
+#include <osmscout/async/ReadWriteLock.h>
+
+#include <osmscout/log/Logger.h>
+
+#include <cassert>
+#include <chrono>
+
+namespace osmscout {
+
+/**
+ * The X flag is set as follows based on the locking steps
+ * Step 0 : X is released
+ * Step 1 : X is held, but waits for release of S
+ * Step 2 : X was released and left available for one of request in wait
+ * Step 3 : X is held
+ * Step N : X recursive N-3
+ */
+constexpr int X_STEP_0 = 0;
+constexpr int X_STEP_1 = 1;
+constexpr int X_STEP_2 = 2;
+constexpr int X_STEP_3 = 3;
+
+Latch::Latch() {
+ /* preallocate free list with 2 nodes */
+ TNode * n1 = new_node(std::thread::id());
+ TNode * n2 = new_node(std::thread::id());
+ free_node(n1);
+ free_node(n2);
+}
+
+Latch::~Latch() {
+ /* destroy free nodes */
+ while (s_freed != nullptr) {
+ TNode * n = s_freed;
+ s_freed = s_freed->_next;
+ delete n;
+ }
+ /* it should be empty, but still tries to destroy any existing busy node */
+ while (s_nodes != nullptr) {
+ TNode * n = s_nodes;
+ s_nodes = s_nodes->_next;
+ delete n;
+ }
+}
+
+Latch::TNode * Latch::find_node(const std::thread::id& id)
+{
+ TNode * p = s_nodes;
+ while (p != nullptr && p->id != id) {
+ p = p->_next;
+ }
+ return p;
+}
+
+Latch::TNode * Latch::new_node(const std::thread::id& id)
+{
+ TNode * p;
+ if (s_freed == nullptr) {
+ /* create node */
+ p = new TNode();
+ } else {
+ /* pop front from free list */
+ p = s_freed;
+ s_freed = p->_next;
+ }
+
+ /* setup */
+ p->id = id;
+ p->count = 0;
+
+ /* push front in list */
+ p->_prev = nullptr;
+ p->_next = s_nodes;
+ if (s_nodes != nullptr) {
+ s_nodes->_prev = p;
+ }
+ s_nodes = p;
+ return p;
+}
+
+void Latch::free_node(TNode * n)
+{
+ /* remove from list */
+ if (n == s_nodes) {
+ s_nodes = n->_next;
+ } else {
+ n->_prev->_next = n->_next;
+ }
+ if (n->_next != nullptr) {
+ n->_next->_prev = n->_prev;
+ }
+
+ /* push front in free list */
+ if (s_freed != nullptr) {
+ s_freed->_prev = n;
+ }
+ n->_next = s_freed;
+ n->_prev = nullptr;
+ s_freed = n;
+}
+
+void Latch::lock() {
+ /* Depending on the internal implementation of conditional variable,
+ * a race condition could arise, permanently blocking the thread;
+ * Setting a timeout works around the issue.
+ */
+ static constexpr std::chrono::seconds exit_timeout(1);
+
+ std::thread::id tid = std::this_thread::get_id();
+
+ spin_lock();
+
+ if (x_owner != tid) {
+ /* increments the count of request in wait */
+ ++x_wait;
+ for (;;) {
+ /* if flag is 0 or 2 then it hold X with no wait,
+ * in other case it have to wait for X gate
+ */
+ if (x_flag == X_STEP_0 || x_flag == X_STEP_2) {
+ x_flag = X_STEP_1;
+ --x_wait;
+ break;
+ } else {
+ /* !!! pop gate then unlock spin */
+ std::unique_lock<std::mutex> lk(x_gate_lock);
+ spin_unlock();
+ x_gate.wait_for(lk, exit_timeout);
+ lk.unlock();
+ }
+ spin_lock();
+ }
+
+ /* find the thread node */
+ TNode * n = find_node(tid);
+ /* X = 1, check the releasing of S */
+ for (;;) {
+ /* if the count of S is zeroed, or equal to self count, then it finalizes
+ * with no wait, in other case it has to wait for S gate
+ */
+ if (s_nodes == nullptr || (s_nodes == n && s_nodes->_next == nullptr)) {
+ x_flag = X_STEP_3;
+ break;
+ } else {
+ /* !!! pop gate then unlock spin (reverse order for S notifier) */
+ std::unique_lock<std::mutex> lk(s_gate_lock);
+ spin_unlock();
+ s_gate.wait_for(lk, exit_timeout);
+ lk.unlock();
+ spin_lock();
+ /* check if the notifier has hand over, else retry */
+ if (x_flag == X_STEP_3) {
+ break;
+ }
+ }
+ }
+
+ /* X = 3, set owner */
+ x_owner = tid;
+ } else {
+ /* recursive X lock */
+ ++x_flag;
+ }
+
+ spin_unlock();
+}
+
+void Latch::unlock() {
+ spin_lock();
+ if (x_owner == std::this_thread::get_id()) {
+ /* decrement recursive lock */
+ if (--x_flag == X_STEP_2) {
+ x_owner = std::thread::id();
+ /* hand-over to a request in wait for X, else release */
+ if (x_wait == 0) {
+ x_flag = X_STEP_0;
+ }
+ /* !!! unlock spin then pop gate (reverse order for receiver) */
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/routing/MultiDBRoutingService.cpp
^
|
| @@ -110,10 +110,14 @@
}
for (auto& handle : handles) {
- handle.routingDatabase->Close();
- handle.routingDatabase.reset();
- handle.router->Close();
- handle.router.reset();
+ if (handle.routingDatabase) {
+ handle.routingDatabase->Close();
+ handle.routingDatabase.reset();
+ }
+ if (handle.router) {
+ handle.router->Close();
+ handle.router.reset();
+ }
handle.profile.reset();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/util/Locale.cpp
^
|
| @@ -35,7 +35,7 @@
}
}
- Locale Locale::ByEnvironment(std::locale cppLocale)
+ Locale Locale::FromStdLocale(std::locale cppLocale)
{
Locale locale;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/libosmscout/src/osmscout/util/String.cpp
^
|
| @@ -41,133 +41,12 @@
#if defined(HAVE_CODECVT)
#include <codecvt>
-#endif
-
-#if defined(HAVE_ICONV)
-#include <iconv.h>
+#else
+static_assert(false, "Missing <codecvt> header, needed for charset conversions");
#endif
namespace osmscout {
-#if defined(HAVE_ICONV)
-
- class IConvWrapper
- {
- private:
- iconv_t handle;
- public:
- IConvWrapper(const std::string &fromCode,
- const std::string &toCode):
- handle(iconv_open(toCode.c_str(), fromCode.c_str()))
- {
- int errnoSnapshot=errno;
- if (!IsValid()) {
- log.Error() << "Error iconv_open(\"" << toCode << "\", \"" << fromCode << "\"): " << strerror(errnoSnapshot);
- }
- }
-
- ~IConvWrapper()
- {
- Close();
- }
-
- bool IsValid() const
- {
- return handle!=(iconv_t)-1;
- }
-
- void Close()
- {
- if (IsValid()) {
- iconv_close(handle);
- handle=(iconv_t)-1; // invalidate handler
- }
- }
-
- template <typename InChar, typename InString, typename OutChar, typename OutString>
- OutString Convert(const InString &text)
- {
- // length+1 to get the result '\0'-terminated
- size_t inCountBytes=(text.length() + 1) * sizeof(InChar);
- size_t outCount=text.length()*4+4; // will be resized when necessary
-
- char *in=const_cast<char*>(reinterpret_cast<const char*>(text.data())); // TODO: it is safe cast?
-
- std::vector<OutChar> outBuff(outCount);
- char *tmpOut=reinterpret_cast<char*>(outBuff.data()); // TODO: it is safe cast?
- size_t tmpOutCountBytes=outBuff.size() * sizeof(OutChar);
- while (inCountBytes > 0) {
- if (iconv(handle, (ICONV_CONST char **) &in, &inCountBytes, &tmpOut, &tmpOutCountBytes) == (size_t) -1) {
- if (errno==EILSEQ || errno==EINVAL) {
- // An invalid multibyte sequence is encountered in the input
- log.Error() << "Error iconv: " << strerror(errno);
- break;
- } else if (errno==E2BIG) {
- // The output buffer has no more room for the next converted character
- size_t convertedBytes = outBuff.size() * sizeof(OutChar) - tmpOutCountBytes;
- outBuff.resize(outBuff.size() * 2);
-
- tmpOut = reinterpret_cast<char*>(outBuff.data()) + convertedBytes;
- tmpOutCountBytes = outBuff.size() * sizeof(OutChar) - convertedBytes;
- } else {
- // unrecoverable error
- Close();
- return OutString();
- }
- }
- }
-
- if (tmpOutCountBytes < (4 * sizeof(OutChar))) { // ensure enough space for remaining data
- size_t convertedBytes = outBuff.size() * sizeof(OutChar) - tmpOutCountBytes;
- outBuff.resize(outBuff.size() + 4);
- tmpOut= reinterpret_cast<char*>(outBuff.data()) + convertedBytes;
- tmpOutCountBytes = outBuff.size() * sizeof(OutChar) - convertedBytes;
- }
-
- // flush the iconv buffer,
- iconv(handle, nullptr, nullptr, &tmpOut, &tmpOutCountBytes);
-
- OutString res=outBuff.data();
- return res;
- }
-
- std::string Convert(const std::string &text)
- {
- return Convert<char, std::string, char, std::string>(text);
- }
- };
-
- class IConvHandlerPool: public ObjectPool<IConvWrapper>
- {
- private:
- std::string fromCode;
- std::string toCode;
- public:
- IConvHandlerPool(const std::string &fromCode,
- const std::string &toCode):
- ObjectPool<IConvWrapper>(std::thread::hardware_concurrency()),
- fromCode(fromCode),
- toCode(toCode)
- {}
-
- IConvWrapper* MakeNew() noexcept override
- {
- IConvWrapper* wrapper=new IConvWrapper(fromCode, toCode);
- if (!wrapper->IsValid()) {
- delete wrapper;
- return nullptr;
- }
- return wrapper;
- }
-
- bool IsValid(IConvWrapper* wrapper) noexcept override
- {
- return wrapper->IsValid();
- }
- };
-
-#endif
-
bool StringToBool(const char* string, bool& value)
{
if (std::strcmp(string,"true")==0) {
@@ -196,6 +75,7 @@
std::string NumberToString(long value, const Locale &locale)
{
std::stringstream ss;
+ ss.imbue(std::locale("C"));
if (std::abs(value) < 1000 || locale.GetThousandsSeparator().empty()){
ss << value;
}else{
@@ -214,6 +94,27 @@
return ss.str();
}
+ extern OSMSCOUT_API std::string FloatToString(double value, const Locale &locale, uint32_t precision)
+ {
+ std::stringstream ss;
+ double order = std::pow(10, precision);
+ value = std::round(value * order) / order;
+ ss << NumberToString(static_cast<long>(value), locale);
+
+ if (precision > 0) {
+ ss << locale.GetDecimalSeparator();
+ double fractionNum = std::abs(value) - std::floor(std::abs(value));
+ std::string fraction = NumberToString(fractionNum * order, Locale());
+ for (size_t i = 0; i < fraction.size(); i++) {
+ if (i > 0 && i % 3 == 0 && i < fraction.size() - 1) {
+ ss << locale.GetThousandsSeparator();
+ }
+ ss << fraction[i];
+ }
+ }
+ return ss.str();
+ }
+
bool GetDigitValue(char digit, size_t& result)
{
switch (digit) {
@@ -329,36 +230,32 @@
return wordCount;
}
- std::string ByteSizeToString(FileOffset value)
+ std::string ByteSizeToString(FileOffset value, const Locale &locale)
{
- return ByteSizeToString((double)value);
+ return ByteSizeToString(static_cast<double>(value), locale);
}
- std::string ByteSizeToString(double value)
+ std::string ByteSizeToString(double value, const Locale &locale)
{
std::stringstream buffer;
- buffer.setf(std::ios::fixed);
- buffer << std::setprecision(1);
-
if (value<1.0 && value>-1) {
- buffer << "0 B";
+ buffer << "0" << locale.GetUnitsSeparator() << "B";
}
- else if (ceil(value)>=1024.0*1024*1024*1024) {
- buffer << value/(1024.0*1024*1024*1024) << " TiB";
+ else if (ceil(value)>=std::pow(1024.0, 4.0)) {
+ buffer << FloatToString(value/std::pow(1024.0, 4.0), locale, 1) << locale.GetUnitsSeparator() << "TiB";
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/meson.build
^
|
| @@ -59,7 +59,6 @@
# Check for headers
fcntlAvailable = compiler.has_header('fcntl.h')
statAvailable = compiler.has_header('sys/stat.h')
-iconvAvailable = compiler.has_header('iconv.h')
codecvtAvailable = compiler.has_header('codecvt')
jniAvailable = compiler.has_header('jni.h')
@@ -83,7 +82,6 @@
# Base
mathDep = compiler.find_library('m', required : false)
threadDep = dependency('threads')
-iconvDep = compiler.find_library('iconv', required: false)
if compiler.get_id()=='clang' or compiler.get_id()=='msvc'
openmpDep = dependency('', required: false)
else
@@ -365,6 +363,10 @@
subdir('DumpData')
subdir('PublicTransportMap')
+if buildGpx
+ subdir('WellScoutedRoute')
+endif
+
if buildOSMScout2
subdir('OSMScout2')
endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/dependencies/libosmscout/sonar-project.properties
^
|
| @@ -2,12 +2,8 @@
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
+sonar.sourceEncoding=UTF-8
sonar.exclusions=**/*.java,**/*.html,**/*.css
sonar.coverage.exclusions=**/*.java,**/*.html,**/*.css
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/graphics/cover-2.34.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.34.tar.bz2/pics/cover.jpg
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/qml/custom/Global.qml
^
|
| @@ -201,6 +201,10 @@
property bool altitudeValid: false
property date lastAltitudeUpdate: new Date(0)
+ property double speed: -1
+ property bool speedValid: false
+ property date lastSpeedUpdate: new Date(0)
+
property double verticalAccuracy: 0
property bool verticalAccuracyValid: false
@@ -271,6 +275,11 @@
verticalAccuracy = position.verticalAccuracy;
verticalAccuracyValid = position.verticalAccuracyValid;
}
+ if (position.speedValid){
+ speed = position.speed;
+ speedValid = true;
+ lastSpeedUpdate = lastUpdate;
+ }
updateInternal();
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/qml/pages/MapPage.qml
^
|
| @@ -1781,6 +1781,7 @@
var key = styleFlagsModel.data(index, StyleFlagsModel.KeyRole);
if (key === "daylight") {
nightModeBtn.daylight = styleFlagsModel.data(index, StyleFlagsModel.ValueRole);
+ nightModeProgressIndicator.running = styleFlagsModel.data(index, StyleFlagsModel.InProgressRole);
// console.log("update daylight to " + nightModeBtn.daylight);
return;
}
@@ -1816,6 +1817,12 @@
styleFlagsModel.setFlag("daylight", !nightModeBtn.daylight);
}
}
+ BusyIndicator{
+ id: nightModeProgressIndicator
+ running: false
+ size: BusyIndicatorSize.Medium
+ anchors.centerIn: parent
+ }
}
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/qml/pages/Tracker.qml
^
|
| @@ -250,7 +250,10 @@
value: qsTranslate("trackType", Global.tracker.type)
}
- SectionHeader{ text: qsTr("Current data") }
+ SectionHeader{
+ text: qsTr("Current data")
+ visible: Global.positionSource.lastUpdate.getTime() > 0
+ }
DetailItem {
id: lastUpdateTime
@@ -260,6 +263,19 @@
value: Qt.formatTime(Global.positionSource.lastUpdate, Qt.DefaultLocaleLongDate)
}
DetailItem {
+ id: currentSpeed
+ visible: Global.positionSource.lastUpdate.getTime() > 0
+ //: Current speed reported by gps
+ label: qsTr("Speed")
+ value: (Global.positionSource.speedValid && ((Global.positionSource.lastUpdate.getTime() - Global.positionSource.lastSpeedUpdate.getTime()) < 10000)) ?
+ (Utils.distanceUnits == "imperial" ?
+ (qsTr("%1 mi/h")
+ .arg(content.round10((Global.positionSource.speed*3.6 * 1000) / 1609.344))) :
+ (qsTr("%1 km/h")
+ .arg(content.round10(Global.positionSource.speed*3.6)))
+ ) : "-"
+ }
+ DetailItem {
id: lastHorizontalAccuracy
visible: lastUpdateTime.visible
label: qsTr("Horizontal accuracy")
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/src/MediaPlayer.h
^
|
| @@ -17,6 +17,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#pragma once
+
// Qt includes
#include <QGuiApplication>
#include <QStandardPaths>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/cs.ts
^
|
| @@ -1630,14 +1630,89 @@
<context>
<name>Tracker</name>
<message>
+ <source>Edit track</source>
+ <translation>Upravit trasu</translation>
+ </message>
+ <message>
<source>New track</source>
<translation>Nová trasa</translation>
</message>
<message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation>Můžete se vrátit na mapu, stopař bude pokračovat na pozadí</translation>
+ </message>
+ <message>
+ <source>Change color</source>
+ <translation>Změnit barvu</translation>
+ </message>
+ <message>
+ <source>Rename track</source>
+ <translation>Přejmenovat trasu</translation>
+ </message>
+ <message>
<source>Stop tracking</source>
<translation>Zastavit stopaře</translation>
</message>
<message>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation>Zastavuji stopaře</translation>
+ </message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation>
+ <numerusform>Nastala %n chyba během trackování. Poslední: %2</numerusform>
+ <numerusform>Nastaly %n chyby během trackování. Poslední: %2</numerusform>
+ <numerusform>Nastalo %n chyb během trackování. Poslední: %2</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
+ <translation>Typ</translation>
+ </message>
+ <message>
+ <source>Current data</source>
+ <translation>Současná data</translation>
+ </message>
+ <message>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation>Poslední aktualizace</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/h</translation>
+ </message>
+ <message>
+ <source>Horizontal accuracy</source>
+ <translation>Horizontální přesnost</translation>
+ </message>
+ <message>
+ <source>Altitude</source>
+ <translation>Nadmořská výška</translation>
+ </message>
+ <message>
+ <source>%1 ft a.s.l.</source>
+ <translation>%1 stop n.m.</translation>
+ </message>
+ <message>
+ <source>%1 m a.s.l.</source>
+ <translation>%1 m n.m.</translation>
+ </message>
+ <message>
+ <source>Vertical accuracy</source>
+ <translation>Vertikální přesnost</translation>
+ </message>
+ <message>
+ <source>Statistics</source>
+ <translation>Statistika</translation>
+ </message>
+ <message>
<source>Distance</source>
<translation>Vzdálenost</translation>
</message>
@@ -1681,14 +1756,6 @@
<translation>Rychlost v pohybu ⌀</translation>
</message>
<message>
- <source>%1 mi/h</source>
- <translation>%1 mi/h</translation>
- </message>
- <message>
- <source>%1 km/h</source>
- <translation>%1 km/h</translation>
- </message>
- <message>
<source>Elevation min/max</source>
<translation>Nadmořská výška min/max</translation>
</message>
@@ -1709,71 +1776,9 @@
<translation>Klesání</translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
- <translation>Zastavuji stopaře</translation>
- </message>
- <message>
- <source>Current data</source>
- <translation>Současná data</translation>
- </message>
- <message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation>Poslední aktualizace</translation>
- </message>
- <message>
- <source>Horizontal accuracy</source>
- <translation>Horizontální přesnost</translation>
- </message>
- <message>
- <source>Altitude</source>
- <translation>Nadmořská výška</translation>
- </message>
- <message>
- <source>%1 ft a.s.l.</source>
- <translation>%1 stop n.m.</translation>
- </message>
- <message>
- <source>%1 m a.s.l.</source>
- <translation>%1 m n.m.</translation>
- </message>
- <message>
- <source>Vertical accuracy</source>
- <translation>Vertikální přesnost</translation>
- </message>
- <message>
- <source>Statistics</source>
- <translation>Statistika</translation>
- </message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation>
- <numerusform>Nastala %n chyba během trackování. Poslední: %2</numerusform>
- <numerusform>Nastaly %n chyby během trackování. Poslední: %2</numerusform>
- <numerusform>Nastalo %n chyb během trackování. Poslední: %2</numerusform>
- </translation>
- </message>
- <message>
- <source>Edit track</source>
- <translation>Upravit trasu</translation>
- </message>
- <message>
- <source>Rename track</source>
- <translation>Přejmenovat trasu</translation>
- </message>
- <message>
- <source>Change color</source>
- <translation>Změnit barvu</translation>
- </message>
- <message>
- <source>Type</source>
- <extracomment>track type</extracomment>
- <translation>Typ</translation>
- </message>
- <message>
- <source>You can return to the map, tracking will continue on background</source>
- <translation>Můžete se vrátit na mapu, stopař bude pokračovat na pozadí</translation>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
+ <translation>Rychlost</translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/de.ts
^
|
| @@ -1630,14 +1630,88 @@
<context>
<name>Tracker</name>
<message>
+ <source>Edit track</source>
+ <translation>Bearbeite Strecke</translation>
+ </message>
+ <message>
<source>New track</source>
<translation>Neue Aufzeichnung</translation>
</message>
<message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation>Du kannst zur Karte zurückkehren, das Tracking wird im Hintergrund fortgesetzt</translation>
+ </message>
+ <message>
+ <source>Change color</source>
+ <translation>Ändere Farbe</translation>
+ </message>
+ <message>
+ <source>Rename track</source>
+ <translation>Strecke umbenennen</translation>
+ </message>
+ <message>
<source>Stop tracking</source>
<translation>Stoppe Aufzeichnung</translation>
</message>
<message>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation>Stoppe Aufzeichnungsmodul</translation>
+ </message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation>
+ <numerusform>Es gab %n Fehler während des Trackens. Neuester: %2</numerusform>
+ <numerusform>Es gab %n Fehler während des Trackens. Neuester: %2</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
+ <translation>Art</translation>
+ </message>
+ <message>
+ <source>Current data</source>
+ <translation>Aktuelle Daten</translation>
+ </message>
+ <message>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation>Letztes Update</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/h</translation>
+ </message>
+ <message>
+ <source>Horizontal accuracy</source>
+ <translation>Horizontale Genauigkeit</translation>
+ </message>
+ <message>
+ <source>Altitude</source>
+ <translation>Höhe</translation>
+ </message>
+ <message>
+ <source>%1 ft a.s.l.</source>
+ <translation>%1 ft ü.M.</translation>
+ </message>
+ <message>
+ <source>%1 m a.s.l.</source>
+ <translation>%1 m ü.M.</translation>
+ </message>
+ <message>
+ <source>Vertical accuracy</source>
+ <translation>Vertikale Genauigkeit</translation>
+ </message>
+ <message>
+ <source>Statistics</source>
+ <translation>Statistik</translation>
+ </message>
+ <message>
<source>Distance</source>
<translation>Entfernung</translation>
</message>
@@ -1681,14 +1755,6 @@
<translation>Reisegeschwindigkeit ⌀</translation>
</message>
<message>
- <source>%1 mi/h</source>
- <translation>%1 mi/h</translation>
- </message>
- <message>
- <source>%1 km/h</source>
- <translation>%1 km/h</translation>
- </message>
- <message>
<source>Elevation min/max</source>
<translation>Höhe min/max</translation>
</message>
@@ -1709,70 +1775,9 @@
<translation>Abstieg</translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
- <translation>Stoppe Aufzeichnungsmodul</translation>
- </message>
- <message>
- <source>Current data</source>
- <translation>Aktuelle Daten</translation>
- </message>
- <message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation>Letztes Update</translation>
- </message>
- <message>
- <source>Horizontal accuracy</source>
- <translation>Horizontale Genauigkeit</translation>
- </message>
- <message>
- <source>Altitude</source>
- <translation>Höhe</translation>
- </message>
- <message>
- <source>%1 ft a.s.l.</source>
- <translation>%1 ft ü.M.</translation>
- </message>
- <message>
- <source>%1 m a.s.l.</source>
- <translation>%1 m ü.M.</translation>
- </message>
- <message>
- <source>Vertical accuracy</source>
- <translation>Vertikale Genauigkeit</translation>
- </message>
- <message>
- <source>Statistics</source>
- <translation>Statistik</translation>
- </message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation>
- <numerusform>Es gab %n Fehler während des Trackens. Neuester: %2</numerusform>
- <numerusform>Es gab %n Fehler während des Trackens. Neuester: %2</numerusform>
- </translation>
- </message>
- <message>
- <source>Edit track</source>
- <translation>Bearbeite Strecke</translation>
- </message>
- <message>
- <source>Rename track</source>
- <translation>Strecke umbenennen</translation>
- </message>
- <message>
- <source>Change color</source>
- <translation>Ändere Farbe</translation>
- </message>
- <message>
- <source>Type</source>
- <extracomment>track type</extracomment>
- <translation>Art</translation>
- </message>
- <message>
- <source>You can return to the map, tracking will continue on background</source>
- <translation>Du kannst zur Karte zurückkehren, das Tracking wird im Hintergrund fortgesetzt</translation>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/en.ts
^
|
| @@ -1630,148 +1630,153 @@
<context>
<name>Tracker</name>
<message>
- <source>New track</source>
+ <source>Edit track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Stop tracking</source>
+ <source>New track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Distance</source>
+ <source>You can return to the map, tracking will continue on background</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Raw distance</source>
+ <source>Change color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>From</source>
- <extracomment>From date time</extracomment>
+ <source>Rename track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>To</source>
- <extracomment>To date time</extracomment>
+ <source>Stop tracking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Time</source>
- <extracomment>Track duration</extracomment>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <source>Moving Time</source>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Speed ⌀/max</source>
+ <source>Current data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 mi/h</source>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 km/h</source>
+ <source>%1 mi/h</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Speed ⌀</source>
+ <source>%1 km/h</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 mi/h</source>
+ <source>Horizontal accuracy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 km/h</source>
+ <source>Altitude</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Elevation min/max</source>
+ <source>%1 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 ft a.s.l.</source>
+ <source>%1 m a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 m a.s.l.</source>
+ <source>Vertical accuracy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Ascent</source>
+ <source>Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Descent</source>
+ <source>Distance</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
+ <source>Raw distance</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Current data</source>
+ <source>From</source>
+ <extracomment>From date time</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
+ <source>To</source>
+ <extracomment>To date time</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Horizontal accuracy</source>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Altitude</source>
+ <source>Moving Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft a.s.l.</source>
+ <source>Speed ⌀/max</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m a.s.l.</source>
+ <source>%1 / %2 mi/h</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Vertical accuracy</source>
+ <source>%1 / %2 km/h</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Statistics</source>
+ <source>Moving Speed ⌀</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Edit track</source>
+ <source>%1 / %2 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Rename track</source>
+ <source>%1 / %2 m a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Change color</source>
+ <source>Ascent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Type</source>
- <extracomment>track type</extracomment>
+ <source>Descent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can return to the map, tracking will continue on background</source>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/es.ts
^
|
| @@ -1630,14 +1630,88 @@
<context>
<name>Tracker</name>
<message>
+ <source>Edit track</source>
+ <translation>Editar rastro</translation>
+ </message>
+ <message>
<source>New track</source>
<translation>Nuevo rastro</translation>
</message>
<message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Change color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Rename track</source>
+ <translation>Renombrar rastro</translation>
+ </message>
+ <message>
<source>Stop tracking</source>
<translation>Detener rastreo</translation>
</message>
<message>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation>Deteniendo el rastreo</translation>
+ </message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation>
+ <numerusform>Hubo %n error durante el seguimiento. Reciente: %2</numerusform>
+ <numerusform>Hubieron %n errores durante el seguimiento. Reciente: %2</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Current data</source>
+ <translation>Datos actuales</translation>
+ </message>
+ <message>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation>Última actualización</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/h</translation>
+ </message>
+ <message>
+ <source>Horizontal accuracy</source>
+ <translation>Precisión horizontal</translation>
+ </message>
+ <message>
+ <source>Altitude</source>
+ <translation>Altitud</translation>
+ </message>
+ <message>
+ <source>%1 ft a.s.l.</source>
+ <translation>%1 ps a.n.m.</translation>
+ </message>
+ <message>
+ <source>%1 m a.s.l.</source>
+ <translation>%1 ms a.n.m.</translation>
+ </message>
+ <message>
+ <source>Vertical accuracy</source>
+ <translation>Precisión vertical</translation>
+ </message>
+ <message>
+ <source>Statistics</source>
+ <translation>Estadísticas</translation>
+ </message>
+ <message>
<source>Distance</source>
<translation>Distancia</translation>
</message>
@@ -1681,14 +1755,6 @@
<translation>Velocidad de movim.</translation>
</message>
<message>
- <source>%1 mi/h</source>
- <translation>%1 mi/h</translation>
- </message>
- <message>
- <source>%1 km/h</source>
- <translation>%1 km/h</translation>
- </message>
- <message>
<source>Elevation min/max</source>
<translation>Elevación min/max</translation>
</message>
@@ -1709,69 +1775,8 @@
<translation>Descenso</translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
- <translation>Deteniendo el rastreo</translation>
- </message>
- <message>
- <source>Current data</source>
- <translation>Datos actuales</translation>
- </message>
- <message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation>Última actualización</translation>
- </message>
- <message>
- <source>Horizontal accuracy</source>
- <translation>Precisión horizontal</translation>
- </message>
- <message>
- <source>Altitude</source>
- <translation>Altitud</translation>
- </message>
- <message>
- <source>%1 ft a.s.l.</source>
- <translation>%1 ps a.n.m.</translation>
- </message>
- <message>
- <source>%1 m a.s.l.</source>
- <translation>%1 ms a.n.m.</translation>
- </message>
- <message>
- <source>Vertical accuracy</source>
- <translation>Precisión vertical</translation>
- </message>
- <message>
- <source>Statistics</source>
- <translation>Estadísticas</translation>
- </message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation>
- <numerusform>Hubo %n error durante el seguimiento. Reciente: %2</numerusform>
- <numerusform>Hubieron %n errores durante el seguimiento. Reciente: %2</numerusform>
- </translation>
- </message>
- <message>
- <source>Edit track</source>
- <translation>Editar rastro</translation>
- </message>
- <message>
- <source>Rename track</source>
- <translation>Renombrar rastro</translation>
- </message>
- <message>
- <source>Change color</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Type</source>
- <extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>You can return to the map, tracking will continue on background</source>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/et.ts
^
|
| @@ -1630,14 +1630,88 @@
<context>
<name>Tracker</name>
<message>
+ <source>Edit track</source>
+ <translation>Muuda rada</translation>
+ </message>
+ <message>
<source>New track</source>
<translation>Uus rada</translation>
</message>
<message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation>Võid uuesti kaardivaate avada ning raja salvestamine jätkub taustal</translation>
+ </message>
+ <message>
+ <source>Change color</source>
+ <translation>Muuda värvi</translation>
+ </message>
+ <message>
+ <source>Rename track</source>
+ <translation>Muuda raja nime</translation>
+ </message>
+ <message>
<source>Stop tracking</source>
<translation>Peata raja salvestamine</translation>
</message>
<message>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation>Peatame raja salvestamist</translation>
+ </message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation>
+ <numerusform>Raja salvestamisel tekkis %n viga, neist viimane on %2</numerusform>
+ <numerusform>Raja salvestamisel tekkis %n viga, neist viimane on %2</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
+ <translation>Tüüp</translation>
+ </message>
+ <message>
+ <source>Current data</source>
+ <translation>Praegused andmed</translation>
+ </message>
+ <message>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation>Viimane uuendus</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/h</translation>
+ </message>
+ <message>
+ <source>Horizontal accuracy</source>
+ <translation>Horisontaalne täpsus</translation>
+ </message>
+ <message>
+ <source>Altitude</source>
+ <translation>Kõrgus merepinnast</translation>
+ </message>
+ <message>
+ <source>%1 ft a.s.l.</source>
+ <translation>%1 ft ümp</translation>
+ </message>
+ <message>
+ <source>%1 m a.s.l.</source>
+ <translation>%1 m ümp</translation>
+ </message>
+ <message>
+ <source>Vertical accuracy</source>
+ <translation>Vertikaalne täpsus</translation>
+ </message>
+ <message>
+ <source>Statistics</source>
+ <translation>Statistika</translation>
+ </message>
+ <message>
<source>Distance</source>
<translation>Vahemaa</translation>
</message>
@@ -1681,14 +1755,6 @@
<translation>Liikumiskiirus ⌀</translation>
</message>
<message>
- <source>%1 mi/h</source>
- <translation>%1 mi/h</translation>
- </message>
- <message>
- <source>%1 km/h</source>
- <translation>%1 km/h</translation>
- </message>
- <message>
<source>Elevation min/max</source>
<translation>Suurim/väikseim kõrgus</translation>
</message>
@@ -1709,70 +1775,9 @@
<translation>Laskumine</translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
- <translation>Peatame raja salvestamist</translation>
- </message>
- <message>
- <source>Current data</source>
- <translation>Praegused andmed</translation>
- </message>
- <message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation>Viimane uuendus</translation>
- </message>
- <message>
- <source>Horizontal accuracy</source>
- <translation>Horisontaalne täpsus</translation>
- </message>
- <message>
- <source>Altitude</source>
- <translation>Kõrgus merepinnast</translation>
- </message>
- <message>
- <source>%1 ft a.s.l.</source>
- <translation>%1 ft ümp</translation>
- </message>
- <message>
- <source>%1 m a.s.l.</source>
- <translation>%1 m ümp</translation>
- </message>
- <message>
- <source>Vertical accuracy</source>
- <translation>Vertikaalne täpsus</translation>
- </message>
- <message>
- <source>Statistics</source>
- <translation>Statistika</translation>
- </message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation>
- <numerusform>Raja salvestamisel tekkis %n viga, neist viimane on %2</numerusform>
- <numerusform>Raja salvestamisel tekkis %n viga, neist viimane on %2</numerusform>
- </translation>
- </message>
- <message>
- <source>Edit track</source>
- <translation>Muuda rada</translation>
- </message>
- <message>
- <source>Rename track</source>
- <translation>Muuda raja nime</translation>
- </message>
- <message>
- <source>Change color</source>
- <translation>Muuda värvi</translation>
- </message>
- <message>
- <source>Type</source>
- <extracomment>track type</extracomment>
- <translation>Tüüp</translation>
- </message>
- <message>
- <source>You can return to the map, tracking will continue on background</source>
- <translation>Võid uuesti kaardivaate avada ning raja salvestamine jätkub taustal</translation>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
+ <translation>Kiirus</translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/fa.ts
^
|
| @@ -1630,54 +1630,52 @@
<context>
<name>Tracker</name>
<message>
- <source>New track</source>
+ <source>Edit track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Stop tracking</source>
+ <source>New track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Distance</source>
- <translation>فاصله</translation>
- </message>
- <message>
- <source>Raw distance</source>
+ <source>You can return to the map, tracking will continue on background</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>From</source>
- <extracomment>From date time</extracomment>
- <translation>از</translation>
- </message>
- <message>
- <source>To</source>
- <extracomment>To date time</extracomment>
- <translation>به</translation>
+ <source>Change color</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Time</source>
- <extracomment>Track duration</extracomment>
- <translation>زمان</translation>
+ <source>Rename track</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Time</source>
- <translation>زمان جابهحایی</translation>
+ <source>Stop tracking</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Speed ⌀/max</source>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <source>%1 / %2 mi/h</source>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 km/h</source>
+ <source>Current data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Speed ⌀</source>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1689,88 +1687,95 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Elevation min/max</source>
+ <source>Horizontal accuracy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 ft a.s.l.</source>
+ <source>Altitude</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 m a.s.l.</source>
+ <source>%1 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Ascent</source>
+ <source>%1 m a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Descent</source>
+ <source>Vertical accuracy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
+ <source>Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Current data</source>
- <translation type="unfinished"></translation>
+ <source>Distance</source>
+ <translation>فاصله</translation>
</message>
<message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
+ <source>Raw distance</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Horizontal accuracy</source>
- <translation type="unfinished"></translation>
+ <source>From</source>
+ <extracomment>From date time</extracomment>
+ <translation>از</translation>
</message>
<message>
- <source>Altitude</source>
- <translation type="unfinished"></translation>
+ <source>To</source>
+ <extracomment>To date time</extracomment>
+ <translation>به</translation>
</message>
<message>
- <source>%1 ft a.s.l.</source>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation>زمان</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation>زمان جابهحایی</translation>
+ </message>
+ <message>
+ <source>Speed ⌀/max</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m a.s.l.</source>
+ <source>%1 / %2 mi/h</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Vertical accuracy</source>
+ <source>%1 / %2 km/h</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Statistics</source>
+ <source>Moving Speed ⌀</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Edit track</source>
+ <source>%1 / %2 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Rename track</source>
+ <source>%1 / %2 m a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Change color</source>
+ <source>Ascent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Type</source>
- <extracomment>track type</extracomment>
+ <source>Descent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can return to the map, tracking will continue on background</source>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/fr.ts
^
|
| @@ -1630,14 +1630,88 @@
<context>
<name>Tracker</name>
<message>
+ <source>Edit track</source>
+ <translation type="unfinished">Modifier la trace</translation>
+ </message>
+ <message>
<source>New track</source>
<translation>Nouvelle trace</translation>
</message>
<message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Change color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Rename track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Stop tracking</source>
<translation>Arrêter l'enregistrement</translation>
</message>
<message>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation>Arrêt de l'enregistrement GPS</translation>
+ </message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation>
+ <numerusform>There was %n error(s) during tracking. Recent: %2</numerusform>
+ <numerusform>There was %n error(s) during tracking. Recent: %2</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Current data</source>
+ <translation>Donnée actuelle</translation>
+ </message>
+ <message>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation>Dernière mise à jour</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/h</translation>
+ </message>
+ <message>
+ <source>Horizontal accuracy</source>
+ <translation>Précision horizontale</translation>
+ </message>
+ <message>
+ <source>Altitude</source>
+ <translation>Altitude</translation>
+ </message>
+ <message>
+ <source>%1 ft a.s.l.</source>
+ <translation>%1 pieds d'altitude</translation>
+ </message>
+ <message>
+ <source>%1 m a.s.l.</source>
+ <translation>%1 m d'altitude</translation>
+ </message>
+ <message>
+ <source>Vertical accuracy</source>
+ <translation>Précision verticale</translation>
+ </message>
+ <message>
+ <source>Statistics</source>
+ <translation>Statistiques</translation>
+ </message>
+ <message>
<source>Distance</source>
<translation>Distance</translation>
</message>
@@ -1681,14 +1755,6 @@
<translation>Vitesse ⌀ de déplacement</translation>
</message>
<message>
- <source>%1 mi/h</source>
- <translation>%1 mi/h</translation>
- </message>
- <message>
- <source>%1 km/h</source>
- <translation>%1 km/h</translation>
- </message>
- <message>
<source>Elevation min/max</source>
<translation>Altitude min/max</translation>
</message>
@@ -1709,69 +1775,8 @@
<translation>Descente</translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
- <translation>Arrêt de l'enregistrement GPS</translation>
- </message>
- <message>
- <source>Current data</source>
- <translation>Donnée actuelle</translation>
- </message>
- <message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation>Dernière mise à jour</translation>
- </message>
- <message>
- <source>Horizontal accuracy</source>
- <translation>Précision horizontale</translation>
- </message>
- <message>
- <source>Altitude</source>
- <translation>Altitude</translation>
- </message>
- <message>
- <source>%1 ft a.s.l.</source>
- <translation>%1 pieds d'altitude</translation>
- </message>
- <message>
- <source>%1 m a.s.l.</source>
- <translation>%1 m d'altitude</translation>
- </message>
- <message>
- <source>Vertical accuracy</source>
- <translation>Précision verticale</translation>
- </message>
- <message>
- <source>Statistics</source>
- <translation>Statistiques</translation>
- </message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation>
- <numerusform>There was %n error(s) during tracking. Recent: %2</numerusform>
- <numerusform>There was %n error(s) during tracking. Recent: %2</numerusform>
- </translation>
- </message>
- <message>
- <source>Edit track</source>
- <translation type="unfinished">Modifier la trace</translation>
- </message>
- <message>
- <source>Rename track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Change color</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Type</source>
- <extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>You can return to the map, tracking will continue on background</source>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/hu.ts
^
|
| @@ -1630,55 +1630,53 @@
<context>
<name>Tracker</name>
<message>
- <source>New track</source>
- <translation>Új track</translation>
+ <source>Edit track</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Stop tracking</source>
- <translation>Trackelés befejezése</translation>
+ <source>New track</source>
+ <translation>Új track</translation>
</message>
<message>
- <source>Distance</source>
- <translation>Távolság</translation>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Raw distance</source>
- <translation>Nyers távolság</translation>
+ <source>Change color</source>
+ <translation>Szín megváltoztatása</translation>
</message>
<message>
- <source>From</source>
- <extracomment>From date time</extracomment>
- <translation>Innen: </translation>
+ <source>Rename track</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>To</source>
- <extracomment>To date time</extracomment>
- <translation>Ide: </translation>
+ <source>Stop tracking</source>
+ <translation>Trackelés befejezése</translation>
</message>
<message>
- <source>Time</source>
- <extracomment>Track duration</extracomment>
- <translation>Időtartam</translation>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation type="unfinished"></translation>
</message>
- <message>
- <source>Moving Time</source>
- <translation>Mozgás időtartama</translation>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>Speed ⌀/max</source>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 mi/h</source>
- <translation>%1 / %2 mi/h</translation>
- </message>
- <message>
- <source>%1 / %2 km/h</source>
- <translation>%1 / %2 km/h</translation>
+ <source>Current data</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Speed ⌀</source>
- <translation type="unfinished"></translation>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation>Legutóbbi frissítés</translation>
</message>
<message>
<source>%1 mi/h</source>
@@ -1689,88 +1687,95 @@
<translation>%1 km/h</translation>
</message>
<message>
- <source>Elevation min/max</source>
- <translation>Eleváció min/max</translation>
+ <source>Horizontal accuracy</source>
+ <translation>Vízszintes pontosság</translation>
</message>
<message>
- <source>%1 / %2 ft a.s.l.</source>
- <translation type="unfinished"></translation>
+ <source>Altitude</source>
+ <translation>Magasság</translation>
</message>
<message>
- <source>%1 / %2 m a.s.l.</source>
+ <source>%1 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Ascent</source>
- <translation>Emelkedő</translation>
+ <source>%1 m a.s.l.</source>
+ <translation type="unfinished">%1 m tengerszint felett</translation>
</message>
<message>
- <source>Descent</source>
- <translation>Lejtő</translation>
+ <source>Vertical accuracy</source>
+ <translation>Függőleges pontosság</translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
- <translation type="unfinished"></translation>
+ <source>Statistics</source>
+ <translation>Statisztikák</translation>
</message>
<message>
- <source>Current data</source>
- <translation type="unfinished"></translation>
+ <source>Distance</source>
+ <translation>Távolság</translation>
</message>
<message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation>Legutóbbi frissítés</translation>
+ <source>Raw distance</source>
+ <translation>Nyers távolság</translation>
</message>
<message>
- <source>Horizontal accuracy</source>
- <translation>Vízszintes pontosság</translation>
+ <source>From</source>
+ <extracomment>From date time</extracomment>
+ <translation>Innen: </translation>
</message>
<message>
- <source>Altitude</source>
- <translation>Magasság</translation>
+ <source>To</source>
+ <extracomment>To date time</extracomment>
+ <translation>Ide: </translation>
</message>
<message>
- <source>%1 ft a.s.l.</source>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation>Időtartam</translation>
+ </message>
+ <message>
+ <source>Moving Time</source>
+ <translation>Mozgás időtartama</translation>
+ </message>
+ <message>
+ <source>Speed ⌀/max</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m a.s.l.</source>
- <translation type="unfinished">%1 m tengerszint felett</translation>
+ <source>%1 / %2 mi/h</source>
+ <translation>%1 / %2 mi/h</translation>
</message>
<message>
- <source>Vertical accuracy</source>
- <translation>Függőleges pontosság</translation>
+ <source>%1 / %2 km/h</source>
+ <translation>%1 / %2 km/h</translation>
</message>
<message>
- <source>Statistics</source>
- <translation>Statisztikák</translation>
+ <source>Moving Speed ⌀</source>
+ <translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>Elevation min/max</source>
+ <translation>Eleváció min/max</translation>
</message>
<message>
- <source>Edit track</source>
+ <source>%1 / %2 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Rename track</source>
+ <source>%1 / %2 m a.s.l.</source>
<translation type="unfinished"></translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/it.ts
^
|
| @@ -1630,54 +1630,53 @@
<context>
<name>Tracker</name>
<message>
- <source>New track</source>
+ <source>Edit track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Stop tracking</source>
+ <source>New track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Distance</source>
+ <source>You can return to the map, tracking will continue on background</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Raw distance</source>
+ <source>Change color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>From</source>
- <extracomment>From date time</extracomment>
+ <source>Rename track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>To</source>
- <extracomment>To date time</extracomment>
+ <source>Stop tracking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Time</source>
- <extracomment>Track duration</extracomment>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
<translation type="unfinished"></translation>
</message>
- <message>
- <source>Moving Time</source>
- <translation type="unfinished"></translation>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>Speed ⌀/max</source>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 mi/h</source>
+ <source>Current data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 km/h</source>
- <translation>%1 / %2 km/h</translation>
- </message>
- <message>
- <source>Moving Speed ⌀</source>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1689,89 +1688,95 @@
<translation>%1 km/h</translation>
</message>
<message>
- <source>Elevation min/max</source>
+ <source>Horizontal accuracy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 ft a.s.l.</source>
+ <source>Altitude</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 m a.s.l.</source>
+ <source>%1 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Ascent</source>
+ <source>%1 m a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Descent</source>
+ <source>Vertical accuracy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
+ <source>Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Current data</source>
+ <source>Distance</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
+ <source>Raw distance</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Horizontal accuracy</source>
+ <source>From</source>
+ <extracomment>From date time</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Altitude</source>
+ <source>To</source>
+ <extracomment>To date time</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft a.s.l.</source>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m a.s.l.</source>
+ <source>Moving Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Vertical accuracy</source>
+ <source>Speed ⌀/max</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Statistics</source>
+ <source>%1 / %2 mi/h</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>%1 / %2 km/h</source>
+ <translation>%1 / %2 km/h</translation>
</message>
<message>
- <source>Edit track</source>
+ <source>Moving Speed ⌀</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Rename track</source>
+ <source>Elevation min/max</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Change color</source>
+ <source>%1 / %2 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Type</source>
- <extracomment>track type</extracomment>
+ <source>%1 / %2 m a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can return to the map, tracking will continue on background</source>
+ <source>Ascent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Descent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/nb.ts
^
|
| @@ -1630,54 +1630,53 @@
<context>
<name>Tracker</name>
<message>
- <source>New track</source>
+ <source>Edit track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Stop tracking</source>
+ <source>New track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Distance</source>
+ <source>You can return to the map, tracking will continue on background</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Raw distance</source>
+ <source>Change color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>From</source>
- <extracomment>From date time</extracomment>
- <translation>Fra</translation>
- </message>
- <message>
- <source>To</source>
- <extracomment>To date time</extracomment>
- <translation>Til</translation>
- </message>
- <message>
- <source>Time</source>
- <extracomment>Track duration</extracomment>
+ <source>Rename track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Time</source>
+ <source>Stop tracking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Speed ⌀/max</source>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <source>%1 / %2 mi/h</source>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 km/h</source>
+ <source>Current data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Speed ⌀</source>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1689,89 +1688,95 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Elevation min/max</source>
+ <source>Horizontal accuracy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 ft a.s.l.</source>
+ <source>Altitude</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 m a.s.l.</source>
+ <source>%1 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Ascent</source>
+ <source>%1 m a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Descent</source>
+ <source>Vertical accuracy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
+ <source>Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Current data</source>
+ <source>Distance</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
+ <source>Raw distance</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Horizontal accuracy</source>
+ <source>From</source>
+ <extracomment>From date time</extracomment>
+ <translation>Fra</translation>
+ </message>
+ <message>
+ <source>To</source>
+ <extracomment>To date time</extracomment>
+ <translation>Til</translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Altitude</source>
+ <source>Moving Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft a.s.l.</source>
+ <source>Speed ⌀/max</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 m a.s.l.</source>
+ <source>%1 / %2 mi/h</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Vertical accuracy</source>
+ <source>%1 / %2 km/h</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Statistics</source>
+ <source>Moving Speed ⌀</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>Elevation min/max</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Edit track</source>
+ <source>%1 / %2 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Rename track</source>
+ <source>%1 / %2 m a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Change color</source>
+ <source>Ascent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Type</source>
- <extracomment>track type</extracomment>
+ <source>Descent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>You can return to the map, tracking will continue on background</source>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/nl.ts
^
|
| @@ -1630,55 +1630,54 @@
<context>
<name>Tracker</name>
<message>
- <source>New track</source>
- <translation type="unfinished"></translation>
+ <source>Edit track</source>
+ <translation type="unfinished">Spoor bewerken</translation>
</message>
<message>
- <source>Stop tracking</source>
+ <source>New track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Distance</source>
+ <source>You can return to the map, tracking will continue on background</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Raw distance</source>
- <translation>Ruwe afstand</translation>
- </message>
- <message>
- <source>From</source>
- <extracomment>From date time</extracomment>
- <translation>Van</translation>
+ <source>Change color</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>To</source>
- <extracomment>To date time</extracomment>
+ <source>Rename track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Time</source>
- <extracomment>Track duration</extracomment>
- <translation>Tijd</translation>
+ <source>Stop tracking</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Time</source>
- <translation>Verplaatsingstijd</translation>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation type="unfinished"></translation>
</message>
- <message>
- <source>Speed ⌀/max</source>
- <translation>Snelheid ⌀/max</translation>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>%1 / %2 mi/h</source>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 km/h</source>
- <translation>%1 / %2 km/u</translation>
+ <source>Current data</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Speed ⌀</source>
- <translation>Verplaatsingssnelheid ⌀</translation>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>%1 mi/h</source>
@@ -1689,89 +1688,95 @@
<translation>%1 km/u</translation>
</message>
<message>
- <source>Elevation min/max</source>
- <translation>Hoogteverschil min/max</translation>
+ <source>Horizontal accuracy</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 ft a.s.l.</source>
+ <source>Altitude</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 m a.s.l.</source>
- <translation>%1 / %2 m boven NAP</translation>
+ <source>%1 ft a.s.l.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Ascent</source>
- <translation>Klim</translation>
+ <source>%1 m a.s.l.</source>
+ <translation type="unfinished">%1 m boven NAP</translation>
</message>
<message>
- <source>Descent</source>
- <translation>Afdaling</translation>
+ <source>Vertical accuracy</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
+ <source>Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Current data</source>
+ <source>Distance</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation type="unfinished"></translation>
+ <source>Raw distance</source>
+ <translation>Ruwe afstand</translation>
</message>
<message>
- <source>Horizontal accuracy</source>
- <translation type="unfinished"></translation>
+ <source>From</source>
+ <extracomment>From date time</extracomment>
+ <translation>Van</translation>
</message>
<message>
- <source>Altitude</source>
+ <source>To</source>
+ <extracomment>To date time</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 ft a.s.l.</source>
- <translation type="unfinished"></translation>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation>Tijd</translation>
</message>
<message>
- <source>%1 m a.s.l.</source>
- <translation type="unfinished">%1 m boven NAP</translation>
+ <source>Moving Time</source>
+ <translation>Verplaatsingstijd</translation>
</message>
<message>
- <source>Vertical accuracy</source>
- <translation type="unfinished"></translation>
+ <source>Speed ⌀/max</source>
+ <translation>Snelheid ⌀/max</translation>
</message>
<message>
- <source>Statistics</source>
+ <source>%1 / %2 mi/h</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>%1 / %2 km/h</source>
+ <translation>%1 / %2 km/u</translation>
</message>
<message>
- <source>Edit track</source>
- <translation type="unfinished">Spoor bewerken</translation>
+ <source>Moving Speed ⌀</source>
+ <translation>Verplaatsingssnelheid ⌀</translation>
</message>
<message>
- <source>Rename track</source>
- <translation type="unfinished"></translation>
+ <source>Elevation min/max</source>
+ <translation>Hoogteverschil min/max</translation>
</message>
<message>
- <source>Change color</source>
+ <source>%1 / %2 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Type</source>
- <extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
+ <source>%1 / %2 m a.s.l.</source>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/nl_BE.ts
^
|
| @@ -1630,55 +1630,54 @@
<context>
<name>Tracker</name>
<message>
- <source>New track</source>
- <translation type="unfinished"></translation>
+ <source>Edit track</source>
+ <translation type="unfinished">Spoor bewerken</translation>
</message>
<message>
- <source>Stop tracking</source>
+ <source>New track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Distance</source>
+ <source>You can return to the map, tracking will continue on background</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Raw distance</source>
- <translation>Ruwe afstand</translation>
- </message>
- <message>
- <source>From</source>
- <extracomment>From date time</extracomment>
- <translation>Van</translation>
+ <source>Change color</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>To</source>
- <extracomment>To date time</extracomment>
- <translation>Naar</translation>
+ <source>Rename track</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Time</source>
- <extracomment>Track duration</extracomment>
- <translation>Tijd</translation>
+ <source>Stop tracking</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Time</source>
- <translation>Verplaatsingstijd</translation>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation type="unfinished"></translation>
</message>
- <message>
- <source>Speed ⌀/max</source>
- <translation>Snelheid ⌀/max</translation>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>%1 / %2 mi/h</source>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 km/h</source>
- <translation>%1 / %2 km/u</translation>
+ <source>Current data</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Speed ⌀</source>
- <translation>Verplaatsingssnelheid ⌀</translation>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>%1 mi/h</source>
@@ -1689,89 +1688,95 @@
<translation>%1 km/u</translation>
</message>
<message>
- <source>Elevation min/max</source>
- <translation>Hoogteverschil min/max</translation>
+ <source>Horizontal accuracy</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 ft a.s.l.</source>
+ <source>Altitude</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 m a.s.l.</source>
- <translation>%1 / %2 m boven zeespiegel</translation>
+ <source>%1 ft a.s.l.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Ascent</source>
- <translation>Klim</translation>
+ <source>%1 m a.s.l.</source>
+ <translation type="unfinished">%1 m boven zeespiegel</translation>
</message>
<message>
- <source>Descent</source>
- <translation>Afdaling</translation>
+ <source>Vertical accuracy</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
+ <source>Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Current data</source>
+ <source>Distance</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation type="unfinished"></translation>
+ <source>Raw distance</source>
+ <translation>Ruwe afstand</translation>
</message>
<message>
- <source>Horizontal accuracy</source>
- <translation type="unfinished"></translation>
+ <source>From</source>
+ <extracomment>From date time</extracomment>
+ <translation>Van</translation>
</message>
<message>
- <source>Altitude</source>
- <translation type="unfinished"></translation>
+ <source>To</source>
+ <extracomment>To date time</extracomment>
+ <translation>Naar</translation>
</message>
<message>
- <source>%1 ft a.s.l.</source>
- <translation type="unfinished"></translation>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation>Tijd</translation>
</message>
<message>
- <source>%1 m a.s.l.</source>
- <translation type="unfinished">%1 m boven zeespiegel</translation>
+ <source>Moving Time</source>
+ <translation>Verplaatsingstijd</translation>
</message>
<message>
- <source>Vertical accuracy</source>
- <translation type="unfinished"></translation>
+ <source>Speed ⌀/max</source>
+ <translation>Snelheid ⌀/max</translation>
</message>
<message>
- <source>Statistics</source>
+ <source>%1 / %2 mi/h</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>%1 / %2 km/h</source>
+ <translation>%1 / %2 km/u</translation>
</message>
<message>
- <source>Edit track</source>
- <translation type="unfinished">Spoor bewerken</translation>
+ <source>Moving Speed ⌀</source>
+ <translation>Verplaatsingssnelheid ⌀</translation>
</message>
<message>
- <source>Rename track</source>
- <translation type="unfinished"></translation>
+ <source>Elevation min/max</source>
+ <translation>Hoogteverschil min/max</translation>
</message>
<message>
- <source>Change color</source>
+ <source>%1 / %2 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Type</source>
- <extracomment>track type</extracomment>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/pl.ts
^
|
| @@ -1630,14 +1630,89 @@
<context>
<name>Tracker</name>
<message>
+ <source>Edit track</source>
+ <translation>Edytuj ślad</translation>
+ </message>
+ <message>
<source>New track</source>
<translation>Nowy ślad</translation>
</message>
<message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation>Możesz wrócić do mapy, śledzenie będzie kontunuowane w tle</translation>
+ </message>
+ <message>
+ <source>Change color</source>
+ <translation>Zmień kolor</translation>
+ </message>
+ <message>
+ <source>Rename track</source>
+ <translation>Zmień nazwę śladu</translation>
+ </message>
+ <message>
<source>Stop tracking</source>
<translation>Zatrzymaj śledzenie</translation>
</message>
<message>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation>Zatrzymywanie trackera</translation>
+ </message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation>
+ <numerusform>Wystąpił %n błąd podczas śledzenia. Szczegóły: %2</numerusform>
+ <numerusform>Wystąpiły %n błędy podczas śledzenia. Ostatni: %2</numerusform>
+ <numerusform>Wystąpiło %n błędów podczas śledzenia. Ostatni: %2</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
+ <translation>Rodzaj</translation>
+ </message>
+ <message>
+ <source>Current data</source>
+ <translation>Aktualne dane</translation>
+ </message>
+ <message>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation>Ostatnia aktualizacja</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/h</translation>
+ </message>
+ <message>
+ <source>Horizontal accuracy</source>
+ <translation>Dokladność w poziomie</translation>
+ </message>
+ <message>
+ <source>Altitude</source>
+ <translation>Wysokość</translation>
+ </message>
+ <message>
+ <source>%1 ft a.s.l.</source>
+ <translation>%1 ft n.p.m.</translation>
+ </message>
+ <message>
+ <source>%1 m a.s.l.</source>
+ <translation>%1 m n.p.m.</translation>
+ </message>
+ <message>
+ <source>Vertical accuracy</source>
+ <translation>Dokładność w pionie</translation>
+ </message>
+ <message>
+ <source>Statistics</source>
+ <translation>Statystyki</translation>
+ </message>
+ <message>
<source>Distance</source>
<translation>Dystans</translation>
</message>
@@ -1681,14 +1756,6 @@
<translation>Prędkość ruchu ⌀</translation>
</message>
<message>
- <source>%1 mi/h</source>
- <translation>%1 mi/h</translation>
- </message>
- <message>
- <source>%1 km/h</source>
- <translation>%1 km/h</translation>
- </message>
- <message>
<source>Elevation min/max</source>
<translation>Wznios min/max</translation>
</message>
@@ -1709,71 +1776,9 @@
<translation>Spadek</translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
- <translation>Zatrzymywanie trackera</translation>
- </message>
- <message>
- <source>Current data</source>
- <translation>Aktualne dane</translation>
- </message>
- <message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation>Ostatnia aktualizacja</translation>
- </message>
- <message>
- <source>Horizontal accuracy</source>
- <translation>Dokladność w poziomie</translation>
- </message>
- <message>
- <source>Altitude</source>
- <translation>Wysokość</translation>
- </message>
- <message>
- <source>%1 ft a.s.l.</source>
- <translation>%1 ft n.p.m.</translation>
- </message>
- <message>
- <source>%1 m a.s.l.</source>
- <translation>%1 m n.p.m.</translation>
- </message>
- <message>
- <source>Vertical accuracy</source>
- <translation>Dokładność w pionie</translation>
- </message>
- <message>
- <source>Statistics</source>
- <translation>Statystyki</translation>
- </message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation>
- <numerusform>Wystąpił %n błąd podczas śledzenia. Szczegóły: %2</numerusform>
- <numerusform>Wystąpiły %n błędy podczas śledzenia. Ostatni: %2</numerusform>
- <numerusform>Wystąpiło %n błędów podczas śledzenia. Ostatni: %2</numerusform>
- </translation>
- </message>
- <message>
- <source>Edit track</source>
- <translation>Edytuj ślad</translation>
- </message>
- <message>
- <source>Rename track</source>
- <translation>Zmień nazwę śladu</translation>
- </message>
- <message>
- <source>Change color</source>
- <translation>Zmień kolor</translation>
- </message>
- <message>
- <source>Type</source>
- <extracomment>track type</extracomment>
- <translation>Rodzaj</translation>
- </message>
- <message>
- <source>You can return to the map, tracking will continue on background</source>
- <translation>Możesz wrócić do mapy, śledzenie będzie kontunuowane w tle</translation>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/pt_BR.ts
^
|
| @@ -1630,54 +1630,53 @@
<context>
<name>Tracker</name>
<message>
- <source>New track</source>
+ <source>Edit track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Stop tracking</source>
+ <source>New track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Distance</source>
- <translation>Distância</translation>
- </message>
- <message>
- <source>Raw distance</source>
- <translation>Distância bruta</translation>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>From</source>
- <extracomment>From date time</extracomment>
- <translation>De</translation>
+ <source>Change color</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>To</source>
- <extracomment>To date time</extracomment>
- <translation>Para</translation>
+ <source>Rename track</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Time</source>
- <extracomment>Track duration</extracomment>
- <translation>Tempo</translation>
+ <source>Stop tracking</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Time</source>
- <translation>Tempo em movimento</translation>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation type="unfinished"></translation>
</message>
- <message>
- <source>Speed ⌀/max</source>
- <translation>Velocidade ⌀ / máx</translation>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <source>%1 / %2 mi/h</source>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 km/h</source>
+ <source>Current data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Moving Speed ⌀</source>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1689,89 +1688,95 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Elevation min/max</source>
- <translation>Elevação min/máx</translation>
+ <source>Horizontal accuracy</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 ft a.s.l.</source>
+ <source>Altitude</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 / %2 m a.s.l.</source>
+ <source>%1 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Ascent</source>
- <translation>Subida</translation>
+ <source>%1 m a.s.l.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Descent</source>
- <translation>Descida</translation>
+ <source>Vertical accuracy</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
+ <source>Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Current data</source>
- <translation type="unfinished"></translation>
+ <source>Distance</source>
+ <translation>Distância</translation>
</message>
<message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation type="unfinished"></translation>
+ <source>Raw distance</source>
+ <translation>Distância bruta</translation>
</message>
<message>
- <source>Horizontal accuracy</source>
- <translation type="unfinished"></translation>
+ <source>From</source>
+ <extracomment>From date time</extracomment>
+ <translation>De</translation>
</message>
<message>
- <source>Altitude</source>
- <translation type="unfinished"></translation>
+ <source>To</source>
+ <extracomment>To date time</extracomment>
+ <translation>Para</translation>
</message>
<message>
- <source>%1 ft a.s.l.</source>
- <translation type="unfinished"></translation>
+ <source>Time</source>
+ <extracomment>Track duration</extracomment>
+ <translation>Tempo</translation>
</message>
<message>
- <source>%1 m a.s.l.</source>
+ <source>Moving Time</source>
+ <translation>Tempo em movimento</translation>
+ </message>
+ <message>
+ <source>Speed ⌀/max</source>
+ <translation>Velocidade ⌀ / máx</translation>
+ </message>
+ <message>
+ <source>%1 / %2 mi/h</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Vertical accuracy</source>
+ <source>%1 / %2 km/h</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Statistics</source>
+ <source>Moving Speed ⌀</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>Elevation min/max</source>
+ <translation>Elevação min/máx</translation>
</message>
<message>
- <source>Edit track</source>
+ <source>%1 / %2 ft a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Rename track</source>
+ <source>%1 / %2 m a.s.l.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Change color</source>
- <translation type="unfinished"></translation>
+ <source>Ascent</source>
+ <translation>Subida</translation>
</message>
<message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/ru.ts
^
|
| @@ -1630,14 +1630,89 @@
<context>
<name>Tracker</name>
<message>
+ <source>Edit track</source>
+ <translation type="unfinished">Редактировать путь</translation>
+ </message>
+ <message>
<source>New track</source>
<translation>Новый путь</translation>
</message>
<message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Change color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Rename track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Stop tracking</source>
<translation>Прекратить запись пути</translation>
</message>
<message>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation>Прекратить запись</translation>
+ </message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Current data</source>
+ <translation>Текущие данные</translation>
+ </message>
+ <message>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation>Последнее обновление координат</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 миль/ч</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 км/ч</translation>
+ </message>
+ <message>
+ <source>Horizontal accuracy</source>
+ <translation>Точность по горизонтали</translation>
+ </message>
+ <message>
+ <source>Altitude</source>
+ <translation>Высота</translation>
+ </message>
+ <message>
+ <source>%1 ft a.s.l.</source>
+ <translation>%1 футов над уровнем моря</translation>
+ </message>
+ <message>
+ <source>%1 m a.s.l.</source>
+ <translation>%1 м над уровнем моря</translation>
+ </message>
+ <message>
+ <source>Vertical accuracy</source>
+ <translation>Точность по вертикали</translation>
+ </message>
+ <message>
+ <source>Statistics</source>
+ <translation>Статистика</translation>
+ </message>
+ <message>
<source>Distance</source>
<translation>Расстояние</translation>
</message>
@@ -1681,14 +1756,6 @@
<translation>Средняя скорость</translation>
</message>
<message>
- <source>%1 mi/h</source>
- <translation>%1 миль/ч</translation>
- </message>
- <message>
- <source>%1 km/h</source>
- <translation>%1 км/ч</translation>
- </message>
- <message>
<source>Elevation min/max</source>
<translation>Высота мин./макс.</translation>
</message>
@@ -1709,70 +1776,8 @@
<translation>Спуск</translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
- <translation>Прекратить запись</translation>
- </message>
- <message>
- <source>Current data</source>
- <translation>Текущие данные</translation>
- </message>
- <message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation>Последнее обновление координат</translation>
- </message>
- <message>
- <source>Horizontal accuracy</source>
- <translation>Точность по горизонтали</translation>
- </message>
- <message>
- <source>Altitude</source>
- <translation>Высота</translation>
- </message>
- <message>
- <source>%1 ft a.s.l.</source>
- <translation>%1 футов над уровнем моря</translation>
- </message>
- <message>
- <source>%1 m a.s.l.</source>
- <translation>%1 м над уровнем моря</translation>
- </message>
- <message>
- <source>Vertical accuracy</source>
- <translation>Точность по вертикали</translation>
- </message>
- <message>
- <source>Statistics</source>
- <translation>Статистика</translation>
- </message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- <numerusform></numerusform>
- </translation>
- </message>
- <message>
- <source>Edit track</source>
- <translation type="unfinished">Редактировать путь</translation>
- </message>
- <message>
- <source>Rename track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Change color</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Type</source>
- <extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>You can return to the map, tracking will continue on background</source>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/sv.ts
^
|
| @@ -1630,14 +1630,88 @@
<context>
<name>Tracker</name>
<message>
+ <source>Edit track</source>
+ <translation>Redigera spåret</translation>
+ </message>
+ <message>
<source>New track</source>
<translation>Nytt spår</translation>
</message>
<message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation>Du kan återvända till kartan, spårningen fortsätter i bakgrunden.</translation>
+ </message>
+ <message>
+ <source>Change color</source>
+ <translation>Byt färg</translation>
+ </message>
+ <message>
+ <source>Rename track</source>
+ <translation>Byt namn på spåret</translation>
+ </message>
+ <message>
<source>Stop tracking</source>
<translation>Sluta spåra</translation>
</message>
<message>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation>Slutar spåra</translation>
+ </message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation>
+ <numerusform>%n fel inträffade under spårning. Senast: %2</numerusform>
+ <numerusform>%n fel inträffade under spårning. Senast: %2</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
+ <translation>Typ</translation>
+ </message>
+ <message>
+ <source>Current data</source>
+ <translation>Aktuell data</translation>
+ </message>
+ <message>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation>Senast uppdaterad</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 mi/h</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/h</translation>
+ </message>
+ <message>
+ <source>Horizontal accuracy</source>
+ <translation>Horisontell noggrannhet</translation>
+ </message>
+ <message>
+ <source>Altitude</source>
+ <translation>Altitud</translation>
+ </message>
+ <message>
+ <source>%1 ft a.s.l.</source>
+ <translation>%1 ft a.s.l.</translation>
+ </message>
+ <message>
+ <source>%1 m a.s.l.</source>
+ <translation>%1 m a.s.l.</translation>
+ </message>
+ <message>
+ <source>Vertical accuracy</source>
+ <translation>Vertikal noggrannhet</translation>
+ </message>
+ <message>
+ <source>Statistics</source>
+ <translation>Statistik</translation>
+ </message>
+ <message>
<source>Distance</source>
<translation>Distans</translation>
</message>
@@ -1681,14 +1755,6 @@
<translation>Rörelsehastighet ⌀</translation>
</message>
<message>
- <source>%1 mi/h</source>
- <translation>%1 mi/h</translation>
- </message>
- <message>
- <source>%1 km/h</source>
- <translation>%1 km/h</translation>
- </message>
- <message>
<source>Elevation min/max</source>
<translation>Höjd min/max</translation>
</message>
@@ -1709,70 +1775,9 @@
<translation>Nedstigning</translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
- <translation>Slutar spåra</translation>
- </message>
- <message>
- <source>Current data</source>
- <translation>Aktuell data</translation>
- </message>
- <message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation>Senast uppdaterad</translation>
- </message>
- <message>
- <source>Horizontal accuracy</source>
- <translation>Horisontell noggrannhet</translation>
- </message>
- <message>
- <source>Altitude</source>
- <translation>Altitud</translation>
- </message>
- <message>
- <source>%1 ft a.s.l.</source>
- <translation>%1 ft a.s.l.</translation>
- </message>
- <message>
- <source>%1 m a.s.l.</source>
- <translation>%1 m a.s.l.</translation>
- </message>
- <message>
- <source>Vertical accuracy</source>
- <translation>Vertikal noggrannhet</translation>
- </message>
- <message>
- <source>Statistics</source>
- <translation>Statistik</translation>
- </message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation>
- <numerusform>%n fel inträffade under spårning. Senast: %2</numerusform>
- <numerusform>%n fel inträffade under spårning. Senast: %2</numerusform>
- </translation>
- </message>
- <message>
- <source>Edit track</source>
- <translation>Redigera spåret</translation>
- </message>
- <message>
- <source>Rename track</source>
- <translation>Byt namn på spåret</translation>
- </message>
- <message>
- <source>Change color</source>
- <translation>Byt färg</translation>
- </message>
- <message>
- <source>Type</source>
- <extracomment>track type</extracomment>
- <translation>Typ</translation>
- </message>
- <message>
- <source>You can return to the map, tracking will continue on background</source>
- <translation>Du kan återvända till kartan, spårningen fortsätter i bakgrunden.</translation>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
+ <translation>Hastighet</translation>
</message>
</context>
<context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout-2.34.tar.bz2/translations/zh_CN.ts
^
|
| @@ -1630,14 +1630,87 @@
<context>
<name>Tracker</name>
<message>
+ <source>Edit track</source>
+ <translation type="unfinished">编辑路线</translation>
+ </message>
+ <message>
<source>New track</source>
<translation>新追踪</translation>
</message>
<message>
+ <source>You can return to the map, tracking will continue on background</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Change color</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Rename track</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Stop tracking</source>
<translation>停止追踪</translation>
</message>
<message>
+ <source>Stopping tracker</source>
+ <extracomment>remorse dialog</extracomment>
+ <translation>停止追踪系统</translation>
+ </message>
+ <message numerus="yes">
+ <source>There was %n error(s) during tracking. Recent: %2</source>
+ <translation>
+ <numerusform>追踪时产生 %n 个错误，最近: %2</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <extracomment>track type</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Current data</source>
+ <translation>当前数据</translation>
+ </message>
+ <message>
+ <source>Last update</source>
+ <extracomment>Last GPS update time</extracomment>
+ <translation>最近更新</translation>
+ </message>
+ <message>
+ <source>%1 mi/h</source>
+ <translation>%1 米/小时</translation>
+ </message>
+ <message>
+ <source>%1 km/h</source>
+ <translation>%1 km/h</translation>
+ </message>
+ <message>
+ <source>Horizontal accuracy</source>
+ <translation>水平经度</translation>
+ </message>
+ <message>
+ <source>Altitude</source>
+ <translation>海拔</translation>
+ </message>
+ <message>
+ <source>%1 ft a.s.l.</source>
+ <translation>%1 ft a.s.l.</translation>
+ </message>
+ <message>
+ <source>%1 m a.s.l.</source>
+ <translation>%1 m a.s.l.</translation>
+ </message>
+ <message>
+ <source>Vertical accuracy</source>
+ <translation>垂直经度</translation>
+ </message>
+ <message>
+ <source>Statistics</source>
+ <translation>统计数据</translation>
+ </message>
+ <message>
<source>Distance</source>
<translation>距离</translation>
</message>
@@ -1681,14 +1754,6 @@
<translation>运动速度 ⌀</translation>
</message>
<message>
- <source>%1 mi/h</source>
- <translation>%1 米/小时</translation>
- </message>
- <message>
- <source>%1 km/h</source>
- <translation>%1 km/h</translation>
- </message>
- <message>
<source>Elevation min/max</source>
<translation>海拔最大值/最小值</translation>
</message>
@@ -1709,68 +1774,8 @@
<translation>下坡</translation>
</message>
<message>
- <source>Stopping tracker</source>
- <extracomment>remorse dialog</extracomment>
- <translation>停止追踪系统</translation>
- </message>
- <message>
- <source>Current data</source>
- <translation>当前数据</translation>
- </message>
- <message>
- <source>Last update</source>
- <extracomment>Last GPS update time</extracomment>
- <translation>最近更新</translation>
- </message>
- <message>
- <source>Horizontal accuracy</source>
- <translation>水平经度</translation>
- </message>
- <message>
- <source>Altitude</source>
- <translation>海拔</translation>
- </message>
- <message>
- <source>%1 ft a.s.l.</source>
- <translation>%1 ft a.s.l.</translation>
- </message>
- <message>
- <source>%1 m a.s.l.</source>
- <translation>%1 m a.s.l.</translation>
- </message>
- <message>
- <source>Vertical accuracy</source>
- <translation>垂直经度</translation>
- </message>
- <message>
- <source>Statistics</source>
- <translation>统计数据</translation>
- </message>
- <message numerus="yes">
- <source>There was %n error(s) during tracking. Recent: %2</source>
- <translation>
- <numerusform>追踪时产生 %n 个错误，最近: %2</numerusform>
- </translation>
- </message>
- <message>
- <source>Edit track</source>
- <translation type="unfinished">编辑路线</translation>
- </message>
- <message>
- <source>Rename track</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Change color</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Type</source>
- <extracomment>track type</extracomment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>You can return to the map, tracking will continue on background</source>
+ <source>Speed</source>
+ <extracomment>Current speed reported by gps</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-osmscout.changes.in
^
|
| @@ -615,3 +615,10 @@
- delete partially downloaded database before new download - it avoids "Directory already exists" error
- fix translations related to opening hours
- improve search for villages without named street, simple "Village <house number>" phrase is working now
+
+* 2024-04-17 Lukáš Karas <lukas.karas@centrum.cz> 2.34
+- fix map byte size formatting with some locales
+- improve night/day mode switching during navigation
+- show current speed (reported by gps) on tracker page
+- update translations (Czech, Estonian, Swedish)
+- fix crash when database is removed during navigation
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-osmscout.yaml
^
|
| @@ -1,59 +0,0 @@
-Name: harbour-osmscout
-Summary: OSMScout for Sailfish
-Version: 2.33
-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
-Group: Qt/Qt
-URL: https://github.com/Karry/osmscout-sailfish
-License: GPLv2
-# This must be generated before uploading a package to a remote build service.
-# Usually this line does not need to be modified.
-Sources:
-- '%{name}-%{version}.tar.bz2'
-Description: |
- OSM Scout is offline map viewer and routing application.
-Configure: none
-# Do not use automatic builder.
-Builder: none
-
-# We need CMake and other tools to build this package.
-PkgBR:
- - cmake
- - chrpath
- - git
- - desktop-file-utils
- - qt5-qttools-linguist
-
-# This section specifies build dependencies that are resolved using pkgconfig.
-PkgConfigBR:
- - libxml-2.0
- - Qt5Core
- - Qt5DBus
- - Qt5Multimedia
- - Qt5Network
- - Qt5Positioning
- - Qt5Qml
- - Qt5Quick
- - Qt5Sql
- - Qt5Svg
- - Qt5Xml
- - sailfishapp >= 1.0.2
-
-# All installed files
-Files:
- - '%{_bindir}'
- - '%{_datadir}/%{name}'
- - '%{_datadir}/%{name}/lib/'
- - '%{_datadir}/applications/%{name}.desktop'
- - '%{_datadir}/%{name}/map-styles/'
- - '%{_datadir}/%{name}/map-icons/'
- - '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
- - '%{_datadir}/icons/hicolor/108x108/apps/%{name}.png'
- - '%{_datadir}/icons/hicolor/128x128/apps/%{name}.png'
- - '%{_datadir}/icons/hicolor/172x172/apps/%{name}.png'
- - '%{_datadir}/icons/hicolor/256x256/apps/%{name}.png'
-
-# For more information about yaml and what's supported in Sailfish OS
-# build system, please see https://wiki.merproject.org/wiki/Spectacle
-
|
