Skip to content

Commit

Permalink
change member predicates to consistent osmway:member, osmway:member_p…
Browse files Browse the repository at this point in the history 
…os, osmrel:member, osmrel:member_pos, osmrel:member_role
  • Loading branch information
@patrickbr
patrickbr committed Jan 28, 2025
1 parent a2b7a9b commit 063183c
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 26 deletions.
2 changes: 1 addition & 1 deletion src/osm/FactHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ void osm2rdf::osm::FactHandler<W>::relation(
const std::string& role = member.role();
const std::string& blankNode = _writer->generateBlankNode();
_writer->writeTriple(
subj, _writer->generateIRIUnsafe(NAMESPACE__OSM_RELATION, "member_ref"),
subj, _writer->generateIRIUnsafe(NAMESPACE__OSM_RELATION, "member"),
blankNode);

_writer->writeTriple(blankNode, IRI__OSM2RDF_MEMBER__ID,
Expand Down
8 changes: 3 additions & 5 deletions src/ttl/Writer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ osm2rdf::ttl::Writer<T>::Writer(const osm2rdf::config::Config& config,
osm2rdf::ttl::constants::IRI__OSM2RDF_MEMBER__POS = generateIRI(
osm2rdf::ttl::constants::NAMESPACE__OSM_RELATION, "member_pos");
osm2rdf::ttl::constants::IRI__OSM2RDF_WAYNODE__POS =
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM_WAY, "node_pos");
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM_WAY, "member_pos");
osm2rdf::ttl::constants::IRI__OSM2RDF_WAYNODE__ID =
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM_WAY, "node_id");
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM_WAY, "member_id");
osm2rdf::ttl::constants::IRI__OSMMETA_CHANGESET =
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM_META, "changeset");
osm2rdf::ttl::constants::IRI__OSMMETA_TIMESTAMP =
Expand All @@ -161,9 +161,7 @@ osm2rdf::ttl::Writer<T>::Writer(const osm2rdf::config::Config& config,
osm2rdf::ttl::constants::IRI__OSMWAY_NEXT_NODE_DISTANCE = generateIRI(
osm2rdf::ttl::constants::NAMESPACE__OSM_WAY, "next_node_distance");
osm2rdf::ttl::constants::IRI__OSMWAY_NODE =
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM_WAY, "node_ref");
osm2rdf::ttl::constants::IRI__OSMWAY_NODE_ID =
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM_WAY, "node_id");
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM_WAY, "member");
osm2rdf::ttl::constants::IRI__OSMWAY_NODE_COUNT =
generateIRI(osm2rdf::ttl::constants::NAMESPACE__OSM_WAY, "nodeCount");
osm2rdf::ttl::constants::IRI__OSMWAY_UNIQUE_NODE_COUNT = generateIRI(
Expand Down
4 changes: 2 additions & 2 deletions tests/issues/Issue24.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@ TEST(Issue24, relationWithGeometryHasGeometryAsGeoSPARQL) {
"osmrel:42 osmmeta:timestamp \"1970-01-01T00:00:00\"^^xsd:dateTime .\n"
"osmrel:42 osmmeta:version \"0\"^^xsd:integer .\n"
"osmrel:42 osm2rdf:facts "
"\"0\"^^xsd:integer .\nosmrel:42 osmrel:member_ref _:0_0 .\n_:0_0 "
"\"0\"^^xsd:integer .\nosmrel:42 osmrel:member _:0_0 .\n_:0_0 "
"osmrel:member_id osmnode:23 .\n_:0_0 osmrel:member_role \"label\" "
".\n_:0_0 osmrel:member_pos \"0\"^^xsd:integer .\nosmrel:42 "
"osmrel:member_ref _:0_1 .\n_:0_1 osmrel:member_id osmway:55 .\n_:0_1 "
"osmrel:member _:0_1 .\n_:0_1 osmrel:member_id osmway:55 .\n_:0_1 "
"osmrel:member_role \"outer\" .\n_:0_1 osmrel:member_pos "
"\"1\"^^xsd:integer .\nosmrel:42 geo:hasGeometry "
"osm2rdfgeom:osm_relation_42 .\nosm2rdfgeom:osm_relation_42 geo:asWKT "
Expand Down
36 changes: 18 additions & 18 deletions tests/osm/FactHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,15 @@ TEST(OSM_FactHandler, relation) {
"osmrel:42 osmmeta:version \"0\"^^xsd:integer .\n"
"osmrel:42 osmkey:city \"Freiburg\" .\n"
"osmrel:42 osm2rdf:facts \"1\"^^xsd:integer .\n"
"osmrel:42 osmrel:member_ref _:0_0 .\n"
"osmrel:42 osmrel:member _:0_0 .\n"
"_:0_0 osmrel:member_id osmnode:1 .\n"
"_:0_0 osmrel:member_role \"label\" .\n"
"_:0_0 osmrel:member_pos \"0\"^^xsd:integer .\n"
"osmrel:42 osmrel:member_ref _:0_1 .\n"
"osmrel:42 osmrel:member _:0_1 .\n"
"_:0_1 osmrel:member_id osmway:1 .\n"
"_:0_1 osmrel:member_role \"outer\" .\n"
"_:0_1 osmrel:member_pos \"1\"^^xsd:integer .\n"
"osmrel:42 osmrel:member_ref _:0_2 .\n"
"osmrel:42 osmrel:member _:0_2 .\n"
"_:0_2 osmrel:member_id osmrel:1 .\n"
"_:0_2 osmrel:member_role \"foo\" .\n"
"_:0_2 osmrel:member_pos \"2\"^^xsd:integer .\n",
Expand Down Expand Up @@ -445,9 +445,9 @@ TEST(OSM_FactHandler, relationWithGeometry) {
"osmrel:42 osmmeta:version \"0\"^^xsd:integer .\n"
"osmrel:42 osmkey:city \"Freiburg\" .\n"
"osmrel:42 osm2rdf:facts \"1\"^^xsd:integer .\nosmrel:42 "
"osmrel:member_ref _:0_0 .\n_:0_0 osmrel:member_id osmnode:23 .\n_:0_0 "
"osmrel:member _:0_0 .\n_:0_0 osmrel:member_id osmnode:23 .\n_:0_0 "
"osmrel:member_role \"label\" .\n_:0_0 osmrel:member_pos "
"\"0\"^^xsd:integer .\nosmrel:42 osmrel:member_ref _:0_1 .\n_:0_1 "
"\"0\"^^xsd:integer .\nosmrel:42 osmrel:member _:0_1 .\n_:0_1 "
"osmrel:member_id osmway:55 .\n_:0_1 osmrel:member_role \"outer\" "
".\n_:0_1 osmrel:member_pos \"1\"^^xsd:integer .\nosmrel:42 "
"geo:hasGeometry osm2rdfgeom:osm_relation_42 "
Expand Down Expand Up @@ -574,9 +574,9 @@ TEST(OSM_FactHandler, wayAddWayNodeOrder) {
"osmway:42 osmmeta:version \"0\"^^xsd:integer .\n"
"osmway:42 osmkey:city \"Freiburg\" .\n"
"osmway:42 osm2rdf:facts \"1\"^^xsd:integer .\nosmway:42 "
"osmway:node_ref _:0_0 .\n_:0_0 osmway:node_id osmnode:1 .\n_:0_0 "
"osmway:node_pos \"0\"^^xsd:integer .\nosmway:42 osmway:node_ref _:0_1 "
".\n_:0_1 osmway:node_id osmnode:2 .\n_:0_1 osmway:node_pos "
"osmway:member _:0_0 .\n_:0_0 osmway:member_id osmnode:1 .\n_:0_0 "
"osmway:member_pos \"0\"^^xsd:integer .\nosmway:42 osmway:member _:0_1 "
".\n_:0_1 osmway:member_id osmnode:2 .\n_:0_1 osmway:member_pos "
"\"1\"^^xsd:integer .\nosmway:42 geo:hasGeometry osm2rdf:way_42 "
".\nosm2rdf:way_42 geo:asWKT \"LINESTRING(48 7.5,48.1 "
"7.6)\"^^geo:wktLiteral .\nosmway:42 osm2rdfgeom:convex_hull "
Expand Down Expand Up @@ -639,9 +639,9 @@ TEST(OSM_FactHandler, wayAddWayNodeSpatialMetadataShortWay) {
"osmway:42 osmmeta:version \"0\"^^xsd:integer .\n"
"osmway:42 osmkey:city \"Freiburg\" .\n"
"osmway:42 osm2rdf:facts \"1\"^^xsd:integer .\nosmway:42 "
"osmway:node_ref _:0_0 .\n_:0_0 osmway:node_id osmnode:1 .\n_:0_0 "
"osmway:node_pos \"0\"^^xsd:integer .\nosmway:42 osmway:node_ref _:0_1 "
".\n_:0_1 osmway:node_id osmnode:2 .\n_:0_1 osmway:node_pos "
"osmway:member _:0_0 .\n_:0_0 osmway:member_id osmnode:1 .\n_:0_0 "
"osmway:member_pos \"0\"^^xsd:integer .\nosmway:42 osmway:member _:0_1 "
".\n_:0_1 osmway:member_id osmnode:2 .\n_:0_1 osmway:member_pos "
"\"1\"^^xsd:integer .\n_:0_0 osmway:next_node osmnode:2 .\n_:0_0 "
"osmway:next_node_distance \"15657.137001\"^^xsd:decimal .\nosmway:42 "
"geo:hasGeometry osm2rdf:way_42 .\nosm2rdf:way_42 geo:asWKT "
Expand Down Expand Up @@ -709,16 +709,16 @@ TEST(OSM_FactHandler, wayAddWayNodeSpatialMetadataLongerWay) {
"osmway:42 osmmeta:version \"0\"^^xsd:integer .\n"
"osmway:42 osmkey:city \"Freiburg\" .\n"
"osmway:42 osm2rdf:facts \"1\"^^xsd:integer .\nosmway:42 "
"osmway:node_ref _:0_0 .\n_:0_0 osmway:node_id osmnode:1 .\n_:0_0 "
"osmway:node_pos \"0\"^^xsd:integer .\nosmway:42 osmway:node_ref _:0_1 "
".\n_:0_1 osmway:node_id osmnode:2 .\n_:0_1 osmway:node_pos "
"osmway:member _:0_0 .\n_:0_0 osmway:member_id osmnode:1 .\n_:0_0 "
"osmway:member_pos \"0\"^^xsd:integer .\nosmway:42 osmway:member _:0_1 "
".\n_:0_1 osmway:member_id osmnode:2 .\n_:0_1 osmway:member_pos "
"\"1\"^^xsd:integer .\n_:0_0 osmway:next_node osmnode:2 .\n_:0_0 "
"osmway:next_node_distance \"15657.137001\"^^xsd:decimal .\nosmway:42 "
"osmway:node_ref _:0_2 .\n_:0_2 osmway:node_id osmnode:4 .\n_:0_2 "
"osmway:node_pos \"2\"^^xsd:integer .\n_:0_1 osmway:next_node "
"osmway:member _:0_2 .\n_:0_2 osmway:member_id osmnode:4 .\n_:0_2 "
"osmway:member_pos \"2\"^^xsd:integer .\n_:0_1 osmway:next_node "
"osmnode:4 .\n_:0_1 osmway:next_node_distance "
"\"11119.490351\"^^xsd:decimal .\nosmway:42 osmway:node_ref _:0_3 .\n_:0_3 "
"osmway:node_id osmnode:3 .\n_:0_3 osmway:node_pos \"3\"^^xsd:integer "
"\"11119.490351\"^^xsd:decimal .\nosmway:42 osmway:member _:0_3 .\n_:0_3 "
"osmway:member_id osmnode:3 .\n_:0_3 osmway:member_pos \"3\"^^xsd:integer "
".\n_:0_2 osmway:next_node osmnode:3 .\n_:0_2 osmway:next_node_distance "
"\"11024.108103\"^^xsd:decimal .\nosmway:42 geo:hasGeometry "
"osm2rdf:way_42 .\nosm2rdf:way_42 geo:asWKT \"LINESTRING(48 7.5,48.1 "
Expand Down

0 comments on commit 063183c

Please sign in to comment.