diff --git a/README.md b/README.md
index b96923cffffedc3054fa12bafd7a9ddb1a9edaf0..6e88db1169116215a38838947c4f0827d4c0385a 100644
--- a/README.md
+++ b/README.md
@@ -693,8 +693,8 @@ query MyQuery($geomGelderland: GeoJSON!) {
longitude
geog{
geojson
- x
- y
+ latitude
+ longitude
}
}
}
@@ -750,8 +750,8 @@ query MyQuery($geomGelderland: GeoJSON!) {
longitude
geog {
geojson
- x
- y
+ latitude
+ longitude
}
}
}
@@ -855,8 +855,8 @@ query MyQuery($geomGelderland: GeoJSON!) {
longitude
geog{
geojson
- x
- y
+ latitude
+ longitude
}
}
}
@@ -1029,8 +1029,8 @@ query MyQuery($geomGelderland: GeoJSON!) {
longitude
geog {
geojson
- x
- y
+ latitude
+ longitude
}
}
}
diff --git a/images/geomGelderland_example1.jpg b/images/geomGelderland_example1.jpg
index f20cbca34986826cd25044a5c4f0bd6d30d11f15..7894bb020ca5242a2cf7b33e7f12541522aaaffe 100644
Binary files a/images/geomGelderland_example1.jpg and b/images/geomGelderland_example1.jpg differ
diff --git a/images/python_q1_result.jpg b/images/python_q1_result.jpg
index ba73cc71ad447d14de25112afcd7410480ef3ec0..96f189cda5151c932367a560a5ef748c5c93dd17 100644
Binary files a/images/python_q1_result.jpg and b/images/python_q1_result.jpg differ
diff --git a/images/python_q2_result.png b/images/python_q2_result.png
index 9631eb5ba230bacb3524df1af14a23f062f86242..7599069d6a00a1dc16180563d29c97a602e0c18b 100644
Binary files a/images/python_q2_result.png and b/images/python_q2_result.png differ
diff --git a/scripts/python/wosis_gelderland.csv b/scripts/python/wosis_gelderland.csv
index 3ccd0a1d54decde2889d92c529a91fd18c8b8ce9..a5d2888ecca1b21a203e87ff68030a399299de6c 100644
--- a/scripts/python/wosis_gelderland.csv
+++ b/scripts/python/wosis_gelderland.csv
@@ -1,104 +1,104 @@
continent,region,profileId,datasetCode,latitude,longitude
-Europe,Western Europe,1043374,NL-Alterra,51.98697542967124,6.665127751403251
-Europe,Western Europe,1043487,NL-Alterra,51.931844611547206,6.724923833764855
-Europe,Western Europe,1043649,NL-Alterra,52.079851588741306,6.660048778683933
-Europe,Western Europe,1043659,NL-Alterra,51.99366275331206,6.662697317751144
-Europe,Western Europe,1043660,NL-Alterra,51.98215296783606,6.646356431984319
-Europe,Western Europe,1043730,NL-Alterra,52.037119170174954,6.5774295292486435
-Europe,Western Europe,1043780,NL-Alterra,52.0991175500654,6.584334798532214
-Europe,Western Europe,1043672,NL-Alterra,51.84682506875407,5.043257305355638
-Europe,Western Europe,1043726,NL-Alterra,51.8838260352328,5.098457949493585
-Europe,Western Europe,1043996,NL-Alterra,51.870326759517646,5.091720086565306
-Europe,Western Europe,934557,EU-FOREGS,52.173553466796875,6.122528076171875
-Europe,Western Europe,936545,EU-FOREGS,52.174461364746094,6.1210808753967285
-Europe,Western Europe,937026,EU-GEMAS,51.83639907836914,5.739999771118164
-Europe,Western Europe,939307,EU-GEMAS,52.25299835205078,5.9720001220703125
-Europe,Western Europe,940825,EU-GEMAS,52.24919891357422,5.962200164794922
-Europe,Western Europe,1004638,EU-SPADE,52.28,5.672777777777778
-Europe,Western Europe,1004950,EU-SPADE,51.834999084472656,6.394400119781494
-Europe,Western Europe,1004960,EU-SPADE,52.14970016479492,6.0
-Europe,Western Europe,1004998,EU-SPADE,51.87919998168945,5.724999904632568
-Europe,Western Europe,1043359,NL-Alterra,51.84178267944147,5.763033086199862
-Europe,Western Europe,1043414,NL-Alterra,51.84872593500576,5.48473003000238
-Europe,Western Europe,1043437,NL-Alterra,51.95179702379335,6.2799998917712365
-Europe,Western Europe,1043438,NL-Alterra,52.02127378968951,6.315550290398462
-Europe,Western Europe,1043439,NL-Alterra,51.88610965746257,6.409792306850038
-Europe,Western Europe,1043440,NL-Alterra,51.92130549918883,6.1692750325682395
-Europe,Western Europe,1043442,NL-Alterra,52.25832382345286,6.105766840872823
-Europe,Western Europe,1043443,NL-Alterra,52.03728303759915,6.505723015891941
-Europe,Western Europe,1043444,NL-Alterra,52.11863727629245,5.978168456684717
-Europe,Western Europe,1043446,NL-Alterra,52.20076299676038,6.034477778698324
+Europe,Western Europe,1043743,NL-Alterra,52.16324078761394,6.5172114574599505
+Europe,Western Europe,1115994,WD-ISIS,52.17583333333334,5.859166666666667
+Europe,Western Europe,1124718,WD-WISE,52.18333333333333,5.716666666666667
Europe,Western Europe,1043452,NL-Alterra,51.888199716958894,5.792472877943635
-Europe,Western Europe,1043453,NL-Alterra,52.25877941271585,6.119396011922248
-Europe,Western Europe,1043465,NL-Alterra,52.378407507979595,5.974652930690879
-Europe,Western Europe,1043471,NL-Alterra,51.900585080127975,6.215411726869212
-Europe,Western Europe,1043473,NL-Alterra,52.40521938028812,6.00439923935644
+Europe,Western Europe,1043858,NL-Alterra,51.83171466339922,5.107206237875864
Europe,Western Europe,1043492,NL-Alterra,52.244687487390784,5.6800436461661175
-Europe,Western Europe,1043493,NL-Alterra,52.28018373346947,5.826815321162722
+Europe,Western Europe,938327,EU-GEMAS,51.85089874267578,5.237500190734863
+Europe,Western Europe,1043677,NL-Alterra,51.99217435907258,6.228751338156893
+Europe,Western Europe,1043847,NL-Alterra,52.15122870187573,6.351568474676469
+Europe,Western Europe,1004998,EU-SPADE,51.87919998168945,5.724999904632568
Europe,Western Europe,1043494,NL-Alterra,52.28007105513121,5.856121827941348
-Europe,Western Europe,1043495,NL-Alterra,52.4498331472039,6.063862580416263
-Europe,Western Europe,1043497,NL-Alterra,52.03497804815366,6.073614888303684
-Europe,Western Europe,1043508,NL-Alterra,51.987466611723036,5.739505227093674
+Europe,Western Europe,1043721,NL-Alterra,51.967561542028776,5.652476178687103
Europe,Western Europe,1043509,NL-Alterra,51.99022231789239,5.719144409739948
+Europe,Western Europe,1043833,NL-Alterra,51.794942564650114,5.793083826669608
+Europe,Western Europe,1107921,WD-ISCN,52.0,5.75
+Europe,Western Europe,939702,EU-GEMAS,51.8931999206543,5.234799861907959
Europe,Western Europe,1043510,NL-Alterra,51.970230719160206,5.788848151133059
+Europe,Western Europe,1043997,NL-Alterra,51.792778558959874,5.187170771354893
+Europe,Western Europe,1043863,NL-Alterra,51.81146569600635,5.930269436572976
+Europe,Western Europe,1043678,NL-Alterra,52.04847991873956,6.143797528670743
+Europe,Western Europe,1004638,EU-SPADE,52.28,5.672777777777778
Europe,Western Europe,1043512,NL-Alterra,52.17526430836403,5.757069589710335
-Europe,Western Europe,1043519,NL-Alterra,52.20482343488615,5.788035922737804
+Europe,Western Europe,1043755,NL-Alterra,52.47483940984441,6.027816982476475
+Europe,Western Europe,1043954,NL-Alterra,51.87166830639998,5.321134590832723
+Europe,Western Europe,1114660,WD-ISCN,52.13330078125,5.75
Europe,Western Europe,1043520,NL-Alterra,51.95188508618982,6.206175273395131
-Europe,Western Europe,1043521,NL-Alterra,52.10432759786435,5.963747804540005
-Europe,Western Europe,1043522,NL-Alterra,52.06868602565271,5.896199113204347
-Europe,Western Europe,1043532,NL-Alterra,52.046005746082464,5.942588221387407
-Europe,Western Europe,1043533,NL-Alterra,52.043936959064645,5.788051812613437
-Europe,Western Europe,1043566,NL-Alterra,52.47105762154436,6.092371168306506
+Europe,Western Europe,1043715,NL-Alterra,51.94306551438424,5.522457483831689
+Europe,Western Europe,1115602,WD-ISIS,52.016666666666666,5.966666666666667
+Europe,Western Europe,1043796,NL-Alterra,51.87728151034946,5.840879352427591
+Europe,Western Europe,1043443,NL-Alterra,52.03728303759915,6.505723015891941
+Europe,Western Europe,1043999,NL-Alterra,51.780188632733385,5.183603790636508
+Europe,Western Europe,1043439,NL-Alterra,51.88610965746257,6.409792306850038
+Europe,Western Europe,1043670,NL-Alterra,51.83334350965305,5.275490211723768
+Europe,Western Europe,1043797,NL-Alterra,51.88530427207969,5.616695154056289
+Europe,Western Europe,1115949,WD-ISIS,52.016666666666666,5.966666666666667
+Europe,Western Europe,1043621,NL-Alterra,51.83393287134585,6.3937354398722
+Europe,Western Europe,1043845,NL-Alterra,52.11596455510221,6.263203600867022
+Europe,Western Europe,1043841,NL-Alterra,52.235800550679436,5.636067834598172
+Europe,Western Europe,1043726,NL-Alterra,51.8838260352328,5.098457949493585
+Europe,Western Europe,1115744,WD-ISIS,52.032222222222224,5.763055555555556
+Europe,Western Europe,1043953,NL-Alterra,51.93651285653109,6.016850295952505
Europe,Western Europe,1043587,NL-Alterra,51.89160083384448,6.044113555216171
+Europe,Western Europe,1043730,NL-Alterra,52.037119170174954,6.5774295292486435
+Europe,Western Europe,1043519,NL-Alterra,52.20482343488615,5.788035922737804
+Europe,Western Europe,1043473,NL-Alterra,52.40521938028812,6.00439923935644
Europe,Western Europe,1043620,NL-Alterra,52.03994743239311,6.209826381610751
-Europe,Western Europe,1043621,NL-Alterra,51.83393287134585,6.3937354398722
-Europe,Western Europe,1043623,NL-Alterra,52.05661846867336,6.0773004393514105
+Europe,Western Europe,1043725,NL-Alterra,51.94825388460149,5.231569217404203
+Europe,Western Europe,1043487,NL-Alterra,51.931844611547206,6.724923833764855
+Europe,Western Europe,1004960,EU-SPADE,52.14970016479492,6.0
+Europe,Western Europe,1116112,WD-ISIS,51.99758333333333,5.62429
+Europe,Western Europe,1043723,NL-Alterra,51.89163547263586,5.3516117726214665
+Europe,Western Europe,1043453,NL-Alterra,52.25877941271585,6.119396011922248
+Europe,Western Europe,1043672,NL-Alterra,51.84682506875407,5.043257305355638
+Europe,Western Europe,1043780,NL-Alterra,52.0991175500654,6.584334798532214
+Europe,Western Europe,1043980,NL-Alterra,52.085672488443265,5.649529488470928
+Europe,Western Europe,1043720,NL-Alterra,51.82036027068235,5.3599350355087605
+Europe,Western Europe,938929,EU-GEMAS,51.80039978027344,5.694900035858154
+Europe,Western Europe,936545,EU-FOREGS,52.174461364746094,6.1210808753967285
+Europe,Western Europe,1124496,WD-WISE,52.016666666666666,5.966666666666667
+Europe,Western Europe,1043566,NL-Alterra,52.47105762154436,6.092371168306506
+Europe,Western Europe,1043675,NL-Alterra,51.86022550830968,5.565758477465195
+Europe,Western Europe,1043438,NL-Alterra,52.02127378968951,6.315550290398462
Europe,Western Europe,1043638,NL-Alterra,52.117610990115374,6.384060344520573
+Europe,Western Europe,1043623,NL-Alterra,52.05661846867336,6.0773004393514105
+Europe,Western Europe,1043930,NL-Alterra,52.226332321895256,5.462212961557902
+Europe,Western Europe,1043744,NL-Alterra,51.96038379304289,5.894679033957757
+Europe,Western Europe,1114507,WD-ISCN,51.96670150756836,5.466700077056885
+Europe,Western Europe,1043718,NL-Alterra,51.919463185820746,6.091037141423828
+Europe,Western Europe,1115824,WD-ISIS,52.18333333333333,5.716666666666667
+Europe,Western Europe,1124890,WD-WISE,52.17583333333334,5.859166666666667
+Europe,Western Europe,1043437,NL-Alterra,51.95179702379335,6.2799998917712365
+Europe,Western Europe,1043471,NL-Alterra,51.900585080127975,6.215411726869212
+Europe,Western Europe,1116107,WD-ISIS,51.966906944444446,5.689726111111111
+Europe,Western Europe,1115651,WD-ISIS,51.95,5.516666666666667
Europe,Western Europe,1043644,NL-Alterra,52.00004075633502,5.868916034043594
+Europe,Western Europe,1043748,NL-Alterra,51.797727752312106,5.142644089946094
Europe,Western Europe,1043669,NL-Alterra,51.93276197170273,5.695455058943515
+Europe,Western Europe,1043446,NL-Alterra,52.20076299676038,6.034477778698324
+Europe,Western Europe,1115811,WD-ISIS,51.916666666666664,5.65
Europe,Western Europe,1043676,NL-Alterra,51.82709423825635,5.436522987160779
-Europe,Western Europe,1043677,NL-Alterra,51.99217435907258,6.228751338156893
-Europe,Western Europe,1043678,NL-Alterra,52.04847991873956,6.143797528670743
-Europe,Western Europe,1043713,NL-Alterra,51.94872298048873,5.8675651416097665
-Europe,Western Europe,1043718,NL-Alterra,51.919463185820746,6.091037141423828
-Europe,Western Europe,1043721,NL-Alterra,51.967561542028776,5.652476178687103
-Europe,Western Europe,1043723,NL-Alterra,51.89163547263586,5.3516117726214665
-Europe,Western Europe,1043743,NL-Alterra,52.16324078761394,6.5172114574599505
-Europe,Western Europe,1043744,NL-Alterra,51.96038379304289,5.894679033957757
-Europe,Western Europe,1043755,NL-Alterra,52.47483940984441,6.027816982476475
-Europe,Western Europe,1043791,NL-Alterra,51.93403917432385,6.4581438693886115
-Europe,Western Europe,1043795,NL-Alterra,51.90200151569097,5.9814933777062445
-Europe,Western Europe,1043796,NL-Alterra,51.87728151034946,5.840879352427591
-Europe,Western Europe,1043797,NL-Alterra,51.88530427207969,5.616695154056289
-Europe,Western Europe,1043798,NL-Alterra,52.074578953736285,6.1386960484576365
+Europe,Western Europe,1043522,NL-Alterra,52.06868602565271,5.896199113204347
Europe,Western Europe,1043815,NL-Alterra,52.36117635260774,5.798256948589491
-Europe,Western Europe,1043831,NL-Alterra,52.07871436682097,6.422947030479737
-Europe,Western Europe,1043833,NL-Alterra,51.794942564650114,5.793083826669608
-Europe,Western Europe,1043841,NL-Alterra,52.235800550679436,5.636067834598172
-Europe,Western Europe,1043844,NL-Alterra,52.14513769387515,5.88392230216291
-Europe,Western Europe,1043845,NL-Alterra,52.11596455510221,6.263203600867022
-Europe,Western Europe,1043847,NL-Alterra,52.15122870187573,6.351568474676469
-Europe,Western Europe,1043855,NL-Alterra,52.00271527776022,6.131810973164188
-Europe,Western Europe,1043863,NL-Alterra,51.81146569600635,5.930269436572976
-Europe,Western Europe,1043887,NL-Alterra,52.00011733902099,5.7163052866684145
-Europe,Western Europe,1043951,NL-Alterra,51.89118481019441,5.347689910672931
-Europe,Western Europe,1043953,NL-Alterra,51.93651285653109,6.016850295952505
-Europe,Western Europe,1043995,NL-Alterra,51.98141438476208,6.159405719681172
-Europe,Western Europe,1043998,NL-Alterra,51.77478275456077,5.774066205363471
-Europe,Western Europe,1107921,WD-ISCN,52.0,5.75
-Europe,Western Europe,1108244,WD-ISCN,51.91669845581055,5.4166998863220215
-Europe,Western Europe,1114660,WD-ISCN,52.13330078125,5.75
-Europe,Western Europe,1115602,WD-ISIS,52.016666666666666,5.966666666666667
-Europe,Western Europe,1115651,WD-ISIS,51.95,5.516666666666667
-Europe,Western Europe,1115744,WD-ISIS,52.032222222222224,5.763055555555556
-Europe,Western Europe,1115758,WD-ISIS,52.03861111111111,5.741944444444444
-Europe,Western Europe,1115811,WD-ISIS,51.916666666666664,5.65
-Europe,Western Europe,1115824,WD-ISIS,52.18333333333333,5.716666666666667
-Europe,Western Europe,1115949,WD-ISIS,52.016666666666666,5.966666666666667
-Europe,Western Europe,1115994,WD-ISIS,52.17583333333334,5.859166666666667
-Europe,Western Europe,1116107,WD-ISIS,51.966906944444446,5.689726111111111
-Europe,Western Europe,1116108,WD-ISIS,51.990613055555556,5.6509261111111115
+Europe,Western Europe,1043465,NL-Alterra,52.378407507979595,5.974652930690879
Europe,Western Europe,1116109,WD-ISIS,51.971765,5.638358055555555
+Europe,Western Europe,1043414,NL-Alterra,51.84872593500576,5.48473003000238
+Europe,Western Europe,1116108,WD-ISIS,51.990613055555556,5.6509261111111115
+Europe,Western Europe,1121523,WD-WISE,52.28,5.672777777777778
+Europe,Western Europe,1043440,NL-Alterra,51.92130549918883,6.1692750325682395
+Europe,Western Europe,1124652,WD-WISE,52.03861111111111,5.741944444444444
+Europe,Western Europe,939307,EU-GEMAS,52.25299835205078,5.9720001220703125
+Europe,Western Europe,1043798,NL-Alterra,52.074578953736285,6.1386960484576365
+Europe,Western Europe,1115758,WD-ISIS,52.03861111111111,5.741944444444444
+Europe,Western Europe,1043855,NL-Alterra,52.00271527776022,6.131810973164188
+Europe,Western Europe,1043532,NL-Alterra,52.046005746082464,5.942588221387407
+Europe,Western Europe,1043442,NL-Alterra,52.25832382345286,6.105766840872823
+Europe,Western Europe,1043719,NL-Alterra,51.85963272280011,5.339225314430387
+Europe,Western Europe,1124545,WD-WISE,51.95,5.516666666666667
+Europe,Western Europe,1043996,NL-Alterra,51.870326759517646,5.091720086565306
+Europe,Western Europe,1115850,WD-ISIS,52.03333333333333,5.683333333333334
+Europe,Western Europe,1043444,NL-Alterra,52.11863727629245,5.978168456684717
Europe,Western Europe,1124744,WD-WISE,52.03333333333333,5.683333333333334
Europe,Western Europe,1043795,NL-Alterra,51.90200151569097,5.9814933777062445
Europe,Western Europe,1108242,WD-ISCN,51.86669921875,5.25
diff --git a/scripts/python/wosis_graphql_q1.py b/scripts/python/wosis_graphql_q1.py
index 997c8d6dc6e22ba689864a2ba6857d62b4cd7b19..bc97eaf1f6dfa59be67ab2b5126c1c941f9567b8 100644
--- a/scripts/python/wosis_graphql_q1.py
+++ b/scripts/python/wosis_graphql_q1.py
@@ -12,7 +12,7 @@ query MyQuery {
datasetCode
latitude
longitude
- geomAccuracy
+ positionalUncertainty
profileCode
}
}
diff --git a/scripts/python/wosis_graphql_q2.py b/scripts/python/wosis_graphql_q2.py
index 304ee4ce7296f6ebe9e8dfc2f699bfa0719d695f..2457c39d60da1590967b7830ed6b34f4b1eed277 100644
--- a/scripts/python/wosis_graphql_q2.py
+++ b/scripts/python/wosis_graphql_q2.py
@@ -13,7 +13,7 @@ query = """
query MyQuery($geomGelderland: GeoJSON!) {
wosisLatestProfiles(
first: 3
- filter: {layersExist: true, geom: {intersects: $geomGelderland}}
+ filter: {layersExist: true, geog: {intersects: $geomGelderland}}
) {
continent
region
@@ -21,10 +21,10 @@ query MyQuery($geomGelderland: GeoJSON!) {
datasetCode
latitude
longitude
- geom{
+ geog{
geojson
- x
- y
+ latitude
+ longitude
}
}
}
diff --git a/scripts/python/wosis_graphql_q3.py b/scripts/python/wosis_graphql_q3.py
index c3a65059174b3319a3e70d4c86a0c14486f776cf..bcea43e720076447c4a204e8b8c615f5bc8ff6ff 100644
--- a/scripts/python/wosis_graphql_q3.py
+++ b/scripts/python/wosis_graphql_q3.py
@@ -14,7 +14,7 @@ query MyQuery($first: Int, $offset: Int, $geomGelderland: GeoJSON!) {
wosisLatestProfiles(
first: $first,
offset: $offset,
- filter: {layersExist: true, geom: {intersects: $geomGelderland}}
+ filter: {layersExist: true, geog: {intersects: $geomGelderland}}
) {
continent
region
diff --git a/scripts/r/wosis_graphql_q1.R b/scripts/r/wosis_graphql_q1.R
index 2fb9c57fc43c9d7b7ad69bfa2be236515e4b1686..54b2382a2fef5ff5201fb18eea0610a6152d06ae 100644
--- a/scripts/r/wosis_graphql_q1.R
+++ b/scripts/r/wosis_graphql_q1.R
@@ -11,7 +11,7 @@ query MyQuery {
datasetCode
latitude
longitude
- geomAccuracy
+ positionalUncertainty
profileCode
}
}
diff --git a/scripts/r/wosis_graphql_q2.R b/scripts/r/wosis_graphql_q2.R
index 243d91b703c53fd61e06ae5d3d5598d22a4632e6..fff160004139b14f7366807c82d9a79f5ffd898f 100644
--- a/scripts/r/wosis_graphql_q2.R
+++ b/scripts/r/wosis_graphql_q2.R
@@ -13,7 +13,7 @@ query <- "
query MyQuery($geomGelderland: GeoJSON!) {
wosisLatestProfiles(
first: 3
- filter: {layersExist: true, geom: {intersects: $geomGelderland}}
+ filter: {layersExist: true, geog: {intersects: $geomGelderland}}
) {
continent
region
@@ -21,10 +21,10 @@ query MyQuery($geomGelderland: GeoJSON!) {
datasetCode
latitude
longitude
- geom {
+ geog{
geojson
- x
- y
+ latitude
+ longitude
}
}
}
diff --git a/scripts/r/wosis_graphql_q3.R b/scripts/r/wosis_graphql_q3.R
index e67ab9e2a6595971310df6b18c5f5f92406e318b..17173e0a82ebe8be0b2819ac372cac95fc869993 100644
--- a/scripts/r/wosis_graphql_q3.R
+++ b/scripts/r/wosis_graphql_q3.R
@@ -13,9 +13,9 @@ geomGelderland <- fromJSON('{
query <- "
query MyQuery($first: Int, $offset: Int, $geomGelderland: GeoJSON!) {
wosisLatestProfiles(
- first: $first,
+ first: $first,
offset: $offset,
- filter: {layersExist: true, geom: {intersects: $geomGelderland}}
+ filter: {layersExist: true, geog: {intersects: $geomGelderland}}
) {
continent
region