Fix for saving relation member ref type, remove debug code

hotosm · Apr 24, 2024 · 85fb8e7 · 85fb8e7
1 parent b94ff62
commit 85fb8e7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/src/osm/osmchange.cc b/src/osm/osmchange.cc
@@ -177,7 +177,7 @@ OsmChangeFile::buildRelationGeometry(osmobjects::OsmRelation &relation) {
         if (!waycache.count(mit->ref)) {
             // Way is not available in cache,
             // possibily because Relation is not in the priority area
-            // or way was deleted
+            // or the way was deleted
             return;
         }
 
@@ -200,7 +200,7 @@ OsmChangeFile::buildRelationGeometry(osmobjects::OsmRelation &relation) {
                     if (!waycache.count(nextWayId)) {
                         // Way is not available in cache,
                         // possibily because Relation is not in the priority area
-                        // or way was deleted
+                        // or the way was deleted
                         return;
                     }
                     nextWay = waycache.at(nextWayId);
@@ -221,17 +221,7 @@ OsmChangeFile::buildRelationGeometry(osmobjects::OsmRelation &relation) {
                     }
                 }
 
-                // Remove repeated point on line continuation
-                // if (bg::equals(part.back(), way->linestring.front())) {
-                //     std::cout << "HERE" << std::endl;
-                //     std::stringstream ss;
-                //     ss << std::setprecision(12) << bg::wkt(way->linestring | boost::adaptors::sliced(1, bg::num_points(way->linestring)));
-                //     std::cout << ss.str() << std::endl;
-
-                //     bg::append(part, way->linestring | boost::adaptors::sliced(1, bg::num_points(way->linestring)));
-                // } else {
                 bg::append(part, way->linestring);
-                // }
 
                 // Check if object is closed
                 if (relation.isMultiPolygon() && bg::equals(part.back(), part.front())) {
@@ -260,7 +250,7 @@ OsmChangeFile::buildRelationGeometry(osmobjects::OsmRelation &relation) {
                     if (!waycache.count(nextWayId)) {
                         // Way is not available in cache,
                         // possibily because Relation is not in the priority area
-                        // or way was deleted
+                        // or the way was deleted
                         return;
                     }
                     nextWay = waycache.at(nextWayId);
@@ -421,10 +411,8 @@ OsmChangeFile::buildRelationGeometry(osmobjects::OsmRelation &relation) {
     if (geometry.size() > 0) {
         geometry.erase(geometry.size() - 1);
         if (relation.isMultiPolygon()) {
-            // std::cout << "POLYGON(" + geometry + ")" << std::endl;
             bg::read_wkt("POLYGON(" + geometry + ")", relation.multipolygon);
         } else {
-            // std::cout << "MULTILINESTRING(" + geometry + ")" << std::endl;
             bg::read_wkt("MULTILINESTRING(" + geometry + ")", relation.multilinestring);
         }
     }

diff --git a/src/raw/queryraw.cc b/src/raw/queryraw.cc
@@ -105,7 +105,16 @@ buildMembersQuery(std::list<OsmRelationMember> members) {
             member_fmt % mit->role;
             membersStr += member_fmt.str();
             member_fmt % "type";
-            member_fmt % mit->type;
+            switch(mit->type) {
+                case osmobjects::osmtype_t::way:
+                    member_fmt % "way"; break;
+                case osmobjects::osmtype_t::node:
+                    member_fmt % "node"; break;
+                case osmobjects::osmtype_t::relation:
+                    member_fmt % "relation"; break;
+                default:
+                    member_fmt % "";
+            }
             membersStr += member_fmt.str();
             membersStr += "\"ref\":";
             membersStr += std::to_string(mit->ref);
@@ -466,8 +475,6 @@ QueryRaw::applyChange(const OsmRelation &relation) const
 
                 query += fmt.str();
             }
-        } else {
-            std::cout << "Relation " << relation.id << " has empty geometry" << std::endl;
         }
     } else if (relation.action == osmobjects::remove) {
         // Delete a Relation geometry and its references.