Merge branch 'master' of sync.virgis.co.uk:/virgis/projects

hope.json

@@ -9,7 +9,7 @@
     ]
   },
   "scales": [
-    3.647862,
+    1.0,
     1.0,
     1.0,
     1.0
@@ -20,9 +20,15 @@
     {
       "type": "Point",
       "coordinates": [
+<<<<<<< HEAD
         -1.7786752501469711,
         53.330099989429186,
         388.1629638671875
+=======
+        -1.7834957576539565,
+        53.327165465325137,
+        205.93867492675781
+>>>>>>> 052ec496d5282d2da7435c1620e682926dd7d206
       ]
     },
     {
@@ -924,7 +930,11 @@
       "id": "006",
       "display-name": "Collars",
       "datatype": "BoreHole",
+<<<<<<< HEAD
       "source": "C:/Users/runes/Documents/GitHub/ViRGiS_geo/test_data/boreholes/Hope_collars_E9.vrt",
+=======
+      "source": "test_data/boreholes/Hope_collars_E9.vrt",
+>>>>>>> 052ec496d5282d2da7435c1620e682926dd7d206
       "position": null,
       "transform": {
         "translate": [
@@ -1354,7 +1364,11 @@
         "bbox": null,
         "mapscale": 0,
         "map_size": 0,
+<<<<<<< HEAD
         "image_folder": "test_data\\images",
+=======
+        "image_folder": "test_data/images",
+>>>>>>> 052ec496d5282d2da7435c1620e682926dd7d206
         "bh-data": {
           "x-field": null,
           "y-field": null,

sandwich.json

@@ -20,9 +20,15 @@
     {
       "type": "Point",
       "coordinates": [
+<<<<<<< HEAD
+        1.3790984994140671,
+        51.295153386188261,
+        201.59054565429688
+=======
         1.3779519593942986,
         51.289877289680938,
         122.25299072265625
+>>>>>>> 1ec70844dd5b0d2f10ac5f0838fb60e46ce75d20
       ]
     },
     {