Skip to content

Fixing the Projection for very high zoomlevels #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
braandl wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixing the Projection for very high zoomlevels #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c9a554
Fix: Mercator Projection
braandl Sep 24, 2014
308b46d
Merge branch 'master' of github.com:medvedNick/Mapsforge_iOS
braandl Sep 24, 2014
8f1ac25
Rebased Project to mapbox-ios-sdk, added sqlite cipher and aes256bit …
braandl Apr 21, 2015
92e8057
Removed old SQLite sources and sqlite3.dyn from project
braandl Apr 21, 2015
3c59dc0
Fix: Database Queue Issues
braandl Aug 7, 2015
4bb42cf
Merge branch 'master' into master
braandl Apr 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
129 changes: 115 additions & 14 deletions CoreParse/CoreParse.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,17 @@
1FC18286139BA47D0027F597 /* CoreParse-template.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "CoreParse-template.md"; sourceTree = "<group>"; };
1FE77D551375AE6F00879A41 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1FE77D821375EA8F00879A41 /* CoreParse Documentation */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "CoreParse Documentation"; sourceTree = BUILT_PRODUCTS_DIR; };

549B67AB187F187100EF4A6E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };

54197207188F7D49004240B4 /* CPRegexpRecogniser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPRegexpRecogniser.h; sourceTree = "<group>"; };
54197208188F7D49004240B4 /* CPRegexpRecogniser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPRegexpRecogniser.m; sourceTree = "<group>"; };
5419721C188F9A54004240B4 /* CPRegexpRecogniserTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPRegexpRecogniserTest.m; sourceTree = "<group>"; };
DA2B1DF41566B311002FDBD7 /* CPSenTestKitAssertions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPSenTestKitAssertions.h; sourceTree = "<group>"; };
DA2B1DF61566B704002FDBD7 /* CPSTAssertionsTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPSTAssertionsTests.h; sourceTree = "<group>"; };
DA2B1DF71566B704002FDBD7 /* CPSTAssertionsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPSTAssertionsTests.m; sourceTree = "<group>"; };
DC3E9BEE191DBAC800F6023C /* CPWillFinishDelegateTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPWillFinishDelegateTest.m; sourceTree = "<group>"; };

/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -732,6 +736,25 @@
productReference = 1F92817F145C11050033BC34 /* libCoreParse.a */;
productType = "com.apple.product-type.library.static";
};
1F92818B145C11050033BC34 /* iOSCoreParseTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1F9281A3145C11050033BC34 /* Build configuration list for PBXNativeTarget "iOSCoreParseTests" */;
buildPhases = (
1F928187145C11050033BC34 /* Sources */,
1F928188145C11050033BC34 /* Frameworks */,
1F928189145C11050033BC34 /* Resources */,
1F92818A145C11050033BC34 /* ShellScript */,
);
buildRules = (
);
dependencies = (
1F928193145C11050033BC34 /* PBXTargetDependency */,
);
name = iOSCoreParseTests;
productName = iOSCoreParseTests;
productReference = 1F92818C145C11050033BC34 /* CoreParseTests.octest */;
productType = "com.apple.product-type.bundle.ocunit-test";
};
1FE77D811375EA8F00879A41 /* CoreParse Documentation */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1FE77D8B1375EA8F00879A41 /* Build configuration list for PBXNativeTarget "CoreParse Documentation" */;
Expand All @@ -753,7 +776,7 @@
1F0E88EC130462F300537D04 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
LastUpgradeCheck = 0640;
ORGANIZATIONNAME = "In The Beginning...";
};
buildConfigurationList = 1F0E88EF130462F300537D04 /* Build configuration list for PBXProject "CoreParse" */;
Expand All @@ -762,6 +785,7 @@
hasScannedForEncodings = 0;
knownRegions = (
en,
de,
);
mainGroup = 1F0E88EA130462F300537D04;
productRefGroup = 1F0E88F7130462F300537D04 /* Products */;
Expand Down Expand Up @@ -961,6 +985,7 @@
isa = PBXVariantGroup;
children = (
1F0E8903130462F300537D04 /* en */,
549B67AB187F187100EF4A6E /* de */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
Expand All @@ -969,6 +994,7 @@
isa = PBXVariantGroup;
children = (
1F0E8914130462F300537D04 /* en */,
549B67AE187F187100EF4A6E /* de */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
Expand All @@ -979,8 +1005,14 @@
1F0E891B130462F300537D04 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
ARCHS = (
"$(ARCHS_STANDARD)",
armv7s,
);
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -1010,8 +1042,9 @@
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = "";
ONLY_ACTIVE_ARCH = NO;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = macosx;
VALID_ARCHS = "i386 x86_64 armv7 armv7s";
};
Expand All @@ -1020,8 +1053,14 @@
1F0E891C130462F300537D04 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
ARCHS = (
"$(ARCHS_STANDARD)",
armv7s,
);
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -1085,10 +1124,13 @@
GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = "CoreParse/CoreParse-Info.plist";
INSTALL_PATH = "@rpath";
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
TEST_AFTER_BUILD = YES;
VALID_ARCHS = "armv7 armv7s arm64";
WRAPPER_EXTENSION = framework;
};
name = Debug;
Expand Down Expand Up @@ -1122,10 +1164,14 @@
GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = "CoreParse/CoreParse-Info.plist";
ONLY_ACTIVE_ARCH = NO;
INSTALL_PATH = "@rpath";
OTHER_CFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
TEST_AFTER_BUILD = YES;
VALID_ARCHS = "armv7 armv7s arm64";
WRAPPER_EXTENSION = framework;
};
name = Release;
Expand Down Expand Up @@ -1175,8 +1221,8 @@
1F92819E145C11050033BC34 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD)";
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = NO;
COPY_PHASE_STRIP = NO;
DSTROOT = /tmp/iOSCoreParse.dst;
GCC_DYNAMIC_NO_PIC = NO;
Expand All @@ -1194,15 +1240,15 @@
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
VALID_ARCHS = "armv7 armv7s x86_x64";
VALID_ARCHS = "armv6 armv7 armv7s arm64";
};
name = Debug;
};
1F92819F145C11050033BC34 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD)";
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = NO;
COPY_PHASE_STRIP = YES;
DSTROOT = /tmp/iOSCoreParse.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -1215,15 +1261,71 @@
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "armv7 armv7s x86_x64";
VALID_ARCHS = "armv6 armv7 armv7s arm64";
};
name = Release;
};
1F9281A0145C11050033BC34 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(DEVELOPER_LIBRARY_DIR)/Frameworks",
);
GCC_DYNAMIC_NO_PIC = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "CoreParse/CoreParse-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_THUMB_SUPPORT = NO;
INFOPLIST_FILE = "CoreParseTests/CoreParseTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = (
"-ObjC",
"-all_load",
);
PRODUCT_NAME = CoreParseTests;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
WRAPPER_EXTENSION = octest;
};
name = Debug;
};
1F9281A1145C11050033BC34 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(DEVELOPER_LIBRARY_DIR)/Frameworks",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "CoreParse/CoreParse-Prefix.pch";
GCC_THUMB_SUPPORT = NO;
INFOPLIST_FILE = "CoreParseTests/CoreParseTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = (
"-ObjC",
"-all_load",
);
PRODUCT_NAME = CoreParseTests;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
VALIDATE_PRODUCT = YES;
WRAPPER_EXTENSION = octest;
};
name = Release;
};
1FE77D8C1375EA8F00879A41 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
Expand All @@ -1238,7 +1340,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
Expand Down
4 changes: 2 additions & 2 deletions CoreParse/CoreParse/Grammar/CPGrammarInternal.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ - (NSString *)description
NSUInteger idx = 0;
for (CPRule *r in ordered)
{
[s appendFormat:@"%3ld %@\n", (long)idx, r];
[s appendFormat:@"%3lu %@\n", (unsigned long)idx, r];
idx++;
}

Expand Down Expand Up @@ -337,7 +337,7 @@ - (NSDictionary *)nameNewRules:(NSSet *)rhsElements withRules:(NSArray *)oldRule
NSMutableDictionary *namedRules = [NSMutableDictionary dictionaryWithCapacity:[rhsElements count]];
for (CPRHSItem *item in rhsElements)
{
[namedRules setObject:[self symbolNameNotInSet:symbolNames basedOnName:[NSString stringWithFormat:@"RHS%ld", (long)name]] forKey:item];
[namedRules setObject:[self symbolNameNotInSet:symbolNames basedOnName:[NSString stringWithFormat:@"RHS%lu", (unsigned long)name]] forKey:item];
name++;
}
return namedRules;
Expand Down
4 changes: 2 additions & 2 deletions CoreParse/CoreParse/Parsers/CPShiftReduceParser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ - (CPRecoveryAction *)error:(CPTokenStream *)tokenStream expecting:(NSSet *)acce
}
else
{
CPToken *t = [tokenStream peekToken];
NSLog(@"%ld:%ld: parse error. Expected %@, found %@", (long)[t lineNumber] + 1, (long)[t columnNumber] + 1, acceptableTokens, t);
//CPToken *t = [tokenStream peekToken];
//NSLog(@"%lu:%d: parse error. Expected %@, found %@", (unsigned long)[t lineNumber], [t columnNumber], acceptableTokens, t);
return nil;
}
}
Expand Down
Loading