Skip to content

feat: geobuf parsing #918

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
stmitt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: geobuf parsing #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions shared/src/map/layers/tiled/vector/Tiled2dMapVectorLayerParserHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ Tiled2dMapVectorLayerParserResult Tiled2dMapVectorLayerParserHelper::parseStyleJ

} else if (type == "vector" && val["tiles"].is_array()) {
tileJsons[key] = val;
} else if (type == "geojson") {
nlohmann::json geojson;
} else if (type == "geojson" || type == "geobuf") {
Options options;
const auto sourceDataFormat = type == "geobuf" ? GeoDataFormat::Geobuf : GeoDataFormat::GeoJson;

if (val["minzoom"].is_number_integer()) {
options.minZoom = val["minzoom"].get<uint8_t>();
Expand All @@ -226,7 +226,14 @@ Tiled2dMapVectorLayerParserResult Tiled2dMapVectorLayerParserHelper::parseStyleJ
options.extent = val["extent"].get<uint32_t>();
}
if (val["data"].is_string()) {
geojsonSources[key] = GeoJsonVTFactory::getGeoJsonVt(key, replaceUrlParams(val["data"].get<std::string>(), sourceUrlParams), loaders, localDataProvider, stringTable, options);
geojsonSources[key] = GeoJsonVTFactory::getGeoJsonVt(
key,
replaceUrlParams(val["data"].get<std::string>(), sourceUrlParams),
loaders,
localDataProvider,
stringTable,
sourceDataFormat,
options);
} else {
try {
geojsonSources[key] = GeoJsonVTFactory::getGeoJsonVt(GeoJsonParser::getGeoJson(val["data"], *stringTable), stringTable, options);
Expand Down
4 changes: 3 additions & 1 deletion shared/src/map/layers/tiled/vector/geojson/GeoJsonVTFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ class GeoJsonVTFactory {
const std::string &geoJsonUrl,
const std::vector<std::shared_ptr<::LoaderInterface>> &loaders, const std::shared_ptr<Tiled2dMapVectorLayerLocalDataProviderInterface> &localDataProvider,
const std::shared_ptr<StringInterner> &stringTable,
GeoDataFormat dataFormat,
const Options& options = Options()) {
std::shared_ptr<GeoJSONVT> vt = std::make_shared<GeoJSONVT>(sourceName, geoJsonUrl, loaders, localDataProvider, stringTable, options);
std::shared_ptr<GeoJSONVT> vt =
std::make_shared<GeoJSONVT>(sourceName, geoJsonUrl, loaders, localDataProvider, stringTable, dataFormat, options);
vt->load();
return vt;
}
Expand Down
Loading