Do the more common check first. Forgot to swap these max/min pairs.

This commit is contained in:
Eric Fischer 2016-06-01 17:09:20 -07:00
parent a504840bd5
commit de46cfa798
2 changed files with 6 additions and 6 deletions

View File

@ -491,11 +491,11 @@ void parse_json(json_pull *jp, const char *reading, volatile long long *layer_se
}
}
if (strcmp(type->string, "FeatureCollection") == 0) {
check_crs(j, reading);
}
if (strcmp(type->string, "Feature") != 0) {
if (strcmp(type->string, "FeatureCollection") == 0) {
check_crs(j, reading);
}
continue;
}

View File

@ -1634,8 +1634,8 @@ int read_input(std::vector<source> &sources, char *fname, const char *layername,
double minlat = 0, minlon = 0, maxlat = 0, maxlon = 0, midlat = 0, midlon = 0;
tile2lonlat(midx, midy, maxzoom, &maxlon, &minlat);
tile2lonlat(midx + 1, midy + 1, maxzoom, &minlon, &maxlat);
tile2lonlat(midx, midy, maxzoom, &minlon, &maxlat);
tile2lonlat(midx + 1, midy + 1, maxzoom, &maxlon, &minlat);
midlat = (maxlat + minlat) / 2;
midlon = (maxlon + minlon) / 2;