Merge branch 'master' into plugins

This commit is contained in:
Eric Fischer
2017-04-21 16:18:00 -07:00
6 changed files with 127 additions and 54 deletions
+2 -1
View File
@@ -415,7 +415,8 @@ void check_crs(json_object *j, const char *reading) {
json_object *name = json_hash_get(properties, "name");
if (name->type == JSON_STRING) {
if (strcmp(name->string, projection->alias) != 0) {
fprintf(stderr, "%s: Warning: GeoJSON specified projection \"%s\", not \"%s\".\n", reading, name->string, projection->alias);
fprintf(stderr, "%s: Warning: GeoJSON specified projection \"%s\", not the expected \"%s\".\n", reading, name->string, projection->alias);
fprintf(stderr, "%s: If \"%s\" is not the expected projection, use -s to specify the right one.\n", reading, projection->alias);
}
}
}