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

Remove osm2rdfgeom namespace #89

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove osm2rdfgeom namespace #89

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
1 change: 0 additions & 1 deletion include/osm2rdf/ttl/Constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ const static inline std::string NAMESPACE__OSM_WAY = "osmway";
const static inline std::string NAMESPACE__OSM_META = "osmmeta";
const static inline std::string NAMESPACE__OSM = "osm";
const static inline std::string NAMESPACE__OSM2RDF = "osm2rdf";
const static inline std::string NAMESPACE__OSM2RDF_GEOM = "osm2rdfgeom";
const static inline std::string NAMESPACE__OSM2RDF_MEMBER = "osm2rdfmember";
const static inline std::string NAMESPACE__OSM2RDF_META = "osm2rdfmeta";
const static inline std::string NAMESPACE__OSM2RDF_TAG = "osm2rdfkey";
Expand Down
25 changes: 12 additions & 13 deletions src/osm/FactHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ using osm2rdf::ttl::constants::IRI__XSD_YEAR_MONTH;
using osm2rdf::ttl::constants::LITERAL__NO;
using osm2rdf::ttl::constants::LITERAL__YES;
using osm2rdf::ttl::constants::NAMESPACE__OSM2RDF;
using osm2rdf::ttl::constants::NAMESPACE__OSM2RDF_GEOM;
using osm2rdf::ttl::constants::NAMESPACE__OSM2RDF_META;
using osm2rdf::ttl::constants::NAMESPACE__OSM2RDF_TAG;
using osm2rdf::ttl::constants::NAMESPACE__OSM_NODE;
Expand All @@ -93,9 +92,9 @@ void osm2rdf::osm::FactHandler<W>::area(const osm2rdf::osm::Area& area) {
area.objId());

const std::string& geomObj = _writer->generateIRI(
NAMESPACE__OSM2RDF_GEOM, DATASET_ID[_config.sourceDataset] + "_" +
(area.fromWay() ? "way" : "rel") + "area_" +
std::to_string(area.objId()));
NAMESPACE__OSM2RDF, DATASET_ID[_config.sourceDataset] +
(area.fromWay() ? "way" : "rel") + "area_" +
std::to_string(area.objId()));

_writer->writeTriple(subj, IRI__GEOSPARQL__HAS_GEOMETRY, geomObj);
writeBoostGeometry(geomObj, IRI__GEOSPARQL__AS_WKT, area.geom());
Expand Down Expand Up @@ -125,8 +124,8 @@ void osm2rdf::osm::FactHandler<W>::node(const osm2rdf::osm::Node& node) {
writeTagList(subj, node.tags());

const std::string& geomObj = _writer->generateIRI(
NAMESPACE__OSM2RDF_GEOM,
DATASET_ID[_config.sourceDataset] + "_node_" + std::to_string(node.id()));
NAMESPACE__OSM2RDF,
DATASET_ID[_config.sourceDataset] + "node_" + std::to_string(node.id()));

_writer->writeTriple(subj, IRI__GEOSPARQL__HAS_GEOMETRY, geomObj);
writeBoostGeometry(geomObj, IRI__GEOSPARQL__AS_WKT, node.geom());
Expand Down Expand Up @@ -183,10 +182,9 @@ void osm2rdf::osm::FactHandler<W>::relation(

#if BOOST_VERSION >= 107800
if (relation.hasGeometry() && !relation.isArea()) {
const std::string& geomObj =
_writer->generateIRI(NAMESPACE__OSM2RDF_GEOM,
DATASET_ID[_config.sourceDataset] + "_relation_" +
std::to_string(relation.id()));
const std::string& geomObj = _writer->generateIRI(
NAMESPACE__OSM2RDF, DATASET_ID[_config.sourceDataset] + "rel_" +
std::to_string(relation.id()));

_writer->writeTriple(subj, IRI__GEOSPARQL__HAS_GEOMETRY, geomObj);
writeBoostGeometry(geomObj, IRI__GEOSPARQL__AS_WKT, relation.geom());
Expand Down Expand Up @@ -242,8 +240,8 @@ void osm2rdf::osm::FactHandler<W>::way(const osm2rdf::osm::Way& way) {
_writer->writeTriple(subj, IRI__RDF_TYPE, IRI__OSM_NODE);

const std::string& geomObj = _writer->generateIRI(
NAMESPACE__OSM2RDF_GEOM, DATASET_ID[_config.sourceDataset] +
"_node_" + std::to_string(node.id()));
NAMESPACE__OSM2RDF, DATASET_ID[_config.sourceDataset] + "node_" +
std::to_string(node.id()));

_writer->writeTriple(subj, IRI__GEOSPARQL__HAS_GEOMETRY, geomObj);
writeBoostGeometry(geomObj, IRI__GEOSPARQL__AS_WKT, node.geom());
Expand Down Expand Up @@ -282,7 +280,8 @@ void osm2rdf::osm::FactHandler<W>::way(const osm2rdf::osm::Way& way) {

if (_config.addAreaWayLinestrings || !way.isArea()) {
const std::string& geomObj = _writer->generateIRI(
NAMESPACE__OSM2RDF, "way_" + std::to_string(way.id()));
NAMESPACE__OSM2RDF,
DATASET_ID[_config.sourceDataset] + "way_" + std::to_string(way.id()));

_writer->writeTriple(subj, IRI__GEOSPARQL__HAS_GEOMETRY, geomObj);
writeBoostGeometry(geomObj, IRI__GEOSPARQL__AS_WKT, locations);
Expand Down
8 changes: 3 additions & 5 deletions src/ttl/Writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ osm2rdf::ttl::Writer<T>::Writer(const osm2rdf::config::Config& config,
// own prefix
{osm2rdf::ttl::constants::NAMESPACE__OSM2RDF,
"https://osm2rdf.cs.uni-freiburg.de/rdf#"},
{osm2rdf::ttl::constants::NAMESPACE__OSM2RDF_GEOM,
"https://osm2rdf.cs.uni-freiburg.de/rdf/geom#"},
{osm2rdf::ttl::constants::NAMESPACE__OSM2RDF_TAG,
"https://osm2rdf.cs.uni-freiburg.de/rdf/key#"},
{osm2rdf::ttl::constants::NAMESPACE__OSM2RDF_MEMBER,
Expand Down Expand Up @@ -109,11 +107,11 @@ osm2rdf::ttl::Writer<T>::Writer(const osm2rdf::config::Config& config,
osm2rdf::ttl::constants::IRI__OSM2RDF_INTERSECTS_NON_AREA = generateIRI(
osm2rdf::ttl::constants::NAMESPACE__OSM2RDF, "intersects_nonarea");
osm2rdf::ttl::constants::IRI__OSM2RDF_GEOM__CONVEX_HULL = generateIRI(
osm2rdf::ttl::constants::NAMESPACE__OSM2RDF_GEOM, "convex_hull");
osm2rdf::ttl::constants::NAMESPACE__OSM2RDF, "convex_hull");
osm2rdf::ttl::constants::IRI__OSM2RDF_GEOM__ENVELOPE =
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM2RDF_GEOM, "envelope");
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM2RDF, "envelope");
osm2rdf::ttl::constants::IRI__OSM2RDF_GEOM__OBB =
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM2RDF_GEOM, "obb");
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM2RDF, "obb");
osm2rdf::ttl::constants::IRI__OSM2RDF_MEMBER__ID =
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM2RDF_MEMBER, "id");
osm2rdf::ttl::constants::IRI__OSM2RDF_MEMBER__ROLE =
Expand Down
2 changes: 2 additions & 0 deletions tests/Baseline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
// You should have received a copy of the GNU General Public License
// along with osm2rdf. If not, see <https://www.gnu.org/licenses/>.

#include <algorithm>

#include "gtest/gtest.h"

namespace osm2rdf {
Expand Down
50 changes: 24 additions & 26 deletions tests/E2E.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ TEST(E2E, singleNodeWithTags) {
::testing::HasSubstr("osmnode:925950614 rdf:type osm:node .\n"));
ASSERT_THAT(printedData,
::testing::HasSubstr(
"osm2rdfgeom:osm_node_240092010 geo:asWKT \"POINT(7.8494005 "
"osm2rdf:osmnode_240092010 geo:asWKT \"POINT(7.8494005 "
"47.9960901)\"^^geo:wktLiteral .\n"));
ASSERT_THAT(printedData,
::testing::HasSubstr(
Expand Down Expand Up @@ -317,7 +317,7 @@ TEST(E2E, singleWayWithTagsAndNodes) {
"\"maps4bw (LGL, www.lgl-bw.de)\" .\n"));
// No nodes -> no real geometry
ASSERT_THAT(printedData,
::testing::HasSubstr("osm2rdf:way_98284318 geo:asWKT "
::testing::HasSubstr("osm2rdf:osmway_98284318 geo:asWKT "
"\"LINESTRING()\"^^geo:wktLiteral .\n"));

// Reset std::cerr and std::cout
Expand Down Expand Up @@ -407,8 +407,9 @@ TEST(E2E, osmWikiExample) {
ASSERT_THAT(printedData,
::testing::HasSubstr(
"osmway:26659127 osmkey:name \"Pastower Straße\" .\n"));
ASSERT_THAT(printedData, ::testing::HasSubstr(
"osm2rdf:way_26659127 geo:asWKT \"LINESTRING("));
ASSERT_THAT(
printedData,
::testing::HasSubstr("osm2rdf:osmway_26659127 geo:asWKT \"LINESTRING("));
ASSERT_THAT(printedData,
::testing::HasSubstr("osmrel:56688 rdf:type osm:relation .\n"));
ASSERT_THAT(printedData,
Expand Down Expand Up @@ -538,7 +539,7 @@ TEST(E2E, building51NT) {
ASSERT_THAT(
printedData,
::testing::HasSubstr(
"<https://osm2rdf.cs.uni-freiburg.de/rdf#way_98284318> "
"<https://osm2rdf.cs.uni-freiburg.de/rdf#osmway_98284318> "
"<http://www.opengis.net/ont/geosparql#asWKT> \"LINESTRING(7"));
ASSERT_THAT(
printedData,
Expand All @@ -547,7 +548,7 @@ TEST(E2E, building51NT) {
ASSERT_THAT(
printedData,
::testing::HasSubstr(
"<https://osm2rdf.cs.uni-freiburg.de/rdf/geom#osm_wayarea_98284318> "
"<https://osm2rdf.cs.uni-freiburg.de/rdf#osmwayarea_98284318> "
"<http://www.opengis.net/ont/geosparql#asWKT> \"MULTIPOLYGON(((7"));
ASSERT_THAT(
printedData,
Expand Down Expand Up @@ -691,12 +692,11 @@ TEST(E2E, building51TTL) {
"\"maps4bw (LGL, www.lgl-bw.de)\" .\n"));
ASSERT_THAT(
printedData,
::testing::HasSubstr("osm2rdf:way_98284318 geo:asWKT \"LINESTRING(7"));
::testing::HasSubstr("osm2rdf:osmway_98284318 geo:asWKT \"LINESTRING(7"));
ASSERT_THAT(printedData, ::testing::HasSubstr("7)\"^^geo:wktLiteral .\n"));
ASSERT_THAT(
printedData,
::testing::HasSubstr(
"osm2rdfgeom:osm_wayarea_98284318 geo:asWKT \"MULTIPOLYGON(((7"));
ASSERT_THAT(printedData,
::testing::HasSubstr(
"osm2rdf:osmwayarea_98284318 geo:asWKT \"MULTIPOLYGON(((7"));
ASSERT_THAT(printedData, ::testing::HasSubstr("0)))\"^^geo:wktLiteral .\n"));
ASSERT_THAT(printedData,
::testing::HasSubstr(
Expand Down Expand Up @@ -824,12 +824,11 @@ TEST(E2E, building51QLEVER) {
"\"maps4bw (LGL, www.lgl-bw.de)\" .\n"));
ASSERT_THAT(
printedData,
::testing::HasSubstr("osm2rdf:way_98284318 geo:asWKT \"LINESTRING(7"));
::testing::HasSubstr("osm2rdf:osmway_98284318 geo:asWKT \"LINESTRING(7"));
ASSERT_THAT(printedData, ::testing::HasSubstr("7)\"^^geo:wktLiteral .\n"));
ASSERT_THAT(
printedData,
::testing::HasSubstr(
"osm2rdfgeom:osm_wayarea_98284318 geo:asWKT \"MULTIPOLYGON(((7"));
ASSERT_THAT(printedData,
::testing::HasSubstr(
"osm2rdf:osmwayarea_98284318 geo:asWKT \"MULTIPOLYGON(((7"));
ASSERT_THAT(printedData, ::testing::HasSubstr("0)))\"^^geo:wktLiteral .\n"));
ASSERT_THAT(printedData,
::testing::HasSubstr(
Expand Down Expand Up @@ -938,12 +937,12 @@ TEST(E2E, tf) {
"\"Albert-Ludwigs-Universität Freiburg\" .\n"));
ASSERT_THAT(printedData, ::testing::HasSubstr(
"osmway:4498466 osmkey:wheelchair \"yes\" .\n"));
ASSERT_THAT(printedData, ::testing::HasSubstr(
"osm2rdf:way_4498466 geo:asWKT \"LINESTRING(7"));
ASSERT_THAT(
printedData,
::testing::HasSubstr(
"osm2rdfgeom:osm_wayarea_4498466 geo:asWKT \"MULTIPOLYGON(((7"));
::testing::HasSubstr("osm2rdf:osmway_4498466 geo:asWKT \"LINESTRING(7"));
ASSERT_THAT(printedData,
::testing::HasSubstr(
"osm2rdf:osmwayarea_4498466 geo:asWKT \"MULTIPOLYGON(((7"));

// Reset std::cerr and std::cout
std::cerr.rdbuf(cerrBufferOrig);
Expand Down Expand Up @@ -1059,11 +1058,10 @@ TEST(E2E, building51inTF) {
"\"maps4bw (LGL, www.lgl-bw.de)\" .\n"));
ASSERT_THAT(
printedData,
::testing::HasSubstr("osm2rdf:way_98284318 geo:asWKT \"LINESTRING(7"));
ASSERT_THAT(
printedData,
::testing::HasSubstr(
"osm2rdfgeom:osm_wayarea_98284318 geo:asWKT \"MULTIPOLYGON(((7"));
::testing::HasSubstr("osm2rdf:osmway_98284318 geo:asWKT \"LINESTRING(7"));
ASSERT_THAT(printedData,
::testing::HasSubstr(
"osm2rdf:osmwayarea_98284318 geo:asWKT \"MULTIPOLYGON(((7"));
ASSERT_THAT(printedData,
::testing::HasSubstr("osmway:4498466 rdf:type osm:way .\n"));
ASSERT_THAT(printedData,
Expand All @@ -1080,7 +1078,7 @@ TEST(E2E, building51inTF) {
"osmway:4498466 osmkey:wheelchair \"yes\" .\n"));
ASSERT_THAT(printedData,
::testing::HasSubstr(
"osm2rdfgeom:osm_wayarea_4498466 geo:asWKT \"MULTIPOLYGON(((7"));
"osm2rdf:osmwayarea_4498466 geo:asWKT \"MULTIPOLYGON(((7"));
ASSERT_THAT(printedData,
::testing::HasSubstr(
"osmway:4498466 ogc:sfContains osmway:98284318 .\n"));
Expand Down
8 changes: 4 additions & 4 deletions tests/issues/Issue15.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ TEST(Issue15, Relation_8291361_expected) {
ASSERT_THAT(
printedData,
::testing::HasSubstr(
"osm2rdfgeom:osm_relarea_8291361 geo:asWKT \"MULTIPOLYGON(((14"));
"osm2rdf:osmrelarea_8291361 geo:asWKT \"MULTIPOLYGON(((14"));

// Reset std::cerr and std::cout
std::cerr.rdbuf(cerrBufferOrig);
Expand Down Expand Up @@ -119,7 +119,7 @@ TEST(Issue15, Relation_8291361_failed) {
ASSERT_THAT(
printedData,
::testing::HasSubstr(
"osm2rdfgeom:osm_relarea_8291361 geo:asWKT \"MULTIPOLYGON(((14"));
"osm2rdf:osmrelarea_8291361 geo:asWKT \"MULTIPOLYGON(((14"));

// Reset std::cerr and std::cout
std::cerr.rdbuf(cerrBufferOrig);
Expand Down Expand Up @@ -171,7 +171,7 @@ TEST(Issue15, Way_201387026_expected) {
ASSERT_THAT(
printedData,
::testing::HasSubstr(
"osm2rdfgeom:osm_wayarea_201387026 geo:asWKT \"MULTIPOLYGON(((1"));
"osm2rdf:osmwayarea_201387026 geo:asWKT \"MULTIPOLYGON(((1"));

// Reset std::cerr and std::cout
std::cerr.rdbuf(cerrBufferOrig);
Expand Down Expand Up @@ -219,7 +219,7 @@ TEST(Issue15, Way_201387026_failed) {
ASSERT_THAT(
printedData,
::testing::HasSubstr(
"osm2rdfgeom:osm_wayarea_201387026 geo:asWKT \"MULTIPOLYGON(((1"));
"osm2rdf:osmwayarea_201387026 geo:asWKT \"MULTIPOLYGON(((1"));

// Reset std::cerr and std::cout
std::cerr.rdbuf(cerrBufferOrig);
Expand Down
50 changes: 25 additions & 25 deletions tests/issues/Issue24.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ TEST(Issue24, areaFromWayHasGeometryAsGeoSPARQL) {
output.close();

ASSERT_EQ(
"osmway:21 geo:hasGeometry osm2rdfgeom:osm_wayarea_21 .\n"
"osm2rdfgeom:osm_wayarea_21 geo:asWKT \"MULTIPOLYGON(((48.0 7.5,48.0 "
"osmway:21 geo:hasGeometry osm2rdf:osmwayarea_21 .\n"
"osm2rdf:osmwayarea_21 geo:asWKT \"MULTIPOLYGON(((48.0 7.5,48.0 "
"7.6,48.1 7.6,48.1 7.5,48.0 7.5)))\"^^geo:wktLiteral .\n"
"osmway:21 osm2rdfgeom:convex_hull \"POLYGON(())\"^^geo:wktLiteral .\n"
"osmway:21 osm2rdfgeom:envelope \"POLYGON((48.0 7.5,48.0 7.6,48.1 "
"osmway:21 osm2rdf:convex_hull \"POLYGON()\"^^geo:wktLiteral .\n"
"osmway:21 osm2rdf:envelope \"POLYGON((48.0 7.5,48.0 7.6,48.1 "
"7.6,48.1 7.5,48.0 7.5))\"^^geo:wktLiteral .\n"
"osmway:21 osm2rdfgeom:obb \"POLYGON(())\"^^geo:wktLiteral .\n"
"osmway:21 osm2rdf:obb \"POLYGON()\"^^geo:wktLiteral .\n"
"osmway:21 osm2rdf:area \"0.000000000000\"^^xsd:double .\n",
buffer.str());

Expand Down Expand Up @@ -117,14 +117,14 @@ TEST(Issue24, areaFromRelationHasGeometryAsGeoSPARQL) {
output.close();

ASSERT_EQ(
"osmrel:10 geo:hasGeometry osm2rdfgeom:osm_relarea_10 .\n"
"osm2rdfgeom:osm_relarea_10 geo:asWKT \"MULTIPOLYGON(((48.0 7.5,48.0 "
"osmrel:10 geo:hasGeometry osm2rdf:osmrelarea_10 .\n"
"osm2rdf:osmrelarea_10 geo:asWKT \"MULTIPOLYGON(((48.0 7.5,48.0 "
"7.6,48.1 7.6,48.1 7.5,48.0 7.5)))\"^^geo:wktLiteral .\n"
"osmrel:10 osm2rdfgeom:convex_hull \"POLYGON((48.0 7.5,48.0 7.6,48.1 "
"osmrel:10 osm2rdf:convex_hull \"POLYGON((48.0 7.5,48.0 7.6,48.1 "
"7.6,48.1 7.5,48.0 7.5))\"^^geo:wktLiteral .\n"
"osmrel:10 osm2rdfgeom:envelope \"POLYGON((48.0 7.5,48.0 7.6,48.1 "
"osmrel:10 osm2rdf:envelope \"POLYGON((48.0 7.5,48.0 7.6,48.1 "
"7.6,48.1 7.5,48.0 7.5))\"^^geo:wktLiteral .\n"
"osmrel:10 osm2rdfgeom:obb \"POLYGON((48.0 7.6,48.1 7.6,48.1 7.5,48.0 "
"osmrel:10 osm2rdf:obb \"POLYGON((48.0 7.6,48.1 7.6,48.1 7.5,48.0 "
"7.5,48.0 7.6))\"^^geo:wktLiteral .\n"
"osmrel:10 osm2rdf:area \"0.010000000000\"^^xsd:double .\n",
buffer.str());
Expand Down Expand Up @@ -170,14 +170,14 @@ TEST(Issue24, nodeHasGeometryAsGeoSPARQL) {
"osmnode:42 rdf:type osm:node .\n"
"osmnode:42 osmmeta:timestamp \"1970-01-01T00:00:00\"^^xsd:dateTime .\n"
"osmnode:42 osm2rdf:facts \"0\"^^xsd:integer .\n"
"osmnode:42 geo:hasGeometry osm2rdfgeom:osm_node_42 .\n"
"osm2rdfgeom:osm_node_42 geo:asWKT \"POINT(7.5 48.0)\"^^geo:wktLiteral "
"osmnode:42 geo:hasGeometry osm2rdf:osmnode_42 .\n"
"osm2rdf:osmnode_42 geo:asWKT \"POINT(7.5 48.0)\"^^geo:wktLiteral "
".\n"
"osmnode:42 osm2rdfgeom:convex_hull \"POLYGON((7.5 48.0,7.5 48.0,7.5 "
"osmnode:42 osm2rdf:convex_hull \"POLYGON((7.5 48.0,7.5 48.0,7.5 "
"48.0,7.5 48.0,7.5 48.0))\"^^geo:wktLiteral .\n"
"osmnode:42 osm2rdfgeom:envelope \"POLYGON((7.5 48.0,7.5 48.0,7.5 "
"osmnode:42 osm2rdf:envelope \"POLYGON((7.5 48.0,7.5 48.0,7.5 "
"48.0,7.5 48.0,7.5 48.0))\"^^geo:wktLiteral .\n"
"osmnode:42 osm2rdfgeom:obb \"POLYGON((7.5 48.0,7.5 48.0,7.5 48.0,7.5 "
"osmnode:42 osm2rdf:obb \"POLYGON((7.5 48.0,7.5 48.0,7.5 48.0,7.5 "
"48.0,7.5 48.0))\"^^geo:wktLiteral .\n",
buffer.str());

Expand Down Expand Up @@ -267,14 +267,14 @@ TEST(Issue24, relationWithGeometryHasGeometryAsGeoSPARQL) {
"_:0_1 osm2rdfmember:id osmway:55 .\n"
"_:0_1 osm2rdfmember:role \"outer\" .\n"
"_:0_1 osm2rdfmember:pos \"1\"^^xsd:integer .\n"
"osmrel:42 geo:hasGeometry osm2rdfgeom:osm_relation_42 .\n"
"osm2rdfgeom:osm_relation_42 geo:asWKT \"GEOMETRYCOLLECTION(POINT(7.5 "
"osmrel:42 geo:hasGeometry osm2rdf:osmrel_42 .\n"
"osm2rdf:osmrel_42 geo:asWKT \"GEOMETRYCOLLECTION(POINT(7.5 "
"48.0),LINESTRING(7.5 48.0,7.6 48.0))\"^^geo:wktLiteral .\n"
"osmrel:42 osm2rdfgeom:convex_hull \"POLYGON((7.5 48.0,7.6 48.0,7.5 "
"osmrel:42 osm2rdf:convex_hull \"POLYGON((7.5 48.0,7.6 48.0,7.5 "
"48.0,7.5 48.0))\"^^geo:wktLiteral .\n"
"osmrel:42 osm2rdfgeom:envelope \"POLYGON((7.5 48.0,7.5 48.0,7.6 "
"osmrel:42 osm2rdf:envelope \"POLYGON((7.5 48.0,7.5 48.0,7.6 "
"48.0,7.6 48.0,7.5 48.0))\"^^geo:wktLiteral .\n"
"osmrel:42 osm2rdfgeom:obb \"POLYGON((7.6 48.0,7.6 48.0,7.5 48.0,7.5 "
"osmrel:42 osm2rdf:obb \"POLYGON((7.6 48.0,7.6 48.0,7.5 48.0,7.5 "
"48.0,7.6 48.0))\"^^geo:wktLiteral .\n"
"osmrel:42 osm2rdf:completeGeometry \"yes\" .\n",
buffer.str());
Expand Down Expand Up @@ -323,14 +323,14 @@ TEST(Issue24, wayHasGeometryAsGeoSPARQL) {
"osmway:42 rdf:type osm:way .\n"
"osmway:42 osmmeta:timestamp \"1970-01-01T00:00:00\"^^xsd:dateTime .\n"
"osmway:42 osm2rdf:facts \"0\"^^xsd:integer .\n"
"osmway:42 geo:hasGeometry osm2rdf:way_42 .\n"
"osm2rdf:way_42 geo:asWKT \"LINESTRING(48.0 7.5,48.1 "
"osmway:42 geo:hasGeometry osm2rdf:osmway_42 .\n"
"osm2rdf:osmway_42 geo:asWKT \"LINESTRING(48.0 7.5,48.1 "
"7.6)\"^^geo:wktLiteral .\n"
"osmway:42 osm2rdfgeom:convex_hull \"POLYGON((48.0 7.5,48.1 7.6,48.0 "
"osmway:42 osm2rdf:convex_hull \"POLYGON((48.0 7.5,48.1 7.6,48.0 "
"7.5,48.0 7.5))\"^^geo:wktLiteral .\n"
"osmway:42 osm2rdfgeom:envelope \"POLYGON((48.0 7.5,48.0 7.6,48.1 "
"osmway:42 osm2rdf:envelope \"POLYGON((48.0 7.5,48.0 7.6,48.1 "
"7.6,48.1 7.5,48.0 7.5))\"^^geo:wktLiteral .\n"
"osmway:42 osm2rdfgeom:obb \"POLYGON((48.1 7.6,48.1 7.6,48.0 7.5,48.0 "
"osmway:42 osm2rdf:obb \"POLYGON((48.1 7.6,48.1 7.6,48.0 7.5,48.0 "
"7.5,48.1 7.6))\"^^geo:wktLiteral .\n"
"osmway:42 osm2rdf:length \"0.141421\"^^xsd:double .\n",
buffer.str());
Expand Down
Loading