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

adds a newline before the closing square bracket of json feature arrays #5685

Merged
merged 9 commits into from
Jul 24, 2023
Merged

adds a newline before the closing square bracket of json feature arrays #5685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
51d8b78
adds a newline before the closing square bracket of json feature arrays
brianhatchl Jul 20, 2023
10832d7
update geojson closing bracket
brianhatchl Jul 20, 2023
8bfe535
copyright
brianhatchl Jul 20, 2023
205d205
more json format test expectation updates
brianhatchl Jul 21, 2023
e3d03d5
restore trailing spaces my editor whacked
brianhatchl Jul 21, 2023
1d06b5a
fix test expectation
brianhatchl Jul 21, 2023
6268ee2
revert test expectation
brianhatchl Jul 21, 2023
d307ce5
revert test expectation
brianhatchl Jul 21, 2023
ea9e7a2
one more attempt
brianhatchl Jul 21, 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
4 changes: 2 additions & 2 deletions hoot-core-test/src/test/cpp/hoot/core/elements/OsmMapTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* This will properly maintain the copyright information. Maxar
* copyrights will be updated automatically.
*
* @copyright Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Maxar (http://www.maxar.com/)
* @copyright Copyright (C) 2012-2023 Maxar (http://www.maxar.com/)
*/

// Hoot
Expand Down Expand Up @@ -711,7 +711,7 @@ class OsmMapTest : public HootTestFixture
writer.setIncludeCompatibilityTags(false);
const QString actual = writer.toString(map);
HOOT_STR_EQUALS("{\"version\": 0.6,\"generator\": \"Hootenanny\",\"elements\": [\n"
"{\"type\":\"way\",\"id\":1,\"nodes\":[2],\"tags\":{\"" + MetadataTags::ErrorCircular() + "\":\"15\"}}]\n"
"{\"type\":\"way\",\"id\":1,\"nodes\":[2],\"tags\":{\"" + MetadataTags::ErrorCircular() + "\":\"15\"}}\n]\n"
"}\n",
actual);
CPPUNIT_ASSERT(OsmJsonReader().isValidJson(actual));
Expand Down
4 changes: 2 additions & 2 deletions hoot-core-test/src/test/cpp/hoot/core/io/MultiFileWriterTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* This will properly maintain the copyright information. Maxar
* copyrights will be updated automatically.
*
* @copyright Copyright (C) 2022 Maxar (http://www.maxar.com/)
* @copyright Copyright (C) 2022-2023 Maxar (http://www.maxar.com/)
*/

// Hoot
Expand Down Expand Up @@ -128,7 +128,7 @@ class MultiFileWriterTest : public HootTestFixture
}
// Write the footer
writer.setFooterSection();
writer.write("]");
writer.write("]\n");
writer.write("}\n");
}

Expand Down
4 changes: 2 additions & 2 deletions hoot-core-test/src/test/cpp/hoot/core/io/OsmPbfReaderTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* This will properly maintain the copyright information. Maxar
* copyrights will be updated automatically.
*
* @copyright Copyright (C) 2012, 2013, 2014, 2017, 2018, 2019, 2020, 2021, 2022 Maxar (http://www.maxar.com/)
* @copyright Copyright (C) 2012-2023 Maxar (http://www.maxar.com/)
*/

// Hoot
Expand Down Expand Up @@ -233,7 +233,7 @@ class OsmPbfReaderTest : public HootTestFixture
"{\"type\":\"node\",\"ref\":2,\"role\":\"t\"},\n"
"{\"type\":\"node\",\"ref\":3,\"role\":\"u\"},\n"
"{\"type\":\"way\",\"ref\":1,\"role\":\"f\"},\n"
"{\"type\":\"relation\",\"ref\":1,\"role\":\"f\"}],\"tags\":{\"" + MetadataTags::ErrorCircular() + "\":\"1.7\",\"hello\":\"world\",\"highway\":\"road\",\"note\":\"test tag\"}}]\n"
"{\"type\":\"relation\",\"ref\":1,\"role\":\"f\"}],\"tags\":{\"" + MetadataTags::ErrorCircular() + "\":\"1.7\",\"hello\":\"world\",\"highway\":\"road\",\"note\":\"test tag\"}}\n]\n"
"}\n",
actual);
CPPUNIT_ASSERT(OsmJsonReader().isValidJson(actual));
Expand Down
3 changes: 2 additions & 1 deletion hoot-core/src/main/cpp/hoot/core/io/OsmGeoJsonWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ void OsmGeoJsonWriter::finalizePartial()
{
// Finish up with the footer
_writer.setFooterSection();
_writeLn("");
_writeLn("]");
_writeLn("}");

Expand Down Expand Up @@ -311,7 +312,7 @@ void OsmGeoJsonWriter::_writePartial(const ElementProviderPtr& provider, const C
}

QString OsmGeoJsonWriter::_getBbox() const
{
{
Envelope bounds = CalculateMapBoundsVisitor::getGeosBounds(_map);
return QString("[%1, %2, %3, %4]")
.arg(QString::number(bounds.getMinX(), 'g', 5), QString::number(bounds.getMinY(), 'g', 5),
Expand Down
1 change: 1 addition & 0 deletions hoot-core/src/main/cpp/hoot/core/io/OsmJsonWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ void OsmJsonWriter::finalizePartial()
{
// Lastly write the footer of the file
_writer.setFooterSection();
_writeLn("");
_writeLn("]");
_writeLn("}");

Expand Down
3 changes: 2 additions & 1 deletion test-files/cmd/slow/CountCmdTest/inputDir/input1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@
{"type":"way","id":-1669801,"timestamp":"1970-01-01T00:00:00Z","version":1,"nodes":[-1669731,-1669791,-1669793],"tags":{"error:circular":"15","note":"1","highway":"road"}},
{"type":"way","id":-1669799,"timestamp":"1970-01-01T00:00:00Z","version":1,"nodes":[-1669729,-1669779,-1669781],"tags":{"error:circular":"15","note":"3","highway":"road"}},
{"type":"way","id":-1669797,"timestamp":"1970-01-01T00:00:00Z","version":1,"nodes":[-1669789,-1669787,-1669785,-1669783,-1669781,-1669731,-1669733,-1669735,-1669723,-1669737,-1669739,-1669741,-1669743,-1669745,-1669747,-1669749,-1669751,-1669753,-1669755,-1669757,-1669759,-1669761,-1669763,-1669765,-1669767,-1669769,-1669771,-1669773,-1669775,-1669777],"tags":{"error:circular":"15","note":"0","highway":"road"}},
{"type":"way","id":-1669795,"timestamp":"1970-01-01T00:00:00Z","version":1,"nodes":[-1669725,-1669727,-1669729,-1669735],"tags":{"error:circular":"15","note":"2","highway":"road"}}]
{"type":"way","id":-1669795,"timestamp":"1970-01-01T00:00:00Z","version":1,"nodes":[-1669725,-1669727,-1669729,-1669735],"tags":{"error:circular":"15","note":"2","highway":"road"}}
]
}
3 changes: 2 additions & 1 deletion test-files/cmd/slow/TaskGridCmdTest/output-node-density-bounds.geojson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{"generator":"Hootenanny","type":"FeatureCollection","bbox":[-77.039, 38.892, -77.034, 38.896],"source":"DcGisRoads.osm;DcTigerRoads.osm","features": [
{"type":"Feature","properties":{"task":"1","node_count":"322"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.039481, 38.8920895],[-77.039481, 38.895769],[-77.033635, 38.895769],[-77.033635, 38.8920895],[-77.039481, 38.8920895]]]]}}]
{"type":"Feature","properties":{"task":"1","node_count":"322"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.039481, 38.8920895],[-77.039481, 38.895769],[-77.033635, 38.895769],[-77.033635, 38.8920895],[-77.039481, 38.8920895]]]]}}
]
}
3 changes: 2 additions & 1 deletion test-files/cmd/slow/TaskGridCmdTest/output-node-density-random.geojson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{"generator":"Hootenanny","type":"FeatureCollection","bbox":[-77.055, 38.89, -77.052, 38.892],"source":"DcGisRoads.osm;DcTigerRoads.osm","features": [
{"type":"Feature","properties":{"task":"3","node_count":"129"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0551, 38.8895],[-77.0551, 38.8915],[-77.0521, 38.8915],[-77.0521, 38.8895],[-77.0551, 38.8895]]]]}}]
{"type":"Feature","properties":{"task":"3","node_count":"129"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0551, 38.8895],[-77.0551, 38.8915],[-77.0521, 38.8915],[-77.0521, 38.8895],[-77.0551, 38.8895]]]]}}
]
}
3 changes: 2 additions & 1 deletion test-files/cmd/slow/TaskGridCmdTest/output-node-density-retry.geojson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@
{"type":"Feature","properties":{"task":"25","node_count":"360"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0411, 38.894],[-77.0411, 38.899],[-77.0341, 38.899],[-77.0341, 38.894],[-77.0411, 38.894]]]]}},
{"type":"Feature","properties":{"task":"26","node_count":"218"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0341, 38.894],[-77.0341, 38.899],[-77.0271, 38.899],[-77.0271, 38.894],[-77.0341, 38.894]]]]}},
{"type":"Feature","properties":{"task":"27","node_count":"259"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0411, 38.899],[-77.0411, 38.904],[-77.0341, 38.904],[-77.0341, 38.899],[-77.0411, 38.899]]]]}},
{"type":"Feature","properties":{"task":"28","node_count":"201"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0341, 38.899],[-77.0341, 38.904],[-77.0271, 38.904],[-77.0271, 38.899],[-77.0341, 38.899]]]]}}]
{"type":"Feature","properties":{"task":"28","node_count":"201"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0341, 38.899],[-77.0341, 38.904],[-77.0271, 38.904],[-77.0271, 38.899],[-77.0341, 38.899]]]]}}
]
}
3 changes: 2 additions & 1 deletion test-files/cmd/slow/TaskGridCmdTest/output-node-density-small.geojson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{"generator":"Hootenanny","type":"FeatureCollection","bbox":[-77.055, 38.885, -77.028, 38.903],"source":"DcGisRoads.osm;DcTigerRoads.osm","features": [
{"type":"Feature","properties":{"task":"1","node_count":"7487"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0551, 38.8845],[-77.0551, 38.9031],[-77.0281, 38.9031],[-77.0281, 38.8845],[-77.0551, 38.8845]]]]}}]
{"type":"Feature","properties":{"task":"1","node_count":"7487"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0551, 38.8845],[-77.0551, 38.9031],[-77.0281, 38.9031],[-77.0281, 38.8845],[-77.0551, 38.8845]]]]}}
]
}
3 changes: 2 additions & 1 deletion test-files/cmd/slow/TaskGridCmdTest/output-node-density.geojson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
{"type":"Feature","properties":{"task":"16","node_count":"476"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0481, 38.8945],[-77.0481, 38.8995],[-77.0411, 38.8995],[-77.0411, 38.8945],[-77.0481, 38.8945]]]]}},
{"type":"Feature","properties":{"task":"17","node_count":"878"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0551, 38.8995],[-77.0551, 38.9045],[-77.0481, 38.9045],[-77.0481, 38.8995],[-77.0551, 38.8995]]]]}},
{"type":"Feature","properties":{"task":"18","node_count":"336"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0481, 38.8995],[-77.0481, 38.9045],[-77.0411, 38.9045],[-77.0411, 38.8995],[-77.0481, 38.8995]]]]}},
{"type":"Feature","properties":{"task":"19","node_count":"1000"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0411, 38.8945],[-77.0411, 38.9045],[-77.0261, 38.9045],[-77.0261, 38.8945],[-77.0411, 38.8945]]]]}}]
{"type":"Feature","properties":{"task":"19","node_count":"1000"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0411, 38.8945],[-77.0411, 38.9045],[-77.0261, 38.9045],[-77.0261, 38.8945],[-77.0411, 38.8945]]]]}}
]
}
3 changes: 2 additions & 1 deletion test-files/cmd/slow/TaskGridCmdTest/output-uniform-bounds.geojson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
{"type":"Feature","properties":{"id":"4"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0368, 38.89139999999999],[-77.0368, 38.89364999999999],[-77.0333, 38.89364999999999],[-77.0333, 38.89139999999999],[-77.0368, 38.89139999999999]]]]}},
{"type":"Feature","properties":{"id":"3"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0368, 38.89364999999999],[-77.0368, 38.8959],[-77.0333, 38.8959],[-77.0333, 38.89364999999999],[-77.0368, 38.89364999999999]]]]}},
{"type":"Feature","properties":{"id":"2"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0403, 38.89139999999999],[-77.0403, 38.89364999999999],[-77.0368, 38.89364999999999],[-77.0368, 38.89139999999999],[-77.0403, 38.89139999999999]]]]}},
{"type":"Feature","properties":{"id":"1"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0403, 38.89364999999999],[-77.0403, 38.8959],[-77.0368, 38.8959],[-77.0368, 38.89364999999999],[-77.0403, 38.89364999999999]]]]}}]
{"type":"Feature","properties":{"id":"1"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0403, 38.89364999999999],[-77.0403, 38.8959],[-77.0368, 38.8959],[-77.0368, 38.89364999999999],[-77.0403, 38.89364999999999]]]]}}
]
}
3 changes: 2 additions & 1 deletion test-files/cmd/slow/TaskGridCmdTest/output-uniform.geojson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
{"type":"Feature","properties":{"id":"4"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0551, 38.88450000000001],[-77.0551, 38.88915000000001],[-77.04835, 38.88915000000001],[-77.04835, 38.88450000000001],[-77.0551, 38.88450000000001]]]]}},
{"type":"Feature","properties":{"id":"3"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0551, 38.88915000000001],[-77.0551, 38.89380000000001],[-77.04835, 38.89380000000001],[-77.04835, 38.88915000000001],[-77.0551, 38.88915000000001]]]]}},
{"type":"Feature","properties":{"id":"2"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0551, 38.89380000000001],[-77.0551, 38.89845],[-77.04835, 38.89845],[-77.04835, 38.89380000000001],[-77.0551, 38.89380000000001]]]]}},
{"type":"Feature","properties":{"id":"1"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0551, 38.89845],[-77.0551, 38.9031],[-77.04835, 38.9031],[-77.04835, 38.89845],[-77.0551, 38.89845]]]]}}]
{"type":"Feature","properties":{"id":"1"},"geometry": {"type":"MultiPolygon","coordinates": [[[[-77.0551, 38.89845],[-77.0551, 38.9031],[-77.04835, 38.9031],[-77.04835, 38.89845],[-77.0551, 38.89845]]]]}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/merging/LinearSnapMergerTest/runTagsNoRelationTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
{"type":"node","id":-2,"lat":0.5000452184238038,"lon":0.5004491746338422},
{"type":"node","id":-1,"lat":0.5000452184392712,"lon":0.5},
{"type":"way","id":-6,"nodes":[-2,-4],"tags":{"error:circular":"15","highway":"footway","uuid":"r"}},
{"type":"way","id":-4,"nodes":[-1,-2],"tags":{"error:circular":"15","highway":"road","uuid":"w1;r"}}]
{"type":"way","id":-4,"nodes":[-1,-2],"tags":{"error:circular":"15","highway":"road","uuid":"w1;r"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/merging/LinearSnapMergerTest/runTagsSplitTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
{"type":"way","id":-1,"nodes":[-7,-8],"tags":{"error:circular":"15","highway":"road","uuid":"w1;w2"}},
{"type":"relation","id":-1,"members":[
{"type":"way","ref":-5,"role":""},
{"type":"way","ref":-6,"role":""}],"tags":{"error:circular":"15","highway":"road","hoot:multilinestring":"yes","uuid":"w1"}}]
{"type":"way","ref":-6,"role":""}],"tags":{"error:circular":"15","highway":"road","hoot:multilinestring":"yes","uuid":"w1"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/merging/LinearSnapMergerTest/runTagsTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
{"type":"way","ref":-14,"role":""}],"tags":{"error:circular":"15","highway":"footway","hoot:multilinestring":"yes","uuid":"r"}},
{"type":"relation","id":-1,"members":[
{"type":"way","ref":-12,"role":""},
{"type":"way","ref":-13,"role":""}],"tags":{"error:circular":"15","highway":"footway","uuid":"r;w3"}}]
{"type":"way","ref":-13,"role":""}],"tags":{"error:circular":"15","highway":"footway","uuid":"r;w3"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/multiary/MultiaryPoiMergerTest/basicTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
{"type":"node","id":-1,"lat":1.808738954100793e-5,"lon":-2.694945852358797e-5,"tags":{"amenity":"pub","hoot:hash":"","name":"My Restaurant","alt_name":"my Restaurant","source:hash":"AAA;BBB"}},
{"type":"relation","id":-1,"members":[
{"type":"node","ref":-3,"role":"reviewee"},
{"type":"node","ref":-1,"role":"reviewee"}],"tags":{"hoot:review:type":"POI","hoot:review:note":"Somewhat similar (12m) - very close together, similar POI type","hoot:review:members":"2","hoot:review:needs":"yes","hoot:review:score":"-1"}}]
{"type":"node","ref":-1,"role":"reviewee"}],"tags":{"hoot:review:type":"POI","hoot:review:note":"Somewhat similar (12m) - very close together, similar POI type","hoot:review:members":"2","hoot:review:needs":"yes","hoot:review:score":"-1"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/poi-polygon/PoiPolygonMergerTest/basicTest1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
{"type":"node","id":-3,"lat":20,"lon":20},
{"type":"node","id":-2,"lat":0,"lon":20},
{"type":"node","id":-1,"lat":0,"lon":0},
{"type":"way","id":-1,"nodes":[-1,-2,-3,-4,-5],"tags":{"alt_name":"bar","amenity":"bar","area":"yes","error:circular":"5","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"0","hoot:poipolygon:poismerged:2":"1","name":"foo","note":"w1"}}]
{"type":"way","id":-1,"nodes":[-1,-2,-3,-4,-5],"tags":{"alt_name":"bar","amenity":"bar","area":"yes","error:circular":"5","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"0","hoot:poipolygon:poismerged:2":"1","name":"foo","note":"w1"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/poi-polygon/PoiPolygonMergerTest/basicTest2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
{"type":"node","id":-3,"lat":20,"lon":20},
{"type":"node","id":-2,"lat":0,"lon":20},
{"type":"node","id":-1,"lat":0,"lon":0},
{"type":"way","id":-1,"nodes":[-1,-2,-3,-4,-5],"tags":{"alt_name":"foo","amenity":"cafe","area":"yes","error:circular":"5","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"1","hoot:poipolygon:poismerged:2":"0","name":"bar","note":"w1"}}]
{"type":"way","id":-1,"nodes":[-1,-2,-3,-4,-5],"tags":{"alt_name":"foo","amenity":"cafe","area":"yes","error:circular":"5","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"1","hoot:poipolygon:poismerged:2":"0","name":"bar","note":"w1"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/poi-polygon/PoiPolygonMergerTest/toyScenario1Test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
{"type":"way","ref":-22,"role":"outer"},
{"type":"way","ref":-21,"role":"outer"},
{"type":"way","ref":-20,"role":"outer"},
{"type":"way","ref":-19,"role":"outer"}],"tags":{"alt_name":"B;C;D;E;F","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"0","hoot:poipolygon:poismerged:2":"1","name":"A","note":"Toy Scenario 1","poi":"yes"}}]
{"type":"way","ref":-19,"role":"outer"}],"tags":{"alt_name":"B;C;D;E;F","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"0","hoot:poipolygon:poismerged:2":"1","name":"A","note":"Toy Scenario 1","poi":"yes"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/poi-polygon/PoiPolygonMergerTest/toyScenario2Test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
{"type":"way","ref":-18,"role":"outer"},
{"type":"way","ref":-17,"role":"outer"},
{"type":"way","ref":-16,"role":"outer"},
{"type":"way","ref":-15,"role":"outer"}],"tags":{"alt_name":"B;C;D;E;F","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"0","hoot:poipolygon:poismerged:2":"1","name":"A","note":"Toy Scenario 2","poi":"yes"}}]
{"type":"way","ref":-15,"role":"outer"}],"tags":{"alt_name":"B;C;D;E;F","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"0","hoot:poipolygon:poismerged:2":"1","name":"A","note":"Toy Scenario 2","poi":"yes"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/poi-polygon/PoiPolygonMergerTest/toyScenario3Test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
{"type":"way","ref":-14,"role":"outer"},
{"type":"way","ref":-13,"role":"outer"},
{"type":"way","ref":-12,"role":"outer"},
{"type":"way","ref":-11,"role":"outer"}],"tags":{"alt_name":"A;B;C;D;E;F","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"2","hoot:poipolygon:poismerged:1":"1","hoot:poipolygon:poismerged:2":"1","name":"G","note":"Toy Scenario 3","poi":"yes"}}]
{"type":"way","ref":-11,"role":"outer"}],"tags":{"alt_name":"A;B;C;D;E;F","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"2","hoot:poipolygon:poismerged:1":"1","hoot:poipolygon:poismerged:2":"1","name":"G","note":"Toy Scenario 3","poi":"yes"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/poi-polygon/PoiPolygonMergerTest/toyScenario4Test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
{"type":"relation","id":-1,"members":[
{"type":"way","ref":-10,"role":"outer"},
{"type":"way","ref":-9,"role":"outer"},
{"type":"way","ref":-8,"role":"outer"}],"tags":{"alt_name":"A;B;C;E;F;bar;foo","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"2","hoot:poipolygon:poismerged:1":"1","hoot:poipolygon:poismerged:2":"1","name":"G","note":"Toy Scenario 4","poi":"yes"}}]
{"type":"way","ref":-8,"role":"outer"}],"tags":{"alt_name":"A;B;C;E;F;bar;foo","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"2","hoot:poipolygon:poismerged:1":"1","hoot:poipolygon:poismerged:2":"1","name":"G","note":"Toy Scenario 4","poi":"yes"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/poi-polygon/PoiPolygonMergerTest/toyScenario5Test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
{"type":"node","id":-15,"lat":-0.0005143,"lon":-0.001151},
{"type":"node","id":-14,"lat":-0.0005151,"lon":-0.0005625},
{"type":"way","id":-7,"nodes":[-80,-79,-81,-78,-77,-76],"tags":{"error:circular":"15","note":"Toy Scenario 5"}},
{"type":"way","id":-2,"nodes":[-25,-24,-23,-22,-21,-20,-19,-18,-17,-16,-15,-14,-25],"tags":{"alt_name":"F","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"0","hoot:poipolygon:poismerged:2":"1","name":"A","note":"Toy Scenario 5","poi":"yes"}}]
{"type":"way","id":-2,"nodes":[-25,-24,-23,-22,-21,-20,-19,-18,-17,-16,-15,-14,-25],"tags":{"alt_name":"F","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"0","hoot:poipolygon:poismerged:2":"1","name":"A","note":"Toy Scenario 5","poi":"yes"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/poi-polygon/PoiPolygonMergerTest/toyScenario6Test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
{"type":"node","id":-3,"lat":-0.001455,"lon":0.00177},
{"type":"node","id":-2,"lat":-0.0004766,"lon":0.001771},
{"type":"node","id":-1,"lat":-0.0004775,"lon":0.00236},
{"type":"way","id":-1,"nodes":[-12,-11,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,-12],"tags":{"alt_name":"F","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"0","hoot:poipolygon:poismerged:2":"1","name":"A","note":"Toy Scenario 6","poi":"yes"}}]
{"type":"way","id":-1,"nodes":[-12,-11,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,-12],"tags":{"alt_name":"F","building":"yes","error:circular":"15","hoot:poipolygon:poismerged":"1","hoot:poipolygon:poismerged:1":"0","hoot:poipolygon:poismerged:2":"1","name":"A","note":"Toy Scenario 6","poi":"yes"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/polygon/BuildingMergerTest/runTagTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
{"type":"way","id":-25,"nodes":[-218,-219,-220,-221,-222,-223,-224,-225,-226,-218],"tags":{"building":"yes","error:circular":"15"}},
{"type":"relation","id":-1,"members":[
{"type":"way","ref":-26,"role":"outer"},
{"type":"way","ref":-25,"role":"outer"}],"tags":{"REF1":"Panera","REF2":"Panera","alt_name":"Maid-Rite;Maid-Rite Diner","building":"yes","error:circular":"15","hoot:building:match":"true","name":"Panera Bread"}}]
{"type":"way","ref":-25,"role":"outer"}],"tags":{"REF1":"Panera","REF2":"Panera","alt_name":"Maid-Rite;Maid-Rite Diner","building":"yes","error:circular":"15","hoot:building:match":"true","name":"Panera Bread"}}
]
}
3 changes: 2 additions & 1 deletion test-files/conflate/review/ReviewMarkerTest/runMultipleScoresTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
{"type":"node","ref":2,"role":"reviewee"}],"tags":{"hoot:review:members":"2","hoot:review:needs":"yes","hoot:review:note":"a note 2","hoot:review:score":"0.5","hoot:review:type":"test"}},
{"type":"relation","id":-1,"members":[
{"type":"node","ref":1,"role":"reviewee"},
{"type":"node","ref":2,"role":"reviewee"}],"tags":{"hoot:review:members":"2","hoot:review:needs":"yes","hoot:review:note":"a note","hoot:review:score":"0.15","hoot:review:type":"test"}}]
{"type":"node","ref":2,"role":"reviewee"}],"tags":{"hoot:review:members":"2","hoot:review:needs":"yes","hoot:review:note":"a note","hoot:review:score":"0.15","hoot:review:type":"test"}}
]
}
Loading