sjs/gh-BertoldVdb-ZoneDetect
1
0
Fork 0
mirror of https://github.com/BertoldVdb/ZoneDetect.git synced 2026-04-27 14:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add simple string lookup function

Browse source
This commit is contained in:
Bertold Van den Bergh 2019-09-27 18:32:28 +02:00
parent 1eb2a136e9
commit be3fb27712
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
demo.c
View file

@ -1,3 +1,4 @@
/* /*
* Copyright (c) 2018, Bertold Van den Bergh (vandenbergh@bertold.org) * Copyright (c) 2018, Bertold Van den Bergh (vandenbergh@bertold.org)
* All rights reserved. * All rights reserved.
@ -27,7 +28,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "zonedetect.h" #include "zonedetect.h"
void printResults(ZoneDetect *cd, ZoneDetectResult *results, float safezone) void printResults(ZoneDetect *cd, ZoneDetectResult *results, float safezone)
@ -74,7 +74,6 @@ void onError(int errZD, int errNative)
fprintf(stderr, "ZD error: %s (0x%08X)\n", ZDGetErrorString(errZD), (unsigned)errNative); fprintf(stderr, "ZD error: %s (0x%08X)\n", ZDGetErrorString(errZD), (unsigned)errNative);
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
if(argc != 4) { if(argc != 4) {
@ -84,15 +83,7 @@ int main(int argc, char *argv[])
ZDSetErrorHandler(onError); ZDSetErrorHandler(onError);
uint8_t* data = malloc(128*1024*1024); ZoneDetect *const cd = ZDOpenDatabase(argv[1]);
FILE* f= fopen(argv[1], "rb");
if(!f){ return 3; }
size_t bytes = fread(data, 1, 128*1024*1024, f);
fclose(f);
printf("Read %lu bytes\n", bytes);
//ZoneDetect *const cd = ZDOpenDatabase(argv[1]);
ZoneDetect *const cd = ZDOpenDatabaseFromMemory(data, bytes);
if(!cd) return 2; if(!cd) return 2;
const float lat = (float)atof(argv[2]); const float lat = (float)atof(argv[2]);
@ -102,7 +93,7 @@ int main(int argc, char *argv[])
ZoneDetectResult *results = ZDLookup(cd, lat, lon, &safezone); ZoneDetectResult *results = ZDLookup(cd, lat, lon, &safezone);
printResults(cd, results, safezone); printResults(cd, results, safezone);
printf("The magic string is [%s]\n", ZDHelperLookupString(cd, lat, lon)); printf("The simple string is [%s]\n", ZDHelperSimpleLookupString(cd, lat, lon));
ZDCloseDatabase(cd); ZDCloseDatabase(cd);

2
library/zonedetect.c
View file

@ -1124,7 +1124,7 @@ int ZDSetErrorHandler(void (*handler)(int, int))
return 0; return 0;
} }
char* ZDHelperLookupString(const ZoneDetect* library, float lat, float lon) char* ZDHelperSimpleLookupString(const ZoneDetect* library, float lat, float lon)
{ {
ZoneDetectResult *result = ZDLookup(library, lat, lon, NULL); ZoneDetectResult *result = ZDLookup(library, lat, lon, NULL);
if(!result) { if(!result) {

2
library/zonedetect.h
View file

@ -82,7 +82,7 @@ ZD_EXPORT const char *ZDGetErrorString(int errZD);
ZD_EXPORT float* ZDPolygonToList(const ZoneDetect *library, uint32_t polygonId, size_t* length); ZD_EXPORT float* ZDPolygonToList(const ZoneDetect *library, uint32_t polygonId, size_t* length);
ZD_EXPORT char* ZDHelperLookupString(const ZoneDetect* library, float lat, float lon); ZD_EXPORT char* ZDHelperSimpleLookupString(const ZoneDetect* library, float lat, float lon);
#ifdef __cplusplus #ifdef __cplusplus
} }