Fix surface mapping

Task-number: QTRD-2528

Change-Id: I2e677519b08d1a634d5024ecc85d82b74f8587ad
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

3 files changed, 28 insertions, 26 deletions

diff --git a/examples/qmlmultigraph/qml/qmlmultigraph/data.qml b/examples/qmlmultigraph/qml/qmlmultigraph/data.qml
index 679cb067..51bee741 100644
--- a/examples/qmlmultigraph/qml/qmlmultigraph/data.qml
+++ b/examples/qmlmultigraph/qml/qmlmultigraph/data.qml
@@ -51,26 +51,26 @@ Item {
 
     ListModel {
         id: surfaceDataModel
-        ListElement{ longitude: "20"; latitude: "10"; pop_density: "4.75"; }
-        ListElement{ longitude: "21"; latitude: "10"; pop_density: "3.00"; }
-        ListElement{ longitude: "22"; latitude: "10"; pop_density: "1.24"; }
-        ListElement{ longitude: "23"; latitude: "10"; pop_density: "2.53"; }
-        ListElement{ longitude: "20"; latitude: "11"; pop_density: "3.55"; }
-        ListElement{ longitude: "21"; latitude: "11"; pop_density: "3.03"; }
-        ListElement{ longitude: "22"; latitude: "11"; pop_density: "3.46"; }
-        ListElement{ longitude: "23"; latitude: "11"; pop_density: "4.12"; }
-        ListElement{ longitude: "20"; latitude: "12"; pop_density: "3.37"; }
-        ListElement{ longitude: "21"; latitude: "12"; pop_density: "2.98"; }
-        ListElement{ longitude: "22"; latitude: "12"; pop_density: "3.33"; }
-        ListElement{ longitude: "23"; latitude: "12"; pop_density: "3.23"; }
-        ListElement{ longitude: "20"; latitude: "13"; pop_density: "5.34"; }
-        ListElement{ longitude: "21"; latitude: "13"; pop_density: "4.54"; }
-        ListElement{ longitude: "22"; latitude: "13"; pop_density: "4.65"; }
-        ListElement{ longitude: "23"; latitude: "13"; pop_density: "6.67"; }
-        ListElement{ longitude: "20"; latitude: "14"; pop_density: "6.01"; }
-        ListElement{ longitude: "21"; latitude: "14"; pop_density: "5.83"; }
-        ListElement{ longitude: "22"; latitude: "14"; pop_density: "5.90"; }
-        ListElement{ longitude: "23"; latitude: "14"; pop_density: "7.32"; }
+        ListElement{ row: "0"; col: "0"; longitude: "20.0"; latitude: "10.0"; pop_density: "4.75"; }
+        ListElement{ row: "1"; col: "0"; longitude: "21.1"; latitude: "10.3"; pop_density: "3.00"; }
+        ListElement{ row: "2"; col: "0"; longitude: "22.5"; latitude: "10.7"; pop_density: "1.24"; }
+        ListElement{ row: "3"; col: "0"; longitude: "24.0"; latitude: "10.5"; pop_density: "2.53"; }
+        ListElement{ row: "0"; col: "1"; longitude: "20.2"; latitude: "11.2"; pop_density: "3.55"; }
+        ListElement{ row: "1"; col: "1"; longitude: "21.3"; latitude: "11.5"; pop_density: "3.03"; }
+        ListElement{ row: "2"; col: "1"; longitude: "22.6"; latitude: "11.7"; pop_density: "3.46"; }
+        ListElement{ row: "3"; col: "1"; longitude: "23.4"; latitude: "11.5"; pop_density: "4.12"; }
+        ListElement{ row: "0"; col: "2"; longitude: "20.2"; latitude: "12.3"; pop_density: "3.37"; }
+        ListElement{ row: "1"; col: "2"; longitude: "21.1"; latitude: "12.4"; pop_density: "2.98"; }
+        ListElement{ row: "2"; col: "2"; longitude: "22.5"; latitude: "12.1"; pop_density: "3.33"; }
+        ListElement{ row: "3"; col: "2"; longitude: "23.3"; latitude: "12.7"; pop_density: "3.23"; }
+        ListElement{ row: "0"; col: "3"; longitude: "20.7"; latitude: "13.3"; pop_density: "5.34"; }
+        ListElement{ row: "1"; col: "3"; longitude: "21.5"; latitude: "13.2"; pop_density: "4.54"; }
+        ListElement{ row: "2"; col: "3"; longitude: "22.4"; latitude: "13.6"; pop_density: "4.65"; }
+        ListElement{ row: "3"; col: "3"; longitude: "23.2"; latitude: "13.4"; pop_density: "6.67"; }
+        ListElement{ row: "0"; col: "4"; longitude: "20.6"; latitude: "15.0"; pop_density: "6.01"; }
+        ListElement{ row: "1"; col: "4"; longitude: "21.3"; latitude: "14.6"; pop_density: "5.83"; }
+        ListElement{ row: "2"; col: "4"; longitude: "22.5"; latitude: "14.8"; pop_density: "5.90"; }
+        ListElement{ row: "3"; col: "4"; longitude: "23.7"; latitude: "14.3"; pop_density: "7.32"; }
     }
 }
 
diff --git a/examples/qmlmultigraph/qml/qmlmultigraph/main.qml b/examples/qmlmultigraph/qml/qmlmultigraph/main.qml
index 23465c75..1761ed34 100644
--- a/examples/qmlmultigraph/qml/qmlmultigraph/main.qml
+++ b/examples/qmlmultigraph/qml/qmlmultigraph/main.qml
@@ -60,16 +60,18 @@ Item {
                     itemLabelFormat: "Pop density at (@xLabel N, @zLabel E): @yLabel"
                     ItemModelSurfaceDataProxy {
                         itemModel: data.surfaceData
-                        // Mapping model roles to surface series rows, columns, and values.
-                        rowRole: "longitude"
-                        columnRole: "latitude"
-                        valueRole: "pop_density"
+                        // The surface data points are not neatly lined up in rows and columns,
+                        // so we define explicit row and column roles.
+                        rowRole: "row"
+                        columnRole: "col"
+                        xPosRole: "latitude"
+                        zPosRole: "longitude"
+                        yPosRole: "pop_density"
                     }
                 }
             }
         }
 
-
         Rectangle {
             Layout.fillHeight: true
             Layout.fillWidth: true
diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml
index da608aa7..aaae9a58 100644
--- a/examples/qmlsurface/qml/qmlsurface/main.qml
+++ b/examples/qmlsurface/qml/qmlsurface/main.qml
@@ -88,7 +88,7 @@ Item {
                     itemModel: surfaceData.model
                     rowRole: "longitude"
                     columnRole: "latitude"
-                    valueRole: "height"
+                    yPosRole: "height"
                 }
                 //! [6]