Skip to content

Commit 6323acf

Browse files
joker234joker234
committed
OSMType string representation changed to lower cases
see GIScience/oshdb@739d743#diff-b44791998a99b0446741e524bcc8de146e557ff2c1319e7fd8bd4d4f23014f8cR38-R41
1 parent 1d51775 commit 6323acf

File tree

5 files changed

+31
-30
lines changed

5 files changed

+31
-30
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ Changelog
33

44
## 1.7.0-SNAPSHOT (current master)
55

6+
### Breaking Changes
7+
* update OSHDB to version 1.0.0-beta-1 ([#278])
8+
* OSM type strings change to `node`, `way`, `relation`
9+
610
### New Features
711

812
* add `contributions/count[/density]/groupBy/boundary` endpoints to fetch contribution counts/densities grouped by boundary ([#217])
@@ -15,9 +19,6 @@ Changelog
1519
* fix a regression causing `…/groupBy/boundary` to crash when used with a geometry type filter using the (deprecated) types/keys/values parameter syntax ([#230])
1620
* fix changed name of property setting HTTP POST size ([#274])
1721

18-
### Other Changes
19-
* update OSHDB to version 1.0.0-beta-1 ([#278])
20-
2122
[#217]: https://github.com/GIScience/ohsome-api/issues/217
2223
[#224]: https://github.com/GIScience/ohsome-api/issues/224
2324
[#227]: https://github.com/GIScience/ohsome-api/issues/227

‎docs/endpoints.rst‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2043,7 +2043,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
20432043
"@changesetId" : 83099383,
20442044
"@contributionChangesetId" : 83099383,
20452045
"@osmId" : "node/323191854",
2046-
"@osmType" : "NODE",
2046+
"@osmType" : "node",
20472047
"@tagChange" : true,
20482048
"@timestamp" : "2020-04-05T13:32:50Z",
20492049
"@version" : 8,
@@ -2077,7 +2077,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
20772077
"@changesetId" : 83099383,
20782078
"@contributionChangesetId" : 83099383,
20792079
"@osmId" : "node/5400804545",
2080-
"@osmType" : "NODE",
2080+
"@osmType" : "node",
20812081
"@tagChange" : true,
20822082
"@timestamp" : "2020-04-05T13:32:50Z",
20832083
"@version" : 2,
@@ -2120,7 +2120,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
21202120
"@changesetId" : 83099383,
21212121
"@contributionChangesetId" : 83099383,
21222122
"@osmId" : "node/323191854",
2123-
"@osmType" : "NODE",
2123+
"@osmType" : "node",
21242124
"@tagChange" : true,
21252125
"@timestamp" : "2020-04-05T13:32:50Z",
21262126
"@version" : 8,
@@ -2154,7 +2154,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
21542154
"@changesetId" : 83099383,
21552155
"@contributionChangesetId" : 83099383,
21562156
"@osmId" : "node/5400804545",
2157-
"@osmType" : "NODE",
2157+
"@osmType" : "node",
21582158
"@tagChange" : true,
21592159
"@timestamp" : "2020-04-05T13:32:50Z",
21602160
"@version" : 2,
@@ -2197,7 +2197,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
21972197
"@changesetId" : 83099383,
21982198
"@contributionChangesetId" : 83099383,
21992199
"@osmId" : "node/323191854",
2200-
"@osmType" : "NODE",
2200+
"@osmType" : "node",
22012201
"@tagChange" : true,
22022202
"@timestamp" : "2020-04-05T13:32:50Z",
22032203
"@version" : 8,
@@ -2231,7 +2231,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
22312231
"@changesetId" : 83099383,
22322232
"@contributionChangesetId" : 83099383,
22332233
"@osmId" : "node/5400804545",
2234-
"@osmType" : "NODE",
2234+
"@osmType" : "node",
22352235
"@tagChange" : true,
22362236
"@timestamp" : "2020-04-05T13:32:50Z",
22372237
"@version" : 2,
@@ -2274,7 +2274,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
22742274
"@changesetId" : 83099383,
22752275
"@contributionChangesetId" : 83099383,
22762276
"@osmId" : "node/323191854",
2277-
"@osmType" : "NODE",
2277+
"@osmType" : "node",
22782278
"@tagChange" : true,
22792279
"@timestamp" : "2020-04-05T13:32:50Z",
22802280
"@version" : 8,
@@ -2308,7 +2308,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
23082308
"@changesetId" : 83099383,
23092309
"@contributionChangesetId" : 83099383,
23102310
"@osmId" : "node/5400804545",
2311-
"@osmType" : "NODE",
2311+
"@osmType" : "node",
23122312
"@tagChange" : true,
23132313
"@timestamp" : "2020-04-05T13:32:50Z",
23142314
"@version" : 2,
@@ -2398,7 +2398,7 @@ Get the latest change of constructions in a certain area of the Bahnstadt in Hei
23982398
"@contributionChangesetId" : 85604249,
23992399
"@geometryChange" : true,
24002400
"@osmId" : "way/795435536",
2401-
"@osmType" : "WAY",
2401+
"@osmType" : "way",
24022402
"@timestamp" : "2020-05-22T10:22:53Z",
24032403
"@version" : 3,
24042404
"landuse" : "construction"
@@ -2411,7 +2411,7 @@ Get the latest change of constructions in a certain area of the Bahnstadt in Hei
24112411
"@contributionChangesetId" : 51902131,
24122412
"@deletion" : true,
24132413
"@osmId" : "way/135635599",
2414-
"@osmType" : "WAY",
2414+
"@osmType" : "way",
24152415
"@timestamp" : "2017-09-10T09:22:03Z",
24162416
"@version" : 9
24172417
}
@@ -2447,7 +2447,7 @@ Get the latest change of constructions in a certain area of the Bahnstadt in Hei
24472447
"@contributionChangesetId" : 85604249,
24482448
"@geometryChange" : true,
24492449
"@osmId" : "way/795435536",
2450-
"@osmType" : "WAY",
2450+
"@osmType" : "way",
24512451
"@timestamp" : "2020-05-22T10:22:53Z",
24522452
"@version" : 3,
24532453
"landuse" : "construction"
@@ -2460,7 +2460,7 @@ Get the latest change of constructions in a certain area of the Bahnstadt in Hei
24602460
"@contributionChangesetId" : 51902131,
24612461
"@deletion" : true,
24622462
"@osmId" : "way/135635599",
2463-
"@osmType" : "WAY",
2463+
"@osmType" : "way",
24642464
"@timestamp" : "2017-09-10T09:22:03Z",
24652465
"@version" : 9
24662466
}
@@ -2496,7 +2496,7 @@ Get the latest change of constructions in a certain area of the Bahnstadt in Hei
24962496
"@contributionChangesetId" : 85604249,
24972497
"@geometryChange" : true,
24982498
"@osmId" : "way/795435536",
2499-
"@osmType" : "WAY",
2499+
"@osmType" : "way",
25002500
"@timestamp" : "2020-05-22T10:22:53Z",
25012501
"@version" : 3,
25022502
"landuse" : "construction"
@@ -2509,7 +2509,7 @@ Get the latest change of constructions in a certain area of the Bahnstadt in Hei
25092509
"@contributionChangesetId" : 51902131,
25102510
"@deletion" : true,
25112511
"@osmId" : "way/135635599",
2512-
"@osmType" : "WAY",
2512+
"@osmType" : "way",
25132513
"@timestamp" : "2017-09-10T09:22:03Z",
25142514
"@version" : 9
25152515
}
@@ -2545,7 +2545,7 @@ Get the latest change of constructions in a certain area of the Bahnstadt in Hei
25452545
"@contributionChangesetId" : 85604249,
25462546
"@geometryChange" : true,
25472547
"@osmId" : "way/795435536",
2548-
"@osmType" : "WAY",
2548+
"@osmType" : "way",
25492549
"@timestamp" : "2020-05-22T10:22:53Z",
25502550
"@version" : 3,
25512551
"landuse" : "construction"
@@ -2558,7 +2558,7 @@ Get the latest change of constructions in a certain area of the Bahnstadt in Hei
25582558
"@contributionChangesetId" : 51902131,
25592559
"@deletion" : true,
25602560
"@osmId" : "way/135635599",
2561-
"@osmType" : "WAY",
2561+
"@osmType" : "way",
25622562
"@timestamp" : "2017-09-10T09:22:03Z",
25632563
"@version" : 9
25642564
}

‎docs/response-parameters.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Description of the custom response parameters that are marked with a leading ``@
4242
* ``@osmId`` - id of the OSM element, including its type (e.g. node/1)
4343
* ``@version`` - version number of the OSM element
4444
* ``@changesetId`` - id of the OSM changeset which last increased the version of this OSM element
45-
* ``@osmType`` - type of the OSM element (NODE, WAY or RELATION)
45+
* ``@osmType`` - type of the OSM element (node, way or relation)
4646

4747
**specific for /elements**
4848

‎src/test/java/org/heigit/ohsome/ohsomeapi/controller/GetControllerTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ public void getElementsCountDensityGroupByTypeCsvTest() throws IOException {
895895
assertEquals(1, Helper.getCsvRecords(responseBody).size());
896896
Map<String, Integer> headers = Helper.getCsvHeaders(responseBody);
897897
assertEquals(4, headers.size());
898-
assertEquals(expectedValue, Double.parseDouble(records.get(0).get("RELATION")),
898+
assertEquals(expectedValue, Double.parseDouble(records.get(0).get("relation")),
899899
expectedValue * deltaPercentage);
900900
}
901901

@@ -975,7 +975,7 @@ public void getElementsCountGroupByTypeCsvTest() throws IOException {
975975
assertEquals(1, Helper.getCsvRecords(responseBody).size());
976976
Map<String, Integer> headers = Helper.getCsvHeaders(responseBody);
977977
assertEquals(4, headers.size());
978-
assertEquals(expectedValue, Double.parseDouble(records.get(0).get("WAY")),
978+
assertEquals(expectedValue, Double.parseDouble(records.get(0).get("way")),
979979
expectedValue * deltaPercentage);
980980
}
981981

@@ -1057,9 +1057,9 @@ public void getElementsAreaDensityGroupByTypeCsvTest() throws IOException {
10571057
assertEquals(1, Helper.getCsvRecords(responseBody).size());
10581058
Map<String, Integer> headers = Helper.getCsvHeaders(responseBody);
10591059
assertEquals(4, headers.size());
1060-
assertEquals(expectedValue1, Double.parseDouble(records.get(0).get("WAY")),
1060+
assertEquals(expectedValue1, Double.parseDouble(records.get(0).get("way")),
10611061
expectedValue1 * deltaPercentage);
1062-
assertEquals(expectedValue2, Double.parseDouble(records.get(0).get("RELATION")),
1062+
assertEquals(expectedValue2, Double.parseDouble(records.get(0).get("relation")),
10631063
expectedValue2 * deltaPercentage);
10641064
}
10651065

@@ -1091,7 +1091,7 @@ public void getElementsAreaGroupByTypeCsvTest() throws IOException {
10911091
assertEquals(1, Helper.getCsvRecords(responseBody).size());
10921092
Map<String, Integer> headers = Helper.getCsvHeaders(responseBody);
10931093
assertEquals(4, headers.size());
1094-
assertEquals(expectedValue, Double.parseDouble(records.get(0).get("WAY")),
1094+
assertEquals(expectedValue, Double.parseDouble(records.get(0).get("way")),
10951095
expectedValue * deltaPercentage);
10961096
}
10971097

@@ -1151,7 +1151,7 @@ public void getUsersCountDensityGroupByTypeCsvTest() throws IOException {
11511151
assertEquals(3, Helper.getCsvRecords(responseBody).size());
11521152
Map<String, Integer> headers = Helper.getCsvHeaders(responseBody);
11531153
assertEquals(5, headers.size());
1154-
assertEquals(expectedValue, Double.parseDouble(records.get(0).get("NODE")),
1154+
assertEquals(expectedValue, Double.parseDouble(records.get(0).get("node")),
11551155
expectedValue * deltaPercentage);
11561156
}
11571157

@@ -1182,7 +1182,7 @@ public void getUsersCountGroupByTypeCsvTest() throws IOException {
11821182
assertEquals(3, Helper.getCsvRecords(responseBody).size());
11831183
Map<String, Integer> headers = Helper.getCsvHeaders(responseBody);
11841184
assertEquals(5, headers.size());
1185-
assertEquals(expectedValue, Double.parseDouble(records.get(2).get("WAY")),
1185+
assertEquals(expectedValue, Double.parseDouble(records.get(2).get("way")),
11861186
expectedValue * deltaPercentage);
11871187
}
11881188

‎src/test/java/org/heigit/ohsome/ohsomeapi/controller/PostControllerTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ public void elementsLengthGroupByTypeCsvTest() throws IOException {
960960
assertEquals(1, Helper.getCsvRecords(responseBody).size());
961961
Map<String, Integer> headers = Helper.getCsvHeaders(responseBody);
962962
assertEquals(4, headers.size());
963-
assertEquals(expectedValue, Double.parseDouble(records.get(0).get("RELATION")),
963+
assertEquals(expectedValue, Double.parseDouble(records.get(0).get("relation")),
964964
expectedValue * deltaPercentage);
965965
}
966966

@@ -1139,8 +1139,8 @@ public void elementsCountGroupByTypeSimpleFeatureCsvTest() throws IOException {
11391139
assertEquals(1, Helper.getCsvRecords(responseBody).size());
11401140
Map<String, Integer> headers = Helper.getCsvHeaders(responseBody);
11411141
assertEquals(4, headers.size());
1142-
assertEquals(1.0, Double.parseDouble(records.get(0).get("RELATION")), 0.0);
1143-
assertEquals(1.0, Double.parseDouble(records.get(0).get("WAY")), 0.0);
1142+
assertEquals(1.0, Double.parseDouble(records.get(0).get("relation")), 0.0);
1143+
assertEquals(1.0, Double.parseDouble(records.get(0).get("way")), 0.0);
11441144
}
11451145

11461146
/*

0 commit comments

Comments
 (0)