Skip to content
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

Minor GPKG/SQLite Reorganization #670

Merged
merged 6 commits into from
Nov 13, 2023
Merged

Minor GPKG/SQLite Reorganization #670

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
2d248f4
sqlite: organize source into component; ngen ns
program-- Nov 6, 2023
00dac1d
fix: update header include; add ngen to explicit ns call
program-- Nov 6, 2023
d094edd
fix: rename header; add ngen ns for partitionGenerator
program-- Nov 6, 2023
dacd5ba
git: integrate #673
program-- Nov 9, 2023
bad989e
fix: break out projection wrapper into new component
program-- Nov 9, 2023
673a227
fix: define epsg table, resolves #567
program-- Nov 9, 2023
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
230 changes: 0 additions & 230 deletions include/geopackage/NGen_SQLite.hpp
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions include/geopackage/GeoPackage.hpp → include/geopackage/geopackage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
#define NGEN_GEOPACKAGE_H

#include "FeatureCollection.hpp"
#include "NGen_SQLite.hpp"
#include "ngen_sqlite.hpp"

namespace ngen {
namespace geopackage {

/**
Expand All @@ -15,7 +16,7 @@ namespace geopackage {
* @return geojson::geometry GPKG WKB converted and projected to a boost geometry model
*/
geojson::geometry build_geometry(
const sqlite_iter& row,
const ngen::sqlite::database::iterator& row,
const std::string& geom_col,
std::vector<double>& bounding_box
);
Expand All @@ -28,7 +29,7 @@ geojson::geometry build_geometry(
* @return geojson::PropertyMap PropertyMap of properties from the given row
*/
geojson::PropertyMap build_properties(
const sqlite_iter& row,
const ngen::sqlite::database::iterator& row,
const std::string& geom_col
);

Expand All @@ -40,7 +41,7 @@ geojson::PropertyMap build_properties(
* @return geojson::Feature Feature containing geometry and properties from the given row
*/
geojson::Feature build_feature(
const sqlite_iter& row,
const ngen::sqlite::database::iterator& row,
const std::string& id_col,
const std::string& geom_col
);
Expand All @@ -60,4 +61,5 @@ std::shared_ptr<geojson::FeatureCollection> read(
);

} // namespace geopackage
} // namespace ngen
#endif // NGEN_GEOPACKAGE_H
Loading
Loading